From cdd13263122e4c4dd22d21bf4144e808d2da3f30 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 8 Sep 2020 12:40:56 +0200 Subject: [PATCH 1/4] types: support eth hex address on accounts --- types/account.go | 3 +++ types/account_test.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/types/account.go b/types/account.go index 8020ed1bf..494445c6b 100644 --- a/types/account.go +++ b/types/account.go @@ -76,6 +76,7 @@ func (acc *EthAccount) SetBalance(amt sdk.Int) { type ethermintAccountPretty struct { Address sdk.AccAddress `json:"address" yaml:"address"` + EthAddress string `json:"eth_address" yaml:"eth_address"` Coins sdk.Coins `json:"coins" yaml:"coins"` PubKey string `json:"public_key" yaml:"public_key"` AccountNumber uint64 `json:"account_number" yaml:"account_number"` @@ -87,6 +88,7 @@ type ethermintAccountPretty struct { func (acc EthAccount) MarshalYAML() (interface{}, error) { alias := ethermintAccountPretty{ Address: acc.Address, + EthAddress: acc.EthAddress().String(), Coins: acc.Coins, AccountNumber: acc.AccountNumber, Sequence: acc.Sequence, @@ -114,6 +116,7 @@ func (acc EthAccount) MarshalYAML() (interface{}, error) { func (acc EthAccount) MarshalJSON() ([]byte, error) { alias := ethermintAccountPretty{ Address: acc.Address, + EthAddress: acc.EthAddress().String(), Coins: acc.Coins, AccountNumber: acc.AccountNumber, Sequence: acc.Sequence, diff --git a/types/account_test.go b/types/account_test.go index 98cad2bff..201bfe7da 100644 --- a/types/account_test.go +++ b/types/account_test.go @@ -75,6 +75,7 @@ func TestEthermintAccount_String(t *testing.T) { accountStr := fmt.Sprintf(`| address: %s + eth_address: %s coins: - denom: aphoton amount: "1" @@ -82,7 +83,7 @@ func TestEthermintAccount_String(t *testing.T) { account_number: 10 sequence: 50 code_hash: "0102" -`, addr, bech32pubkey) +`, addr, ethAcc.EthAddress().String(), bech32pubkey) require.Equal(t, accountStr, ethAcc.String()) From 52af971b58e8a9b0a54eae72b64a6620381a6442 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 8 Sep 2020 12:45:27 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b5dba8d..d79ceea39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (types) [\#502](https://github.com/ChainSafe/ethermint/pull/502) `EthAccount` now also exposes the Ethereum hex address in `string` format to clients. * (types) [\#494](https://github.com/ChainSafe/ethermint/pull/494) Update `EthAccount` public key JSON type to `string`. * (app) [\#471](https://github.com/ChainSafe/ethermint/pull/471) Add `x/upgrade` module for managing software updates. * (`x/evm`) [\#458](https://github.com/ChainSafe/ethermint/pull/458) Define parameter for token denomination used for the EVM module. From 1fb6aa44c4b1a556761fc352edc3f47860542221 Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 8 Sep 2020 12:59:34 +0200 Subject: [PATCH 3/4] doc update --- docs/basics/accounts.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/docs/basics/accounts.md b/docs/basics/accounts.md index ef21a7620..fd2415fc3 100644 --- a/docs/basics/accounts.md +++ b/docs/basics/accounts.md @@ -42,9 +42,40 @@ clients. The hex format on the other hand, is the Ethereum `common.Address` repr Cosmos `sdk.AccAddress`. - Address (Bech32): `eth1crwhac03z2pcgu88jfnqnwu66xlthlz2rhljah` -- Address (Hex): `0xc0dd7ee1f112838470e7926609bb9ad1bebbfc4a` +- Address ([EIP55](https://eips.ethereum.org/EIPS/eip-55) Hex): `0xc0dd7ee1f112838470e7926609bb9ad1bebbfc4a` - Compressed Public Key (Bech32): `ethpub1pfqnmk6pqnwwuw0h9hj58t2hyzwvqc3truhhp5tl5hfucezcfy2rs8470nkyzju2vmk645fzmw2wveaqcqek767kwa0es9rmxe9nmmjq84cpny3fvj6tpg` +You can query an account address using the Cosmos CLI or REST clients: + +```bash +# NOTE: the --output (-o) flag will define the output format in JSON or YAML (text) +ethermintcli q auth account $(ethermintcli keys show -a) -o text +| + address: eth1f8rqrfwut7ngkxwth0gt99h0lxnxsp09ngvzwl + eth_address: 0x49c601A5DC5FA68b19CBbbd0b296eFF9a66805e5 + coins: + - denom: aphoton + amount: "1000000000000000000" + - denom: stake + amount: "999999999900000000" + public_key: ethpub1pfqnmkepqw45vpsn6dzvm7k22zrghx0nfewjdfacy7wyycv5evfk57kyhwr8cqj5r4x + account_number: 0 + sequence: 1 + code_hash: c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 +``` + +``` bash +# GET /auth/accounts/{address} +curl -X GET "/auth/accounts/eth1f8rqrfwut7ngkxwth0gt99h0lxnxsp09ngvzwl" -H "accept: application/json" +``` + +To retrieve the Ethereum hex address using Web3, use the JSON-RPC `eth_accounts` endpoint: + +```bash +# query against a local node +curl -X POST --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[],"id":1}' -H "Content-Type: application/json" http://localhost:26664 +``` + ## Next {hide} Learn about Ethermint [transactions](./transactions.md) {hide} From 0195c764718b3f4ada463522c7c2b572e2b3d1cf Mon Sep 17 00:00:00 2001 From: Federico Kunze Date: Tue, 8 Sep 2020 13:56:58 +0200 Subject: [PATCH 4/4] add note for keyring output --- docs/basics/accounts.md | 4 ++++ docs/quickstart/run_node.md | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/basics/accounts.md b/docs/basics/accounts.md index fd2415fc3..12817324a 100644 --- a/docs/basics/accounts.md +++ b/docs/basics/accounts.md @@ -69,6 +69,10 @@ ethermintcli q auth account $(ethermintcli keys show -a) -o text curl -X GET "/auth/accounts/eth1f8rqrfwut7ngkxwth0gt99h0lxnxsp09ngvzwl" -H "accept: application/json" ``` +::: tip +The Cosmos SDK Keyring output (i.e `ethermintcli keys`) only supports addresses and public keys in Bech32 format. +::: + To retrieve the Ethereum hex address using Web3, use the JSON-RPC `eth_accounts` endpoint: ```bash diff --git a/docs/quickstart/run_node.md b/docs/quickstart/run_node.md index 111511e2b..1561ef000 100644 --- a/docs/quickstart/run_node.md +++ b/docs/quickstart/run_node.md @@ -50,7 +50,8 @@ To run a node with the same key every time: replace `ethermintcli keys add $KEY` echo "your mnemonic here" | ethermintcli keys add $KEY --recover ``` -::: tip Ethermint currently only supports 24 word mnemonics. +::: tip +Ethermint currently only supports 24 word mnemonics. ::: You can generate a new key/mnemonic with: