Skip to content

Commit f7b8072

Browse files
author
Daisuke Kanda
committed
use debug chain module
Signed-off-by: Daisuke Kanda <daisuke.kanda@datachain.jp>
1 parent 5d2d66c commit f7b8072

File tree

9 files changed

+49
-48
lines changed

9 files changed

+49
-48
lines changed

‎tests/cases/tm2eth/configs/demo/ibc-0.json‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"chain": {
3-
"@type": "/relayer.chains.tendermint.config.ChainConfig",
4-
"key": "testkey",
5-
"chain_id": "ibc0",
6-
"rpc_addr": "http://localhost:26657",
7-
"account_prefix": "cosmos",
8-
"gas_adjustment": 1.5,
9-
"gas_prices": "0.025stake",
10-
"average_block_time_msec": 1000,
11-
"max_retry_for_commit": 5
3+
"@type": "/relayer.chains.debug.config.ChainConfig",
4+
"origin_chain": {
5+
"@type": "/relayer.chains.tendermint.config.ChainConfig",
6+
"key": "testkey",
7+
"chain_id": "ibc0",
8+
"rpc_addr": "http://localhost:26657",
9+
"account_prefix": "cosmos",
10+
"gas_adjustment": 1.5,
11+
"gas_prices": "0.025stake",
12+
"average_block_time_msec": 1000,
13+
"max_retry_for_commit": 5
14+
}
1215
},
1316
"prover": {
1417
"@type": "/relayer.provers.debug.config.ProverConfig",

‎tests/cases/tm2eth/configs/template/ibc-1.template.json‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
{
22
"chain": {
3-
"@type": "/relayer.chains.ethereum.config.ChainConfig",
4-
"chain_id": "ibc1",
5-
"eth_chain_id": 2018,
6-
"rpc_addr": "http://localhost:8645",
7-
"signer": {
8-
"@type": "/relayer.signers.hd.SignerConfig",
9-
"mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
10-
"path": "m/44'/60'/0'/0/0"
11-
},
12-
"ibc_address": "PLACE_HOLDER",
13-
"initial_send_checkpoint": 1,
14-
"initial_recv_checkpoint": 1,
15-
"enable_debug_trace": true,
16-
"average_block_time_msec": 1000,
17-
"max_retry_for_inclusion": 5,
18-
"gas_estimate_rate": {
19-
"numerator": 3,
20-
"denominator": 2
21-
},
22-
"max_gas_limit": 10000000,
23-
"tx_type": "auto",
24-
"blocks_per_event_query": 1000,
25-
"abi_paths": [
26-
"fixtures/ethereum/ibc1/abis"
27-
],
28-
"price_bump": 10
3+
"@type": "/relayer.chains.debug.config.ChainConfig",
4+
"origin_chain": {
5+
"@type": "/relayer.chains.ethereum.config.ChainConfig",
6+
"chain_id": "ibc1",
7+
"eth_chain_id": 2018,
8+
"rpc_addr": "http://localhost:8645",
9+
"signer": {
10+
"@type": "/relayer.signers.hd.SignerConfig",
11+
"mnemonic": "math razor capable expose worth grape metal sunset metal sudden usage scheme",
12+
"path": "m/44'/60'/0'/0/0"
13+
},
14+
"ibc_address": "PLACE_HOLDER",
15+
"initial_send_checkpoint": 1,
16+
"initial_recv_checkpoint": 1,
17+
"enable_debug_trace": true,
18+
"average_block_time_msec": 1000,
19+
"max_retry_for_inclusion": 5,
20+
"gas_estimate_rate": {
21+
"numerator": 3,
22+
"denominator": 2
23+
},
24+
"max_gas_limit": 10000000,
25+
"tx_type": "auto",
26+
"blocks_per_event_query": 1000,
27+
"abi_paths": [
28+
"fixtures/ethereum/ibc1/abis"
29+
],
30+
"price_bump": 10
31+
}
2932
},
3033
"prover": {
3134
"@type": "/relayer.provers.debug.config.ProverConfig",

‎tests/cases/tm2eth/scripts/fixture‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ${DOCKER} cp ethereum-geth0:/root/addresses ${FIXTURES_DIR}/ethereum/ibc1/addres
2323

2424
# assign the contract address to ChainConfig
2525
IBC_HANDLER_ADDRESS=`cat ${FIXTURES_DIR}/ethereum/ibc1/addresses/IBCHandler`
26-
jq ".chain.ibc_address |= \"$IBC_HANDLER_ADDRESS\"" < "$CONF_DIR/template/ibc-1.template.json" > "$CONF_DIR/demo/ibc-1.json"
26+
jq ".chain.origin_chain.ibc_address |= \"$IBC_HANDLER_ADDRESS\"" < "$CONF_DIR/template/ibc-1.template.json" > "$CONF_DIR/demo/ibc-1.json"

‎tests/cases/tm2eth/scripts/handshake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ MOCKAPP_PATH=mockapp-path
1515
ICS20_PATH=ics20-path
1616

1717
if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
18-
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
1918
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
2019
export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
2120
fi

‎tests/cases/tm2eth/scripts/test-channel-upgrade‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
1212
RLY="${RLY_BINARY} --debug"
1313

1414
if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
15-
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
1615
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
1716
export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
1817
fi

‎tests/cases/tm2eth/scripts/test-ics20-packet-relay‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
1010
RLY="${RLY_BINARY} --debug"
1111

1212
if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
13-
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
1413
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
1514
export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
1615
fi
@@ -25,8 +24,8 @@ ADDRESSES_DIR_B="${FIXTURES_DIR}/ethereum/ibc1/addresses"
2524
ERC20_TOKEN_CONTRACT_B=`cat ${ADDRESSES_DIR_B}/ERC20Token`
2625
ICS20_TRANSFER_CONTRACT_B=`cat ${ADDRESSES_DIR_B}/ICS20Transfer`
2726

28-
MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.signer.mnemonic')
29-
RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.rpc_addr')
27+
MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.signer.mnemonic')
28+
RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.rpc_addr')
3029
PORT_A=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].src."port-id"')
3130
PORT_B=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].dst."port-id"')
3231
CHANNEL_A=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].src."channel-id"')

