Merge pull request #33 from schnetzlerjoe/main

Finish v0.1.0 release

Makefile

@@ -220,6 +220,8 @@ init:
 	./testnet/private/update_configs.sh
 	@echo "Starting up network"
 	./network/start.sh
+	@echo "Starting up hermes"
+	./network/hermes/start.sh
 
 init-rly:
 	@echo "Initializing relayer..." 
@@ -259,6 +261,14 @@ kill-dev:
 ###                                  Test                                   ###
 ###############################################################################
 
+send-osmo:
+	@echo "Sending osmo to test account..."
+	./tests/send-osmo.sh
+
+create-channel:
+	@echo "Creating channel for transfer port..."
+	./tests/create-channel.sh
+
 test-all:
 	@echo "Running all bash tests......."
 	test-activate-broker

app/app.go

@@ -310,7 +310,6 @@ func New(
 	scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
 	scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName)
 	scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName)
-	scopedBrokerKeeper := app.CapabilityKeeper.ScopeToModule(brokermoduletypes.ModuleName)
 	scopedETFKeeper := app.CapabilityKeeper.ScopeToModule(etfmoduletypes.ModuleName)
 	// this line is used by starport scaffolding # stargate/app/scopedKeeper
 
@@ -398,30 +397,21 @@ func New(
 	)
 	queryModule := querymodule.NewAppModule(appCodec, app.QueryKeeper, app.AccountKeeper)
 
-	app.BrokerKeeper = brokermodulekeeper.NewKeeper(appCodec, keys[brokermoduletypes.StoreKey], app.GetSubspace(brokermoduletypes.ModuleName), app.ICAControllerKeeper, scopedBrokerKeeper, app.TransferKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ConnectionKeeper, app.IBCKeeper.ClientKeeper, app.QueryKeeper, app.EtfKeeper, app.BankKeeper)
+	app.BrokerKeeper = brokermodulekeeper.NewKeeper(appCodec, keys[brokermoduletypes.StoreKey], app.GetSubspace(brokermoduletypes.ModuleName), app.ICAControllerKeeper, app.TransferKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ConnectionKeeper, app.IBCKeeper.ClientKeeper, app.QueryKeeper, app.EtfKeeper, app.BankKeeper)
 	brokerModule := brokermodule.NewAppModule(appCodec, app.BrokerKeeper, app.TransferKeeper)
-	brokerIBCModule := brokermodule.NewIBCModule(app.BrokerKeeper, app.EtfKeeper)
-
-	icaControllerIBCModule := icacontroller.NewIBCMiddleware(brokerIBCModule, app.ICAControllerKeeper)
-	icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper)
-
-	// Create evidence Keeper for to register the IBC light client misbehaviour evidence route
-	evidenceKeeper := evidencekeeper.NewKeeper(
-		appCodec, keys[evidencetypes.StoreKey], &app.StakingKeeper, app.SlashingKeeper,
-	)
-	// If evidence needs to be handled for the app, set routes in router here and seal
-	app.EvidenceKeeper = *evidenceKeeper
 
 	app.GovKeeper = govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
 		&stakingKeeper, govRouter,
 	)
 
-	app.EtfKeeper = *etfmodulekeeper.NewKeeper(
+	app.EtfKeeper = etfmodulekeeper.NewKeeper(
 		appCodec,
 		keys[etfmoduletypes.StoreKey],
 		keys[etfmoduletypes.MemStoreKey],
 
+		scopedETFKeeper,
+
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.IBCKeeper.ChannelKeeper,
@@ -433,6 +423,17 @@ func New(
 		app.TransferKeeper,
 	)
 	etfModule := etfmodule.NewAppModule(appCodec, app.EtfKeeper, app.AccountKeeper, app.BankKeeper, app.QueryKeeper, app.BrokerKeeper)
+	etfIBCModule := etfmodule.NewIBCModule(app.EtfKeeper, app.EtfKeeper, app.BrokerKeeper)
+
+	icaControllerIBCModule := icacontroller.NewIBCMiddleware(etfIBCModule, app.ICAControllerKeeper)
+	icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper)
+
+	// Create evidence Keeper for to register the IBC light client misbehaviour evidence route
+	evidenceKeeper := evidencekeeper.NewKeeper(
+		appCodec, keys[evidencetypes.StoreKey], &app.StakingKeeper, app.SlashingKeeper,
+	)
+	// If evidence needs to be handled for the app, set routes in router here and seal
+	app.EvidenceKeeper = *evidenceKeeper
 
 	// finish transfer stack
 	transferStack := etfmodule.NewIBCMiddleware(transferIBCModule, app.EtfKeeper)
@@ -443,7 +444,7 @@ func New(
 		AddRoute(ibctransfertypes.ModuleName, transferStack).
 		AddRoute(icacontrollertypes.SubModuleName, icaControllerIBCModule).
 		AddRoute(icahosttypes.SubModuleName, icaHostIBCModule).
-		AddRoute(brokermoduletypes.ModuleName, icaControllerIBCModule)
+		AddRoute(etfmoduletypes.ModuleName, icaControllerIBCModule)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
 	// this line is used by starport scaffolding # stargate/app/keeperDefinition
@@ -579,7 +580,6 @@ func New(
 	app.ScopedTransferKeeper = scopedTransferKeeper
 	app.ScopedICAControllerKeeper = scopedICAControllerKeeper
 	app.ScopedICAHostKeeper = scopedICAHostKeeper
-	app.ScopedBrokerKeeper = scopedBrokerKeeper
 	app.ScopedETFKeeper = scopedETFKeeper
 	// this line is used by starport scaffolding # stargate/app/beforeInitReturn
 

app/config.go

@@ -7,19 +7,16 @@ import (
 )
 
 func SetTendermintConfigs(config *tmcfg.Config) {
+	// Peer Configs
 	config.P2P.MaxNumInboundPeers = 100
 	config.P2P.MaxNumOutboundPeers = 100
 	config.P2P.SendRate = 20480000
 	config.P2P.RecvRate = 20480000
 	config.P2P.MaxPacketMsgPayloadSize = 10240
 	config.P2P.FlushThrottleTimeout = 10 * time.Millisecond
-	// Mempool configs
-	config.Mempool.Size = 5000
-	config.Mempool.MaxTxsBytes = 10737418240
-	config.Mempool.MaxTxBytes = 2048576
 	// Consensus Configs
-	config.Consensus.TimeoutPrevote = 250 * time.Millisecond
-	config.Consensus.TimeoutPrecommit = 250 * time.Millisecond
-	config.Consensus.TimeoutCommit = 250 * time.Millisecond
+	config.Consensus.TimeoutPrevote = 200 * time.Millisecond
+	config.Consensus.TimeoutPrecommit = 200 * time.Millisecond
+	config.Consensus.TimeoutCommit = 200 * time.Millisecond
 	config.Consensus.SkipTimeoutCommit = true
 }