fix bug

diff --git a/swap/htlc.go b/swap/htlc.go
index e34dccf..f8dd949 100644 (file)
--- a/swap/htlc.go
+++ b/swap/htlc.go
@@ -405,10 +405,11 @@ func CallHTLCContract(account HTLCAccount, contractUTXOID, preimage string, cont
        }
 
        // sign raw transaction
-       recipientSig, err := signMessage(address, buildTxResp.RawTransaction, account.Password)
+       recipientSig, err := signMessage(address, signData, account.Password)
        if err != nil {
                return "", err
        }
+       fmt.Println("recipientSig:", recipientSig)
 
        // sign raw transaction
        signedTransaction, err := signUnlockHTLCContractTransaction(account, preimage, recipientSig, buildTxResp.RawTransaction, string(signingInst))

diff --git a/swap/htlc_test.go b/swap/htlc_test.go
index 2499b5c..ded64ad 100644 (file)
--- a/swap/htlc_test.go
+++ b/swap/htlc_test.go
@@ -6,22 +6,34 @@ import (
        "testing"
 )
 
+var contractArgs = HTLCContractArgs{
+       SenderPublicKey:    "a550d20483af8a0ed02d061d1659f1346a16566d4afa93c49dbce9bc5a5bf559",
+       RecipientPublicKey: "6ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d",
+       BlockHeight:        uint64(1100),
+       Hash:               "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
+}
+
+var contractValue = AssetAmount{
+       Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
+       Amount: uint64(200000000),
+}
+
 func TestDeployHTLCContract(t *testing.T) {
        account := HTLCAccount{
                AccountID: "10CJPO1HG0A02",
                Password:  "12345",
                TxFee:     uint64(100000000),
        }
-       contractArgs := HTLCContractArgs{
-               SenderPublicKey:    "3e5d7d52d334964eef173021ef6a04dc0807ac8c41700fe718f5a80c2109f79e",
-               RecipientPublicKey: "6ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d",
-               BlockHeight:        uint64(950),
-               Hash:               "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
-       }
-       contractValue := AssetAmount{
-               Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
-               Amount: uint64(20000000000),
-       }
+       // contractArgs := HTLCContractArgs{
+       //      SenderPublicKey:    "a550d20483af8a0ed02d061d1659f1346a16566d4afa93c49dbce9bc5a5bf559",
+       //      RecipientPublicKey: "6ea28f3f1389efd6a731de070fb38ab69dc93dae6c73b6524bac901b662f601d",
+       //      BlockHeight:        uint64(1100),
+       //      Hash:               "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
+       // }
+       // contractValue := AssetAmount{
+       //      Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
+       //      Amount: uint64(20000000000),
+       // }
        contractUTXOID, err := DeployHTLCContract(account, contractValue, contractArgs)
        if err != nil {
                fmt.Println(err)
@@ -36,11 +48,11 @@ func TestBuildUnlockHTLCContractTransaction(t *testing.T) {
                Receiver:  "00140fdee108543d305308097019ceb5aec3da60ec66",
                TxFee:     uint64(100000000),
        }
-       contractUTXOID := "e5b3b14c03eaab17c21cc23b925309bd7b8f8ed85b3fd078e0170498f5e069c8"
-       contractValue := AssetAmount{
-               Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
-               Amount: uint64(20000000000),
-       }
+       contractUTXOID := "4de2ad249889499a0c5cc3190061d50390f295d6d00cf86d35df63a723a8dd0e"
+       // contractValue := AssetAmount{
+       //      Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
+       //      Amount: uint64(20000000000),
+       // }
        buildTxResp, err := buildUnlockHTLCContractTransaction(account, contractUTXOID, contractValue)
        if err != nil {
                fmt.Println(err)
@@ -93,21 +105,12 @@ func TestCallHTLCContract(t *testing.T) {
        account := HTLCAccount{
                AccountID: "10CKAD3000A02",
                Password:  "12345",
-               Receiver:  "00140fdee108543d305308097019ceb5aec3da60ec66",
+               Receiver:  "0014a90cd8c57c682e01f3e7553ea18722621be845f2",
                TxFee:     uint64(100000000),
        }
-       contractUTXOID := "68b6f62e826d219fba4997794e1399014a2a093184ec01fcf9be9cd4bae892cd"
+       contractUTXOID := "4de2ad249889499a0c5cc3190061d50390f295d6d00cf86d35df63a723a8dd0e"
        preimage := "68656c6c6f"
-       contractArgs := HTLCContractArgs{
-               SenderPublicKey:    "3e5d7d52d334964eef173021ef6a04dc0807ac8c41700fe718f5a80c2109f79e",
-               RecipientPublicKey: "198787c8380ed1ba6fec1f81bb68c17c16432c4bc646effe0a5fae4f1b528f16",
-               BlockHeight:        uint64(950),
-               Hash:               "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
-       }
-       contractValue := AssetAmount{
-               Asset:  "bae7e17bb8f5d0cfbfd87a92f3204da082d388d4c9b10e8dcd36b3d0a18ceb3a",
-               Amount: uint64(20000000000),
-       }
+
        txID, err := CallHTLCContract(account, contractUTXOID, preimage, contractArgs, contractValue)
        if err != nil {
                fmt.Println(err)