‎tests/cases/tm2eth/scripts/test-mockapp-packet-relay‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/yrly
1111
RLY="${RLY_BINARY} --debug"
1212

1313
if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
14-
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
1514
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
1615
export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
1716
fi
@@ -21,8 +20,8 @@ PATH_NAME=mockapp-path
2120
ADDRESSES_DIR_B="${FIXTURES_DIR}/ethereum/ibc1/addresses"
2221
MOCKAPP_CONTRACT_B=`cat ${ADDRESSES_DIR_B}/AppV1`
2322

24-
MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.signer.mnemonic')
25-
RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.rpc_addr')
23+
MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.signer.mnemonic')
24+
RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.rpc_addr')
2625
PORT_B=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].dst."port-id"')
2726
CHANNEL_B=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].dst."channel-id"')
2827

‎tests/cases/tm2eth/scripts/test-service‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ RLY_BIN=${SCRIPT_DIR}/../../../../build/yrly
1616
RLY="${RLY_BIN} --debug"
1717

1818
if [ "USE_FAKELOST-$USE_FAKELOST" = "USE_FAKELOST-yes" ]; then
19-
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_CHAIN_ibc1="10"
2019
export DEBUG_RELAYER_PRUNE_AFTER_BLOCKS_PROVER_ibc1="10"
2120
export DEBUG_RELAYER_SHFU_WAIT_ibc0="20"
2221
fi
@@ -50,6 +49,6 @@ waitUnrelayedCount $PATH_NAME "unrelayed-acknowledgements" "dst" 0 300
5049
echo "Waiting src->dst ack is relayed"
5150
waitUnrelayedCount $PATH_NAME "unrelayed-acknowledgements" "src" 0 300
5251

53-
echo "Finished"
52+
echo "$0 Finished"
5453

5554
kill $RLY_PID

‎tests/cases/tm2eth/scripts/utils‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ waitUnrelayedCount() {
3535
sendPacketOnEth() {
3636
local PATH_NAME=$1
3737
local MOCKAPP_CONTRACT_B=$(cat $(dirname $0)/../fixtures/ethereum/ibc1/addresses/AppV1)
38-
local RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.rpc_addr')
38+
local RPC_ADDRESS_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.rpc_addr')
3939
local PORT_B=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].dst."port-id"')
4040
local CHANNEL_B=$($RLY paths list --json | jq -r --arg path $PATH_NAME '.[$path].dst."channel-id"')
4141

42-
local MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.chain_id == "ibc1").chain.signer.mnemonic')
42+
local MNEMONIC_B=$($RLY config show | jq -r '.chains[] | select(.chain.origin_chain.chain_id == "ibc1").chain.origin_chain.signer.mnemonic')
4343
local SENDER=$(cast wallet address --mnemonic "$MNEMONIC_B" --mnemonic-index 2)
4444

4545
cast balance $SENDER --rpc-url $RPC_ADDRESS_B

0 commit comments

Comments
 (0)