sign remark and assetid (#247)

fractalplatform · May 13, 2019 · 7311d31 · 7311d31
1 parent 04d79b1
commit 7311d31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/test/fee/transaction_contract.go b/test/fee/transaction_contract.go
@@ -182,31 +182,31 @@ func generateAccount() {
 	contract_b = common.Name(fmt.Sprintf("contractb%d", nonce))
 
 	key := types.MakeKeyPair(privateKey, []uint64{0})
-	acct := &accountmanager.AccountAction{
+	acct := &accountmanager.CreateAccountAction{
 		AccountName: normal_a,
 		Founder:     normal_a,
 		PublicKey:   pubKey_a,
 	}
 	b, _ := rlp.EncodeToBytes(acct)
 	sendTransferTx(types.CreateAccount, adminAccount, accAccount, nonce, assetID, balance, b, []*types.KeyPair{key})
 
-	acct = &accountmanager.AccountAction{
+	acct = &accountmanager.CreateAccountAction{
 		AccountName: normal_b,
 		Founder:     normal_b,
 		PublicKey:   pubKey_b,
 	}
 	b, _ = rlp.EncodeToBytes(acct)
 	sendTransferTx(types.CreateAccount, adminAccount, accAccount, nonce+1, assetID, balance, b, []*types.KeyPair{key})
 
-	acct = &accountmanager.AccountAction{
+	acct = &accountmanager.CreateAccountAction{
 		AccountName: contract_a,
 		Founder:     contract_a,
 		PublicKey:   pubKey_c,
 	}
 	b, _ = rlp.EncodeToBytes(acct)
 	sendTransferTx(types.CreateAccount, adminAccount, accAccount, nonce+2, assetID, big.NewInt(1000000000000), b, []*types.KeyPair{key})
 
-	acct = &accountmanager.AccountAction{
+	acct = &accountmanager.CreateAccountAction{
 		AccountName: contract_b,
 		Founder:     contract_b,
 		PublicKey:   pubKey_c,

diff --git a/types/signer.go b/types/signer.go
@@ -175,6 +175,8 @@ func (s Signer) Hash(tx *Transaction) common.Hash {
 			a.data.GasLimit,
 			a.data.Amount,
 			a.data.Payload,
+			a.data.AssetID,
+			a.data.Remark,
 			s.chainID, uint(0), uint(0),
 		})
 		actionHashs[i] = hash