Skip to content

Commit a45c68b

Browse files
smsunartosmsunarto
authored
fix(evm): polaris/rollkit version bump and resolve gRPC server startup race condition (#756)
1 parent 5f1e39a commit a45c68b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1992
-2345
lines changed

‎.github/workflows/test.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ jobs:
3838
# key: docker-${{ runner.os }}-${{ hashFiles('e2e/testgames/game/Dockerfile') }}
3939
- name: E2E Test Nakama
4040
run: make e2e-nakama
41-
# https://linear.app/arguslabs/issue/WORLD-929/re-enable-e2e-evm-tests-once-polaris-is-upgraded
42-
# - name: E2E Test EVM <> Cardinal # Re-enable this after polaris problem is fixed.
43-
# run: make e2e-evm
41+
# - name: E2E Test EVM <> Cardinal # This works locally, but need to bug some Docker issues in CI
42+
# run: make e2e-evm
4443
- name: E2E docker compose logs last status
4544
if: success() || failure()
4645
run: |

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,7 @@ contracts/out/
273273
*/**/*.bin
274274

275275
# Docs
276-
!docs/package.json
276+
!docs/package.json
277+
278+
# EVM
279+
transactions.rlp

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ include makefiles/test.mk
1111
###############################################################################
1212

1313
include makefiles/build.mk
14+
include makefiles/start.mk
1415

1516
###############################################################################
1617
### Tagging and Release ###

‎assert/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.22.1
44

55
require (
66
github.com/rotisserie/eris v0.5.4
7-
github.com/stretchr/testify v1.8.4
7+
github.com/stretchr/testify v1.9.0
88
gotest.tools/v3 v3.5.1
99
)
1010

1111
require (
1212
github.com/kr/pretty v0.3.1 // indirect
13-
github.com/rogpeppe/go-internal v1.11.0 // indirect
13+
github.com/rogpeppe/go-internal v1.12.0 // indirect
1414
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
1515
)
1616

‎assert/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
1414
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
1515
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1616
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
17-
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
18-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
17+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
18+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
1919
github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
2020
github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
21-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
22-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
21+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
22+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2323
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2424
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
2525
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎cardinal/go.mod

+14-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/JeremyLoy/config v1.5.0
88
github.com/alecthomas/participle/v2 v2.1.0
99
github.com/alicebob/miniredis/v2 v2.30.5
10-
github.com/ethereum/go-ethereum v1.13.4
10+
github.com/ethereum/go-ethereum v1.13.10
1111
github.com/fasthttp/websocket v1.5.8
1212
github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf
1313
github.com/goccy/go-json v0.10.2
@@ -21,12 +21,12 @@ require (
2121
github.com/invopop/jsonschema v0.7.0
2222
github.com/redis/go-redis/v9 v9.1.0
2323
github.com/rotisserie/eris v0.5.4
24-
github.com/rs/zerolog v1.31.0
24+
github.com/rs/zerolog v1.32.0
2525
github.com/stretchr/testify v1.9.0
2626
github.com/swaggo/swag v1.16.3
2727
github.com/wI2L/jsondiff v0.5.0
28-
google.golang.org/grpc v1.62.0
29-
google.golang.org/protobuf v1.32.0
28+
google.golang.org/grpc v1.63.2
29+
google.golang.org/protobuf v1.33.0
3030
gopkg.in/DataDog/dd-trace-go.v1 v1.58.1
3131
gotest.tools/v3 v3.5.1
3232
pkg.world.dev/world-engine/assert v1.0.0
@@ -47,7 +47,6 @@ require (
4747
github.com/andybalholm/brotli v1.1.0 // indirect
4848
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
4949
github.com/cespare/xxhash/v2 v2.2.0 // indirect
50-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
5150
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5251
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
5352
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
@@ -58,9 +57,10 @@ require (
5857
github.com/go-openapi/jsonreference v0.20.0 // indirect
5958
github.com/go-openapi/spec v0.20.8 // indirect
6059
github.com/go-openapi/swag v0.22.4 // indirect
61-
github.com/golang/protobuf v1.5.3 // indirect
60+
github.com/golang/protobuf v1.5.4 // indirect
6261
github.com/google/go-cmp v0.6.0 // indirect
63-
github.com/holiman/uint256 v1.2.3 // indirect
62+
github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect
63+
github.com/holiman/uint256 v1.2.4 // indirect
6464
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
6565
github.com/josharian/intern v1.0.0 // indirect
6666
github.com/klauspost/compress v1.17.7 // indirect
@@ -75,7 +75,6 @@ require (
7575
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7676
github.com/rivo/uniseg v0.4.7 // indirect
7777
github.com/rogpeppe/go-internal v1.11.0 // indirect
78-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7978
github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect
8079
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
8180
github.com/swaggo/files/v2 v2.0.0 // indirect
@@ -84,26 +83,23 @@ require (
8483
github.com/tidwall/pretty v1.2.1 // indirect
8584
github.com/tidwall/sjson v1.2.5 // indirect
8685
github.com/tinylib/msgp v1.1.8 // indirect
87-
github.com/urfave/cli/v2 v2.25.7 // indirect
8886
github.com/valyala/bytebufferpool v1.0.0 // indirect
8987
github.com/valyala/fasthttp v1.52.0 // indirect
9088
github.com/valyala/tcplisten v1.0.0 // indirect
91-
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
9289
github.com/yuin/gopher-lua v1.1.0 // indirect
9390
go.uber.org/atomic v1.11.0 // indirect
9491
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
9592
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
96-
golang.org/x/crypto v0.21.0 // indirect
97-
golang.org/x/mod v0.14.0 // indirect
98-
golang.org/x/net v0.22.0 // indirect
99-
golang.org/x/sys v0.18.0 // indirect
93+
golang.org/x/crypto v0.22.0 // indirect
94+
golang.org/x/mod v0.17.0 // indirect
95+
golang.org/x/net v0.24.0 // indirect
96+
golang.org/x/sync v0.7.0 // indirect
97+
golang.org/x/sys v0.19.0 // indirect
10098
golang.org/x/text v0.14.0 // indirect
10199
golang.org/x/time v0.5.0 // indirect
102-
golang.org/x/tools v0.16.1 // indirect
100+
golang.org/x/tools v0.20.0 // indirect
103101
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
104-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
105-
gopkg.in/yaml.v2 v2.4.0 // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
106103
gopkg.in/yaml.v3 v3.0.1 // indirect
107104
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
108-
sigs.k8s.io/yaml v1.3.0 // indirect
109105
)

0 commit comments

Comments
 (0)