DNM: IBC-Gaia Integration

Makefile

@@ -87,8 +87,8 @@ else
 endif
 
 install: go.sum check-ledger
-	go install -mod=readonly $(BUILD_FLAGS) ./cmd/gaiad
-	go install -mod=readonly $(BUILD_FLAGS) ./cmd/gaiacli
+	go install $(BUILD_FLAGS) ./cmd/gaiad
+	go install $(BUILD_FLAGS) ./cmd/gaiacli
 
 install-debug: go.sum
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/gaiadebug

app/app.go

@@ -21,6 +21,9 @@ import (
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/gov"
+	"github.com/cosmos/cosmos-sdk/x/ibc"
+	mockrecv "github.com/cosmos/cosmos-sdk/x/ibc/mock/recv"
+	mocksend "github.com/cosmos/cosmos-sdk/x/ibc/mock/send"
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
@@ -53,6 +56,7 @@ var (
 		crisis.AppModuleBasic{},
 		slashing.AppModuleBasic{},
 		supply.AppModuleBasic{},
+		ibc.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -91,16 +95,19 @@ type GaiaApp struct {
 	tkeys map[string]*sdk.TransientStoreKey
 
 	// keepers
-	accountKeeper  auth.AccountKeeper
-	bankKeeper     bank.Keeper
-	supplyKeeper   supply.Keeper
-	stakingKeeper  staking.Keeper
-	slashingKeeper slashing.Keeper
-	mintKeeper     mint.Keeper
-	distrKeeper    distr.Keeper
-	govKeeper      gov.Keeper
-	crisisKeeper   crisis.Keeper
-	paramsKeeper   params.Keeper
+	accountKeeper     auth.AccountKeeper
+	bankKeeper        bank.Keeper
+	supplyKeeper      supply.Keeper
+	stakingKeeper     staking.Keeper
+	slashingKeeper    slashing.Keeper
+	mintKeeper        mint.Keeper
+	distrKeeper       distr.Keeper
+	govKeeper         gov.Keeper
+	crisisKeeper      crisis.Keeper
+	paramsKeeper      params.Keeper
+	ibcKeeper         ibc.Keeper
+	ibcMockSendKeeper mocksend.Keeper
+	ibcMockRecvKeeper mockrecv.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -122,7 +129,7 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest b
 	keys := sdk.NewKVStoreKeys(
 		bam.MainStoreKey, auth.StoreKey, staking.StoreKey,
 		supply.StoreKey, mint.StoreKey, distr.StoreKey, slashing.StoreKey,
-		gov.StoreKey, params.StoreKey,
+		gov.StoreKey, params.StoreKey, ibc.StoreKey, mocksend.ModuleName, mockrecv.ModuleName,
 	)
 	tkeys := sdk.NewTransientStoreKeys(staking.TStoreKey, params.TStoreKey)
 
@@ -160,6 +167,9 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest b
 		app.cdc, keys[slashing.StoreKey], &stakingKeeper, slashingSubspace, slashing.DefaultCodespace,
 	)
 	app.crisisKeeper = crisis.NewKeeper(crisisSubspace, invCheckPeriod, app.supplyKeeper, auth.FeeCollectorName)
+	app.ibcKeeper = ibc.NewKeeper(app.cdc, keys[ibc.StoreKey])
+	app.ibcMockSendKeeper = mocksend.NewKeeper(app.cdc, keys[mocksend.ModuleName], app.ibcKeeper.Port(mocksend.ModuleName))
+	app.ibcMockRecvKeeper = mockrecv.NewKeeper(app.cdc, keys[mockrecv.ModuleName], app.ibcKeeper.Port(mockrecv.ModuleName))
 
 	// register the proposal types
 	govRouter := gov.NewRouter()
@@ -190,6 +200,9 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest b
 		mint.NewAppModule(app.mintKeeper),
 		slashing.NewAppModule(app.slashingKeeper, app.stakingKeeper),
 		staking.NewAppModule(app.stakingKeeper, app.accountKeeper, app.supplyKeeper),
+		ibc.NewAppModule(app.ibcKeeper),
+		mocksend.NewAppModule(app.ibcMockSendKeeper),
+		mockrecv.NewAppModule(app.ibcMockRecvKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that

cmd/gaiacli/README.md

@@ -0,0 +1,148 @@
+# IBC instruction
+
+// temporal document
+
+## Dependencies
+
+This branch uses non-canonical branch of cosmos-sdk. Before building, run `go mod vendor` on the root directory to retrive the dependencies. To build:
+
+```shell
+git clone git@github.com:cosmos/gaia
+cd gaia
+go mod vendor
+make install
+gaiad version
+gaiacli version
+```
+
+Stub out testnet files for 2 nodes, this example does so in your $HOME directory:
+
+```shell
+cd ~ && mkdir ibc-testnets && cd ibc-testnet
+gaiad testnet -o ibc0 --v 1 --chain-id ibc0 --node-dir-prefix n
+gaiad testnet -o ibc1 --v 1 --chain-id ibc1 --node-dir-prefix n
+```
+
+Fix the configuration files to allow both chains/nodes to run on the same machine
+
+```shell
+# Configure the proper database backend for each node
+sed -i '' 's/"leveldb"/"goleveldb"/g' ibc0/n0/gaiad/config/config.toml
+sed -i '' 's/"leveldb"/"goleveldb"/g' ibc1/n0/gaiad/config/config.toml
+
+# Configure chain ibc1 to have different listening ports
+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
+```
+
+Then configure your `gaiacli` instances for each chain:
+
+```bash
+gaiacli config --home ibc0/n0/gaiacli/ chain-id ibc0
+gaiacli config --home ibc1/n0/gaiacli/ chain-id ibc1
+gaiacli config --home ibc0/n0/gaiacli/ node http://localhost:26657
+gaiacli config --home ibc1/n0/gaiacli/ node http://localhost:26557
+
+# Add the key from ibc1 to the ibc0 cli
+jq -r '.secret' ibc1/n0/gaiacli/key_seed.json | pbcopy
+
+# Paste the mnemonic from the above command after setting password (12345678)
+gaiacli --home ibc0/n0/gaiacli keys add n1 --recover
+```
+
+After configuration is complete, start each node in a seperate terminal window:
+
+```bash
+gaiad --home ibc0/n0/gaiad start
+gaiad --home ibc1/n0/gaiad start
+```
+
+## Client
+
+Create a client on ibc1:
+
+```bash
+gaiacli --home ibc0/n0/gaiacli q ibc client path > path0.json
+gaiacli --home ibc0/n0/gaiacli q ibc client consensus-state > state0.json
+gaiacli --home ibc1/n0/gaiacli tx ibc client create c1 ./state0.json --from n0
+gaiacli --home ibc1/n0/gaiacli q ibc client client c1
+```
+
+Create a client on ibc0:
+
+```bash
+gaiacli --home ibc1/n0/gaiacli q ibc client path > path1.json
+gaiacli --home ibc1/n0/gaiacli q ibc client consensus-state > state1.json
+gaiacli --home ibc0/n0/gaiacli tx ibc client create c0 ./state1.json --from n0
+gaiacli --home ibc0/n0/gaiacli q ibc client client c0
+```
+
+## Connection
+
+Connections can be established with `connection.sh $CLIENTID` command. It will print
+
+```shell
+gaiacli \
+  --home ibc0/n0/gaiacli \
+  tx ibc connection handshake \
+  conn0 c0 path1.json \
+  conn1 c1 path0.json \
+  --from1 n0 --from2 n1 \
+  --node1 tcp://localhost:26657 \
+  --node2 tcp://localhost:26557
+```
+
+Once the connection is established you should be able to query it:
+
+```bash
+gaiacli --home ibc0/n0/gaiacli q ibc connection connection conn0 --trust-node
+```
+
+## Channel
+
+To establish a channel using the `ibc-mock` application protocol run the following command:
+
+```
+gaiacli \
+  --home ibc0/n0/gaiacli \
+  tx ibc channel handshake \
+  ibc-mock chan0 conn0 \
+  ibc-mock chan1 conn1 \
+  --from1 n0 --from2 n1
+```
+
+You can query the channel after establishment by
+
+```bash
+gaiacli --home ibc0/n0/gaiacli query ibc channel channel ibc-mock chan0 --trust-node
+```
+
+## Send Packet
+
+To send a packet using the `ibc-mock` application protocol run the following command:
+
+```
+gaiacli --home ibc0/n0/gaiacli q ibcmocksend sequence chan0
+```
+
+The command will return the latest sent sequence(0 if not exists). Run command with next sequence.
+
+```
+gaiacli --home ibc0/n0/gaiacli tx ibcmocksend sequence chan0 (sequence+1)
+```
+
+## Receive Packet
+
+To receive packets using the `ibc-mock` application protocol run the following command:
+
+```
+gaiacli --home ibc0/n0/gaiacli tx ibc channel flush ibcmocksend chan0 --trust-node
+```
+
+To see the updated sequence run the following command:
+
+```
+gaiacli --home ibc1/n0/gaiacli q ibcmockrecv sequence chan1 --trust-node
+```