Merge pull request #128 from renproject/feat/update_buildtx

updated buildtx api

Author: roynalnaruto

api/account/account.go

@@ -6,6 +6,7 @@ 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 +57,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,7 +3,6 @@ package cosmos
 import (
 	"context"
 	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
 	"math/big"
 
@@ -16,11 +15,13 @@ import (
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	bankType "github.com/cosmos/cosmos-sdk/x/bank/types"
+	"github.com/renproject/id"
 	"github.com/renproject/multichain"
 	"github.com/renproject/multichain/api/account"
 	"github.com/renproject/multichain/api/address"
 	"github.com/renproject/multichain/api/contract"
 	"github.com/renproject/pack"
+	"github.com/renproject/surge"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 )
 
@@ -75,15 +76,13 @@ 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) {
-	// We assume the "from" address is a public key as it is required for
-	// setting the signature.
-	pubKeyBytes, err := hex.DecodeString(string(from))
+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) {
+	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

@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/renproject/id"
 	"github.com/renproject/multichain/api/account"
 	"github.com/renproject/multichain/api/address"
 	"github.com/renproject/multichain/chain/evm"
@@ -26,7 +27,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, 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) {
 	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

@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/renproject/id"
 	"github.com/renproject/multichain/api/account"
 	"github.com/renproject/multichain/api/address"
 	"github.com/renproject/multichain/api/contract"
@@ -26,7 +27,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,14 +3,17 @@ package filecoin
 import (
 	"bytes"
 	"context"
+	"crypto/ecdsa"
 	"fmt"
 
+	ethcrypto "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"
 	"github.com/filecoin-project/go-state-types/crypto"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/minio/blake2b-simd"
+	"github.com/renproject/id"
 	"github.com/renproject/multichain/api/account"
 	"github.com/renproject/multichain/api/address"
 	"github.com/renproject/multichain/api/contract"
@@ -29,10 +32,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 := ethcrypto.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: %v", err)
 	}
 	filto, err := filaddress.NewFromString(string(to))
 	if err != nil {

chain/filecoin/filecoin_test.go

@@ -82,7 +82,7 @@ var _ = Describe("Filecoin", func() {
 
 			tx, err := filTxBuilder.BuildTx(
 				ctx,
-				sender,
+				senderPrivKey.PubKey(),
 				multichain.Address(pack.String(recipientFilAddr.String())),
 				amount, // amount
 				nonce,  // nonce

chain/terra/terra_test.go

@@ -75,7 +75,7 @@ var _ = Describe("Terra", func() {
 				amount := pack.NewU256FromU64(pack.U64(2000000))
 				tx, err := txBuilder.BuildTx(
 					ctx,
-					multichain.Address(addr.String()),     // from
+					privKey.PubKey(),                      // fromPubKey
 					recipient,                             // to
 					amount,                                // amount
 					nonce,                                 // nonce

go.mod

@@ -33,12 +33,4 @@ replace github.com/filecoin-project/filecoin-ffi => ./chain/filecoin/filecoin-ff
 
 replace github.com/renproject/solana-ffi => ./chain/solana/solana-ffi
 
-replace github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
-
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
-
-replace github.com/tendermint/tendermint => github.com/tendermint/tendermint v0.34.12
-
-replace github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76