add relay rpc test

build/docker-compose.sh

@@ -57,7 +57,7 @@ if [ -n "${DAPP}" ]; then
 
 fi
 
-if [ -z "$DAPP" ]; then
+if [ -z "$DAPP" ] || [ "$DAPP" == "paracross" ]; then
     # shellcheck source=/dev/null
     source system-test-rpc.sh
     # shellcheck source=/dev/null
@@ -328,16 +328,20 @@ function transfer() {
 }
 
 function base_config() {
-    sync
+#    sync
     transfer "${CLI}"
     #    transfer "${CLI4}"
 }
 
 function base_test() {
     if [ "$DAPP" == "" ]; then
-        system_test_rpc "${1}"
-        dapp_test_rpc "${1}"
+        system_test_rpc "http://${1}:8801"
+        dapp_test_rpc "http://${1}:8801"
     fi
+#    if [ "$DAPP" == "paracross" ]; then
+#        system_test_rpc "http://${1}:8901"
+#        dapp_test_rpc "http://${1}:8901"
+#    fi
 
 }
 function dapp_run() {

build/system-test-rpc.sh

@@ -30,8 +30,7 @@ chain33_unlock() {
 
 }
 function system_test_rpc() {
-    local ip=$1
-    MAIN_HTTP="http://$ip:8801"
+    MAIN_HTTP="$1"
     echo "=========== # system rpc test ============="
     echo "ip=$MAIN_HTTP"
 
@@ -44,4 +43,4 @@ function system_test_rpc() {
     fi
 }
 
-#system_rpc_test
+#system_test_rpc $1

plugin/dapp/relay/commands/relay.go

@@ -36,7 +36,6 @@ func RelayCmd() *cobra.Command {
 		CreateRawRelayAcceptTxCmd(),
 		CreateRawRevokeTxCmd(),
 		CreateRawRelayConfirmTxCmd(),
-		CreateRawRelayVerifyBTCTxCmd(),
 		CreateRawRelayBtcHeaderCmd(),
 	)
 
@@ -566,52 +565,3 @@ func relaySaveBtcHead(cmd *cobra.Command, args []string) {
 	ctx.RunWithoutMarshal()
 }
 
-// CreateRawRelayVerifyBTCTxCmd verify btc tx from cli
-func CreateRawRelayVerifyBTCTxCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "verify",
-		Short: "Create a verify coin transaction",
-		Run:   relayVerifyBTC,
-	}
-	addVerifyBTCFlags(cmd)
-	return cmd
-}
-
-func addVerifyBTCFlags(cmd *cobra.Command) {
-	cmd.Flags().StringP("order_id", "o", "", "order id")
-	cmd.MarkFlagRequired("order_id")
-
-	cmd.Flags().StringP("raw_tx", "t", "", "coin raw tx")
-	cmd.MarkFlagRequired("raw_tx")
-
-	cmd.Flags().Uint32P("tx_index", "i", 0, "raw tx index")
-	cmd.MarkFlagRequired("tx_index")
-
-	cmd.Flags().StringP("merk_branch", "m", "", "tx merkle branch")
-	cmd.MarkFlagRequired("merk_branch")
-
-	cmd.Flags().StringP("block_hash", "b", "", "block hash of tx ")
-	cmd.MarkFlagRequired("block_hash")
-
-}
-
-func relayVerifyBTC(cmd *cobra.Command, args []string) {
-	rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
-	orderid, _ := cmd.Flags().GetString("order_id")
-	rawtx, _ := cmd.Flags().GetString("raw_tx")
-	txindex, _ := cmd.Flags().GetUint32("tx_index")
-	merkbranch, _ := cmd.Flags().GetString("merk_branch")
-	blockhash, _ := cmd.Flags().GetString("block_hash")
-
-	params := &ty.RelayVerifyCli{
-		OrderId:    orderid,
-		RawTx:      rawtx,
-		TxIndex:    txindex,
-		MerkBranch: merkbranch,
-		BlockHash:  blockhash,
-	}
-
-	var res string
-	ctx := jsonclient.NewRPCCtx(rpcLaddr, "relay.CreateRawRelayVerifyBTCTx", params, &res)
-	ctx.RunWithoutMarshal()
-}

plugin/dapp/relay/executor/exec.go

@@ -34,10 +34,6 @@ func (r *relay) Exec_Verify(payload *rty.RelayVerify, tx *types.Transaction, ind
 	return action.verifyTx(payload)
 }
 
-func (r *relay) Exec_VerifyCli(payload *rty.RelayVerifyCli, tx *types.Transaction, index int) (*types.Receipt, error) {
-	action := newRelayDB(r, tx)
-	return action.verifyCmdTx(payload)
-}
 
 func (r *relay) Exec_BtcHeaders(payload *rty.BtcHeaders, tx *types.Transaction, index int) (*types.Receipt, error) {
 	action := newRelayDB(r, tx)

plugin/dapp/relay/executor/relaydb.go

@@ -566,6 +566,7 @@ func (action *relayDB) verifyTx(verify *ty.RelayVerify) (*types.Receipt, error)
 
 }
 
+//之前用作cli verify, 检查不严格，现在弃用
 func (action *relayDB) verifyCmdTx(verify *ty.RelayVerifyCli) (*types.Receipt, error) {
 	orderID := []byte(verify.OrderId)
 	order, err := action.getOrderByID(orderID)

plugin/dapp/relay/rpc/rpc.go

@@ -41,13 +41,7 @@ func createRawRelayConfirmTx(parm *ty.RelayConfirmTx) ([]byte, error) {
 	return types.CallCreateTx(types.ExecName(ty.RelayX), "ConfirmTx", parm)
 }
 
-func createRawRelayVerifyBTCTx(parm *ty.RelayVerifyCli) ([]byte, error) {
-	if parm == nil {
-		return nil, types.ErrInvalidParam
-	}
-	v := *parm
-	return types.CallCreateTx(types.ExecName(ty.RelayX), "VerifyCli", &v)
-}
+
 
 func createRawRelaySaveBTCHeadTx(parm *ty.BtcHeader) ([]byte, error) {
 	if parm == nil {
@@ -58,6 +52,10 @@ func createRawRelaySaveBTCHeadTx(parm *ty.BtcHeader) ([]byte, error) {
 		PreviousHash: parm.PreviousHash,
 		MerkleRoot:   parm.MerkleRoot,
 		Height:       parm.Height,
+		Version:   	  parm.Version,
+		Time: 		  parm.Time,
+		Nonce:        parm.Nonce,
+		Bits:         parm.Bits,
 		IsReset:      parm.IsReset,
 	}
 
@@ -109,16 +107,6 @@ func (c *Jrpc) CreateRawRelayConfirmTx(in *ty.RelayConfirmTx, result *interface{
 	return nil
 }
 
-//CreateRawRelayVerifyBTCTx jrpc create veirfy btc tx
-func (c *Jrpc) CreateRawRelayVerifyBTCTx(in *ty.RelayVerifyCli, result *interface{}) error {
-	reply, err := createRawRelayVerifyBTCTx(in)
-	if err != nil {
-		return err
-	}
-	*result = hex.EncodeToString(reply)
-	return nil
-}
-
 //CreateRawRelaySaveBTCHeadTx jrpc save btc header
 func (c *Jrpc) CreateRawRelaySaveBTCHeadTx(in *ty.BtcHeader, result *interface{}) error {
 	reply, err := createRawRelaySaveBTCHeadTx(in)