From 6c6bdfe26c1ccfeb168b73c55421a1de9d7efc1c Mon Sep 17 00:00:00 2001 From: yito88 Date: Wed, 2 Aug 2023 21:46:14 +0200 Subject: [PATCH] fix scripts --- Cargo.lock | 12 ++++++------ crates/relayer/src/chain/namada.rs | 28 ++++++++++++++++++---------- scripts/join-namada.sh | 16 ++++++++-------- scripts/setup-namada.sh | 6 ++---- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12f67176f8..185c3999d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4636,7 +4636,7 @@ dependencies = [ [[package]] name = "namada" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "async-trait", "bimap", @@ -4695,7 +4695,7 @@ dependencies = [ [[package]] name = "namada_apps" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "ark-serialize", "ark-std", @@ -4780,7 +4780,7 @@ dependencies = [ [[package]] name = "namada_core" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "ark-bls12-381", "ark-ec", @@ -4833,7 +4833,7 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "borsh 0.9.4", "ethers", @@ -4854,7 +4854,7 @@ dependencies = [ [[package]] name = "namada_macros" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "proc-macro2", "quote", @@ -4864,7 +4864,7 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" version = "0.20.1" -source = "git+https://github.com/anoma/namada?rev=80f0f687ab93cd69720c2505224a6dbb40aae420#80f0f687ab93cd69720c2505224a6dbb40aae420" +source = "git+https://github.com/anoma/namada?rev=c85f75d06d50e90325738c8e456642fd4ffe4bfd#c85f75d06d50e90325738c8e456642fd4ffe4bfd" dependencies = [ "borsh 0.9.4", "data-encoding", diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs index ec8442dbb0..1a535ea704 100644 --- a/crates/relayer/src/chain/namada.rs +++ b/crates/relayer/src/chain/namada.rs @@ -390,11 +390,15 @@ impl ChainEndpoint for NamadaChain { let amount = token::Amount::try_from_slice(&value[..]).map_err(Error::borsh_decode)?; let denom_key = token::denom_key(&token); let (value, _) = self.query(denom_key, QueryHeight::Latest, IncludeProof::No)?; - let namada_denom = - token::Denomination::try_from_slice(&value[..]).map_err(Error::borsh_decode)?; - let denominated_amount = token::DenominatedAmount { - amount, - denom: namada_denom, + let denominated_amount = if value.is_empty() { + token::DenominatedAmount::native(amount) + } else { + let token_denom = + token::Denomination::try_from_slice(&value[..]).map_err(Error::borsh_decode)?; + token::DenominatedAmount { + amount, + denom: token_denom, + } }; Ok(Balance { @@ -420,11 +424,15 @@ impl ChainEndpoint for NamadaChain { let denom_key = token::denom_key(&token); let (value, _) = self.query(denom_key, QueryHeight::Latest, IncludeProof::No)?; - let namada_denom = token::Denomination::try_from_slice(&value[..]) - .map_err(Error::borsh_decode)?; - let denominated_amount = token::DenominatedAmount { - amount, - denom: namada_denom, + let denominated_amount = if value.is_empty() { + token::DenominatedAmount::native(amount) + } else { + let namada_denom = token::Denomination::try_from_slice(&value[..]) + .map_err(Error::borsh_decode)?; + token::DenominatedAmount { + amount, + denom: namada_denom, + } }; let alias = self .wallet diff --git a/scripts/join-namada.sh b/scripts/join-namada.sh index 9a8f3ed6d8..f37c286f36 100755 --- a/scripts/join-namada.sh +++ b/scripts/join-namada.sh @@ -66,7 +66,7 @@ type = 'namada' rpc_addr = 'http://127.0.0.1:27657' grpc_addr = 'http://127.0.0.1:9090' event_source = { mode = 'push', url = 'ws://127.0.0.1:27657/websocket', batch_delay = '500ms' } -account_prefix = 'cosmos' +account_prefix = '' key_name = 'relayer' store_prefix = 'ibc' gas_price = { price = 0.001, denom = 'nam' } @@ -80,7 +80,7 @@ mkdir -p ${BASE_DIR_B} ${NAMADAC} --base-dir ${BASE_DIR_A} utils join-network --chain-id ${CHAIN_ID_A} ${NAMADAC} --base-dir ${BASE_DIR_B} utils join-network --chain-id ${CHAIN_ID_B} -# Run ledger B temporarily for making tendermint config +# Run ledger B temporarily for making cometbft config ${NAMADAN} --base-dir ${BASE_DIR_B} ledger run > /dev/null 2>&1 & pid=$! sleep 5 @@ -95,14 +95,14 @@ cat ${BASE_DIR_B}/${CHAIN_ID_B}/config.toml \ -e "s/127.0.0.1:26661/127.0.0.1:27661/g" \ > tmp.toml mv tmp.toml ${BASE_DIR_B}/${CHAIN_ID_B}/config.toml -cat ${BASE_DIR_B}/${CHAIN_ID_B}/tendermint/config/config.toml \ +cat ${BASE_DIR_B}/${CHAIN_ID_B}/cometbft/config/config.toml \ | sed \ -e "s/127.0.0.1:26658/127.0.0.1:27658/g" \ -e "s/127.0.0.1:26657/127.0.0.1:27657/g" \ -e "s/0.0.0.0:26656/0.0.0.0:27656/g" \ -e "s/127.0.0.1:26661/127.0.0.1:27661/g" \ > tmp.toml -mv tmp.toml ${BASE_DIR_B}/${CHAIN_ID_B}/tendermint/config/config.toml +mv tmp.toml ${BASE_DIR_B}/${CHAIN_ID_B}/cometbft/config/config.toml # Run ledgers ${NAMADAN} --base-dir ${BASE_DIR_A} ledger run > ${BASE_DIR_A}/namada.log 2>&1 & @@ -115,8 +115,8 @@ ${NAMADAW} --base-dir ${BASE_DIR_B} key gen --alias relayer --unsafe-dont-encryp # Copy wallets mkdir -p ${HERMES_DIR}/namada_wallet/${CHAIN_ID_A} mkdir -p ${HERMES_DIR}/namada_wallet/${CHAIN_ID_B} -cp ${BASE_DIR_A}/${CHAIN_ID_A}/wallet.toml ${HERMES_DIR}/namada_wallet/${CHAIN_ID_A} -cp ${BASE_DIR_B}/${CHAIN_ID_B}/wallet.toml ${HERMES_DIR}/namada_wallet/${CHAIN_ID_B} +ln -s ${BASE_DIR_A}/${CHAIN_ID_A}/wallet.toml ${HERMES_DIR}/namada_wallet/${CHAIN_ID_A} +ln -s ${BASE_DIR_B}/${CHAIN_ID_B}/wallet.toml ${HERMES_DIR}/namada_wallet/${CHAIN_ID_B} # Make Hermes config echo "${HERMES_CONFIG_TEMPLATE}" \ @@ -128,8 +128,8 @@ Namada data and logs are under ${HERMES_DIR}/data/namada-*/.namada" echo "After the sync, you can create a channel and start Hermes process " echo "Command to create a channel: -hermes -c ${HERMES_DIR}/config_for_namada.toml create channel --a-chain ${CHAIN_ID_A} --b-chain ${CHAIN_ID_B} --a-port transfer --b-port transfer --new-client-connection --yes +hermes --config ${HERMES_DIR}/config_for_namada.toml create channel --a-chain ${CHAIN_ID_A} --b-chain ${CHAIN_ID_B} --a-port transfer --b-port transfer --new-client-connection --yes " echo "Command to start Hermes to relay packets: -hermes -c ${HERMES_DIR}/config_for_namada.toml start +hermes --config ${HERMES_DIR}/config_for_namada.toml start " diff --git a/scripts/setup-namada.sh b/scripts/setup-namada.sh index 7f837dca5e..8bf12313cd 100755 --- a/scripts/setup-namada.sh +++ b/scripts/setup-namada.sh @@ -64,7 +64,7 @@ type = 'namada' rpc_addr = 'http://127.0.0.1:27657' grpc_addr = 'http://127.0.0.1:9090' event_source = { mode = 'push', url = 'ws://127.0.0.1:27657/websocket', batch_delay = '500ms' } -account_prefix = 'cosmos' +account_prefix = '' key_name = 'relayer' store_prefix = 'ibc' gas_price = { price = 0.001, denom = 'nam' } @@ -119,8 +119,6 @@ function copy_wasm() { cp ${NAMADA_DIR}/wasm/checksums.json ${base_dir}/${chain_id}/setup/validator-0/.namada/${chain_id}/wasm/ cp ${NAMADA_DIR}/wasm/*.wasm ${base_dir}/${chain_id}/setup/validator-0/.namada/${chain_id}/wasm/ - cp ${NAMADA_DIR}/wasm/checksums.json ${base_dir}/${chain_id}/wasm/ - cp ${NAMADA_DIR}/wasm/*.wasm ${base_dir}/${chain_id}/wasm/ } function init_relayer_acc() { @@ -135,7 +133,7 @@ function init_relayer_acc() { key gen --alias relayer --unsafe-dont-encrypt mkdir -p ${wallet_dir} - cp ${base_dir}/${chain_id}/wallet.toml ${wallet_dir} + ln -s ${base_dir}/${chain_id}/wallet.toml ${wallet_dir} } # ==== main ====