diff --git a/cmd/minitiad/launch.go b/cmd/minitiad/launch.go index f44e41c..3a9b9e4 100644 --- a/cmd/minitiad/launch.go +++ b/cmd/minitiad/launch.go @@ -17,7 +17,7 @@ import ( ) // DefaultLaunchStepFactories is a list of default launch step factories. -var DefaultLaunchStepFactories = []launchtools.LauncherStepFuncFactory[launchtools.Input]{ +var DefaultLaunchStepFactories = []launchtools.LauncherStepFuncFactory[*launchtools.Config]{ steps.InitializeConfig, steps.InitializeRPCHelpers, @@ -41,12 +41,16 @@ var DefaultLaunchStepFactories = []launchtools.LauncherStepFuncFactory[launchtoo "ics721-1" }), - // Enable the oracle - steps.EnableOracle, - // Create OP Bridge, using open channel states steps.InitializeOpBridge, + // Set bridge info and update clients + steps.SetBridgeInfo, + + // Get the L1 and L2 heights + steps.GetL1Height, + steps.GetL2Height, + // Cleanup steps.StopApp, } @@ -62,7 +66,7 @@ func LaunchCommand(ac *appCreator, enc params.EncodingConfig, mbm module.BasicMa } // StoreAndInstantiateNFTContracts stores and instantiates cw721 and ics721 contracts -func StoreAndInstantiateNFTContracts(input launchtools.Input) launchtools.LauncherStepFunc { +func StoreAndInstantiateNFTContracts(input *launchtools.Config) launchtools.LauncherStepFunc { return func(ctx launchtools.Launcher) error { ctx.Logger().Info("Storing and instantiating cw721 and ics721 contracts") @@ -107,7 +111,7 @@ func StoreAndInstantiateNFTContracts(input launchtools.Input) launchtools.Launch input.SystemKeys.Validator.Address, input.SystemKeys.Validator.Mnemonic, 10000000, - sdk.NewCoins(sdk.NewInt64Coin(input.L2Config.Denom, 1500000)), + sdk.NewCoins(), msg, ) diff --git a/go.mod b/go.mod index 4b55e93..591d070 100644 --- a/go.mod +++ b/go.mod @@ -34,8 +34,8 @@ require ( github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/hashicorp/go-metrics v0.5.3 - github.com/initia-labs/OPinit v0.2.7 - github.com/initia-labs/initia v0.2.7 + github.com/initia-labs/OPinit v0.2.8 + github.com/initia-labs/initia v0.2.8 github.com/initia-labs/kvindexer v0.1.3 github.com/initia-labs/kvindexer/submodules/block v0.1.0 github.com/initia-labs/kvindexer/submodules/tx v0.1.0 diff --git a/go.sum b/go.sum index 0f6a8b8..a6160bf 100644 --- a/go.sum +++ b/go.sum @@ -790,8 +790,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/initia-labs/OPinit v0.2.7 h1:CK7+1UoaoVhQlgjw2xRUEtBZKuCJAVJtXvoA+8x/fCI= -github.com/initia-labs/OPinit v0.2.7/go.mod h1:ih8DF/djza3oqMpKFeACPp7YtaJpMBPqO+cgKbKqeG8= +github.com/initia-labs/OPinit v0.2.8 h1:nKouL3kXwc1bXEq1FHSM91O5n2rwpwjLXn/nXsuz5IY= +github.com/initia-labs/OPinit v0.2.8/go.mod h1:ih8DF/djza3oqMpKFeACPp7YtaJpMBPqO+cgKbKqeG8= github.com/initia-labs/OPinit/api v0.2.6 h1:his/7339UJbBcHOY4TcRzGxNWBtcpdt9bzfGKBh/d8w= github.com/initia-labs/OPinit/api v0.2.6/go.mod h1:oo8VsUFo1vVRg1jXhTMzlm5IF1JjU0I0u0OF/jo6iO4= github.com/initia-labs/cometbft v0.0.0-20240425025334-db711cb7c25d h1:PR3BwlnPSq37qF0HUQmnbA76YvlopD9prW9OYLDoKLk= @@ -802,8 +802,8 @@ github.com/initia-labs/iavl v0.0.0-20240415085037-7e81233cdd9e h1:1gkMWkAgVhYFhE github.com/initia-labs/iavl v0.0.0-20240415085037-7e81233cdd9e/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM= github.com/initia-labs/ibc-go/v8 v8.0.0-20240419124350-4275a05abe2c h1:FDwh5zZbm9v7C37ni4FytQQ9Os5XxYp1px5U7Nqdu2Y= github.com/initia-labs/ibc-go/v8 v8.0.0-20240419124350-4275a05abe2c/go.mod h1:wj3qx75iC/XNnsMqbPDCIGs0G6Y3E/lo3bdqCyoCy+8= -github.com/initia-labs/initia v0.2.7 h1:avSfEh+nheYC7gFxnfHaXSHRBZYWHI19vn/T0luI4y8= -github.com/initia-labs/initia v0.2.7/go.mod h1:PFWX4I983j462shp3a1lLRheBiIfZrRoF/MQI/CsL9o= +github.com/initia-labs/initia v0.2.8 h1:Gc+LwVsP02hqXieXkrxbB34Q/xQYZYmntsCwWnuwew0= +github.com/initia-labs/initia v0.2.8/go.mod h1:XGlsgJh+7SlY36YoqBCnMhEuuVnstaR/BqpmKnnp0bc= github.com/initia-labs/kvindexer v0.1.3 h1:TLkgJjp5TiPnH+OzYfk7ZKQTKqGOfSte59Y3gasob+o= github.com/initia-labs/kvindexer v0.1.3/go.mod h1:rvAmgCAmEs4KM8sRRPcyTqNNwi8s2JiHybiFkYfp4KE= github.com/initia-labs/kvindexer/submodules/block v0.1.0 h1:y+EXnksd/I2F96mzIoQA64nZUZON2P+99YrSzeLCLoY= @@ -814,8 +814,8 @@ github.com/initia-labs/kvindexer/submodules/wasm-nft v0.1.2 h1:JAn1BkURDDYQlM0Ge github.com/initia-labs/kvindexer/submodules/wasm-nft v0.1.2/go.mod h1:1HD0/oH6kErv8F0J5ayGfLqerWSCPveGHSCbcfiBELw= github.com/initia-labs/kvindexer/submodules/wasm-pair v0.1.0 h1:Ns7bxZkwdby67aIq3VXFAzlpoLdGONJbDaMiqu6k408= github.com/initia-labs/kvindexer/submodules/wasm-pair v0.1.0/go.mod h1:SEotHE6mJ3VKr9g4j0AoXHgEYz6qhL3i1bX1QRnVT6g= -github.com/initia-labs/movevm v0.2.7 h1:6UM35Cp6XQ1LgM7gnaSYouc7osSwxSQJsZgQdpXnBM4= -github.com/initia-labs/movevm v0.2.7/go.mod h1:6MxR4GP5zH3JUc1IMgfqAe1e483mZVS7fshPknZPJ30= +github.com/initia-labs/movevm v0.2.8 h1:4UCUOrYSRQbfBLHEryqG2U1i9Qme/ms14HoVhcpmUNI= +github.com/initia-labs/movevm v0.2.8/go.mod h1:6MxR4GP5zH3JUc1IMgfqAe1e483mZVS7fshPknZPJ30= github.com/initia-labs/slinky v0.0.0-20240418051646-d45167cc66b1 h1:7mXLhI/X+GLdAYNmzXE5CIvTuOgETUMB7tR6VHvX/tY= github.com/initia-labs/slinky v0.0.0-20240418051646-d45167cc66b1/go.mod h1:ZK3DD0WLDIcBkyo8w2mr/KiIqCovVBNx82jSRhC2DTA= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=