Merge pull request #49 from renproject/fix/cosmos-chain-prefix

fix: set prefix in cosmos client

Author: roynalnaruto

chain/cosmos/client.go

@@ -95,10 +95,11 @@ type Client struct {
 	opts   ClientOptions
 	cliCtx cliContext.CLIContext
 	cdc    *codec.Codec
+	hrp    string
 }
 
 // NewClient returns a new Client.
-func NewClient(opts ClientOptions, cdc *codec.Codec) *Client {
+func NewClient(opts ClientOptions, cdc *codec.Codec, hrp string) *Client {
 	httpClient, err := rpchttp.NewWithTimeout(opts.Host.String(), "websocket", uint(opts.Timeout/time.Second))
 	if err != nil {
 		panic(err)
@@ -110,6 +111,7 @@ func NewClient(opts ClientOptions, cdc *codec.Codec) *Client {
 		opts:   opts,
 		cliCtx: cliCtx,
 		cdc:    cdc,
+		hrp:    hrp,
 	}
 }
 
@@ -155,6 +157,8 @@ func (client *Client) SubmitTx(ctx context.Context, tx account.Tx) error {
 // AccountNonce returns the current nonce of the account. This is the nonce to
 // be used while building a new transaction.
 func (client *Client) AccountNonce(_ context.Context, addr address.Address) (pack.U256, error) {
+	types.GetConfig().SetBech32PrefixForAccount(client.hrp, client.hrp+"pub")
+
 	cosmosAddr, err := types.AccAddressFromBech32(string(addr))
 	if err != nil {
 		return pack.U256{}, fmt.Errorf("bad address: '%v': %v", addr, err)
@@ -171,6 +175,8 @@ func (client *Client) AccountNonce(_ context.Context, addr address.Address) (pac
 
 // AccountNumber returns the account number for a given address.
 func (client *Client) AccountNumber(_ context.Context, addr address.Address) (pack.U64, error) {
+	types.GetConfig().SetBech32PrefixForAccount(client.hrp, client.hrp+"pub")
+
 	cosmosAddr, err := types.AccAddressFromBech32(string(addr))
 	if err != nil {
 		return 0, fmt.Errorf("bad address: '%v': %v", addr, err)

chain/cosmos/tx.go

@@ -65,6 +65,8 @@ func NewTxBuilder(options TxBuilderOptions, client *Client) account.TxBuilder {
 // 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) {
+	types.GetConfig().SetBech32PrefixForAccount(builder.client.hrp, builder.client.hrp+"pub")
+
 	fromAddr, err := types.AccAddressFromBech32(string(from))
 	if err != nil {
 		return nil, err

chain/terra/terra.go

@@ -30,7 +30,7 @@ var (
 
 // NewClient returns returns a new Client with Terra codec.
 func NewClient(opts ClientOptions) *Client {
-	return cosmos.NewClient(opts, app.MakeCodec())
+	return cosmos.NewClient(opts, app.MakeCodec(), "terra")
 }
 
 // NewTxBuilder returns an implementation of the transaction builder interface