diff --git a/Dockerfile b/Dockerfile index 7ed4d7d..86f1d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.22-alpine3.19 AS go-builder #ARG arch=x86_64 # See https://github.com/initia-labs/movevm/releases -ENV LIBMOVEVM_VERSION=v0.2.7 +ENV LIBMOVEVM_VERSION=v0.2.8 # this comes from standard alpine nightly file # https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile diff --git a/cmd/minitiad/launch.go b/cmd/minitiad/launch.go index 1d8829d..f282da3 100644 --- a/cmd/minitiad/launch.go +++ b/cmd/minitiad/launch.go @@ -14,7 +14,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, @@ -32,12 +32,16 @@ var DefaultLaunchStepFactories = []launchtools.LauncherStepFuncFactory[launchtoo return "nft-transfer", "nft-transfer", "ics721-1" }), - // Enable 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, } diff --git a/go.mod b/go.mod index 653bba6..61c48c0 100644 --- a/go.mod +++ b/go.mod @@ -25,15 +25,15 @@ require ( github.com/cosmos/ibc-go/v8 v8.2.0 github.com/golang/mock v1.6.0 github.com/gorilla/mux v1.8.1 - 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/move-nft v0.1.2 github.com/initia-labs/kvindexer/submodules/pair v0.1.1 github.com/initia-labs/kvindexer/submodules/tx v0.1.0 // we also need to update `LIBMOVEVM_VERSION` of images/private/Dockerfile#5 - github.com/initia-labs/movevm v0.2.7 + github.com/initia-labs/movevm v0.2.8 github.com/noble-assets/forwarding v0.0.0-20240416085758-ed8e9efaf69a github.com/pkg/errors v0.9.1 github.com/rakyll/statik v0.1.7 diff --git a/go.sum b/go.sum index e74213a..e4f640e 100644 --- a/go.sum +++ b/go.sum @@ -784,8 +784,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= @@ -796,8 +796,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= @@ -808,8 +808,8 @@ github.com/initia-labs/kvindexer/submodules/pair v0.1.1 h1:o151gA4jIbqEl+pWTOCiz github.com/initia-labs/kvindexer/submodules/pair v0.1.1/go.mod h1:8X1GE1ZLkH7z8TKb5MUh7UClTkcqVFIwXIIRdsqeUZY= github.com/initia-labs/kvindexer/submodules/tx v0.1.0 h1:6kbf6wmzXPN0XCQLasiFgq1AlZHkt5K3/ZG+IWw1nNs= github.com/initia-labs/kvindexer/submodules/tx v0.1.0/go.mod h1:i0XeLbLa6xdgTR01WF8kaAO50vMmwxbeq0fKexwpFHU= -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= diff --git a/images/private/Dockerfile b/images/private/Dockerfile index f6cd084..dc3bbf2 100644 --- a/images/private/Dockerfile +++ b/images/private/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.22-alpine3.19 AS go-builder #ARG arch=x86_64 # See https://github.com/initia-labs/movevm/releases -ARG LIBMOVEVM_VERSION=v0.2.7 +ARG LIBMOVEVM_VERSION=v0.2.8 # this comes from standard alpine nightly file # https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile