Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump: initia to latest #21

Merged
merged 6 commits into from
Apr 15, 2024
Merged

bump: initia to latest #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b58b82
bump initia to latest
beer-1 Apr 12, 2024
cf945ea
fix go version
beer-1 Apr 12, 2024
8ced0ef
bump movevm version
beer-1 Apr 13, 2024
9d44780
use latest initia
beer-1 Apr 13, 2024
0820133
bump opinit and initia to latest
beer-1 Apr 15, 2024
47067cf
bump go version to v1.22
beer-1 Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.21
go-version: 1.22
- uses: technote-space/get-diff-action@v5
id: git_diff
with:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
go-version: 1.21
go-version: 1.22
# for private repo access
- run: git config --global url.https://${GITHUB_ACCESS_TOKEN}:[email protected]/.insteadOf https://github.com/
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.21
go-version: 1.22
- name: Install openssl
run: sudo apt-get install libssl-dev
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.21-alpine AS go-builder
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.2
ENV LIBMOVEVM_VERSION=v0.2.5

# this comes from standard alpine nightly file
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
Expand Down Expand Up @@ -39,7 +39,7 @@ RUN cp /lib/libcompiler_muslc.`uname -m`.a /lib/libcompiler_muslc.a
# force it to use static lib (from above) not standard libmovevm.so and libcompiler.so file
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LDFLAGS="-linkmode=external -extldflags \"-L/code/mimalloc/build -lmimalloc -Wl,-z,muldefs -static\"" make build

FROM alpine:3.15.4
FROM alpine:3.19

RUN addgroup minitia \
&& adduser -G minitia -D -h /minitia minitia
Expand Down
4 changes: 2 additions & 2 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ func NewMinitiaApp(
packetForwardMiddleware,
ibchooks.NewICS4Middleware(
nil, /* ics4wrapper: not used */
ibcmovehooks.NewMoveHooks(app.MoveKeeper, ac),
ibcmovehooks.NewMoveHooks(appCodec, ac, app.MoveKeeper),
),
app.IBCHooksKeeper,
)
Expand Down Expand Up @@ -548,7 +548,7 @@ func NewMinitiaApp(
nftTransferIBCModule,
ibchooks.NewICS4Middleware(
nil, /* ics4wrapper: not used */
ibcmovehooks.NewMoveHooks(app.MoveKeeper, ac),
ibcmovehooks.NewMoveHooks(appCodec, ac, app.MoveKeeper),
),
app.IBCHooksKeeper,
)
Expand Down
11 changes: 6 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/initia-labs/minimove

go 1.21.5
go 1.22

toolchain go1.22.2

require (
cosmossdk.io/api v0.7.3
Expand All @@ -24,10 +26,10 @@ 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.3-0.20240409080116-b1905ecee383
github.com/initia-labs/initia v0.2.3
github.com/initia-labs/OPinit v0.2.3
github.com/initia-labs/initia v0.2.4
// we also need to update `LIBMOVEVM_VERSION` of images/private/Dockerfile#5
github.com/initia-labs/movevm v0.2.2
github.com/initia-labs/movevm v0.2.5
github.com/pkg/errors v0.9.1
github.com/rakyll/statik v0.1.7
github.com/skip-mev/block-sdk v0.0.0-20231213233341-deceeb0e993b
Expand Down Expand Up @@ -133,7 +135,6 @@ require (
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/initia-labs/OPinit/api v0.0.0-20240409080116-b1905ecee383 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.17.7 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,20 +722,20 @@ 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.3-0.20240409080116-b1905ecee383 h1:cQFjJi7tzyEiypbwNbPooiZhK4IFc1oJHOUL77nhouY=
github.com/initia-labs/OPinit v0.2.3-0.20240409080116-b1905ecee383/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
github.com/initia-labs/OPinit/api v0.0.0-20240409080116-b1905ecee383 h1:e+C945Wl9Pi24OHUjZjuq8tflzYaTh2xydgTD0BdVKo=
github.com/initia-labs/OPinit/api v0.0.0-20240409080116-b1905ecee383/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
github.com/initia-labs/OPinit v0.2.3 h1:QWjYlHi2ibQ972PU1sJF03P3B/NWrZecVvrbm/CWbFE=
github.com/initia-labs/OPinit v0.2.3/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e h1:PxrLVIOox7+r2M1nV6KtlIZtVSEONdkh6oyklduJMHc=
github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf h1:7k3u0huB7OpiDfQKnfcwKUvByl7HyYs3itgROO/YpFg=
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf/go.mod h1:PIi48BpzwlHqtV3mzwPyQgOyOnU94BNBimLS2ebBHOg=
github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21 h1:AwqnO5IR+3LWzjqR33MzOkce38ExWLtQwlqrLZVrMyw=
github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ=
github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0 h1:GQ7/UD5mB6q104roqZK5jxb6ff9sBk0/uwFxgERQIaU=
github.com/initia-labs/iavl v0.0.0-20240208034922-5d81c449d4c0/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc=
github.com/initia-labs/initia v0.2.3 h1:btg3UoX6oy7LOcsy03rZaYmxDk5RvOyBY+hQ4EtuxUg=
github.com/initia-labs/initia v0.2.3/go.mod h1:xLkPASIv+6EuE7BHCxB3ag2K9+rUwJ/6AC5fkYmSejw=
github.com/initia-labs/movevm v0.2.2 h1:T0FwprEEDWhNfPREthNDvRr+IGg9N7eQg+zXvT8V/U4=
github.com/initia-labs/movevm v0.2.2/go.mod h1:1EyJ06+Hn43MfaXZ+30a2gmhS5zjqiFF8oSF5CHai28=
github.com/initia-labs/initia v0.2.4 h1:e4yUUDqMYSp+TdseJjUzGIbTbU2uC2v7ZSiVIP5n5Nk=
github.com/initia-labs/initia v0.2.4/go.mod h1:WO4Onb8FfU/UYayGxXfOgguL/TXQMsDmCDpfCFhM6HY=
github.com/initia-labs/movevm v0.2.5 h1:H2U+I/6X8Ue/MqixHuqOorTKEa8+E1qzLiVXicsW648=
github.com/initia-labs/movevm v0.2.5/go.mod h1:6MxR4GP5zH3JUc1IMgfqAe1e483mZVS7fshPknZPJ30=
github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls=
github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
Expand Down
6 changes: 3 additions & 3 deletions images/private/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.21-alpine AS go-builder
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.2
ARG LIBMOVEVM_VERSION=v0.2.5

# this comes from standard alpine nightly file
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN cp /lib/libcompiler_muslc.`uname -m`.a /lib/libcompiler_muslc.a
# force it to use static lib (from above) not standard libmovevm.so and libcompiler.so file
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LDFLAGS="-linkmode=external -extldflags \"-L/code/mimalloc/build -lmimalloc -Wl,-z,muldefs -static\"" make build

FROM alpine:3.15.4
FROM alpine:3.19

RUN addgroup minitia \
&& adduser -G minitia -D -h /minitia minitia
Expand Down
2 changes: 1 addition & 1 deletion shared.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bullseye AS go-builder
FROM golang:1.22-bullseye AS go-builder

# Install minimum necessary dependencies, build Cosmos SDK, remove packages
RUN apt update
Expand Down
Loading