add contract template LockWithPublicKeyHash and RevealPreimage (#1101)

adjust contract template structure

diff --git a/cmd/bytomcli/commands/template.go b/cmd/bytomcli/commands/template.go
index 93bc5ed..b48f4f4 100644 (file)
--- a/cmd/bytomcli/commands/template.go
+++ b/cmd/bytomcli/commands/template.go
@@ -3,14 +3,14 @@ package commands
 // contract is LockWithPublicKey
 var buildLockWithPublicKeyReqFmt = `
        {"actions": [
-               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {derivation_path": ["%s", "%s"], "xpub": "%s"}}]},
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
                {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"},
                {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount": %s, "account_id": "%s"}
        ]}`
 
 var buildLockWithPublicKeyReqFmtByAlias = `
        {"actions": [
-               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"derivation_path": ["%s", "%s"], "xpub": "%s"}}]},
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
                {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"},
                {"type": "spend_account", "asset_alias": "BTM", "amount": %s, "account_alias": "%s"}
        ]}`
@@ -18,16 +18,48 @@ var buildLockWithPublicKeyReqFmtByAlias = `
 // contract is LockWithMultiSig
 var buildLockWithMultiSigReqFmt = `
        {"actions": [
-               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"derivation_path": ["%s", "%s"], "xpub": "%s"}},
-                               {"type": "raw_tx_signature", "raw_data": {"derivation_path": ["%s", "%s"], "xpub": "%s"}}]},
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}},
+                               {"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
                {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"},
                {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount": %s, "account_id": "%s"}
        ]}`
 
 var buildLockWithMultiSigReqFmtByAlias = `
        {"actions": [
-               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"derivation_path": ["%s", "%s"], "xpub": "%s"}},
-                               {"type": "raw_tx_signature", "raw_data": {"derivation_path": ["%s", "%s"], "xpub": "%s"}}]},
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}},
+                               {"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
+               {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"},
+               {"type": "spend_account", "asset_alias": "BTM", "amount": %s, "account_alias": "%s"}
+       ]}`
+
+// contract is LockWithPublicKeyHash
+var buildLockWithPublicKeyHashReqFmt = `
+       {"actions": [
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "data", "raw_data": {"value": "%s"}},
+                               {"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
+               {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"},
+               {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount": %s, "account_id": "%s"}
+       ]}`
+
+var buildLockWithPublicKeyHashReqFmtByAlias = `
+       {"actions": [
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "data", "raw_data": {"value": "%s"}},
+                               {"type": "raw_tx_signature", "raw_data": {"xpub": "%s", "derivation_path": ["%s", "%s"]}}]},
+               {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"},
+               {"type": "spend_account", "asset_alias": "BTM", "amount": %s, "account_alias": "%s"}
+       ]}`
+
+// contract is RevealPreimage
+var buildRevealPreimageReqFmt = `
+       {"actions": [
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "data", "raw_data": {"value": "%s"}}]},
+               {"type": "control_program", "asset_id": "%s", "amount": %s, "control_program": "%s"},
+               {"type": "spend_account", "asset_id": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "amount": %s, "account_id": "%s"}
+       ]}`
+
+var buildRevealPreimageReqFmtByAlias = `
+       {"actions": [
+               {"type": "spend_account_unspent_output", "output_id": "%s", "arguments": [{"type": "data", "raw_data": {"value": "%s"}}]},
                {"type": "control_program", "asset_alias": "%s", "amount": %s, "control_program": "%s"},
                {"type": "spend_account", "asset_alias": "BTM", "amount": %s, "account_alias": "%s"}
        ]}`

diff --git a/cmd/bytomcli/commands/transaction.go b/cmd/bytomcli/commands/transaction.go
index 1ac5a24..576170a 100644 (file)
--- a/cmd/bytomcli/commands/transaction.go
+++ b/cmd/bytomcli/commands/transaction.go
@@ -126,7 +126,7 @@ var buildControlProgramReqFmtByAlias = `
        ]}`
 
 var buildTransactionCmd = &cobra.Command{
-       Use:   "build-transaction <accountID|alias> <assetID|alias> <amount>",
+       Use:   "build-transaction <accountID|alias> <assetID|alias> <amount> [outputID]",
        Short: "Build one transaction template,default use account id and asset id",
        Args:  cobra.RangeArgs(3, 20),
        PreRun: func(cmd *cobra.Command, args []string) {
@@ -172,32 +172,34 @@ var buildTransactionCmd = &cobra.Command{
                        }
                        buildReqStr = fmt.Sprintf(buildControlProgramReqFmt, btmGas, accountInfo, assetInfo, amount, accountInfo, assetInfo, amount, program)
                case "unlock":
-                       usage := "Usage:\n  bytomcli build-transaction <accountID|alias> <assetID|alias> <amount> -c <contractName> <outputID>"
+                       usage := "Usage:\n  bytomcli build-transaction <accountID|alias> <assetID|alias> <amount> <outputID> -c <contractName>"
+                       if len(args) <= 3 {
+                               jww.ERROR.Printf("%s <contract_argument> ... [flags]\n\n", usage)
+                               os.Exit(util.ErrLocalExe)
+                       }
+                       outputID := args[3]
                        switch contractName {
                        case "LockWithPublicKey":
                                if len(args) != 7 {
-                                       fmt.Printf("%s <rootPub> <path1> <path2> [flags]\n\n", usage)
+                                       jww.ERROR.Printf("%s <rootPub> <path1> <path2> [flags]\n\n", usage)
                                        os.Exit(util.ErrLocalExe)
                                }
 
-                               outputID := args[3]
                                rootPub := args[4]
                                path1 := args[5]
                                path2 := args[6]
-
                                if alias {
-                                       buildReqStr = fmt.Sprintf(buildLockWithPublicKeyReqFmtByAlias, outputID, path1, path2, rootPub, assetInfo, amount, program, btmGas, accountInfo)
+                                       buildReqStr = fmt.Sprintf(buildLockWithPublicKeyReqFmtByAlias, outputID, rootPub, path1, path2, assetInfo, amount, program, btmGas, accountInfo)
                                        break
                                }
-                               buildReqStr = fmt.Sprintf(buildLockWithPublicKeyReqFmt, outputID, path1, path2, rootPub, assetInfo, amount, program, btmGas, accountInfo)
+                               buildReqStr = fmt.Sprintf(buildLockWithPublicKeyReqFmt, outputID, rootPub, path1, path2, assetInfo, amount, program, btmGas, accountInfo)
 
                        case "LockWithMultiSig":
                                if len(args) != 10 {
-                                       fmt.Printf("%s <rootPub1> <path11> <path12> <rootPub2> <path21> <path22> [flags]\n\n", usage)
+                                       jww.ERROR.Printf("%s <rootPub1> <path11> <path12> <rootPub2> <path21> <path22> [flags]\n\n", usage)
                                        os.Exit(util.ErrLocalExe)
                                }
 
-                               outputID := args[3]
                                rootPub1 := args[4]
                                path11 := args[5]
                                path12 := args[6]
@@ -205,13 +207,42 @@ var buildTransactionCmd = &cobra.Command{
                                path21 := args[8]
                                path22 := args[9]
                                if alias {
-                                       buildReqStr = fmt.Sprintf(buildLockWithMultiSigReqFmtByAlias, outputID, path11, path12, rootPub1, path21, path22, rootPub2, assetInfo, amount, program, btmGas, accountInfo)
+                                       buildReqStr = fmt.Sprintf(buildLockWithMultiSigReqFmtByAlias, outputID, rootPub1, path11, path12, rootPub2, path21, path22, assetInfo, amount, program, btmGas, accountInfo)
+                                       break
+                               }
+                               buildReqStr = fmt.Sprintf(buildLockWithMultiSigReqFmt, outputID, rootPub1, path11, path12, rootPub2, path21, path22, assetInfo, amount, program, btmGas, accountInfo)
+
+                       case "LockWithPublicKeyHash":
+                               if len(args) != 8 {
+                                       jww.ERROR.Printf("%s <pubkey> <rootPub> <path1> <path2> [flags]\n\n", usage)
+                                       os.Exit(util.ErrLocalExe)
+                               }
+
+                               pubkey := args[4]
+                               rootPub := args[5]
+                               path1 := args[6]
+                               path2 := args[7]
+                               if alias {
+                                       buildReqStr = fmt.Sprintf(buildLockWithPublicKeyHashReqFmtByAlias, outputID, pubkey, rootPub, path1, path2, assetInfo, amount, program, btmGas, accountInfo)
+                                       break
+                               }
+                               buildReqStr = fmt.Sprintf(buildLockWithPublicKeyHashReqFmt, outputID, pubkey, rootPub, path1, path2, assetInfo, amount, program, btmGas, accountInfo)
+
+                       case "RevealPreimage":
+                               if len(args) != 5 {
+                                       jww.ERROR.Printf("%s <value> [flags]\n\n", usage)
+                                       os.Exit(util.ErrLocalExe)
+                               }
+
+                               value := args[4]
+                               if alias {
+                                       buildReqStr = fmt.Sprintf(buildRevealPreimageReqFmtByAlias, outputID, value, assetInfo, amount, program, btmGas, accountInfo)
                                        break
                                }
-                               buildReqStr = fmt.Sprintf(buildLockWithMultiSigReqFmt, outputID, path11, path12, rootPub1, path21, path22, rootPub2, assetInfo, amount, program, btmGas, accountInfo)
+                               buildReqStr = fmt.Sprintf(buildRevealPreimageReqFmt, outputID, value, assetInfo, amount, program, btmGas, accountInfo)
 
                        default:
-                               jww.ERROR.Println("Invalid Contract template")
+                               jww.ERROR.Printf("Invalid Contract template: %s\n\n", contractName)
                                os.Exit(util.ErrLocalExe)
                        }