updated build tx api

Signed-off-by: Soumya Ghosh Dastidar <[email protected]>

Author: gdsoumya

api/account/account.go

@@ -6,6 +6,8 @@ package account
 import (
 	"context"
 
+	"github.com/renproject/id"
+
 	"github.com/renproject/multichain/api/address"
 	"github.com/renproject/multichain/api/contract"
 	"github.com/renproject/pack"
@@ -56,7 +58,7 @@ type Tx interface {
 // information, and this should be accepted during the construction of the
 // chain-specific transaction builder.
 type TxBuilder interface {
-	BuildTx(ctx context.Context, from, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (Tx, error)
+	BuildTx(ctx context.Context, fromPubKey *id.PubKey, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (Tx, error)
 }
 
 // The Client interface defines the functionality required to interact with a

chain/cosmos/tx.go

@@ -3,10 +3,12 @@ package cosmos
 import (
 	"context"
 	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
 	"math/big"
 
+	"github.com/renproject/id"
+	"github.com/renproject/surge"
+
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
@@ -75,15 +77,15 @@ func (builder txBuilder) WithSignMode(signMode int32) txBuilder {
 // BuildTx consumes a list of MsgSend to build and return a cosmos transaction.
 // This transaction is unsigned, and must be signed before submitting to the
 // cosmos chain.
-func (builder txBuilder) BuildTx(ctx context.Context, from, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
+func (builder txBuilder) BuildTx(ctx context.Context, fromPubKey *id.PubKey, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
 	// We assume the "from" address is a public key as it is required for
 	// setting the signature.
-	pubKeyBytes, err := hex.DecodeString(string(from))
+	pubKeyBytes, err := surge.ToBinary(fromPubKey)
 	if err != nil {
 		return nil, err
 	}
 	pubKey := secp256k1.PubKey{Key: pubKeyBytes}
-	from = multichain.Address(types.AccAddress(pubKey.Address()).String())
+	from := multichain.Address(types.AccAddress(pubKey.Address()).String())
 
 	fromAddr, err := types.AccAddressFromBech32(string(from))
 	if err != nil {

chain/ethereum/tx.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/renproject/id"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/renproject/multichain/api/account"
@@ -26,7 +28,10 @@ func NewTxBuilder(chainID *big.Int) TxBuilder {
 }
 
 // BuildTx receives transaction fields and constructs a new transaction.
-func (txBuilder TxBuilder) BuildTx(ctx context.Context, from, to address.Address, value, nonce, gas, gasTipCap, gasFeeCap pack.U256, payload pack.Bytes) (account.Tx, error) {
+func (txBuilder TxBuilder) BuildTx(ctx context.Context, fromPubKey *id.PubKey, to address.Address, value, nonce, gas, gasTipCap, gasFeeCap pack.U256, payload pack.Bytes) (account.Tx, error) {
+
+	//_ = multichain.Address(crypto.PubkeyToAddress(ecdsa.PublicKey(fromPubKey)).Hex())
+
 	toAddr, err := NewAddressFromHex(string(pack.String(to)))
 	if err != nil {
 		return nil, fmt.Errorf("bad to address '%v': %v", to, err)

chain/evm/tx.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/renproject/id"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/renproject/multichain/api/account"
@@ -26,7 +28,7 @@ func NewTxBuilder(chainID *big.Int) TxBuilder {
 }
 
 // BuildTx receives transaction fields and constructs a new transaction.
-func (txBuilder TxBuilder) BuildTx(ctx context.Context, from, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
+func (txBuilder TxBuilder) BuildTx(ctx context.Context, fromPubKey *id.PubKey, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
 	toAddr, err := NewAddressFromHex(string(pack.String(to)))
 	if err != nil {
 		return nil, fmt.Errorf("bad to address '%v': %v", to, err)

chain/filecoin/account.go

@@ -3,8 +3,12 @@ package filecoin
 import (
 	"bytes"
 	"context"
+	"crypto/ecdsa"
 	"fmt"
 
+	"github.com/renproject/id"
+
+	eth_crypto "github.com/ethereum/go-ethereum/crypto"
 	filaddress "github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/go-state-types/big"
@@ -29,10 +33,11 @@ func NewTxBuilder() TxBuilder {
 }
 
 // BuildTx receives transaction fields and constructs a new transaction.
-func (txBuilder TxBuilder) BuildTx(ctx context.Context, from, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
-	filfrom, err := filaddress.NewFromString(string(from))
+func (txBuilder TxBuilder) BuildTx(ctx context.Context, fromPubKey *id.PubKey, to address.Address, value, nonce, gasLimit, gasPrice, gasCap pack.U256, payload pack.Bytes) (account.Tx, error) {
+	pubKeyUncompressed := eth_crypto.FromECDSAPub((*ecdsa.PublicKey)(fromPubKey))
+	filfrom, err := filaddress.NewSecp256k1Address(pubKeyUncompressed)
 	if err != nil {
-		return nil, fmt.Errorf("bad from address '%v': %v", from, err)
+		return nil, fmt.Errorf("bad from pubkey address '%v': %v", fromPubKey, err)
 	}
 	filto, err := filaddress.NewFromString(string(to))
 	if err != nil {

multichain_test.go

@@ -924,22 +924,11 @@ var _ = Describe("Multichain", func() {
 
 						accountTx, err := txBuilder.BuildTx(
 							ctx,
-							multichain.Address(senderAddr),
+							senderPubKey,
 							recipientAddr,
 							amount, nonce, gasLimit, gasPrice, gasCap,
 							payload,
 						)
-						// TODO: Temporarily use the public key in place of the
-						// from address for Terra.
-						if accountChain.chain == multichain.Terra {
-							accountTx, err = txBuilder.BuildTx(
-								ctx,
-								multichain.Address(hex.EncodeToString(senderPubKeyBytes)),
-								recipientAddr,
-								amount, nonce, gasLimit, gasPrice, gasCap,
-								payload,
-							)
-						}
 						Expect(err).NotTo(HaveOccurred())
 
 						// Get the transaction bytes and sign them.