Skip to content

Commit

Permalink
[R4R]: Release/v0.4.1 (#983)
Browse files Browse the repository at this point in the history 
# Goals of PR

merge 0.4.1-alpha.1

Notes:
no

Related Issues:
no
  • Loading branch information
@Sha3nS
Sha3nS authored Jun 13, 2023
2 parents 37ff674 + 6f3c566 commit 5614403
Show file tree
Hide file tree
Showing 39 changed files with 2,734 additions and 2,019 deletions.
3 changes: 3 additions & 0 deletions batch-submitter/docker.go.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ use (
./batch-submitter
./bss-core
./l2geth
./tss
./metrics
./fraud-proof
)
5 changes: 2 additions & 3 deletions batch-submitter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ require (
github.com/mantlenetworkio/mantle/l2geth v0.0.0
github.com/mantlenetworkio/mantle/tss v0.0.0
github.com/prometheus/client_golang v1.15.1
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.4
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/urfave/cli v1.22.12
github.com/urfave/cli v1.22.14
google.golang.org/api v0.126.0
)

Expand Down Expand Up @@ -69,7 +69,6 @@ require (
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand Down
1,212 changes: 1,210 additions & 2 deletions batch-submitter/go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bss-core/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/ethereum/go-ethereum v1.10.26
github.com/getsentry/sentry-go v0.12.0
github.com/prometheus/client_golang v1.15.1
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.4
github.com/tyler-smith/go-bip39 v1.1.0
google.golang.org/api v0.126.0
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc
Expand Down
2 changes: 1 addition & 1 deletion bss-core/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
Expand Down
10 changes: 6 additions & 4 deletions fraud-proof/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ replace github.com/mantlenetworkio/mantle/fraud-proof => ./

replace github.com/mantlenetworkio/mantle/metrics => ../metrics

replace github.com/mantlenetworkio/mantle/l2geth => ../l2geth

require (
cloud.google.com/go/kms v1.11.0
github.com/cbergoon/merkletree v0.2.0
github.com/ethereum/go-ethereum v1.10.26
github.com/holiman/uint256 v1.2.0
github.com/mantlenetworkio/mantle/bss-core v0.0.0-20230524081854-aedc5de809b9
github.com/mantlenetworkio/mantle/l2geth v0.0.0-20230524081854-aedc5de809b9
github.com/mantlenetworkio/mantle/metrics v0.0.0-00010101000000-000000000000
github.com/mantlenetworkio/mantle/bss-core v0.0.0
github.com/mantlenetworkio/mantle/l2geth v0.0.0
github.com/mantlenetworkio/mantle/metrics v0.0.0
github.com/prometheus/client_golang v1.15.1
github.com/specularl2/specular/clients/geth/specular v0.0.0-20221120100224-5e02437e9455
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.4
google.golang.org/api v0.126.0
gopkg.in/urfave/cli.v1 v1.20.0
)
Expand Down
35 changes: 34 additions & 1 deletion fraud-proof/go.sum
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions gas-oracle/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash

COPY ./gas-oracle /gas-oracle
COPY ./bss-core /bss-core
COPY ./gas-oracle/docker.go.work /go/go.work

RUN cd /gas-oracle && make gas-oracle

Expand Down
6 changes: 6 additions & 0 deletions gas-oracle/docker.go.work
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
go 1.18

use (
./bss-core
./gas-oracle
)
6 changes: 3 additions & 3 deletions gas-oracle/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
cloud.google.com/go/kms v1.11.0
github.com/ethereum/go-ethereum v1.10.26
github.com/go-resty/resty/v2 v2.7.0
github.com/mantlenetworkio/mantle/bss-core v0.0.0-20230612013908-4e6b42537743
github.com/stretchr/testify v1.8.1
github.com/urfave/cli v1.22.12
github.com/mantlenetworkio/mantle/bss-core v0.0.0
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.14
google.golang.org/api v0.126.0
)

Expand Down
9 changes: 5 additions & 4 deletions gas-oracle/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
Expand Down Expand Up @@ -468,8 +468,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
Expand All @@ -483,8 +484,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
Expand Down
30 changes: 13 additions & 17 deletions go.work
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
go 1.18

use (
./batch-submitter
./bss-core
./fraud-proof
./gas-oracle
./integration-tests/go-tests
./l2geth
./l2geth-exporter
./mt-batcher
./mt-challenger
./proxyd
./state-surgery
./subsidy
./tss
metrics
replace (
github.com/Layr-Labs/datalayr/common v0.0.0 => ./datalayr/common
github.com/Layr-Labs/datalayr/lib/merkzg v0.0.0 => ./datalayr/lib/merkzg
github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-mantle/reference-optimistic-geth v0.0.0-20220803173305-1c9d4cc76a6e
github.com/mantlenetworkio/mantle/bss-core v0.0.0 => ./bss-core
github.com/mantlenetworkio/mantle/fraud-proof v0.0.0 => ./fraud-proof
github.com/mantlenetworkio/mantle/gas-oracle v0.0.0 => ./gas-oracle
github.com/mantlenetworkio/mantle/l2geth v0.0.0 => ./l2geth
github.com/mantlenetworkio/mantle/metrics v0.0.0 => ./metrics
github.com/mantlenetworkio/mantle/mt-batcher v0.0.0 => ./mt-batcher
github.com/mantlenetworkio/mantle/mt-challenger v0.0.0 => ./mt-challenger
github.com/mantlenetworkio/mantle/subsidy v0.0.0 => ./subsidy
github.com/mantlenetworkio/mantle/tss v0.0.0 => ./tss
)

replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-mantle/reference-optimistic-geth v0.0.0-20220803173305-1c9d4cc76a6e

// For local debugging:
//replace github.com/ethereum/go-ethereum v1.10.21 => ../go-ethereum
Loading

0 comments on commit 5614403

Please sign in to comment.