Merge remote-tracking branch 'upstream/master'

go.mod

@@ -20,8 +20,6 @@ require (
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/protobuf v1.3.2
 	github.com/hashicorp/golang-lru v0.5.0
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pkg/errors v0.8.0
 	github.com/prometheus/client_golang v1.1.0 // indirect
 	github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d

plugin/dapp/retrieve/cmd/retrieve.go

@@ -168,7 +168,7 @@ func performCmd(cmd *cobra.Command, args []string) {
 		return
 	}
 	for i := 0; i < len(execs); i++ {
-		params.Assets = append(params.Assets, rpc.Asset{Exec: execs[i], Symbol: symbols[0]})
+		params.Assets = append(params.Assets, rpc.Asset{Exec: execs[i], Symbol: symbols[i]})
 	}
 
 	ctx := jsonrpc.NewRPCCtx(rpcLaddr, "retrieve.CreateRawRetrievePerformTx", params, nil)
@@ -206,7 +206,7 @@ func cancelCmd(cmd *cobra.Command, args []string) {
 func RetrieveQueryCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "query",
-		Short: "Backup the wallet",
+		Short: "show retrieve info",
 		Run:   queryRetrieveCmd,
 	}
 	addQueryRetrieveCmdFlags(cmd)
@@ -218,6 +218,9 @@ func addQueryRetrieveCmdFlags(cmd *cobra.Command) {
 	cmd.MarkFlagRequired("backup")
 	cmd.Flags().StringP("default", "t", "", "default address")
 	cmd.MarkFlagRequired("default")
+
+	cmd.Flags().StringP("asset_exec", "e", "", "asset exec")
+	cmd.Flags().StringP("asset_symbol", "s", "", "asset symbol")
 }
 
 func parseRerieveDetail(arg interface{}) (interface{}, error) {
@@ -246,10 +249,14 @@ func queryRetrieveCmd(cmd *cobra.Command, args []string) {
 	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
 	backup, _ := cmd.Flags().GetString("backup")
 	defaultAddr, _ := cmd.Flags().GetString("default")
+	exec, _ := cmd.Flags().GetString("asset_exec")
+	symbol, _ := cmd.Flags().GetString("asset_symbol")
 
 	req := &rt.ReqRetrieveInfo{
 		BackupAddress:  backup,
 		DefaultAddress: defaultAddr,
+		AssetExec:      exec,
+		AssetSymbol:    symbol,
 	}
 
 	var params rpctypes.Query4Jrpc

plugin/dapp/retrieve/executor/exec_del_local.go

@@ -97,7 +97,7 @@ func (c *Retrieve) ExecDelLocal_Perform(perf *rt.PerformRetrieve, tx *types.Tran
 
 	if types.IsDappFork(c.GetHeight(), rt.RetrieveX, rt.ForkRetriveAssetX) {
 		if len(perf.Assets) == 0 {
-			perf.Assets = append(perf.Assets, &types.Asset{Exec: "coins", Symbol: types.GetCoinSymbol()})
+			perf.Assets = append(perf.Assets, &rt.AssetSymbol{Exec: "coins", Symbol: types.GetCoinSymbol()})
 		}
 	}
 	for _, asset := range perf.Assets {

plugin/dapp/retrieve/executor/exec_local.go

@@ -104,7 +104,7 @@ func (c *Retrieve) ExecLocal_Perform(perf *rt.PerformRetrieve, tx *types.Transac
 	}
 	if types.IsDappFork(c.GetHeight(), rt.RetrieveX, rt.ForkRetriveAssetX) {
 		if len(perf.Assets) == 0 {
-			perf.Assets = append(perf.Assets, &types.Asset{Exec: "coins", Symbol: types.GetCoinSymbol()})
+			perf.Assets = append(perf.Assets, &rt.AssetSymbol{Exec: "coins", Symbol: types.GetCoinSymbol()})
 		}
 	}
 	for _, asset := range perf.Assets {

plugin/dapp/retrieve/executor/query.go

@@ -5,8 +5,6 @@
 package executor
 
 import (
-	"fmt"
-
 	"github.com/33cn/chain33/types"
 	rt "github.com/33cn/plugin/plugin/dapp/retrieve/types"
 )
@@ -29,11 +27,9 @@ func (r *Retrieve) Query_GetRetrieveInfo(in *rt.ReqRetrieveInfo) (types.Message,
 	if info.Status == retrievePerform && in.GetAssetExec() != "" {
 		// retrievePerform状态下，不存在有两种情况
 		// 1 还没找回, 2 fork 之前是没有coins 找回记录的
-		count := r.GetLocalDB().PrefixCount(calcRetrieveAssetPrefix(in.BackupAddress, in.DefaultAddress))
 		// 2 fork 之前是 没有coins 找回记录的, 相当于都找回了
-		if count == 0 {
-			return info, nil
-		}
+		// localdb not support PrefixCount
+		// 所以在填写具体资产的情况下， 认为是要找对应的资产
 
 		asset, _ := getRetrieveAsset(r.GetLocalDB(), in.BackupAddress, in.DefaultAddress, in.AssetExec, in.AssetSymbol)
 		if asset != nil {
@@ -48,8 +44,3 @@ func (r *Retrieve) Query_GetRetrieveInfo(in *rt.ReqRetrieveInfo) (types.Message,
 	}
 	return info, nil
 }
-
-func calcRetrieveAssetPrefix(backupAddr, defaultAddr string) []byte {
-	key := fmt.Sprintf("LODB-retrieve-backup-asset:%s:%s:", backupAddr, defaultAddr)
-	return []byte(key)
-}

plugin/dapp/retrieve/executor/retrievedb.go

@@ -211,7 +211,7 @@ func (action *Action) RetrievePerformAssets(perfRet *rt.PerformRetrieve, default
 
 	// 兼容原来的找回， 在不指定的情况下，找回主币
 	if len(perfRet.Assets) == 0 {
-		perfRet.Assets = append(perfRet.Assets, &types.Asset{Exec: "coins", Symbol: types.GetCoinSymbol()})
+		perfRet.Assets = append(perfRet.Assets, &rt.AssetSymbol{Exec: "coins", Symbol: types.GetCoinSymbol()})
 		//return nil, nil
 	}
 
@@ -224,7 +224,7 @@ func (action *Action) RetrievePerformAssets(perfRet *rt.PerformRetrieve, default
 		acc := accdb.LoadExecAccount(defaultAddress, action.execaddr)
 		rlog.Debug("RetrievePerform", "acc.Balance", acc.Balance)
 		if acc.Balance > 0 {
-			receipt, err = action.coinsAccount.ExecTransfer(defaultAddress, perfRet.BackupAddress, action.execaddr, acc.Balance)
+			receipt, err = accdb.ExecTransfer(defaultAddress, perfRet.BackupAddress, action.execaddr, acc.Balance)
 			if err != nil {
 				rlog.Debug("RetrievePerform", "ExecTransfer", err)
 				return nil, err

plugin/dapp/retrieve/proto/retrieve.proto

@@ -40,10 +40,16 @@ message PrepareRetrieve {
     string defaultAddress = 2;
 }
 
+
+message AssetSymbol {
+    string exec = 1;
+    string symbol = 2;
+}
+
 message PerformRetrieve {
     string backupAddress  = 1;
     string defaultAddress = 2;
-    repeated Asset assets = 3;
+    repeated AssetSymbol assets = 3;
 }
 
 message CancelRetrieve {

plugin/dapp/retrieve/rpc/jrpc.go

@@ -49,6 +49,11 @@ func (c *Jrpc) CreateRawRetrievePerformTx(in *RetrievePerformTx, result *interfa
 	head := &types.PerformRetrieve{
 		BackupAddress:  in.BackupAddr,
 		DefaultAddress: in.DefaultAddr,
+		Assets:         []*types.AssetSymbol{},
+	}
+
+	for i := 0; i < len(in.Assets); i++ {
+		head.Assets = append(head.Assets, &types.AssetSymbol{Exec: in.Assets[i].Exec, Symbol: in.Assets[i].Symbol})
 	}
 	reply, err := c.cli.Perform(context.Background(), head)
 	if err != nil {

plugin/dapp/retrieve/rpc/jrpc_channel_test.go

@@ -8,11 +8,14 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/33cn/chain33/common"
+
 	commonlog "github.com/33cn/chain33/common/log"
 	"github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
 	"github.com/33cn/chain33/util/testnode"
+
 	"github.com/33cn/plugin/plugin/dapp/retrieve/rpc"
 	pty "github.com/33cn/plugin/plugin/dapp/retrieve/types"
 	"github.com/stretchr/testify/assert"
@@ -67,8 +70,28 @@ func testPrepareCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
 }
 
 func testPerformCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
-	params := rpc.RetrievePerformTx{}
-	return jrpc.Call("retrieve.CreateRawRetrievePerformTx", params, nil)
+	params := rpc.RetrievePerformTx{
+		BackupAddr:  "b",
+		DefaultAddr: "d",
+		Assets:      []rpc.Asset{{"e", "s"}},
+	}
+
+	var txS string
+	t.Log("tx info", "x", params.Assets)
+	err := jrpc.Call("retrieve.CreateRawRetrievePerformTx", &params, &txS)
+	var tx types.Transaction
+	bytes, err := common.FromHex(txS)
+	if err != nil {
+		return err
+	}
+	err = types.Decode(bytes, &tx)
+	if err != nil {
+		return err
+	}
+	var p2 pty.RetrieveAction
+	err = types.Decode(tx.Payload, &p2)
+	t.Log("asset", p2.GetPerform().GetAssets())
+	return err
 }
 
 func testCancelCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {

plugin/dapp/retrieve/rpc/rpc.go

@@ -43,10 +43,12 @@ func (c *channelClient) Perform(ctx context.Context, v *rt.PerformRetrieve) (*ty
 		Ty:    rt.RetrieveActionPerform,
 		Value: &rt.RetrieveAction_Perform{Perform: v},
 	}
-	tx, err := types.CreateFormatTx(types.ExecName(rt.RetrieveX), types.Encode(perform))
+	payload := types.Encode(perform)
+	tx, err := types.CreateFormatTx(types.ExecName(rt.RetrieveX), payload)
 	if err != nil {
 		return nil, err
 	}
+
 	data := types.Encode(tx)
 	return &types.UnsignTx{Data: data}, nil
 }