From 99fa1534eef3d34ddfc9fc34e3b7a37defc32423 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 13:46:58 +0100 Subject: [PATCH 01/61] Fix "sed" command --- ibc-demo.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index 09dc21f173..3242ba4515 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -29,12 +29,12 @@ Fix the configuration files for both `gaiad` and `gaiacli` to allow both chains/ ```bash # Configure the proper database backend for each node and different listening ports -sed -i '' 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml -sed -i '' 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml +sed -i 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml gaiacli config --home ibc0/n0/gaiacli/ chain-id ibc0 gaiacli config --home ibc1/n0/gaiacli/ chain-id ibc1 gaiacli config --home ibc0/n0/gaiacli/ output json From a8e35507021d928624642ac4a066d25e1a6c3a8e Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 13:54:40 +0100 Subject: [PATCH 02/61] Add copy instructions for Linux --- ibc-demo.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index 3242ba4515..85cfc98851 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -43,13 +43,25 @@ gaiacli config --home ibc0/n0/gaiacli/ node http://localhost:26657 gaiacli config --home ibc1/n0/gaiacli/ node http://localhost:26557 ``` -Add keys from each chain to the other and make sure that the key at `ibc1/n0/gaiacli/key_seed.json` is named `n1` on each `gaiacli` instance and the same for `n0`. After this is complete the results of `gaiacli keys list` from each chain should be identical. The following are instructions for how to do this on Mac: +Add keys from each chain to the other and make sure that the key at `ibc1/n0/gaiacli/key_seed.json` is named `n1` on each `gaiacli` instance and the same for `n0`. After this is complete the results of `gaiacli keys list` from each chain should be identical. + +The following are instructions for how to copy seed phrases to the clipboard on Mac: ```bash -# These commands copy the seed phrase from each dir into the clipboard on mac jq -r '.secret' ibc0/n0/gaiacli/key_seed.json | pbcopy jq -r '.secret' ibc1/n0/gaiacli/key_seed.json | pbcopy +``` + +Or on Linux: + +```bash +jq -r '.secret' ibc0/n0/gaiacli/key_seed.json | xclip -sel clip +jq -r '.secret' ibc1/n0/gaiacli/key_seed.json | xclip -sel clip +``` +Then continue: + +``` # Remove the key n0 on ibc1 gaiacli --home ibc1/n0/gaiacli keys delete n0 From b289f838fd9389b6c837d48e485005c95fa77f14 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 14:42:05 +0100 Subject: [PATCH 03/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c7082ed285..415eae8d30 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191030201649-0d595c862ea0 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 6a90e0f2b4..667da6cd8e 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191029141616-9742c1440ec3 h1:Q8Oc0bcAmf github.com/cosmos/cosmos-sdk v0.34.4-0.20191029141616-9742c1440ec3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191030201649-0d595c862ea0 h1:LZc0hJa0W9opISQVJ0AUohyJANZVSUBPfQkVKlFu5jA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191030201649-0d595c862ea0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55 h1:zBQhxMKhYT/zPBKS2FVxho/xfXakSM86NYrZGoD+Y/A= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 0ceb7941208ec00408a3b020181f4cf1f0c4fa85 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:07:34 +0100 Subject: [PATCH 04/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 415eae8d30..fb1d5453a8 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 667da6cd8e..b594e4eec8 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191030201649-0d595c862ea0 h1:LZc0hJa0W9 github.com/cosmos/cosmos-sdk v0.34.4-0.20191030201649-0d595c862ea0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55 h1:zBQhxMKhYT/zPBKS2FVxho/xfXakSM86NYrZGoD+Y/A= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3 h1:3aXneUkdQaF0eRHvPYP35hQjk8xoXEIFn3SzsTcD9qI= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From af7895ec7006d75918e3750de1a5f4176572b0dd Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:19:12 +0100 Subject: [PATCH 05/61] Update instructions, add script (wip) --- ibc-demo.md | 28 +++++++------- ibc-demo.sh | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 14 deletions(-) create mode 100755 ibc-demo.sh diff --git a/ibc-demo.md b/ibc-demo.md index 85cfc98851..3eddfa0b32 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -125,8 +125,8 @@ Create a `connection` with the following command: gaiacli \ --home ibc0/n0/gaiacli \ tx ibc connection handshake \ - conn0 ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ - conn1 ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ + connection0 ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ + connection1 ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 \ --node1 tcp://localhost:26657 \ @@ -136,8 +136,8 @@ gaiacli \ Once the connection is established you should be able to query it: ```bash -gaiacli --home ibc0/n0/gaiacli q ibc connection connection conn0 --indent --trust-node -gaiacli --home ibc1/n0/gaiacli q ibc connection connection conn1 --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc connection connection connection0 --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc connection connection connection1 --indent --trust-node ``` ### Channel @@ -150,8 +150,8 @@ Now that the `connection` has been created, it's time to establish a `channel` f gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibcmocksend chan0 conn0 \ - ibcmockrecv chan1 conn1 \ + ibcmocksend channel0 connection0 \ + ibcmockrecv channel1 connection1 \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ @@ -161,8 +161,8 @@ gaiacli \ You can query the `channel` after establishment by running the following command: ```bash -gaiacli --home ibc0/n0/gaiacli query ibc channel channel ibcmocksend chan0 --indent --trust-node -gaiacli --home ibc1/n0/gaiacli query ibc channel channel ibcmockrecv chan1 --indent --trust-node +gaiacli --home ibc0/n0/gaiacli query ibc channel channel ibcmocksend channel0 --indent --trust-node +gaiacli --home ibc1/n0/gaiacli query ibc channel channel ibcmockrecv channel1 --indent --trust-node ``` ## Send Packet @@ -171,16 +171,16 @@ To send a packet using the `ibc-mock` application protocol, you need to know the ```bash # Returns the last sequence number -gaiacli --home ibc0/n0/gaiacli q ibcmocksend sequence chan0 +gaiacli --home ibc0/n0/gaiacli q ibcmocksend sequence channel0 # Returns the next expected sequence number, for use in scripting -gaiacli --home ibc0/n0/gaiacli q ibcmocksend next chan0 +gaiacli --home ibc0/n0/gaiacli q ibcmocksend next channel0 ``` -Now you are ready to send an `ibc-mock` packet down the channel (`chan0`) from chain `ibc0` to chain `ibc1`! To do so run the following commands to send a packet down the channel: +Now you are ready to send an `ibc-mock` packet down the channel (`channel0`) from chain `ibc0` to chain `ibc1`! To do so run the following commands to send a packet down the channel: ```bash -gaiacli --home ibc0/n0/gaiacli tx ibcmocksend sequence chan0 $(gaiacli --home ibc0/n0/gaiacli q ibcmocksend next chan0) --from n0 -o text -y +gaiacli --home ibc0/n0/gaiacli tx ibcmocksend sequence channel0 $(gaiacli --home ibc0/n0/gaiacli q ibcmocksend next channel0) --from n0 -o text -y ``` ### Receive Packet @@ -190,7 +190,7 @@ Once packets are sent, receipt must be confirmed on the destination chain. To `p ```bash gaiacli \ --home ibc1/n0/gaiacli \ - tx ibc channel pull ibcmockrecv chan1 \ + tx ibc channel pull ibcmockrecv channel1 \ --node1 tcp://localhost:26557 \ --node2 tcp://localhost:26657 \ --chain-id2 ibc0 \ @@ -214,5 +214,5 @@ ibc1 <- empty-packet [OK] txid(92D76EF46FDCB3739DB06960BECCD7DA30AAA6AECA687DF Once the packets have been sent, you can check the updated sequence by running: ```bash -gaiacli --home ibc1/n0/gaiacli q ibcmockrecv sequence chan1 --trust-node +gaiacli --home ibc1/n0/gaiacli q ibcmockrecv sequence channel1 --trust-node ``` diff --git a/ibc-demo.sh b/ibc-demo.sh new file mode 100755 index 0000000000..00a7dd5d5d --- /dev/null +++ b/ibc-demo.sh @@ -0,0 +1,106 @@ +#!/bin/zsh + +GAIA_BRANCH=cwgoes/ibc-demo-fixes +GAIA_DIR=$(mktemp -d) +CONF_DIR=$(mktemp -d) + +echo "GAIA_DIR: ${GAIA_DIR}" +echo "CONF_DIR: ${CONF_DIR}" + +sleep 1 + +set -x + +echo "Killing existing gaiad instances..." + +killall gaiad + +set -e + +echo "Building Gaia..." + +cd $GAIA_DIR +git clone git@github.com:cosmos/gaia +cd gaia +git checkout $GAIA_BRANCH +make install +gaiad version +gaiacli version + +echo "Generating configurations..." + +cd $CONF_DIR && mkdir ibc-testnets && cd ibc-testnets +echo -e "\n" | gaiad testnet -o ibc0 --v 1 --chain-id ibc0 --node-dir-prefix n +echo -e "\n" | gaiad testnet -o ibc1 --v 1 --chain-id ibc1 --node-dir-prefix n +sed -i 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml +sed -i 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml +sed -i 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml +gaiacli config --home ibc0/n0/gaiacli/ chain-id ibc0 +gaiacli config --home ibc1/n0/gaiacli/ chain-id ibc1 +gaiacli config --home ibc0/n0/gaiacli/ output json +gaiacli config --home ibc1/n0/gaiacli/ output json +gaiacli config --home ibc0/n0/gaiacli/ node http://localhost:26657 +gaiacli config --home ibc1/n0/gaiacli/ node http://localhost:26557 + +echo "Importing keys..." + +SEED0=$(jq -r '.secret' ibc0/n0/gaiacli/key_seed.json) +SEED1=$(jq -r '.secret' ibc1/n0/gaiacli/key_seed.json) +echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli keys delete n0 + +echo "Seed 0: ${SEED0}" +echo "Seed 1: ${SEED1}" + +echo "Enter seed 1:" +gaiacli --home ibc0/n0/gaiacli keys add n1 --recover + +echo "Enter seed 0:" +gaiacli --home ibc1/n0/gaiacli keys add n0 --recover + +echo "Enter seed 1:" +gaiacli --home ibc1/n0/gaiacli keys add n1 --recover + +#echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +#echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +#echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover + +echo "Keys should match:" + +gaiacli --home ibc0/n0/gaiacli keys list | jq '.[].address' +gaiacli --home ibc1/n0/gaiacli keys list | jq '.[].address' + +echo "Starting Gaiad instances..." + +nohup gaiad --home ibc0/n0/gaiad --log_level="*:debug" start > ibc0.log & +nohup gaiad --home ibc1/n0/gaiad --log_level="*:debug" start > ibc1.log & + +sleep 20 + +echo "Creating clients..." + +echo -e "12345678\n" | gaiacli --home ibc0/n0/gaiacli \ + tx ibc client create ibconeclient \ + $(gaiacli --home ibc1/n0/gaiacli q ibc client node-state) \ + --from n0 -y -o text + +echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli \ + tx ibc client create ibczeroclient \ + $(gaiacli --home ibc0/n0/gaiacli q ibc client node-state) \ + --from n1 -y -o text + +sleep 3 + +echo "Establishing a connection..." + +gaiacli \ + --home ibc0/n0/gaiacli \ + tx ibc connection handshake \ + connection0 ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ + connection1 ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ + --chain-id2 ibc1 \ + --from1 n0 --from2 n1 \ + --node1 tcp://localhost:26657 \ + --node2 tcp://localhost:26557 From 297287fb9b8c65368a56865a18271e9a7eb49bbb Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:22:48 +0100 Subject: [PATCH 06/61] Progress... --- ibc-demo.md | 12 ++++++------ ibc-demo.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index 3eddfa0b32..f7352492e0 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -125,8 +125,8 @@ Create a `connection` with the following command: gaiacli \ --home ibc0/n0/gaiacli \ tx ibc connection handshake \ - connection0 ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ - connection1 ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ + connectionzero ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ + connectionone ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 \ --node1 tcp://localhost:26657 \ @@ -136,8 +136,8 @@ gaiacli \ Once the connection is established you should be able to query it: ```bash -gaiacli --home ibc0/n0/gaiacli q ibc connection connection connection0 --indent --trust-node -gaiacli --home ibc1/n0/gaiacli q ibc connection connection connection1 --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc connection connection connectionzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc connection connection connectionone --indent --trust-node ``` ### Channel @@ -150,8 +150,8 @@ Now that the `connection` has been created, it's time to establish a `channel` f gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibcmocksend channel0 connection0 \ - ibcmockrecv channel1 connection1 \ + ibcmocksend channel0 connectionzero \ + ibcmockrecv channel1 connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ diff --git a/ibc-demo.sh b/ibc-demo.sh index 00a7dd5d5d..f4d1906e4c 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -98,8 +98,8 @@ echo "Establishing a connection..." gaiacli \ --home ibc0/n0/gaiacli \ tx ibc connection handshake \ - connection0 ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ - connection1 ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ + connectionzero ibconeclient $(gaiacli --home ibc1/n0/gaiacli q ibc client path) \ + connectionone ibczeroclient $(gaiacli --home ibc0/n0/gaiacli q ibc client path) \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 \ --node1 tcp://localhost:26657 \ From 8de0d8bdda03fab032d04cf2800b5b13b19c5c8c Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:30:25 +0100 Subject: [PATCH 07/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fb1d5453a8..8dd95cf052 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index b594e4eec8..5c79c7ed9e 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55 h1:zBQhxMKhYT github.com/cosmos/cosmos-sdk v0.34.4-0.20191031032021-609883398c55/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3 h1:3aXneUkdQaF0eRHvPYP35hQjk8xoXEIFn3SzsTcD9qI= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981 h1:bsy0pWnbT6DLG6/xJusCt0QE/Ydhi0sg5ZOVhwTD2NQ= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 70c07306bfd854a6c89535213fb0d25001316e3e Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:49:48 +0100 Subject: [PATCH 08/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8dd95cf052..a68bf12a5f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 5c79c7ed9e..620618ec14 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3 h1:3aXneUkdQa github.com/cosmos/cosmos-sdk v0.34.4-0.20191031140628-96a4006ba6c3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981 h1:bsy0pWnbT6DLG6/xJusCt0QE/Ydhi0sg5ZOVhwTD2NQ= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d h1:ZAiQ3aNolD5oMNbxx0BIlwQpAgqMYs+a+DyS75+JgKQ= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 254cd3f578148eafe9e7a2294f1b19b0108e7a63 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 15:57:33 +0100 Subject: [PATCH 09/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a68bf12a5f..9e8a626966 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 620618ec14..42c3e29de2 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981 h1:bsy0pWnbT6 github.com/cosmos/cosmos-sdk v0.34.4-0.20191031142903-25850f858981/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d h1:ZAiQ3aNolD5oMNbxx0BIlwQpAgqMYs+a+DyS75+JgKQ= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae h1:6WUa2EBzTtimXDRhbT2WBkjmwDtClE9TdXaTNQp8BbM= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From d823d3d7ae9fad4be4995a1b2a72233021f080e9 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 16:28:54 +0100 Subject: [PATCH 10/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9e8a626966..222e6cc5d0 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 42c3e29de2..08458a0725 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d h1:ZAiQ3aNolD github.com/cosmos/cosmos-sdk v0.34.4-0.20191031144901-cb62cbdb615d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae h1:6WUa2EBzTtimXDRhbT2WBkjmwDtClE9TdXaTNQp8BbM= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335 h1:UoKcyn7zx1DYtqLHDQ7Pi+QqDRUfVpTKaes/6ubYAK4= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 1634ed71404faded89c2931905314e487e0beae1 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 16:37:13 +0100 Subject: [PATCH 11/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 222e6cc5d0..8ba6c6bb21 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 08458a0725..c7102ab0e3 100644 --- a/go.sum +++ b/go.sum @@ -58,6 +58,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae h1:6WUa2EBzTt github.com/cosmos/cosmos-sdk v0.34.4-0.20191031145626-ee81f0ed55ae/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335 h1:UoKcyn7zx1DYtqLHDQ7Pi+QqDRUfVpTKaes/6ubYAK4= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e h1:K5qjH/CQO5nxkfng+Q4zBUyVnMAJi+0xUmIGH5RQxM4= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 197f7d5818bb8ecd4d6184e44323b94134b46aec Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 16:43:28 +0100 Subject: [PATCH 12/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8ba6c6bb21..e35fe93053 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index c7102ab0e3..ce1803be58 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335 h1:UoKcyn7zx1 github.com/cosmos/cosmos-sdk v0.34.4-0.20191031152636-2bd263329335/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e h1:K5qjH/CQO5nxkfng+Q4zBUyVnMAJi+0xUmIGH5RQxM4= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d h1:LZJOPTsFezAIfDCK5EzqltoYmM+YwhvJDf7+ik6b8qA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 370848c6fc5ecc732f5682a60b89a10f8a5092ae Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 16:54:54 +0100 Subject: [PATCH 13/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e35fe93053..e1a76d036c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index ce1803be58..397cd0da34 100644 --- a/go.sum +++ b/go.sum @@ -62,6 +62,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e h1:K5qjH/CQO5 github.com/cosmos/cosmos-sdk v0.34.4-0.20191031153617-9ecbe171509e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d h1:LZJOPTsFezAIfDCK5EzqltoYmM+YwhvJDf7+ik6b8qA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75 h1:Fm6rlSIzQa0z3lCVqnDIzrj90wEDIs8aVL3aEiSnZGc= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From a1096ee6954c1a4a6176b4173dfd709fb52501ed Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 17:27:29 +0100 Subject: [PATCH 14/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e1a76d036c..0581aa73b5 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 397cd0da34..c7e8f101e5 100644 --- a/go.sum +++ b/go.sum @@ -64,6 +64,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d h1:LZJOPTsFez github.com/cosmos/cosmos-sdk v0.34.4-0.20191031154238-e370978efb4d/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75 h1:Fm6rlSIzQa0z3lCVqnDIzrj90wEDIs8aVL3aEiSnZGc= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4 h1:p6MXCqXnXb9iJpJRJ63dogOYMmoYDE+SJGpgAjVnOfU= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From fc5bf599f88678bc88d0ba91a0bf6ce4384c12fa Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 18:08:16 +0100 Subject: [PATCH 15/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0581aa73b5..e261933c51 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index c7e8f101e5..e38ab864c1 100644 --- a/go.sum +++ b/go.sum @@ -66,6 +66,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75 h1:Fm6rlSIzQa github.com/cosmos/cosmos-sdk v0.34.4-0.20191031155247-f6b8b1effd75/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4 h1:p6MXCqXnXb9iJpJRJ63dogOYMmoYDE+SJGpgAjVnOfU= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839 h1:v1pIvaPRy7hwvNz/nlBK3A43mc10tAi68FsbjscxY2E= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From f3a9cc97c26823a1a1e9b40c9504406558d9d4b7 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 18:15:03 +0100 Subject: [PATCH 16/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e261933c51..e36d2a8334 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index e38ab864c1..58b31726e5 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4 h1:p6MXCqXnXb github.com/cosmos/cosmos-sdk v0.34.4-0.20191031162634-a1bb1617adf4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839 h1:v1pIvaPRy7hwvNz/nlBK3A43mc10tAi68FsbjscxY2E= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16 h1:f7DyQfDaSqVLr3trhA4DkOyOtf2Zcz6ymZ6oSV8L9kA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 784d37035978f50025aacc732eb93effb098ade6 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Thu, 31 Oct 2019 18:33:06 +0100 Subject: [PATCH 17/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e36d2a8334..0f2af43d85 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 58b31726e5..6909201e09 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839 h1:v1pIvaPRy7 github.com/cosmos/cosmos-sdk v0.34.4-0.20191031170720-0fb06f8c6839/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16 h1:f7DyQfDaSqVLr3trhA4DkOyOtf2Zcz6ymZ6oSV8L9kA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e h1:Vg1dYdlXFcw0xu5Dhqm8CkA0ncZHajA84CwVzvX9Vak= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 95cd5a9252a44ddc4fe265945a4582fed82cfdae Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 11:15:13 -0700 Subject: [PATCH 18/61] Demo script for mac --- ibc-demo.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index f4d1906e4c..7366fed3da 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -32,12 +32,12 @@ echo "Generating configurations..." cd $CONF_DIR && mkdir ibc-testnets && cd ibc-testnets echo -e "\n" | gaiad testnet -o ibc0 --v 1 --chain-id ibc0 --node-dir-prefix n echo -e "\n" | gaiad testnet -o ibc1 --v 1 --chain-id ibc1 --node-dir-prefix n -sed -i 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml -sed -i 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml -sed -i 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml -sed -i 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml -sed -i 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml -sed -i 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml +sed -i '' 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml +sed -i '' 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml +sed -i '' 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml +sed -i '' 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml +sed -i '' 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml +sed -i '' 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml gaiacli config --home ibc0/n0/gaiacli/ chain-id ibc0 gaiacli config --home ibc1/n0/gaiacli/ chain-id ibc1 gaiacli config --home ibc0/n0/gaiacli/ output json From 66136037ab4aa4071261ba8e3b54fac321b1461c Mon Sep 17 00:00:00 2001 From: mossid Date: Thu, 31 Oct 2019 14:47:25 -0700 Subject: [PATCH 19/61] fix connection query --- ibc-demo.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index f7352492e0..27ff59cc92 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -136,8 +136,8 @@ gaiacli \ Once the connection is established you should be able to query it: ```bash -gaiacli --home ibc0/n0/gaiacli q ibc connection connection connectionzero --indent --trust-node -gaiacli --home ibc1/n0/gaiacli q ibc connection connection connectionone --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc connection end connectionzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc connection end connectionone --indent --trust-node ``` ### Channel From 00812a08de0dc22ace281e43bf0c343a80f222cb Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 15:15:37 -0700 Subject: [PATCH 20/61] WIP channel shake :man-dancing: --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0f2af43d85..2f50d451f3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 6909201e09..183ba64c00 100644 --- a/go.sum +++ b/go.sum @@ -72,6 +72,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16 h1:f7DyQfDaSq github.com/cosmos/cosmos-sdk v0.34.4-0.20191031171416-d8af5f548e16/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e h1:Vg1dYdlXFcw0xu5Dhqm8CkA0ncZHajA84CwVzvX9Vak= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c h1:4hlE2KNkRS6woJoKYSqgq340EBp+yiakmsHH/Zx8o6s= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From d9314427713f7465cbe5b18bebf332b60ac7edd0 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 15:30:22 -0700 Subject: [PATCH 21/61] WIP channel shake :man-dancing: --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 30 +++++++++++++++++++++--------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2f50d451f3..2eeadc06b4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 183ba64c00..d95351fa26 100644 --- a/go.sum +++ b/go.sum @@ -74,6 +74,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e h1:Vg1dYdlXFc github.com/cosmos/cosmos-sdk v0.34.4-0.20191031172954-32fc31014a6e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c h1:4hlE2KNkRS6woJoKYSqgq340EBp+yiakmsHH/Zx8o6s= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df h1:UokYN91hq5nHQOWwk7Ce6BoEb2T0Unc+uLzHLwPMu18= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 7366fed3da..fcaa7a486c 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -54,18 +54,18 @@ echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli keys delete n0 echo "Seed 0: ${SEED0}" echo "Seed 1: ${SEED1}" -echo "Enter seed 1:" -gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +# echo "Enter seed 1:" +# gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -echo "Enter seed 0:" -gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +# echo "Enter seed 0:" +# gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -echo "Enter seed 1:" -gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +# echo "Enter seed 1:" +# gaiacli --home ibc1/n0/gaiacli keys add n1 --recover -#echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -#echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -#echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover echo "Keys should match:" @@ -104,3 +104,15 @@ gaiacli \ --from1 n0 --from2 n1 \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 + +echo "Establishing a channel..." + +gaiacli \ + --home ibc0/n0/gaiacli \ + tx ibc channel handshake \ + ibconeclient bank channelzero connectionzero \ + ibczeroclient bank channelone connectionone \ + --node1 tcp://localhost:26657 \ + --node2 tcp://localhost:26557 \ + --chain-id2 ibc1 \ + --from1 n0 --from2 n1 From 8b8c5148c1a9abf40983fb01ef60891085f27ab2 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 15:34:11 -0700 Subject: [PATCH 22/61] WIP channel shake :man-dancing: --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2eeadc06b4..dab90b3bf3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index d95351fa26..efea7e1706 100644 --- a/go.sum +++ b/go.sum @@ -76,6 +76,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c h1:4hlE2KNkRS github.com/cosmos/cosmos-sdk v0.34.4-0.20191031221245-740f41a66e5c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df h1:UokYN91hq5nHQOWwk7Ce6BoEb2T0Unc+uLzHLwPMu18= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b h1:9RArPzjyNquSTCxOkepJK9K/fN8td7bqganRfWFS+uQ= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From dc350053ee1e738fb5be27a38acf926e8fd384fa Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 15:44:35 -0700 Subject: [PATCH 23/61] WIP channel shake :man-dancing: --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index dab90b3bf3..af26b1677c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031224352-bd07a7371fc4 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect @@ -27,3 +27,5 @@ require ( golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect ) + +replace github.com/cosmos/cosmos-sdk => /Users/johnzampolin/go/src/github.com/cosmos/cosmos-sdk From 42e47fb4a1ddbd558359c00e88982c2813fe5259 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 15:50:13 -0700 Subject: [PATCH 24/61] WIP channel shake :man-dancing: --- go.mod | 2 +- ibc-demo.sh | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index af26b1677c..9f66a5c996 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031224352-bd07a7371fc4 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031224906-7ec2beab5a23 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/ibc-demo.sh b/ibc-demo.sh index fcaa7a486c..b40d1d76e1 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -54,18 +54,18 @@ echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli keys delete n0 echo "Seed 0: ${SEED0}" echo "Seed 1: ${SEED1}" -# echo "Enter seed 1:" -# gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +echo "Enter seed 1:" +gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -# echo "Enter seed 0:" -# gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +echo "Enter seed 0:" +gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -# echo "Enter seed 1:" -# gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +echo "Enter seed 1:" +gaiacli --home ibc1/n0/gaiacli keys add n1 --recover -echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +# echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +# echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +# echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover echo "Keys should match:" From 5ea4e75f0adcb462afe23ee74ad8725452544a38 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 16:24:16 -0700 Subject: [PATCH 25/61] WIP channel shake :man-dancing: --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9f66a5c996..edcb9d1b6c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031224906-7ec2beab5a23 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect From c220b8e5c46081ed693d97e1c302891b947695e1 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 1 Nov 2019 01:46:22 +0100 Subject: [PATCH 26/61] Update upstream --- go.mod | 2 -- go.sum | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index edcb9d1b6c..3cbf63d914 100644 --- a/go.mod +++ b/go.mod @@ -27,5 +27,3 @@ require ( golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect ) - -replace github.com/cosmos/cosmos-sdk => /Users/johnzampolin/go/src/github.com/cosmos/cosmos-sdk diff --git a/go.sum b/go.sum index efea7e1706..04a4d11d8b 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df h1:UokYN91hq5 github.com/cosmos/cosmos-sdk v0.34.4-0.20191031222731-6aafb62b26df/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b h1:9RArPzjyNquSTCxOkepJK9K/fN8td7bqganRfWFS+uQ= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 h1:/+f3xe4IsmMnJCKX1oieNd7dmPcyX4e9h4AKzXzSCYo= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 7fcbc47db90c6811d6c608669faaebbc26c43e96 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Thu, 31 Oct 2019 17:54:09 -0700 Subject: [PATCH 27/61] WIP IBC token transfer demo :man_dancing: --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.md | 10 +++++----- ibc-demo.sh | 4 ++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3cbf63d914..592ef6c45e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 04a4d11d8b..d82e243783 100644 --- a/go.sum +++ b/go.sum @@ -80,6 +80,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b h1:9RArPzjyNq github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 h1:/+f3xe4IsmMnJCKX1oieNd7dmPcyX4e9h4AKzXzSCYo= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c h1:mlHFI1f6mgj8DGnhBvAZ6Z/LPt1+xbJ/hlJA9RhI7Tk= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.md b/ibc-demo.md index 27ff59cc92..f6d365c7c8 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -150,8 +150,8 @@ Now that the `connection` has been created, it's time to establish a `channel` f gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibcmocksend channel0 connectionzero \ - ibcmockrecv channel1 connectionone \ + ibconeclient bank channelzero connectionzero \ + ibczeroclient bank channelone connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ @@ -161,13 +161,13 @@ gaiacli \ You can query the `channel` after establishment by running the following command: ```bash -gaiacli --home ibc0/n0/gaiacli query ibc channel channel ibcmocksend channel0 --indent --trust-node -gaiacli --home ibc1/n0/gaiacli query ibc channel channel ibcmockrecv channel1 --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc channel end bank channelzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc channel end bank channelone --indent --trust-node ``` ## Send Packet -To send a packet using the `ibc-mock` application protocol, you need to know the channel you plan to send on, as well as the sequence number on the channel. To get the sequence you use the following commands: +To send a packet using the `bank` application protocol, you need to know the channel you plan to send on, as well as the sequence number on the channel. To get the sequence you use the following commands: ```bash # Returns the last sequence number diff --git a/ibc-demo.sh b/ibc-demo.sh index b40d1d76e1..cfd6f740dd 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -116,3 +116,7 @@ gaiacli \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 + + echo "Sending token packets from ibc0..." + + echo "Recieving token packets on ibc1..." From e5e7ea95791a35aa3ad0d241522ad28d6437fd4f Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 1 Nov 2019 01:56:51 +0100 Subject: [PATCH 28/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3cbf63d914..592ef6c45e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 04a4d11d8b..d82e243783 100644 --- a/go.sum +++ b/go.sum @@ -80,6 +80,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b h1:9RArPzjyNq github.com/cosmos/cosmos-sdk v0.34.4-0.20191031223208-5eb968bc488b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 h1:/+f3xe4IsmMnJCKX1oieNd7dmPcyX4e9h4AKzXzSCYo= github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c h1:mlHFI1f6mgj8DGnhBvAZ6Z/LPt1+xbJ/hlJA9RhI7Tk= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 506e148e8a649053352becafa12b4c418ae54f80 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 1 Nov 2019 11:41:17 +0100 Subject: [PATCH 29/61] Update upstream & script --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 50 +++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 592ef6c45e..c6f11b40b7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index d82e243783..4b8a6082a4 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8 h1:/+f3xe4Ism github.com/cosmos/cosmos-sdk v0.34.4-0.20191031232319-0ca3fafc8be8/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c h1:mlHFI1f6mgj8DGnhBvAZ6Z/LPt1+xbJ/hlJA9RhI7Tk= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3 h1:PDTblqXLSe27KoCMRwjUJe+86kEqsRGmhq4ABJkP3Zs= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index cfd6f740dd..250f84be2d 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -32,12 +32,23 @@ echo "Generating configurations..." cd $CONF_DIR && mkdir ibc-testnets && cd ibc-testnets echo -e "\n" | gaiad testnet -o ibc0 --v 1 --chain-id ibc0 --node-dir-prefix n echo -e "\n" | gaiad testnet -o ibc1 --v 1 --chain-id ibc1 --node-dir-prefix n -sed -i '' 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml -sed -i '' 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml -sed -i '' 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml + +if [ "$(uname)" = "Linux" ]; then + sed -i 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml + sed -i 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml + sed -i 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml + sed -i 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml + sed -i 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml + sed -i 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml +else + sed -i '' 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml + sed -i '' 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml + sed -i '' 's#"tcp://0.0.0.0:26656"#"tcp://0.0.0.0:26556"#g' ibc1/n0/gaiad/config/config.toml + sed -i '' 's#"tcp://0.0.0.0:26657"#"tcp://0.0.0.0:26557"#g' ibc1/n0/gaiad/config/config.toml + sed -i '' 's#"localhost:6060"#"localhost:6061"#g' ibc1/n0/gaiad/config/config.toml + sed -i '' 's#"tcp://127.0.0.1:26658"#"tcp://127.0.0.1:26558"#g' ibc1/n0/gaiad/config/config.toml +fi; + gaiacli config --home ibc0/n0/gaiacli/ chain-id ibc0 gaiacli config --home ibc1/n0/gaiacli/ chain-id ibc1 gaiacli config --home ibc0/n0/gaiacli/ output json @@ -63,15 +74,19 @@ gaiacli --home ibc1/n0/gaiacli keys add n0 --recover echo "Enter seed 1:" gaiacli --home ibc1/n0/gaiacli keys add n1 --recover -# echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -# echo -e "12345678\n12345678\n${SEED0}\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -# echo -e "12345678\n12345678\n${SEED1}\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +#echo -e "12345678\n12345678\n$SEED1\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover +#echo -e "12345678\n12345678\n$SEED0\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover +#echo -e "12345678\n12345678\n$SEED1\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover echo "Keys should match:" gaiacli --home ibc0/n0/gaiacli keys list | jq '.[].address' gaiacli --home ibc1/n0/gaiacli keys list | jq '.[].address' +DEST=$(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') + +echo "Destination: $DEST" + echo "Starting Gaiad instances..." nohup gaiad --home ibc0/n0/gaiad --log_level="*:debug" start > ibc0.log & @@ -117,6 +132,19 @@ gaiacli \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 - echo "Sending token packets from ibc0..." +echo "Sending token packets from ibc0..." - echo "Recieving token packets on ibc1..." +gaiacli \ + --home ibc0/n0/gaiacli \ + tx ibc transfer transfer \ + bankbankbank channelzero \ + $DEST 1stake + +echo "Recieving token packets on ibc1..." + +gaiacli \ + --home ibc1/n0/gaiacli \ + tx ibc transfer recv-packet \ + bankbankbank channelone \ + packet.json \ + proof.json From 03bc0f7d34d1cfe513c45ab9024c2bdf2ceec206 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 1 Nov 2019 11:54:03 +0100 Subject: [PATCH 30/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c6f11b40b7..b8f01055a9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 4b8a6082a4..0897ed2780 100644 --- a/go.sum +++ b/go.sum @@ -84,6 +84,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c h1:mlHFI1f6mg github.com/cosmos/cosmos-sdk v0.34.4-0.20191101005114-606e114a468c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3 h1:PDTblqXLSe27KoCMRwjUJe+86kEqsRGmhq4ABJkP3Zs= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87 h1:vDw+W7vOsdfdDy/irIPr7uaYkpBeA31EhoW1AaEEsD8= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From b27375af12726e4c5c3732c71b0a79010de90869 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Fri, 1 Nov 2019 11:58:06 +0100 Subject: [PATCH 31/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b8f01055a9..ebd91a54a2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 0897ed2780..38e33daff0 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3 h1:PDTblqXLSe github.com/cosmos/cosmos-sdk v0.34.4-0.20191101103856-885acaf23ce3/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87 h1:vDw+W7vOsdfdDy/irIPr7uaYkpBeA31EhoW1AaEEsD8= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9 h1:Eexj7uPTBKUqyMrgNVbWGkQ1Vj6jG9g2kX9VLBVOU/4= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 250f84be2d..f7beb7134a 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -138,7 +138,8 @@ gaiacli \ --home ibc0/n0/gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ - $DEST 1stake + $DEST 1stake \ + --from n0 echo "Recieving token packets on ibc1..." @@ -147,4 +148,5 @@ gaiacli \ tx ibc transfer recv-packet \ bankbankbank channelone \ packet.json \ - proof.json + proof.json \ + --from n1 From 28fdb2140adaeab46da05bd9ce037033aeedc180 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 14:20:00 -0700 Subject: [PATCH 32/61] attempt --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ebd91a54a2..1b0b60d010 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 38e33daff0..26f4b4d578 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87 h1:vDw+W7vOsd github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105222-220ac1d9be87/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9 h1:Eexj7uPTBKUqyMrgNVbWGkQ1Vj6jG9g2kX9VLBVOU/4= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4 h1:/4PHB0utarAgCy4MujoAzaxVoKNYa5uEaI6tVHZipBE= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From fcb0049136ab8b98ac2b865642966cc238bb20f3 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 14:26:07 -0700 Subject: [PATCH 33/61] Try debuggin --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1b0b60d010..a58b61c394 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 26f4b4d578..2b9240b17d 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9 h1:Eexj7uPTBK github.com/cosmos/cosmos-sdk v0.34.4-0.20191101105703-b4b5a76315e9/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4 h1:/4PHB0utarAgCy4MujoAzaxVoKNYa5uEaI6tVHZipBE= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a h1:h9LgiheGGoYJkJBc24fg3XNWD+MLi+y09emn3kVfljs= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From e8a621b701ad8e8c348aed5b1e19d41a63b109c7 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 14:30:54 -0700 Subject: [PATCH 34/61] Try debuggin --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a58b61c394..39899fd355 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 2b9240b17d..7eeb6fcfc6 100644 --- a/go.sum +++ b/go.sum @@ -92,6 +92,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4 h1:/4PHB0utar github.com/cosmos/cosmos-sdk v0.34.4-0.20191101211756-5c54d19898d4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a h1:h9LgiheGGoYJkJBc24fg3XNWD+MLi+y09emn3kVfljs= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904 h1:clRC2z+5j5ekQiuH+dCqLST/Wb0lFFzZatBtDzkrDso= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 3075ef74b1bc6879523bcba5a4c0fe308b7f5b20 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 15:01:07 -0700 Subject: [PATCH 35/61] Debuggin' --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 39899fd355..811247a472 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 7eeb6fcfc6..8daa01571f 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a h1:h9LgiheGGo github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212509-011e54c3247a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904 h1:clRC2z+5j5ekQiuH+dCqLST/Wb0lFFzZatBtDzkrDso= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e h1:Nh0GT2kueFtSaKnm9VM53wAIw4+0k8hgvkX1MCvzxpQ= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index f7beb7134a..36897ad507 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -139,7 +139,7 @@ gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ $DEST 1stake \ - --from n0 + --from n0 -y echo "Recieving token packets on ibc1..." @@ -149,4 +149,4 @@ gaiacli \ bankbankbank channelone \ packet.json \ proof.json \ - --from n1 + --from n1 -y From 42e09624db66c115a45f99a5bcd39b4b4f6be47f Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 15:04:21 -0700 Subject: [PATCH 36/61] Debuggin... --- go.mod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 811247a472..2f9a3fbc27 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101220305-3c262cc96ff9 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect @@ -27,3 +27,5 @@ require ( golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect ) + +replace github.com/cosmos/cosmos-sdk => /Users/johnzampolin/go/src/github.com/cosmos/cosmos-sdk From 3d94292b2546a09d662cc8365f8babf6dd29b99f Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 15:34:16 -0700 Subject: [PATCH 37/61] Push current state --- go.mod | 4 +--- go.sum | 2 ++ ibc-demo.sh | 10 +++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2f9a3fbc27..b03b7d6721 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101220305-3c262cc96ff9 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect @@ -27,5 +27,3 @@ require ( golang.org/x/text v0.3.2 // indirect google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 // indirect ) - -replace github.com/cosmos/cosmos-sdk => /Users/johnzampolin/go/src/github.com/cosmos/cosmos-sdk diff --git a/go.sum b/go.sum index 8daa01571f..3e76af7fac 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904 h1:clRC2z+5j5 github.com/cosmos/cosmos-sdk v0.34.4-0.20191101212939-9201bf46d904/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e h1:Nh0GT2kueFtSaKnm9VM53wAIw4+0k8hgvkX1MCvzxpQ= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31 h1:J7uwnbnbaDRw8nJH5d5tBe/geJjQRotO91puC+q0x8g= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 36897ad507..838bed6a5d 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -83,10 +83,6 @@ echo "Keys should match:" gaiacli --home ibc0/n0/gaiacli keys list | jq '.[].address' gaiacli --home ibc1/n0/gaiacli keys list | jq '.[].address' -DEST=$(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') - -echo "Destination: $DEST" - echo "Starting Gaiad instances..." nohup gaiad --home ibc0/n0/gaiad --log_level="*:debug" start > ibc0.log & @@ -138,8 +134,8 @@ gaiacli \ --home ibc0/n0/gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ - $DEST 1stake \ - --from n0 -y + $(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') 1stake \ + --from n0 echo "Recieving token packets on ibc1..." @@ -149,4 +145,4 @@ gaiacli \ bankbankbank channelone \ packet.json \ proof.json \ - --from n1 -y + --from n1 From c1130cdb63139f7c0adb9e101abccdf70ae8767a Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 00:06:55 +0100 Subject: [PATCH 38/61] Use automated command --- ibc-demo.sh | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index 36897ad507..48d2ee8e61 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -17,15 +17,15 @@ killall gaiad set -e -echo "Building Gaia..." +#echo "Building Gaia..." -cd $GAIA_DIR -git clone git@github.com:cosmos/gaia -cd gaia -git checkout $GAIA_BRANCH -make install -gaiad version -gaiacli version +#cd $GAIA_DIR +#git clone git@github.com:cosmos/gaia +#cd gaia +#git checkout $GAIA_BRANCH +#make install +#gaiad version +#gaiacli version echo "Generating configurations..." @@ -65,18 +65,9 @@ echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli keys delete n0 echo "Seed 0: ${SEED0}" echo "Seed 1: ${SEED1}" -echo "Enter seed 1:" -gaiacli --home ibc0/n0/gaiacli keys add n1 --recover - -echo "Enter seed 0:" -gaiacli --home ibc1/n0/gaiacli keys add n0 --recover - -echo "Enter seed 1:" -gaiacli --home ibc1/n0/gaiacli keys add n1 --recover - -#echo -e "12345678\n12345678\n$SEED1\n" | gaiacli --home ibc0/n0/gaiacli keys add n1 --recover -#echo -e "12345678\n12345678\n$SEED0\n" | gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -#echo -e "12345678\n12345678\n$SEED1\n" | gaiacli --home ibc1/n0/gaiacli keys add n1 --recover +gaiacli keys test --home ibc0/n0/gaiacli n1 "$(jq -r '.secret' ibc1/n0/gaiacli/key_seed.json)" 12345678 +gaiacli keys test --home ibc1/n0/gaiacli n0 "$(jq -r '.secret' ibc0/n0/gaiacli/key_seed.json)" 12345678 +gaiacli keys test --home ibc1/n0/gaiacli n1 "$(jq -r '.secret' ibc1/n0/gaiacli/key_seed.json)" 12345678 echo "Keys should match:" @@ -139,7 +130,7 @@ gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ $DEST 1stake \ - --from n0 -y + --from n0 echo "Recieving token packets on ibc1..." @@ -149,4 +140,4 @@ gaiacli \ bankbankbank channelone \ packet.json \ proof.json \ - --from n1 -y + --from n1 From 51ccf342b569916201b161c86ef43636ea1e44a6 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 00:31:01 +0100 Subject: [PATCH 39/61] Fix port id --- ibc-demo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index b8fddc8e75..466632fcc0 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -112,8 +112,8 @@ echo "Establishing a channel..." gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibconeclient bank channelzero connectionzero \ - ibczeroclient bank channelone connectionone \ + ibconeclient bankbankbank channelzero connectionzero \ + ibczeroclient bankbankbank channelone connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ From 5f7728a50b1ac8110821b95fabf980f7519ef52a Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 00:48:27 +0100 Subject: [PATCH 40/61] Use source --- ibc-demo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index 466632fcc0..ba2918ccda 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -126,7 +126,8 @@ gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ $(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') 1stake \ - --from n0 + --from n0 \ + --source echo "Recieving token packets on ibc1..." From b358b185d5dda2355a247bca52df0459edf5381f Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:01:56 +0100 Subject: [PATCH 41/61] Update upstream --- go.mod | 2 +- go.sum | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b03b7d6721..2e7b8a21e1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 3e76af7fac..a48794e333 100644 --- a/go.sum +++ b/go.sum @@ -98,6 +98,12 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e h1:Nh0GT2kueF github.com/cosmos/cosmos-sdk v0.34.4-0.20191101215656-6d2e71cc234e/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31 h1:J7uwnbnbaDRw8nJH5d5tBe/geJjQRotO91puC+q0x8g= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101223126-8481c9573f31/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101232510-845c7acbc1ae h1:BvpntNZGU0OW6w1fil98/jj0vhnb+rT2fXnNo5hErBI= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101232510-845c7acbc1ae/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101233916-4753b8024103 h1:sr5yP+24Jlse4Zr4/4XvOUW24Vt+pz9nPu1qidY8DlU= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101233916-4753b8024103/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4 h1:sSgcpvjxH+OvpntvXbQCplQMsbkoYo9mQOyNTQegnbI= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From fabf17eac551deb2de63a133709404924da2a9ed Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:12:30 +0100 Subject: [PATCH 42/61] Update ibc-demo.sh --- ibc-demo.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index ba2918ccda..ebf4c8a0e0 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -129,12 +129,16 @@ gaiacli \ --from n0 \ --source +echo "Enter height:" + +read -r HEIGHT + echo "Recieving token packets on ibc1..." gaiacli \ --home ibc1/n0/gaiacli \ tx ibc transfer recv-packet \ - bankbankbank channelone \ packet.json \ proof.json \ + $HEIGHT --from n1 From 3592100ab7f8c09d2e7ba052b3184a7db611daf4 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:14:38 +0100 Subject: [PATCH 43/61] Update ibc-demo.sh --- ibc-demo.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index ebf4c8a0e0..b26fe1470b 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -121,11 +121,13 @@ gaiacli \ echo "Sending token packets from ibc0..." +DEST=$(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') + gaiacli \ --home ibc0/n0/gaiacli \ tx ibc transfer transfer \ bankbankbank channelzero \ - $(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') 1stake \ + $DEST 1stake \ --from n0 \ --source @@ -133,6 +135,9 @@ echo "Enter height:" read -r HEIGHT +echo "Account before:" +gaiacli --home ibc1/n0/gaiacli q account $DEST + echo "Recieving token packets on ibc1..." gaiacli \ @@ -142,3 +147,6 @@ gaiacli \ proof.json \ $HEIGHT --from n1 + +echo "Account after:" +gaiacli --home ibc1/n0/gaiacli q account $DEST From 05bb79781a42ee5f005d730ba0b909648371d0cb Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:35:31 +0100 Subject: [PATCH 44/61] Update upstream & script --- go.mod | 2 +- go.sum | 4 ++++ ibc-demo.sh | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e7b8a21e1..836c3c2e05 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index a48794e333..39b6ce4e79 100644 --- a/go.sum +++ b/go.sum @@ -104,6 +104,10 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191101233916-4753b8024103 h1:sr5yP+24Jl github.com/cosmos/cosmos-sdk v0.34.4-0.20191101233916-4753b8024103/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4 h1:sSgcpvjxH+OvpntvXbQCplQMsbkoYo9mQOyNTQegnbI= github.com/cosmos/cosmos-sdk v0.34.4-0.20191101235625-42fdf9c5fbd4/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102002835-f6bbdf2fb9f5 h1:pcE0nRokdu4aPALeei8fQFOWQLxZEC8gVFp+6kNrwXQ= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102002835-f6bbdf2fb9f5/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22 h1:pJ75SlN3T24byGG6TX9hT4zOQDW5bEhQdNFMT+UbM1w= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index b26fe1470b..220449dec6 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -135,6 +135,8 @@ echo "Enter height:" read -r HEIGHT +TIMEOUT=$(echo "$HEIGHT + 1000" | bc -l) + echo "Account before:" gaiacli --home ibc1/n0/gaiacli q account $DEST @@ -143,9 +145,12 @@ echo "Recieving token packets on ibc1..." gaiacli \ --home ibc1/n0/gaiacli \ tx ibc transfer recv-packet \ - packet.json \ + bankbankbank channelzero \ + bankbankbank channelone \ proof.json \ - $HEIGHT + $HEIGHT \ + --packet-sequence 0 \\ + --timeout $TIMEOUT \\ --from n1 echo "Account after:" From 73715079e4f512fae3c92701ea49f1c30878baaf Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:47:59 +0100 Subject: [PATCH 45/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 836c3c2e05..2c2ca34da4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 39b6ce4e79..a704d4f3c7 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102002835-f6bbdf2fb9f5 h1:pcE0nRokdu github.com/cosmos/cosmos-sdk v0.34.4-0.20191102002835-f6bbdf2fb9f5/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22 h1:pJ75SlN3T24byGG6TX9hT4zOQDW5bEhQdNFMT+UbM1w= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0 h1:itmZtFwb7X+a2eRXKWDNz0Outqg8mYVk5e/jgbJ9qPc= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 8c7d3cbaf3163ecd6b601a98eb5ea40c9140e99d Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 01:53:52 +0100 Subject: [PATCH 46/61] Update script --- ibc-demo.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index 220449dec6..5c9b8d8cff 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -143,15 +143,13 @@ gaiacli --home ibc1/n0/gaiacli q account $DEST echo "Recieving token packets on ibc1..." gaiacli \ - --home ibc1/n0/gaiacli \ tx ibc transfer recv-packet \ bankbankbank channelzero \ - bankbankbank channelone \ - proof.json \ - $HEIGHT \ - --packet-sequence 0 \\ - --timeout $TIMEOUT \\ - --from n1 + --home ibc1/n0/gaiacli \ + --packet-sequence 0 \ + --timeout $TIMEOUT \ + --from n1 \ + --node2 tcp://localhost:26657 echo "Account after:" gaiacli --home ibc1/n0/gaiacli q account $DEST From 1fb404481888055d3925c9644c73d7270b8c3fb2 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 02:00:43 +0100 Subject: [PATCH 47/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2c2ca34da4..3b86e03bbd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index a704d4f3c7..fc166f9ef1 100644 --- a/go.sum +++ b/go.sum @@ -110,6 +110,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22 h1:pJ75SlN3T2 github.com/cosmos/cosmos-sdk v0.34.4-0.20191102003129-cb3d21781c22/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0 h1:itmZtFwb7X+a2eRXKWDNz0Outqg8mYVk5e/jgbJ9qPc= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a h1:QsOuMXT7pzSsGF2zVRbLuuPOetadLphkn5tGJoKcNA8= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 5c9b8d8cff..c342b1e17a 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -146,7 +146,7 @@ gaiacli \ tx ibc transfer recv-packet \ bankbankbank channelzero \ --home ibc1/n0/gaiacli \ - --packet-sequence 0 \ + --packet-sequence 1 \ --timeout $TIMEOUT \ --from n1 \ --node2 tcp://localhost:26657 From fb65b272253f1171ed2dce093b34598608967aad Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 1 Nov 2019 18:03:46 -0700 Subject: [PATCH 48/61] Update ibc-demo.md to match ibc-demo.sh and small script changes --- ibc-demo.md | 136 +++++++++++++++++++++++++--------------------------- ibc-demo.sh | 21 +++++++- 2 files changed, 86 insertions(+), 71 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index f6d365c7c8..9bdb640ce4 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -43,49 +43,31 @@ gaiacli config --home ibc0/n0/gaiacli/ node http://localhost:26657 gaiacli config --home ibc1/n0/gaiacli/ node http://localhost:26557 ``` -Add keys from each chain to the other and make sure that the key at `ibc1/n0/gaiacli/key_seed.json` is named `n1` on each `gaiacli` instance and the same for `n0`. After this is complete the results of `gaiacli keys list` from each chain should be identical. - -The following are instructions for how to copy seed phrases to the clipboard on Mac: +Add keys from each chain to the other and make sure that the key at `ibc1/n0/gaiacli/key_seed.json` is named `n1` on each `gaiacli` instance and the same for `n0`. After this is complete the results of `gaiacli keys list` from each chain should be identical. The following commands will do the trick: ```bash -jq -r '.secret' ibc0/n0/gaiacli/key_seed.json | pbcopy -jq -r '.secret' ibc1/n0/gaiacli/key_seed.json | pbcopy +gaiacli --home ibc1/n0/gaiacli keys delete n0 +gaiacli keys test --home ibc0/n0/gaiacli n1 "$(jq -r '.secret' ibc1/n0/gaiacli/key_seed.json)" 12345678 +gaiacli keys test --home ibc1/n0/gaiacli n0 "$(jq -r '.secret' ibc0/n0/gaiacli/key_seed.json)" 12345678 +gaiacli keys test --home ibc1/n0/gaiacli n1 "$(jq -r '.secret' ibc1/n0/gaiacli/key_seed.json)" 12345678 ``` -Or on Linux: +After this operation, check to make sure the keys match: ```bash -jq -r '.secret' ibc0/n0/gaiacli/key_seed.json | xclip -sel clip -jq -r '.secret' ibc1/n0/gaiacli/key_seed.json | xclip -sel clip -``` - -Then continue: - +gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[].address' +gaiacli --home ibc1/n0/gaiacli keys list | jq -r '.[].address' ``` -# Remove the key n0 on ibc1 -gaiacli --home ibc1/n0/gaiacli keys delete n0 - -# seed from ibc1/n0/gaiacli/key_seed.json -> ibc0/n1 -gaiacli --home ibc0/n0/gaiacli keys add n1 --recover - -# seed from ibc0/n0/gaiacli/key_seed.json -> ibc1/n0 -gaiacli --home ibc1/n0/gaiacli keys add n0 --recover -# seed from ibc1/n0/gaiacli/key_seed.json -> ibc1/n1 -gaiacli --home ibc1/n0/gaiacli keys add n1 --recover - -# Ensure keys match -gaiacli --home ibc0/n0/gaiacli keys list | jq '.[].address' -gaiacli --home ibc1/n0/gaiacli keys list | jq '.[].address' -``` - -After configuration is complete, start your `gaiad` processes: +After configuration is complete, you will be able to start two `gaiad` processes: ```bash nohup gaiad --home ibc0/n0/gaiad start > ibc0.log & nohup gaiad --home ibc1/n0/gaiad start > ibc1.log & ``` +> NOTE: If you would like to look at the logs from the instances just `tail -f ibc0.log`. + ## IBC Command Sequence ### Client Creation @@ -94,13 +76,13 @@ Create IBC clients on each chain using the following commands. Note that we are ```bash # client for chain ibc1 on chain ibc0 -gaiacli --home ibc0/n0/gaiacli \ +echo -e "12345678\n" | gaiacli --home ibc0/n0/gaiacli \ tx ibc client create ibconeclient \ $(gaiacli --home ibc1/n0/gaiacli q ibc client node-state) \ --from n0 -y -o text # client for chain ibc0 on chain ibc1 -gaiacli --home ibc1/n0/gaiacli \ +echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli \ tx ibc client create ibczeroclient \ $(gaiacli --home ibc0/n0/gaiacli q ibc client node-state) \ --from n1 -y -o text @@ -119,7 +101,7 @@ In order to send transactions using IBC there are two different handshakes that Create a `connection` with the following command: -> NOTE: This command broadcasts a total of 7 transactions between the two chains from 2 different wallets. At the start of the command you will be prompted for passwords for the two different keys. The command may then take some time. Please wait for the command to return! +> NOTE: This command broadcasts a total of 7 transactions between the two chains from 2 different wallets. At the start of the command you will be prompted for passwords for the two different keys (`12345678` for both). The command will then take some time, please wait for it to return! ```shell gaiacli \ @@ -133,6 +115,18 @@ gaiacli \ --node2 tcp://localhost:26557 ``` +After the password input, you should see output like the following: + +``` +ibc0 <- connection_open_init [OK] txid(B41C15A8F31524CB34EE061BA4418F48A3A37A7348BF8F818E67F5EE90AED45F) client(ibconeclient) connection(connectionzero) +ibc1 <- update_client [OK] txid(CD9F9AFD311DDF6B3604BCDD3DF371FAE93F76A01E66815AD6E2DCDDA942976D) client(ibconeclient) +ibc1 <- connection_open_try [OK] txid(F364081569703146978605D9079B751FA83E8766C749B1DA96054D2728DBD715) client(ibczeroclient) connection(connectionone) +ibc0 <- update_client [OK] txid(58A8E012E623303AA2B4A73099D00A6A3F34220E10FA5445251B1F7E6435EFF5) client(ibczeroclient) +ibc0 <- connection_open_ack [OK] txid(9535B4E25E204C129B91CF2FBDBD3E9AC17881AB4D4BFD4F57731E96D348B053) connection(connectionzero) +ibc1 <- update_client [OK] txid(50D737D7798E1D0A2E0452B7EDDC2D06A06524424F10B54F6400F148D9255DAF) client(ibconeclient) +ibc0 <- connection_open_confirm [OK] txid(CF0F7E54481D90A438A625E16EAB48F5480334AF090CE05736BDFACB69B8F798) connection(connectionone) +``` + Once the connection is established you should be able to query it: ```bash @@ -144,75 +138,77 @@ gaiacli --home ibc1/n0/gaiacli q ibc connection end connectionone --indent --tru Now that the `connection` has been created, it's time to establish a `channel` for the `ibc-mock` application protocol. This will allow sending of data between `ibc0` and `ibc1`. To create the `channel`, run the following command: -> NOTE: This command broadcasts a total of 7 transactions between the two chains from 2 different wallets. At the start of the command you will be prompted for passwords for the two different keys. The command may then take some time. Please wait for the command to return! +> NOTE: This command broadcasts a total of 7 transactions between the two chains from 2 different wallets. At the start of the command you will be prompted for passwords for the two different keys (`12345678` for both). The command will then take some time, please wait for it to return! ```bash gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibconeclient bank channelzero connectionzero \ - ibczeroclient bank channelone connectionone \ + ibconeclient bankbankbank channelzero connectionzero \ + ibczeroclient bankbankbank channelone connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 ``` +You should see output like the following: + +``` +ibc0 <- channel_open_init [OK] txid(792E51E0455A8E0C85705C61A638A4D7C5399B3BA5AF6F29C85BB4E090FCA1B7) portid(bankbankbank) chanid(channelzero) +ibc1 <- update_client [OK] txid(CEA961B9BE931E7B06E6D5643486D267677E66A253F104BC00E2BCE1F9343C03) client(ibczeroclient) +ibc1 <- channel_open_try [OK] txid(D6BC3B03646EF61D1DA153C6678FE047DF76CB12981AC1D524C69C22124967D7) portid(bankbankbank) chanid(channelone) +ibc0 <- update_client [OK] txid(FA22E93601218CEA839FDEB7BD0D8F47D81E1172E18A8B21717675FF5C4BCF40) client(ibconeclient) +ibc0 <- channel_open_ack [OK] txid(1840343AFB2D5666F52440C199A1356C63A884A959F0A9A53175773CDB83006B) portid(bankbankbank) chanid(channelzero) +ibc1 <- update_client [OK] txid(BBE212C5041AC366C018BB97F8DF8A495562EAFFFF51BFDA7BBAE9952BE589D0) client(ibczeroclient) +ibc1 <- channel_open_confirm [OK] txid(69F50CA44AE6AD84BD24866E7DB7FE8ADFD9C484171662CB9E6F0C71BFC222A9) portid(bankbankbank) chanid(channelone) +``` + You can query the `channel` after establishment by running the following command: ```bash -gaiacli --home ibc0/n0/gaiacli q ibc channel end bank channelzero --indent --trust-node -gaiacli --home ibc1/n0/gaiacli q ibc channel end bank channelone --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc channel end bankbankbank channelzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc channel end bankbankbank channelone --indent --trust-node ``` -## Send Packet +### Send Packet -To send a packet using the `bank` application protocol, you need to know the channel you plan to send on, as well as the sequence number on the channel. To get the sequence you use the following commands: +To send a packet using the `bank` application protocol, you need to know the `channel` you plan to send on, as well as the `port` on the channel. You also need to provide an `address` and `amount`. Use the following command to send the packet: ```bash -# Returns the last sequence number -gaiacli --home ibc0/n0/gaiacli q ibcmocksend sequence channel0 - -# Returns the next expected sequence number, for use in scripting -gaiacli --home ibc0/n0/gaiacli q ibcmocksend next channel0 +gaiacli \ + --home ibc0/n0/gaiacli \ + tx ibc transfer transfer \ + bankbankbank channelzero \ + $(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') 1stake \ + --from n0 \ + --source ``` -Now you are ready to send an `ibc-mock` packet down the channel (`channel0`) from chain `ibc0` to chain `ibc1`! To do so run the following commands to send a packet down the channel: +> NOTE: This commands returns the `height` at which it was committed, this should be at the beginning of the JSON output. You will need this number for the next command. + +### Receive Packet + +Now, try querying the account on `ibc1` that you sent the `1stake` to, the account will be empty: ```bash -gaiacli --home ibc0/n0/gaiacli tx ibcmocksend sequence channel0 $(gaiacli --home ibc0/n0/gaiacli q ibcmocksend next channel0) --from n0 -o text -y +gaiacli --home ibc1/n0/gaiacli q account $(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) ``` -### Receive Packet - -Once packets are sent, receipt must be confirmed on the destination chain. To `pull` the packets from `ibc0` on `ibc1`, run the following command: +To complete the transfer once packets are sent, receipt must be confirmed on the destination chain. To `recv-packet` from `ibc0` on `ibc1`, run the following command: ```bash gaiacli \ --home ibc1/n0/gaiacli \ - tx ibc channel pull ibcmockrecv channel1 \ - --node1 tcp://localhost:26557 \ - --node2 tcp://localhost:26657 \ - --chain-id2 ibc0 \ + tx ibc transfer recv-packet \ + packet.json \ + proof.json \ + $HEIGHT --from n1 ``` -This command sends two transactions. You should see the reciept of the packet: - -``` -ibc1 <- update-client [OK] txid(7D4B4DE7A6B8E1045CA7BEB16E21DD0491BED000E5FB0D05BBB7960AABE5CC78) client(c1) -ibc1 <- empty-packet [OK] txid(6E90B9CE19394D7D41CF55E4ADCC94D6169B476B45527F9C47346080C85A289F) packets(1) -``` - -> Note: This command pushes all the packets out of the channel with one command. Try pushing a **couple of packets** from `ibc0` to `ibc1` then fulshing them at once. You should see output like: - -``` -ibc1 <- update-client [OK] txid(21E0CE99A21DD7630A7DDE62459DD82C4051CC46B231A7B31529928B1B1B2C53) client(c1) -ibc1 <- empty-packet [OK] txid(92D76EF46FDCB3739DB06960BECCD7DA30AAA6AECA687DF4D92CC272D4941F7E) packets(2) -``` - -Once the packets have been sent, you can check the updated sequence by running: +Once the packets have been recieved you should see the `1stake` in your account on `ibc1`: ```bash -gaiacli --home ibc1/n0/gaiacli q ibcmockrecv sequence channel1 --trust-node -``` +gaiacli --home ibc1/n0/gaiacli q account $(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) +``` \ No newline at end of file diff --git a/ibc-demo.sh b/ibc-demo.sh index c342b1e17a..94aabdf9ca 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -95,6 +95,11 @@ echo -e "12345678\n" | gaiacli --home ibc1/n0/gaiacli \ sleep 3 +echo "Querying clients..." + +gaiacli --home ibc0/n0/gaiacli q ibc client consensus-state ibconeclient --indent +gaiacli --home ibc1/n0/gaiacli q ibc client consensus-state ibczeroclient --indent + echo "Establishing a connection..." gaiacli \ @@ -107,6 +112,13 @@ gaiacli \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 +sleep 2 + +echo "Querying connection..." + +gaiacli --home ibc0/n0/gaiacli q ibc connection end connectionzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc connection end connectionone --indent --trust-node + echo "Establishing a channel..." gaiacli \ @@ -119,9 +131,16 @@ gaiacli \ --chain-id2 ibc1 \ --from1 n0 --from2 n1 +sleep 2 + +echo "Querying channel..." + +gaiacli --home ibc0/n0/gaiacli q ibc channel end bankbankbank channelzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc channel end bankbankbank channelone --indent --trust-node + echo "Sending token packets from ibc0..." -DEST=$(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') +DEST=$(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) gaiacli \ --home ibc0/n0/gaiacli \ From 33ee1dc84443c6e6fc939fc2b2b90bbcf31710ea Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 02:11:37 +0100 Subject: [PATCH 49/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3b86e03bbd..c3b127984f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index fc166f9ef1..6278eb74bc 100644 --- a/go.sum +++ b/go.sum @@ -112,6 +112,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0 h1:itmZtFwb7X github.com/cosmos/cosmos-sdk v0.34.4-0.20191102004622-2392e95703a0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a h1:QsOuMXT7pzSsGF2zVRbLuuPOetadLphkn5tGJoKcNA8= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b h1:8aWAseB45FVNEl9wiMu9oE4gjMspGdv+QxFLlGSw69U= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 6ddabcb88eac593cf61994fcbcad7f53c80ee785 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 02:51:05 +0100 Subject: [PATCH 50/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c3b127984f..54ed96dabd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 6278eb74bc..e5f4287bb6 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a h1:QsOuMXT7pz github.com/cosmos/cosmos-sdk v0.34.4-0.20191102005936-a6a92623d51a/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b h1:8aWAseB45FVNEl9wiMu9oE4gjMspGdv+QxFLlGSw69U= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440 h1:KXyshBHzP2iYb7CGSMhR+SOA2SvuEVRjWaAa1/g1D/k= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From b9fa733fb6cb9b8e3b03edab0a7151b9d62cc184 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 02:56:32 +0100 Subject: [PATCH 51/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 54ed96dabd..eb5f9b6041 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index e5f4287bb6..f7c84c1e0d 100644 --- a/go.sum +++ b/go.sum @@ -116,6 +116,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b h1:8aWAseB45F github.com/cosmos/cosmos-sdk v0.34.4-0.20191102011030-ebd533611a8b/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440 h1:KXyshBHzP2iYb7CGSMhR+SOA2SvuEVRjWaAa1/g1D/k= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651 h1:ZbSZy6bIGekGB/5GDXDSXk6ru/YmugHbN1GyyUdxxvs= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 54916921321d085ef88f3cea71e81db0fd2fe09e Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 03:06:31 +0100 Subject: [PATCH 52/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index eb5f9b6041..d4c86574b0 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index f7c84c1e0d..a12628288f 100644 --- a/go.sum +++ b/go.sum @@ -118,6 +118,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440 h1:KXyshBHzP2 github.com/cosmos/cosmos-sdk v0.34.4-0.20191102014502-47b2b8ff3440/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651 h1:ZbSZy6bIGekGB/5GDXDSXk6ru/YmugHbN1GyyUdxxvs= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc h1:btYTKTaVK86mgYgIeYkxfNzVtMMEI0niO/6qnd0gv74= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 399f4fda17750f42463faf9f2bd8386fbad201ec Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 03:18:30 +0100 Subject: [PATCH 53/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d4c86574b0..6fbf428500 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index a12628288f..93c719bba2 100644 --- a/go.sum +++ b/go.sum @@ -120,6 +120,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651 h1:ZbSZy6bIGe github.com/cosmos/cosmos-sdk v0.34.4-0.20191102015520-088f30acc651/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc h1:btYTKTaVK86mgYgIeYkxfNzVtMMEI0niO/6qnd0gv74= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba h1:hCyiw5zEl8n70MvcqzSx7PVDLzQCj6Bta67Bd3WKLcY= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 94e9893a9836e643ac3a4b9de9b1f2b7ffddd173 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 03:25:45 +0100 Subject: [PATCH 54/61] Update upstream & port --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6fbf428500..6d1554e8b9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 93c719bba2..70382293d6 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc h1:btYTKTaVK8 github.com/cosmos/cosmos-sdk v0.34.4-0.20191102020339-39a0b63b77dc/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba h1:hCyiw5zEl8n70MvcqzSx7PVDLzQCj6Bta67Bd3WKLcY= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c h1:7S9WXqPElCh37r/LWWnA1fWt9hwi4oW1EeFYBSEftv8= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 94aabdf9ca..f7a6a930de 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -124,8 +124,8 @@ echo "Establishing a channel..." gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibconeclient bankbankbank channelzero connectionzero \ - ibczeroclient bankbankbank channelone connectionone \ + ibconeclient bank channelzero connectionzero \ + ibczeroclient bank channelone connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ @@ -135,8 +135,8 @@ sleep 2 echo "Querying channel..." -gaiacli --home ibc0/n0/gaiacli q ibc channel end bankbankbank channelzero --indent --trust-node -gaiacli --home ibc1/n0/gaiacli q ibc channel end bankbankbank channelone --indent --trust-node +gaiacli --home ibc0/n0/gaiacli q ibc channel end bank channelzero --indent --trust-node +gaiacli --home ibc1/n0/gaiacli q ibc channel end bank channelone --indent --trust-node echo "Sending token packets from ibc0..." @@ -145,7 +145,7 @@ DEST=$(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) gaiacli \ --home ibc0/n0/gaiacli \ tx ibc transfer transfer \ - bankbankbank channelzero \ + bank channelzero \ $DEST 1stake \ --from n0 \ --source @@ -163,7 +163,7 @@ echo "Recieving token packets on ibc1..." gaiacli \ tx ibc transfer recv-packet \ - bankbankbank channelzero \ + bank channelzero \ --home ibc1/n0/gaiacli \ --packet-sequence 1 \ --timeout $TIMEOUT \ From 854ffc363fa4f68a7b6a7b3252260d6113302655 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Sat, 2 Nov 2019 03:57:52 +0100 Subject: [PATCH 55/61] Update upstream --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6d1554e8b9..5a782002ce 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102025106-28ab5c8345a0 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 70382293d6..db85f6babf 100644 --- a/go.sum +++ b/go.sum @@ -124,6 +124,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba h1:hCyiw5zEl8 github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c h1:7S9WXqPElCh37r/LWWnA1fWt9hwi4oW1EeFYBSEftv8= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102025106-28ab5c8345a0 h1:bhN3MzeYXMm11fXKaWjCHhQOQu0hwriSJhLgf7cS6bA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102025106-28ab5c8345a0/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From daad30ded35880719f5f6856a2cc2c7ad67f9398 Mon Sep 17 00:00:00 2001 From: mossid Date: Fri, 1 Nov 2019 21:13:11 -0700 Subject: [PATCH 56/61] update shell --- ibc-demo.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index f7a6a930de..dc85969332 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -163,12 +163,13 @@ echo "Recieving token packets on ibc1..." gaiacli \ tx ibc transfer recv-packet \ - bank channelzero \ + bank channelzero ibczeroclient \ --home ibc1/n0/gaiacli \ --packet-sequence 1 \ --timeout $TIMEOUT \ --from n1 \ - --node2 tcp://localhost:26657 + --node2 tcp://localhost:26657 \ + --chain-id2 ibc0 echo "Account after:" gaiacli --home ibc1/n0/gaiacli q account $DEST From 63b89a72f8c2c1063d177f8d16001443bc073a33 Mon Sep 17 00:00:00 2001 From: mossid Date: Fri, 1 Nov 2019 21:18:10 -0700 Subject: [PATCH 57/61] finalize shell --- ibc-demo.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ibc-demo.sh b/ibc-demo.sh index dc85969332..1a09a4db10 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -1,6 +1,6 @@ #!/bin/zsh -GAIA_BRANCH=cwgoes/ibc-demo-fixes +GAIA_BRANCH=cwgoes-ibc-demo-fixes GAIA_DIR=$(mktemp -d) CONF_DIR=$(mktemp -d) @@ -17,15 +17,15 @@ killall gaiad set -e -#echo "Building Gaia..." +echo "Building Gaia..." -#cd $GAIA_DIR -#git clone git@github.com:cosmos/gaia -#cd gaia -#git checkout $GAIA_BRANCH -#make install -#gaiad version -#gaiacli version +cd $GAIA_DIR +git clone git@github.com:cosmos/gaia +cd gaia +git checkout $GAIA_BRANCH +make install +gaiad version +gaiacli version echo "Generating configurations..." @@ -161,6 +161,8 @@ gaiacli --home ibc1/n0/gaiacli q account $DEST echo "Recieving token packets on ibc1..." +sleep 3 + gaiacli \ tx ibc transfer recv-packet \ bank channelzero ibczeroclient \ From 1eb24cbaa5e1623557da1ff3ac5e1d171a47938a Mon Sep 17 00:00:00 2001 From: mossid Date: Fri, 1 Nov 2019 21:19:45 -0700 Subject: [PATCH 58/61] update go.mod --- go.mod | 2 +- go.sum | 2 ++ ibc-demo.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 6d1554e8b9..48fabd16f7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102035446-f72b3912da86 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/go.sum b/go.sum index 70382293d6..9da163dbba 100644 --- a/go.sum +++ b/go.sum @@ -124,6 +124,8 @@ github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba h1:hCyiw5zEl8 github.com/cosmos/cosmos-sdk v0.34.4-0.20191102021558-90c45383b8ba/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c h1:7S9WXqPElCh37r/LWWnA1fWt9hwi4oW1EeFYBSEftv8= github.com/cosmos/cosmos-sdk v0.34.4-0.20191102022336-804454c82b3c/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102035446-f72b3912da86 h1:zj3Rzlz492rj5EYcprWAG0p/xBaQtHN/KKwB1jzO+tI= +github.com/cosmos/cosmos-sdk v0.34.4-0.20191102035446-f72b3912da86/go.mod h1:VmzpKwtYtelTVZuNkq/rkcgVawGpHckfRYS08JVcnqA= github.com/cosmos/cosmos-sdk v0.37.3 h1:v4IQIPq3zFB95ibAS7zqsnkZ/8SE3er16Og45EGHggo= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/ibc-demo.sh b/ibc-demo.sh index 1a09a4db10..b4a1d2ea63 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -1,6 +1,6 @@ #!/bin/zsh -GAIA_BRANCH=cwgoes-ibc-demo-fixes +GAIA_BRANCH=cwgoes/ibc-demo-fixes GAIA_DIR=$(mktemp -d) CONF_DIR=$(mktemp -d) From a35b18bb2b96f42be3a46204adf52004edf70287 Mon Sep 17 00:00:00 2001 From: mossid Date: Fri, 1 Nov 2019 22:35:53 -0700 Subject: [PATCH 59/61] update go.mod, make shell to use --source on recv --- go.mod | 2 +- ibc-demo.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 48fabd16f7..2c2846f38c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect - github.com/cosmos/cosmos-sdk v0.34.4-0.20191102035446-f72b3912da86 + github.com/cosmos/cosmos-sdk v0.34.4-0.20191102053406-d1f6c30cc5ee github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/golang/mock v1.3.1 // indirect github.com/onsi/ginkgo v1.8.0 // indirect diff --git a/ibc-demo.sh b/ibc-demo.sh index b4a1d2ea63..c99aff1980 100755 --- a/ibc-demo.sh +++ b/ibc-demo.sh @@ -171,7 +171,8 @@ gaiacli \ --timeout $TIMEOUT \ --from n1 \ --node2 tcp://localhost:26657 \ - --chain-id2 ibc0 + --chain-id2 ibc0 \ + --source echo "Account after:" gaiacli --home ibc1/n0/gaiacli q account $DEST From b5f08678747aef89d81ade6faf751603039f8896 Mon Sep 17 00:00:00 2001 From: mossid Date: Sat, 2 Nov 2019 14:05:16 -0700 Subject: [PATCH 60/61] update markdown to match sh --- ibc-demo.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ibc-demo.md b/ibc-demo.md index 9bdb640ce4..a95ae36a60 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -7,7 +7,7 @@ This branch uses non-canonical branch of cosmos-sdk. Before building, run `go mo ```shell git clone git@github.com:cosmos/gaia cd gaia -git checkout fedekunze/ibc +git checkout cwgoes/ibc-demo-fixes make install gaiad version gaiacli version @@ -144,8 +144,8 @@ Now that the `connection` has been created, it's time to establish a `channel` f gaiacli \ --home ibc0/n0/gaiacli \ tx ibc channel handshake \ - ibconeclient bankbankbank channelzero connectionzero \ - ibczeroclient bankbankbank channelone connectionone \ + ibconeclient bank channelzero connectionzero \ + ibczeroclient bank channelone connectionone \ --node1 tcp://localhost:26657 \ --node2 tcp://localhost:26557 \ --chain-id2 ibc1 \ @@ -179,13 +179,13 @@ To send a packet using the `bank` application protocol, you need to know the `ch gaiacli \ --home ibc0/n0/gaiacli \ tx ibc transfer transfer \ - bankbankbank channelzero \ - $(gaiacli --home ibc0/n0/gaiacli keys list | jq -r '.[1].address') 1stake \ + bank channelzero \ + $(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) 1stake \ --from n0 \ --source ``` -> NOTE: This commands returns the `height` at which it was committed, this should be at the beginning of the JSON output. You will need this number for the next command. +> NOTE: This commands returns the `height` at which it was committed, this should be at the beginning of the JSON output. The enviornment variable `TIMEOUT`. ### Receive Packet @@ -199,16 +199,18 @@ To complete the transfer once packets are sent, receipt must be confirmed on the ```bash gaiacli \ - --home ibc1/n0/gaiacli \ tx ibc transfer recv-packet \ - packet.json \ - proof.json \ - $HEIGHT - --from n1 + --home ibc1/n0/gaiacli \ + --packet-sequence 1 \ + --timeout $TIMEOUT \ + --from n1 \ + --node2 tcp://localhost:26657 \ + --chain-id2 ibc0 \ + --source ``` Once the packets have been recieved you should see the `1stake` in your account on `ibc1`: ```bash gaiacli --home ibc1/n0/gaiacli q account $(gaiacli --home ibc0/n0/gaiacli keys show n1 -a) -``` \ No newline at end of file +``` From 2f6835b9c703c65b4402794a1872fbe0f2a6a0d0 Mon Sep 17 00:00:00 2001 From: mossid Date: Sat, 2 Nov 2019 15:59:08 -0700 Subject: [PATCH 61/61] fix ibc-demo.md typo --- ibc-demo.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ibc-demo.md b/ibc-demo.md index a95ae36a60..b87a75c95c 100644 --- a/ibc-demo.md +++ b/ibc-demo.md @@ -200,6 +200,7 @@ To complete the transfer once packets are sent, receipt must be confirmed on the ```bash gaiacli \ tx ibc transfer recv-packet \ + bank channelzero ibczeroclient \ --home ibc1/n0/gaiacli \ --packet-sequence 1 \ --timeout $TIMEOUT \