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.

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

bump opinit and initia to latest #18

Merged
merged 2 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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 @@ -64,7 +64,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
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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/CosmWasm/wasmvm/releases
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN cp /lib/libwasmvm_muslc.`uname -m`.a /lib/libwasmvm_muslc.a
# force it to use static lib (from above) not standard libwasmvm.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
3 changes: 2 additions & 1 deletion app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ func SetupWithGenesisAccounts(
// set validators and delegations
var opchildGenesis opchildtypes.GenesisState
app.AppCodec().MustUnmarshalJSON(genesisState[opchildtypes.ModuleName], &opchildGenesis)
opchildGenesis.Params.Admin = sdk.AccAddress(valSet.Validators[0].Address.Bytes()).String()
opchildGenesis.Params.BridgeExecutor = sdk.AccAddress(valSet.Validators[0].Address.Bytes()).String()

// set validators and delegations
opchildGenesis = *opchildtypes.NewGenesisState(opchildGenesis.Params, validators)
opchildGenesis = *opchildtypes.NewGenesisState(opchildGenesis.Params, validators, nil)
genesisState[opchildtypes.ModuleName] = app.AppCodec().MustMarshalJSON(&opchildGenesis)

// update total supply
Expand Down
10 changes: 6 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/initia-labs/miniwasm

go 1.21.5
go 1.22

toolchain go1.22.2

require (
cosmossdk.io/api v0.7.3
Expand Down Expand Up @@ -32,8 +34,8 @@ require (
github.com/golang/protobuf v1.5.4
github.com/gorilla/mux v1.8.1
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/initia-labs/OPinit v0.2.3-0.20240404023002-8608273959a8
github.com/initia-labs/initia v0.2.2
github.com/initia-labs/OPinit v0.2.3
github.com/initia-labs/initia v0.2.4
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.18.0
github.com/rakyll/statik v0.1.7
Expand Down Expand Up @@ -142,7 +144,7 @@ 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-20240404023002-8608273959a8 // indirect
github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e // 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
Original file line number Diff line number Diff line change
Expand Up @@ -730,20 +730,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.20240404023002-8608273959a8 h1:d4Wz4h9q/Kc+tmwP+S6Ra1aCTJKUDb0g2w2V5Z5uFuM=
github.com/initia-labs/OPinit v0.2.3-0.20240404023002-8608273959a8/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
github.com/initia-labs/OPinit/api v0.0.0-20240404023002-8608273959a8 h1:Wk/SJ6RCGA34Sr0i0t+pXL+cVreaptuuHFuWDO9KVu4=
github.com/initia-labs/OPinit/api v0.0.0-20240404023002-8608273959a8/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-20240404091408-238cddd887d3 h1:IX3182+BZ8ksVtAdIlU9ub01dmSAM9lvjHuUz9GWzjc=
github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3/go.mod h1:qv+nhSohSXLgU45IxHDGM5x4+bG4khsqqyn+e0iEbfo=
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.2 h1:qbHs7TO9coC2iEMBKbmF5JoosbiGvs/TIve6nWOCQyE=
github.com/initia-labs/initia v0.2.2/go.mod h1:oSWtBjAI9hA8umlp1patsSzqlUL4aSymwRnC+WxHhQA=
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
4 changes: 2 additions & 2 deletions images/private/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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/CosmWasm/wasmvm/releases
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN cp /lib/libwasmvm_muslc.`uname -m`.a /lib/libwasmvm_muslc.a
# force it to use static lib (from above) not standard libwasmvm.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
Loading