diff --git a/.github/workflows/taiko-client--pages.yml b/.github/workflows/taiko-client--pages.yml new file mode 100644 index 00000000000..11ac1ddbb81 --- /dev/null +++ b/.github/workflows/taiko-client--pages.yml @@ -0,0 +1,64 @@ +name: GitHub Pages + +on: + push: + branches: + - preconf-driver-apis + +jobs: + swagger-gen: + if: ${{ !contains(github.event.head_commit.message, 'Update Swagger documentation') }} + runs-on: [arc-runner-set] + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: preconf-driver-apis + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: "1.23" + + - name: Install swaggo + run: | + export CGO_ENABLED=0 + go install github.com/swaggo/swag/cmd/swag@latest + + - name: Generate Swagger documentation + run: | + export CGO_ENABLED=0 + cd packages/taiko-client + ./scripts/gen_swagger_json.sh + + - name: Commit Swagger docs + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git add . + if ! git diff --quiet; then + git commit -m "Update Swagger documentation" + git push origin HEAD:${{ github.ref_name }} + else + echo "No changes to commit" + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + deploy: + if: ${{ !contains(github.event.head_commit.message, 'Update Swagger documentation') }} + runs-on: [arc-runner-set] + needs: swagger-gen + permissions: + contents: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: preconf-driver-apis + + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: packages/taiko-client/docs # Set this to where your `index.html` is located + publish_branch: gh-pages diff --git a/go.mod b/go.mod index 5a7576e5e62..ae2e13f83b5 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/google/uuid v1.6.0 github.com/joho/godotenv v1.5.1 github.com/labstack/echo-contrib v0.17.1 + github.com/labstack/echo-jwt/v4 v4.2.0 github.com/labstack/echo/v4 v4.12.0 github.com/labstack/gommon v0.4.2 github.com/modern-go/reflect2 v1.0.2 @@ -100,10 +101,10 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/spec v0.20.4 // indirect - github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/spec v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.13.0 // indirect @@ -112,7 +113,8 @@ require ( github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/golang-jwt/jwt/v4 v4.5.1 // indirect + github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -207,13 +209,13 @@ require ( go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/crypto v0.28.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect @@ -235,7 +237,7 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.11.1 +replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.11.2-0.20241031044538-43ab184d9ebd replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39 diff --git a/go.sum b/go.sum index 2a5672519f8..cd5a47307b5 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= @@ -213,17 +211,14 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M= -github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY= +github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -251,8 +246,10 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= -github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= @@ -388,6 +385,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/labstack/echo-contrib v0.17.1 h1:7I/he7ylVKsDUieaGRZ9XxxTYOjfQwVzHzUYrNykfCU= github.com/labstack/echo-contrib v0.17.1/go.mod h1:SnsCZtwHBAZm5uBSAtQtXQHI3wqEA73hvTn0bYMKnZA= +github.com/labstack/echo-jwt/v4 v4.2.0 h1:odSISV9JgcSCuhgQSV/6Io3i7nUmfM/QkBeR5GVJj5c= +github.com/labstack/echo-jwt/v4 v4.2.0/go.mod h1:MA2RqdXdEn4/uEglx0HcUOgQSyBaTh5JcaHIan3biwU= github.com/labstack/echo/v4 v4.0.0/go.mod h1:tZv7nai5buKSg5h/8E6zz4LsD/Dqh9/91Mvs7Z5Zyno= github.com/labstack/echo/v4 v4.1.15/go.mod h1:GWO5IBVzI371K8XJe50CSvHjQCafK6cw8R/moLhEU6o= github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= @@ -407,9 +406,6 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -478,7 +474,6 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/neko-neko/echo-logrus/v2 v2.0.1 h1:BX2U6uv2N3UiUY75y+SntQak5S1AJIel9j+5Y6h4Nb4= github.com/neko-neko/echo-logrus/v2 v2.0.1/go.mod h1:GDYWo9CY4VXk/vn5ac5reoutYEkZEexlFI01MzHXVG0= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= @@ -612,8 +607,8 @@ github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3Ke github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ= github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39 h1:JssMxaDmORjQ9RPZNulVJhAD8zSPd6LZFq5wsr6Nwz8= github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39/go.mod h1:ym7scR7ZHvEmwx1DLGVDzFlAdR+uhP1+Z4XCiFuSD5s= -github.com/taikoxyz/taiko-geth v1.11.1 h1:pur1WP6YJkwKhLVeN3Zf7dOwbPq6tS88gYod6QKlJc4= -github.com/taikoxyz/taiko-geth v1.11.1/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= +github.com/taikoxyz/taiko-geth v1.11.2-0.20241031044538-43ab184d9ebd h1:QAdpo8oqI+X66EA5dc6cT77fEgNk2sqVKC6j14vv6uk= +github.com/taikoxyz/taiko-geth v1.11.2-0.20241031044538-43ab184d9ebd/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo= github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNulFGdFHTD8HB2vLq/231xY2iPQ= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= @@ -688,8 +683,8 @@ golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= @@ -700,8 +695,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -718,7 +713,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -728,8 +722,8 @@ golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= @@ -769,7 +763,6 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -789,16 +782,16 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -808,8 +801,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -863,9 +856,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -889,7 +880,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/datatypes v1.2.4 h1:uZmGAcK/QZ0uyfCuVg0VQY1ZmV9h1fuG0tMwKByO1z4= diff --git a/packages/protocol/contract_layout_layer1.md b/packages/protocol/contract_layout_layer1.md index 299e675c91e..0a917b8b612 100644 --- a/packages/protocol/contract_layout_layer1.md +++ b/packages/protocol/contract_layout_layer1.md @@ -1,487 +1,509 @@ ## ERC1155Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC1155Vault | -| _initializing | bool | 0 | 1 | 1 | ERC1155Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC1155Vault | -| _owner | address | 51 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC1155Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC1155Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | ERC1155Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC1155Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC1155Vault | +| \_owner | address | 51 | 0 | 20 | ERC1155Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC1155Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC1155Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC1155Vault | | addressManager | address | 151 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC1155Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC1155Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC1155Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC1155Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC1155Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC1155Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC1155Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC1155Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC1155Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC1155Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC1155Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | ERC1155Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC1155Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | ERC1155Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | ERC1155Vault | -| __gap | uint256[50] | 401 | 0 | 1600 | ERC1155Vault | -| __gap | uint256[50] | 451 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | ERC1155Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[50] | 401 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[50] | 451 | 0 | 1600 | ERC1155Vault | ## ERC20Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|-------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC20Vault | -| _initializing | bool | 0 | 1 | 1 | ERC20Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC20Vault | -| _owner | address | 51 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC20Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC20Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ---------- | +| \_initialized | uint8 | 0 | 0 | 1 | ERC20Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC20Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC20Vault | +| \_owner | address | 51 | 0 | 20 | ERC20Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC20Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC20Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC20Vault | | addressManager | address | 151 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC20Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC20Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC20Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC20Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC20Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC20Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC20Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC20Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC20Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC20Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC20Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC20Vault | | bridgedToCanonical | mapping(address => struct ERC20Vault.CanonicalERC20) | 301 | 0 | 32 | ERC20Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC20Vault | | btokenDenylist | mapping(address => bool) | 303 | 0 | 32 | ERC20Vault | | lastMigrationStart | mapping(uint256 => mapping(address => uint256)) | 304 | 0 | 32 | ERC20Vault | -| __gap | uint256[46] | 305 | 0 | 1472 | ERC20Vault | +| \_\_gap | uint256[46] | 305 | 0 | 1472 | ERC20Vault | ## ERC721Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|---------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC721Vault | -| _initializing | bool | 0 | 1 | 1 | ERC721Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC721Vault | -| _owner | address | 51 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC721Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC721Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ----------- | +| \_initialized | uint8 | 0 | 0 | 1 | ERC721Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC721Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC721Vault | +| \_owner | address | 51 | 0 | 20 | ERC721Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC721Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC721Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC721Vault | | addressManager | address | 151 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC721Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC721Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC721Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC721Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC721Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC721Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC721Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC721Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC721Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC721Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC721Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC721Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | ERC721Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC721Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | ERC721Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | ERC721Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | ERC721Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | ERC721Vault | ## BridgedERC20 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC20 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC20 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20 | -| _owner | address | 51 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20 | -| addressManager | address | 151 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC20 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC20 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20 | -| _balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20 | -| _allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20 | -| _totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20 | -| _name | string | 254 | 0 | 32 | BridgedERC20 | -| _symbol | string | 255 | 0 | 32 | BridgedERC20 | -| __gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20 | -| srcToken | address | 301 | 0 | 20 | BridgedERC20 | -| __srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20 | -| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20 | -| migratingAddress | address | 303 | 0 | 20 | BridgedERC20 | -| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC20 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC20 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20 | +| \_owner | address | 51 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20 | +| addressManager | address | 151 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC20 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC20 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20 | +| \_balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20 | +| \_allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20 | +| \_totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20 | +| \_name | string | 254 | 0 | 32 | BridgedERC20 | +| \_symbol | string | 255 | 0 | 32 | BridgedERC20 | +| \_\_gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20 | +| srcToken | address | 301 | 0 | 20 | BridgedERC20 | +| \_\_srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20 | +| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20 | +| migratingAddress | address | 303 | 0 | 20 | BridgedERC20 | +| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20 | ## BridgedERC20V2 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------------------------------------|------|--------|-------|---------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC20V2 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC20V2 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20V2 | -| _owner | address | 51 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20V2 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20V2 | -| addressManager | address | 151 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20V2 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC20V2 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC20V2 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20V2 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20V2 | -| _balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20V2 | -| _allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20V2 | -| _totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20V2 | -| _name | string | 254 | 0 | 32 | BridgedERC20V2 | -| _symbol | string | 255 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20V2 | -| srcToken | address | 301 | 0 | 20 | BridgedERC20V2 | -| __srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20V2 | -| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20V2 | -| migratingAddress | address | 303 | 0 | 20 | BridgedERC20V2 | -| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20V2 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20V2 | -| _hashedName | bytes32 | 351 | 0 | 32 | BridgedERC20V2 | -| _hashedVersion | bytes32 | 352 | 0 | 32 | BridgedERC20V2 | -| _name | string | 353 | 0 | 32 | BridgedERC20V2 | -| _version | string | 354 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[48] | 355 | 0 | 1536 | BridgedERC20V2 | -| _nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[49] | 404 | 0 | 1568 | BridgedERC20V2 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------------------------------------ | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC20V2 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC20V2 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20V2 | +| \_owner | address | 51 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20V2 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20V2 | +| addressManager | address | 151 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20V2 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC20V2 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC20V2 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20V2 | +| \_balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20V2 | +| \_allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20V2 | +| \_totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20V2 | +| \_name | string | 254 | 0 | 32 | BridgedERC20V2 | +| \_symbol | string | 255 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20V2 | +| srcToken | address | 301 | 0 | 20 | BridgedERC20V2 | +| \_\_srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20V2 | +| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20V2 | +| migratingAddress | address | 303 | 0 | 20 | BridgedERC20V2 | +| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20V2 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20V2 | +| \_hashedName | bytes32 | 351 | 0 | 32 | BridgedERC20V2 | +| \_hashedVersion | bytes32 | 352 | 0 | 32 | BridgedERC20V2 | +| \_name | string | 353 | 0 | 32 | BridgedERC20V2 | +| \_version | string | 354 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[48] | 355 | 0 | 1536 | BridgedERC20V2 | +| \_nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 404 | 0 | 1568 | BridgedERC20V2 | ## BridgedERC721 -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|----------------------------------------------|------|--------|-------|-------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC721 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC721 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC721 | -| _owner | address | 51 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC721 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC721 | -| addressManager | address | 151 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC721 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC721 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC721 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC721 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC721 | -| __gap | uint256[50] | 251 | 0 | 1600 | BridgedERC721 | -| _name | string | 301 | 0 | 32 | BridgedERC721 | -| _symbol | string | 302 | 0 | 32 | BridgedERC721 | -| _owners | mapping(uint256 => address) | 303 | 0 | 32 | BridgedERC721 | -| _balances | mapping(address => uint256) | 304 | 0 | 32 | BridgedERC721 | -| _tokenApprovals | mapping(uint256 => address) | 305 | 0 | 32 | BridgedERC721 | -| _operatorApprovals | mapping(address => mapping(address => bool)) | 306 | 0 | 32 | BridgedERC721 | -| __gap | uint256[44] | 307 | 0 | 1408 | BridgedERC721 | -| srcToken | address | 351 | 0 | 20 | BridgedERC721 | -| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC721 | -| __gap | uint256[48] | 353 | 0 | 1536 | BridgedERC721 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------- | -------------------------------------------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC721 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC721 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC721 | +| \_owner | address | 51 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC721 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC721 | +| addressManager | address | 151 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC721 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC721 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC721 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC721 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC721 | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | BridgedERC721 | +| \_name | string | 301 | 0 | 32 | BridgedERC721 | +| \_symbol | string | 302 | 0 | 32 | BridgedERC721 | +| \_owners | mapping(uint256 => address) | 303 | 0 | 32 | BridgedERC721 | +| \_balances | mapping(address => uint256) | 304 | 0 | 32 | BridgedERC721 | +| \_tokenApprovals | mapping(uint256 => address) | 305 | 0 | 32 | BridgedERC721 | +| \_operatorApprovals | mapping(address => mapping(address => bool)) | 306 | 0 | 32 | BridgedERC721 | +| \_\_gap | uint256[44] | 307 | 0 | 1408 | BridgedERC721 | +| srcToken | address | 351 | 0 | 20 | BridgedERC721 | +| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC721 | +| \_\_gap | uint256[48] | 353 | 0 | 1536 | BridgedERC721 | ## BridgedERC1155 -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|-------------------------------------------------|------|--------|-------|---------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC1155 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC1155 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC1155 | -| _owner | address | 51 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC1155 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC1155 | -| addressManager | address | 151 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC1155 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC1155 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC1155 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC1155 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC1155 | -| __gap | uint256[50] | 251 | 0 | 1600 | BridgedERC1155 | -| _balances | mapping(uint256 => mapping(address => uint256)) | 301 | 0 | 32 | BridgedERC1155 | -| _operatorApprovals | mapping(address => mapping(address => bool)) | 302 | 0 | 32 | BridgedERC1155 | -| _uri | string | 303 | 0 | 32 | BridgedERC1155 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC1155 | -| srcToken | address | 351 | 0 | 20 | BridgedERC1155 | -| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC1155 | -| symbol | string | 353 | 0 | 32 | BridgedERC1155 | -| name | string | 354 | 0 | 32 | BridgedERC1155 | -| __gap | uint256[46] | 355 | 0 | 1472 | BridgedERC1155 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------- | ----------------------------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC1155 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC1155 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC1155 | +| \_owner | address | 51 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC1155 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC1155 | +| addressManager | address | 151 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC1155 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC1155 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC1155 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC1155 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC1155 | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | BridgedERC1155 | +| \_balances | mapping(uint256 => mapping(address => uint256)) | 301 | 0 | 32 | BridgedERC1155 | +| \_operatorApprovals | mapping(address => mapping(address => bool)) | 302 | 0 | 32 | BridgedERC1155 | +| \_uri | string | 303 | 0 | 32 | BridgedERC1155 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC1155 | +| srcToken | address | 351 | 0 | 20 | BridgedERC1155 | +| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC1155 | +| symbol | string | 353 | 0 | 32 | BridgedERC1155 | +| name | string | 354 | 0 | 32 | BridgedERC1155 | +| \_\_gap | uint256[46] | 355 | 0 | 1472 | BridgedERC1155 | ## Bridge -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------|------|--------|-------|-------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | Bridge | -| _initializing | bool | 0 | 1 | 1 | Bridge | -| __gap | uint256[50] | 1 | 0 | 1600 | Bridge | -| _owner | address | 51 | 0 | 20 | Bridge | -| __gap | uint256[49] | 52 | 0 | 1568 | Bridge | -| _pendingOwner | address | 101 | 0 | 20 | Bridge | -| __gap | uint256[49] | 102 | 0 | 1568 | Bridge | -| addressManager | address | 151 | 0 | 20 | Bridge | -| __gap | uint256[49] | 152 | 0 | 1568 | Bridge | -| __reentry | uint8 | 201 | 0 | 1 | Bridge | -| __paused | uint8 | 201 | 1 | 1 | Bridge | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | Bridge | -| __gap | uint256[49] | 202 | 0 | 1568 | Bridge | -| __reserved1 | uint64 | 251 | 0 | 8 | Bridge | -| nextMessageId | uint64 | 251 | 8 | 8 | Bridge | -| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | Bridge | -| __ctx | struct IBridge.Context | 253 | 0 | 64 | Bridge | -| __reserved2 | uint256 | 255 | 0 | 32 | Bridge | -| __reserved3 | uint256 | 256 | 0 | 32 | Bridge | -| __gap | uint256[44] | 257 | 0 | 1408 | Bridge | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------- | ---- | ------ | ----- | -------- | +| \_initialized | uint8 | 0 | 0 | 1 | Bridge | +| \_initializing | bool | 0 | 1 | 1 | Bridge | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | Bridge | +| \_owner | address | 51 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | Bridge | +| \_pendingOwner | address | 101 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | Bridge | +| addressManager | address | 151 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | Bridge | +| \_\_reentry | uint8 | 201 | 0 | 1 | Bridge | +| \_\_paused | uint8 | 201 | 1 | 1 | Bridge | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | Bridge | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | Bridge | +| \_\_reserved1 | uint64 | 251 | 0 | 8 | Bridge | +| nextMessageId | uint64 | 251 | 8 | 8 | Bridge | +| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | Bridge | +| \_\_ctx | struct IBridge.Context | 253 | 0 | 64 | Bridge | +| \_\_reserved2 | uint256 | 255 | 0 | 32 | Bridge | +| \_\_reserved3 | uint256 | 256 | 0 | 32 | Bridge | +| \_\_gap | uint256[44] | 257 | 0 | 1408 | Bridge | ## QuotaManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------------|------|--------|-------|-------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | QuotaManager | -| _initializing | bool | 0 | 1 | 1 | QuotaManager | -| __gap | uint256[50] | 1 | 0 | 1600 | QuotaManager | -| _owner | address | 51 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 52 | 0 | 1568 | QuotaManager | -| _pendingOwner | address | 101 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 102 | 0 | 1568 | QuotaManager | -| addressManager | address | 151 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 152 | 0 | 1568 | QuotaManager | -| __reentry | uint8 | 201 | 0 | 1 | QuotaManager | -| __paused | uint8 | 201 | 1 | 1 | QuotaManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | QuotaManager | -| __gap | uint256[49] | 202 | 0 | 1568 | QuotaManager | -| tokenQuota | mapping(address => struct QuotaManager.Quota) | 251 | 0 | 32 | QuotaManager | -| quotaPeriod | uint24 | 252 | 0 | 3 | QuotaManager | -| __gap | uint256[48] | 253 | 0 | 1536 | QuotaManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | QuotaManager | +| \_initializing | bool | 0 | 1 | 1 | QuotaManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | QuotaManager | +| \_owner | address | 51 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | QuotaManager | +| \_pendingOwner | address | 101 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | QuotaManager | +| addressManager | address | 151 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | QuotaManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | QuotaManager | +| \_\_paused | uint8 | 201 | 1 | 1 | QuotaManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | QuotaManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | QuotaManager | +| tokenQuota | mapping(address => struct QuotaManager.Quota) | 251 | 0 | 32 | QuotaManager | +| quotaPeriod | uint24 | 252 | 0 | 3 | QuotaManager | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | QuotaManager | ## AddressManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | AddressManager | -| _initializing | bool | 0 | 1 | 1 | AddressManager | -| __gap | uint256[50] | 1 | 0 | 1600 | AddressManager | -| _owner | address | 51 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 52 | 0 | 1568 | AddressManager | -| _pendingOwner | address | 101 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 102 | 0 | 1568 | AddressManager | -| addressManager | address | 151 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 152 | 0 | 1568 | AddressManager | -| __reentry | uint8 | 201 | 0 | 1 | AddressManager | -| __paused | uint8 | 201 | 1 | 1 | AddressManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | AddressManager | -| __gap | uint256[49] | 202 | 0 | 1568 | AddressManager | -| __addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | AddressManager | -| __gap | uint256[49] | 252 | 0 | 1568 | AddressManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | AddressManager | +| \_initializing | bool | 0 | 1 | 1 | AddressManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | AddressManager | +| \_owner | address | 51 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | AddressManager | +| \_pendingOwner | address | 101 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | AddressManager | +| addressManager | address | 151 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | AddressManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | AddressManager | +| \_\_paused | uint8 | 201 | 1 | 1 | AddressManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | AddressManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | AddressManager | +| \_\_addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | AddressManager | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | AddressManager | ## AddressResolver -| Name | Type | Slot | Offset | Bytes | Contract | -|----------------|-------------|------|--------|-------|-------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | AddressResolver | -| _initializing | bool | 0 | 1 | 1 | AddressResolver | + +| Name | Type | Slot | Offset | Bytes | Contract | +| -------------- | ----------- | ---- | ------ | ----- | --------------- | +| \_initialized | uint8 | 0 | 0 | 1 | AddressResolver | +| \_initializing | bool | 0 | 1 | 1 | AddressResolver | | addressManager | address | 0 | 2 | 20 | AddressResolver | -| __gap | uint256[49] | 1 | 0 | 1568 | AddressResolver | +| \_\_gap | uint256[49] | 1 | 0 | 1568 | AddressResolver | ## EssentialContract -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|-----------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | EssentialContract | -| _initializing | bool | 0 | 1 | 1 | EssentialContract | -| __gap | uint256[50] | 1 | 0 | 1600 | EssentialContract | -| _owner | address | 51 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 52 | 0 | 1568 | EssentialContract | -| _pendingOwner | address | 101 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 102 | 0 | 1568 | EssentialContract | -| addressManager | address | 151 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 152 | 0 | 1568 | EssentialContract | -| __reentry | uint8 | 201 | 0 | 1 | EssentialContract | -| __paused | uint8 | 201 | 1 | 1 | EssentialContract | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | EssentialContract | -| __gap | uint256[49] | 202 | 0 | 1568 | EssentialContract | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ----------------- | +| \_initialized | uint8 | 0 | 0 | 1 | EssentialContract | +| \_initializing | bool | 0 | 1 | 1 | EssentialContract | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | EssentialContract | +| \_owner | address | 51 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | EssentialContract | +| \_pendingOwner | address | 101 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | EssentialContract | +| addressManager | address | 151 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | EssentialContract | +| \_\_reentry | uint8 | 201 | 0 | 1 | EssentialContract | +| \_\_paused | uint8 | 201 | 1 | 1 | EssentialContract | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | EssentialContract | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | EssentialContract | ## SignalService -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------------|------|--------|-------|---------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | SignalService | -| _initializing | bool | 0 | 1 | 1 | SignalService | -| __gap | uint256[50] | 1 | 0 | 1600 | SignalService | -| _owner | address | 51 | 0 | 20 | SignalService | -| __gap | uint256[49] | 52 | 0 | 1568 | SignalService | -| _pendingOwner | address | 101 | 0 | 20 | SignalService | -| __gap | uint256[49] | 102 | 0 | 1568 | SignalService | -| addressManager | address | 151 | 0 | 20 | SignalService | -| __gap | uint256[49] | 152 | 0 | 1568 | SignalService | -| __reentry | uint8 | 201 | 0 | 1 | SignalService | -| __paused | uint8 | 201 | 1 | 1 | SignalService | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | SignalService | -| __gap | uint256[49] | 202 | 0 | 1568 | SignalService | -| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | SignalService | -| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | SignalService | -| __gap | uint256[48] | 253 | 0 | 1536 | SignalService | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | SignalService | +| \_initializing | bool | 0 | 1 | 1 | SignalService | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | SignalService | +| \_owner | address | 51 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | SignalService | +| \_pendingOwner | address | 101 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | SignalService | +| addressManager | address | 151 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | SignalService | +| \_\_reentry | uint8 | 201 | 0 | 1 | SignalService | +| \_\_paused | uint8 | 201 | 1 | 1 | SignalService | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | SignalService | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | SignalService | +| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | SignalService | +| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | SignalService | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | SignalService | ## TaikoToken -| Name | Type | Slot | Offset | Bytes | Contract | -|-----------------------------------------------------|---------------------------------------------------------------|------|--------|-------|--------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | TaikoToken | -| _initializing | bool | 0 | 1 | 1 | TaikoToken | -| __gap | uint256[50] | 1 | 0 | 1600 | TaikoToken | -| _owner | address | 51 | 0 | 20 | TaikoToken | -| __gap | uint256[49] | 52 | 0 | 1568 | TaikoToken | -| _pendingOwner | address | 101 | 0 | 20 | TaikoToken | -| __gap | uint256[49] | 102 | 0 | 1568 | TaikoToken | -| addressManager | address | 151 | 0 | 20 | TaikoToken | -| __gap | uint256[49] | 152 | 0 | 1568 | TaikoToken | -| __reentry | uint8 | 201 | 0 | 1 | TaikoToken | -| __paused | uint8 | 201 | 1 | 1 | TaikoToken | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoToken | -| __gap | uint256[49] | 202 | 0 | 1568 | TaikoToken | -| __slots_previously_used_by_ERC20SnapshotUpgradeable | uint256[50] | 251 | 0 | 1600 | TaikoToken | -| _balances | mapping(address => uint256) | 301 | 0 | 32 | TaikoToken | -| _allowances | mapping(address => mapping(address => uint256)) | 302 | 0 | 32 | TaikoToken | -| _totalSupply | uint256 | 303 | 0 | 32 | TaikoToken | -| _name | string | 304 | 0 | 32 | TaikoToken | -| _symbol | string | 305 | 0 | 32 | TaikoToken | -| __gap | uint256[45] | 306 | 0 | 1440 | TaikoToken | -| _hashedName | bytes32 | 351 | 0 | 32 | TaikoToken | -| _hashedVersion | bytes32 | 352 | 0 | 32 | TaikoToken | -| _name | string | 353 | 0 | 32 | TaikoToken | -| _version | string | 354 | 0 | 32 | TaikoToken | -| __gap | uint256[48] | 355 | 0 | 1536 | TaikoToken | -| _nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | TaikoToken | -| _PERMIT_TYPEHASH_DEPRECATED_SLOT | bytes32 | 404 | 0 | 32 | TaikoToken | -| __gap | uint256[49] | 405 | 0 | 1568 | TaikoToken | -| _delegates | mapping(address => address) | 454 | 0 | 32 | TaikoToken | -| _checkpoints | mapping(address => struct ERC20VotesUpgradeable.Checkpoint[]) | 455 | 0 | 32 | TaikoToken | -| _totalSupplyCheckpoints | struct ERC20VotesUpgradeable.Checkpoint[] | 456 | 0 | 32 | TaikoToken | -| __gap | uint256[47] | 457 | 0 | 1504 | TaikoToken | -| __gap | uint256[50] | 504 | 0 | 1600 | TaikoToken | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ----------------------------------------------------- | ------------------------------------------------------------- | ---- | ------ | ----- | ---------- | +| \_initialized | uint8 | 0 | 0 | 1 | TaikoToken | +| \_initializing | bool | 0 | 1 | 1 | TaikoToken | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | TaikoToken | +| \_owner | address | 51 | 0 | 20 | TaikoToken | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | TaikoToken | +| \_pendingOwner | address | 101 | 0 | 20 | TaikoToken | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | TaikoToken | +| addressManager | address | 151 | 0 | 20 | TaikoToken | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | TaikoToken | +| \_\_reentry | uint8 | 201 | 0 | 1 | TaikoToken | +| \_\_paused | uint8 | 201 | 1 | 1 | TaikoToken | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoToken | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | TaikoToken | +| \_\_slots_previously_used_by_ERC20SnapshotUpgradeable | uint256[50] | 251 | 0 | 1600 | TaikoToken | +| \_balances | mapping(address => uint256) | 301 | 0 | 32 | TaikoToken | +| \_allowances | mapping(address => mapping(address => uint256)) | 302 | 0 | 32 | TaikoToken | +| \_totalSupply | uint256 | 303 | 0 | 32 | TaikoToken | +| \_name | string | 304 | 0 | 32 | TaikoToken | +| \_symbol | string | 305 | 0 | 32 | TaikoToken | +| \_\_gap | uint256[45] | 306 | 0 | 1440 | TaikoToken | +| \_hashedName | bytes32 | 351 | 0 | 32 | TaikoToken | +| \_hashedVersion | bytes32 | 352 | 0 | 32 | TaikoToken | +| \_name | string | 353 | 0 | 32 | TaikoToken | +| \_version | string | 354 | 0 | 32 | TaikoToken | +| \_\_gap | uint256[48] | 355 | 0 | 1536 | TaikoToken | +| \_nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | TaikoToken | +| \_PERMIT_TYPEHASH_DEPRECATED_SLOT | bytes32 | 404 | 0 | 32 | TaikoToken | +| \_\_gap | uint256[49] | 405 | 0 | 1568 | TaikoToken | +| \_delegates | mapping(address => address) | 454 | 0 | 32 | TaikoToken | +| \_checkpoints | mapping(address => struct ERC20VotesUpgradeable.Checkpoint[]) | 455 | 0 | 32 | TaikoToken | +| \_totalSupplyCheckpoints | struct ERC20VotesUpgradeable.Checkpoint[] | 456 | 0 | 32 | TaikoToken | +| \_\_gap | uint256[47] | 457 | 0 | 1504 | TaikoToken | +| \_\_gap | uint256[50] | 504 | 0 | 1600 | TaikoToken | ## ComposeVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ComposeVerifier | -| _initializing | bool | 0 | 1 | 1 | ComposeVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | ComposeVerifier | -| _owner | address | 51 | 0 | 20 | ComposeVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | ComposeVerifier | -| _pendingOwner | address | 101 | 0 | 20 | ComposeVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | ComposeVerifier | -| addressManager | address | 151 | 0 | 20 | ComposeVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | ComposeVerifier | -| __reentry | uint8 | 201 | 0 | 1 | ComposeVerifier | -| __paused | uint8 | 201 | 1 | 1 | ComposeVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ComposeVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | ComposeVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | ComposeVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | --------------- | +| \_initialized | uint8 | 0 | 0 | 1 | ComposeVerifier | +| \_initializing | bool | 0 | 1 | 1 | ComposeVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ComposeVerifier | +| \_owner | address | 51 | 0 | 20 | ComposeVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ComposeVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | ComposeVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ComposeVerifier | +| addressManager | address | 151 | 0 | 20 | ComposeVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ComposeVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | ComposeVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | ComposeVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ComposeVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ComposeVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ComposeVerifier | ## TeeAnyVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|----------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | TeeAnyVerifier | -| _initializing | bool | 0 | 1 | 1 | TeeAnyVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | TeeAnyVerifier | -| _owner | address | 51 | 0 | 20 | TeeAnyVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | TeeAnyVerifier | -| _pendingOwner | address | 101 | 0 | 20 | TeeAnyVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | TeeAnyVerifier | -| addressManager | address | 151 | 0 | 20 | TeeAnyVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | TeeAnyVerifier | -| __reentry | uint8 | 201 | 0 | 1 | TeeAnyVerifier | -| __paused | uint8 | 201 | 1 | 1 | TeeAnyVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | TeeAnyVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | TeeAnyVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | TeeAnyVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | TeeAnyVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | TeeAnyVerifier | +| \_initializing | bool | 0 | 1 | 1 | TeeAnyVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | TeeAnyVerifier | +| \_owner | address | 51 | 0 | 20 | TeeAnyVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | TeeAnyVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | TeeAnyVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | TeeAnyVerifier | +| addressManager | address | 151 | 0 | 20 | TeeAnyVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | TeeAnyVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | TeeAnyVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | TeeAnyVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | TeeAnyVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | TeeAnyVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | TeeAnyVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | TeeAnyVerifier | ## ZkAndTeeVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|--------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ZkAndTeeVerifier | -| _initializing | bool | 0 | 1 | 1 | ZkAndTeeVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | ZkAndTeeVerifier | -| _owner | address | 51 | 0 | 20 | ZkAndTeeVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | ZkAndTeeVerifier | -| _pendingOwner | address | 101 | 0 | 20 | ZkAndTeeVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | ZkAndTeeVerifier | -| addressManager | address | 151 | 0 | 20 | ZkAndTeeVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | ZkAndTeeVerifier | -| __reentry | uint8 | 201 | 0 | 1 | ZkAndTeeVerifier | -| __paused | uint8 | 201 | 1 | 1 | ZkAndTeeVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ZkAndTeeVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | ZkAndTeeVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | ZkAndTeeVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | ZkAndTeeVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ---------------- | +| \_initialized | uint8 | 0 | 0 | 1 | ZkAndTeeVerifier | +| \_initializing | bool | 0 | 1 | 1 | ZkAndTeeVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ZkAndTeeVerifier | +| \_owner | address | 51 | 0 | 20 | ZkAndTeeVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ZkAndTeeVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | ZkAndTeeVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ZkAndTeeVerifier | +| addressManager | address | 151 | 0 | 20 | ZkAndTeeVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ZkAndTeeVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | ZkAndTeeVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | ZkAndTeeVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ZkAndTeeVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ZkAndTeeVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ZkAndTeeVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | ZkAndTeeVerifier | ## ZkAnyVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|--------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ZkAnyVerifier | -| _initializing | bool | 0 | 1 | 1 | ZkAnyVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | ZkAnyVerifier | -| _owner | address | 51 | 0 | 20 | ZkAnyVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | ZkAnyVerifier | -| _pendingOwner | address | 101 | 0 | 20 | ZkAnyVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | ZkAnyVerifier | -| addressManager | address | 151 | 0 | 20 | ZkAnyVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | ZkAnyVerifier | -| __reentry | uint8 | 201 | 0 | 1 | ZkAnyVerifier | -| __paused | uint8 | 201 | 1 | 1 | ZkAnyVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ZkAnyVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | ZkAnyVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | ZkAnyVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | ZkAnyVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | ZkAnyVerifier | +| \_initializing | bool | 0 | 1 | 1 | ZkAnyVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ZkAnyVerifier | +| \_owner | address | 51 | 0 | 20 | ZkAnyVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ZkAnyVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | ZkAnyVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ZkAnyVerifier | +| addressManager | address | 151 | 0 | 20 | ZkAnyVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ZkAnyVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | ZkAnyVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | ZkAnyVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ZkAnyVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ZkAnyVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ZkAnyVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | ZkAnyVerifier | ## Risc0Verifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | Risc0Verifier | -| _initializing | bool | 0 | 1 | 1 | Risc0Verifier | -| __gap | uint256[50] | 1 | 0 | 1600 | Risc0Verifier | -| _owner | address | 51 | 0 | 20 | Risc0Verifier | -| __gap | uint256[49] | 52 | 0 | 1568 | Risc0Verifier | -| _pendingOwner | address | 101 | 0 | 20 | Risc0Verifier | -| __gap | uint256[49] | 102 | 0 | 1568 | Risc0Verifier | -| addressManager | address | 151 | 0 | 20 | Risc0Verifier | -| __gap | uint256[49] | 152 | 0 | 1568 | Risc0Verifier | -| __reentry | uint8 | 201 | 0 | 1 | Risc0Verifier | -| __paused | uint8 | 201 | 1 | 1 | Risc0Verifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | Risc0Verifier | -| __gap | uint256[49] | 202 | 0 | 1568 | Risc0Verifier | -| isImageTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | Risc0Verifier | -| __gap | uint256[49] | 252 | 0 | 1568 | Risc0Verifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | Risc0Verifier | +| \_initializing | bool | 0 | 1 | 1 | Risc0Verifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | Risc0Verifier | +| \_owner | address | 51 | 0 | 20 | Risc0Verifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | Risc0Verifier | +| \_pendingOwner | address | 101 | 0 | 20 | Risc0Verifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | Risc0Verifier | +| addressManager | address | 151 | 0 | 20 | Risc0Verifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | Risc0Verifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | Risc0Verifier | +| \_\_paused | uint8 | 201 | 1 | 1 | Risc0Verifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | Risc0Verifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | Risc0Verifier | +| isImageTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | Risc0Verifier | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | Risc0Verifier | ## SP1Verifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|--------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | SP1Verifier | -| _initializing | bool | 0 | 1 | 1 | SP1Verifier | -| __gap | uint256[50] | 1 | 0 | 1600 | SP1Verifier | -| _owner | address | 51 | 0 | 20 | SP1Verifier | -| __gap | uint256[49] | 52 | 0 | 1568 | SP1Verifier | -| _pendingOwner | address | 101 | 0 | 20 | SP1Verifier | -| __gap | uint256[49] | 102 | 0 | 1568 | SP1Verifier | -| addressManager | address | 151 | 0 | 20 | SP1Verifier | -| __gap | uint256[49] | 152 | 0 | 1568 | SP1Verifier | -| __reentry | uint8 | 201 | 0 | 1 | SP1Verifier | -| __paused | uint8 | 201 | 1 | 1 | SP1Verifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | SP1Verifier | -| __gap | uint256[49] | 202 | 0 | 1568 | SP1Verifier | -| isProgramTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | SP1Verifier | -| __gap | uint256[49] | 252 | 0 | 1568 | SP1Verifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | ----------- | +| \_initialized | uint8 | 0 | 0 | 1 | SP1Verifier | +| \_initializing | bool | 0 | 1 | 1 | SP1Verifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | SP1Verifier | +| \_owner | address | 51 | 0 | 20 | SP1Verifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | SP1Verifier | +| \_pendingOwner | address | 101 | 0 | 20 | SP1Verifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | SP1Verifier | +| addressManager | address | 151 | 0 | 20 | SP1Verifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | SP1Verifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | SP1Verifier | +| \_\_paused | uint8 | 201 | 1 | 1 | SP1Verifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | SP1Verifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | SP1Verifier | +| isProgramTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | SP1Verifier | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | SP1Verifier | ## SgxVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|-------------------|-------------------------------------------------|------|--------|-------|--------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | SgxVerifier | -| _initializing | bool | 0 | 1 | 1 | SgxVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | SgxVerifier | -| _owner | address | 51 | 0 | 20 | SgxVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | SgxVerifier | -| _pendingOwner | address | 101 | 0 | 20 | SgxVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | SgxVerifier | -| addressManager | address | 151 | 0 | 20 | SgxVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | SgxVerifier | -| __reentry | uint8 | 201 | 0 | 1 | SgxVerifier | -| __paused | uint8 | 201 | 1 | 1 | SgxVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | SgxVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | SgxVerifier | -| nextInstanceId | uint256 | 251 | 0 | 32 | SgxVerifier | -| instances | mapping(uint256 => struct SgxVerifier.Instance) | 252 | 0 | 32 | SgxVerifier | -| addressRegistered | mapping(address => bool) | 253 | 0 | 32 | SgxVerifier | -| __gap | uint256[47] | 254 | 0 | 1504 | SgxVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | ----------- | +| \_initialized | uint8 | 0 | 0 | 1 | SgxVerifier | +| \_initializing | bool | 0 | 1 | 1 | SgxVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | SgxVerifier | +| \_owner | address | 51 | 0 | 20 | SgxVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | SgxVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | SgxVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | SgxVerifier | +| addressManager | address | 151 | 0 | 20 | SgxVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | SgxVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | SgxVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | SgxVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | SgxVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | SgxVerifier | +| nextInstanceId | uint256 | 251 | 0 | 32 | SgxVerifier | +| instances | mapping(uint256 => struct SgxVerifier.Instance) | 252 | 0 | 32 | SgxVerifier | +| addressRegistered | mapping(address => bool) | 253 | 0 | 32 | SgxVerifier | +| \_\_gap | uint256[47] | 254 | 0 | 1504 | SgxVerifier | ## AutomataDcapV3Attestation -| Name | Type | Slot | Offset | Bytes | Contract | -|-------------------------|-------------------------------------------------|------|--------|-------|-----------------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | AutomataDcapV3Attestation | -| _initializing | bool | 0 | 1 | 1 | AutomataDcapV3Attestation | -| __gap | uint256[50] | 1 | 0 | 1600 | AutomataDcapV3Attestation | -| _owner | address | 51 | 0 | 20 | AutomataDcapV3Attestation | -| __gap | uint256[49] | 52 | 0 | 1568 | AutomataDcapV3Attestation | -| _pendingOwner | address | 101 | 0 | 20 | AutomataDcapV3Attestation | -| __gap | uint256[49] | 102 | 0 | 1568 | AutomataDcapV3Attestation | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ----------------------- | ----------------------------------------------- | ---- | ------ | ----- | ------------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | AutomataDcapV3Attestation | +| \_initializing | bool | 0 | 1 | 1 | AutomataDcapV3Attestation | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | AutomataDcapV3Attestation | +| \_owner | address | 51 | 0 | 20 | AutomataDcapV3Attestation | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | AutomataDcapV3Attestation | +| \_pendingOwner | address | 101 | 0 | 20 | AutomataDcapV3Attestation | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | AutomataDcapV3Attestation | | addressManager | address | 151 | 0 | 20 | AutomataDcapV3Attestation | -| __gap | uint256[49] | 152 | 0 | 1568 | AutomataDcapV3Attestation | -| __reentry | uint8 | 201 | 0 | 1 | AutomataDcapV3Attestation | -| __paused | uint8 | 201 | 1 | 1 | AutomataDcapV3Attestation | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | AutomataDcapV3Attestation | -| __gap | uint256[49] | 202 | 0 | 1568 | AutomataDcapV3Attestation | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | AutomataDcapV3Attestation | +| \_\_reentry | uint8 | 201 | 0 | 1 | AutomataDcapV3Attestation | +| \_\_paused | uint8 | 201 | 1 | 1 | AutomataDcapV3Attestation | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | AutomataDcapV3Attestation | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | AutomataDcapV3Attestation | | sigVerifyLib | contract ISigVerifyLib | 251 | 0 | 20 | AutomataDcapV3Attestation | | pemCertLib | contract IPEMCertChainLib | 252 | 0 | 20 | AutomataDcapV3Attestation | | checkLocalEnclaveReport | bool | 252 | 20 | 1 | AutomataDcapV3Attestation | @@ -490,326 +512,345 @@ | serialNumIsRevoked | mapping(uint256 => mapping(bytes => bool)) | 255 | 0 | 32 | AutomataDcapV3Attestation | | tcbInfo | mapping(string => struct TCBInfoStruct.TCBInfo) | 256 | 0 | 32 | AutomataDcapV3Attestation | | qeIdentity | struct EnclaveIdStruct.EnclaveId | 257 | 0 | 128 | AutomataDcapV3Attestation | -| __gap | uint256[39] | 261 | 0 | 1248 | AutomataDcapV3Attestation | +| \_\_gap | uint256[39] | 261 | 0 | 1248 | AutomataDcapV3Attestation | ## TaikoL1 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|------------------------|------|--------|-------|--------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | TaikoL1 | -| _initializing | bool | 0 | 1 | 1 | TaikoL1 | -| __gap | uint256[50] | 1 | 0 | 1600 | TaikoL1 | -| _owner | address | 51 | 0 | 20 | TaikoL1 | -| __gap | uint256[49] | 52 | 0 | 1568 | TaikoL1 | -| _pendingOwner | address | 101 | 0 | 20 | TaikoL1 | -| __gap | uint256[49] | 102 | 0 | 1568 | TaikoL1 | -| addressManager | address | 151 | 0 | 20 | TaikoL1 | -| __gap | uint256[49] | 152 | 0 | 1568 | TaikoL1 | -| __reentry | uint8 | 201 | 0 | 1 | TaikoL1 | -| __paused | uint8 | 201 | 1 | 1 | TaikoL1 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoL1 | -| __gap | uint256[49] | 202 | 0 | 1568 | TaikoL1 | -| state | struct TaikoData.State | 251 | 0 | 1600 | TaikoL1 | -| __gap | uint256[50] | 301 | 0 | 1600 | TaikoL1 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------- | ---- | ------ | ----- | -------- | +| \_initialized | uint8 | 0 | 0 | 1 | TaikoL1 | +| \_initializing | bool | 0 | 1 | 1 | TaikoL1 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | TaikoL1 | +| \_owner | address | 51 | 0 | 20 | TaikoL1 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | TaikoL1 | +| \_pendingOwner | address | 101 | 0 | 20 | TaikoL1 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | TaikoL1 | +| addressManager | address | 151 | 0 | 20 | TaikoL1 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | TaikoL1 | +| \_\_reentry | uint8 | 201 | 0 | 1 | TaikoL1 | +| \_\_paused | uint8 | 201 | 1 | 1 | TaikoL1 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoL1 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | TaikoL1 | +| state | struct TaikoData.State | 251 | 0 | 1600 | TaikoL1 | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | TaikoL1 | ## HeklaTaikoL1 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|------------------------|------|--------|-------|------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | HeklaTaikoL1 | -| _initializing | bool | 0 | 1 | 1 | HeklaTaikoL1 | -| __gap | uint256[50] | 1 | 0 | 1600 | HeklaTaikoL1 | -| _owner | address | 51 | 0 | 20 | HeklaTaikoL1 | -| __gap | uint256[49] | 52 | 0 | 1568 | HeklaTaikoL1 | -| _pendingOwner | address | 101 | 0 | 20 | HeklaTaikoL1 | -| __gap | uint256[49] | 102 | 0 | 1568 | HeklaTaikoL1 | -| addressManager | address | 151 | 0 | 20 | HeklaTaikoL1 | -| __gap | uint256[49] | 152 | 0 | 1568 | HeklaTaikoL1 | -| __reentry | uint8 | 201 | 0 | 1 | HeklaTaikoL1 | -| __paused | uint8 | 201 | 1 | 1 | HeklaTaikoL1 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | HeklaTaikoL1 | -| __gap | uint256[49] | 202 | 0 | 1568 | HeklaTaikoL1 | -| state | struct TaikoData.State | 251 | 0 | 1600 | HeklaTaikoL1 | -| __gap | uint256[50] | 301 | 0 | 1600 | HeklaTaikoL1 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | HeklaTaikoL1 | +| \_initializing | bool | 0 | 1 | 1 | HeklaTaikoL1 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | HeklaTaikoL1 | +| \_owner | address | 51 | 0 | 20 | HeklaTaikoL1 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | HeklaTaikoL1 | +| \_pendingOwner | address | 101 | 0 | 20 | HeklaTaikoL1 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | HeklaTaikoL1 | +| addressManager | address | 151 | 0 | 20 | HeklaTaikoL1 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | HeklaTaikoL1 | +| \_\_reentry | uint8 | 201 | 0 | 1 | HeklaTaikoL1 | +| \_\_paused | uint8 | 201 | 1 | 1 | HeklaTaikoL1 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | HeklaTaikoL1 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | HeklaTaikoL1 | +| state | struct TaikoData.State | 251 | 0 | 1600 | HeklaTaikoL1 | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | HeklaTaikoL1 | ## HeklaTierRouter + | Name | Type | Slot | Offset | Bytes | Contract | -|------|------|------|--------|-------|----------| +| ---- | ---- | ---- | ------ | ----- | -------- | ## MainnetBridge -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------|------|--------|-------|----------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetBridge | -| _initializing | bool | 0 | 1 | 1 | MainnetBridge | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetBridge | -| _owner | address | 51 | 0 | 20 | MainnetBridge | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetBridge | -| _pendingOwner | address | 101 | 0 | 20 | MainnetBridge | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetBridge | -| addressManager | address | 151 | 0 | 20 | MainnetBridge | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetBridge | -| __reentry | uint8 | 201 | 0 | 1 | MainnetBridge | -| __paused | uint8 | 201 | 1 | 1 | MainnetBridge | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetBridge | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetBridge | -| __reserved1 | uint64 | 251 | 0 | 8 | MainnetBridge | -| nextMessageId | uint64 | 251 | 8 | 8 | MainnetBridge | -| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | MainnetBridge | -| __ctx | struct IBridge.Context | 253 | 0 | 64 | MainnetBridge | -| __reserved2 | uint256 | 255 | 0 | 32 | MainnetBridge | -| __reserved3 | uint256 | 256 | 0 | 32 | MainnetBridge | -| __gap | uint256[44] | 257 | 0 | 1408 | MainnetBridge | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetBridge | +| \_initializing | bool | 0 | 1 | 1 | MainnetBridge | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetBridge | +| \_owner | address | 51 | 0 | 20 | MainnetBridge | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetBridge | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetBridge | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetBridge | +| addressManager | address | 151 | 0 | 20 | MainnetBridge | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetBridge | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetBridge | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetBridge | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetBridge | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetBridge | +| \_\_reserved1 | uint64 | 251 | 0 | 8 | MainnetBridge | +| nextMessageId | uint64 | 251 | 8 | 8 | MainnetBridge | +| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | MainnetBridge | +| \_\_ctx | struct IBridge.Context | 253 | 0 | 64 | MainnetBridge | +| \_\_reserved2 | uint256 | 255 | 0 | 32 | MainnetBridge | +| \_\_reserved3 | uint256 | 256 | 0 | 32 | MainnetBridge | +| \_\_gap | uint256[44] | 257 | 0 | 1408 | MainnetBridge | ## MainnetSignalService -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------------|------|--------|-------|------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetSignalService | -| _initializing | bool | 0 | 1 | 1 | MainnetSignalService | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetSignalService | -| _owner | address | 51 | 0 | 20 | MainnetSignalService | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetSignalService | -| _pendingOwner | address | 101 | 0 | 20 | MainnetSignalService | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetSignalService | -| addressManager | address | 151 | 0 | 20 | MainnetSignalService | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetSignalService | -| __reentry | uint8 | 201 | 0 | 1 | MainnetSignalService | -| __paused | uint8 | 201 | 1 | 1 | MainnetSignalService | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSignalService | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetSignalService | -| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | MainnetSignalService | -| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | MainnetSignalService | -| __gap | uint256[48] | 253 | 0 | 1536 | MainnetSignalService | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------------- | ---- | ------ | ----- | -------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetSignalService | +| \_initializing | bool | 0 | 1 | 1 | MainnetSignalService | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetSignalService | +| \_owner | address | 51 | 0 | 20 | MainnetSignalService | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetSignalService | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetSignalService | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetSignalService | +| addressManager | address | 151 | 0 | 20 | MainnetSignalService | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetSignalService | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetSignalService | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetSignalService | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSignalService | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetSignalService | +| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | MainnetSignalService | +| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | MainnetSignalService | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | MainnetSignalService | ## MainnetERC20Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetERC20Vault | -| _initializing | bool | 0 | 1 | 1 | MainnetERC20Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetERC20Vault | -| _owner | address | 51 | 0 | 20 | MainnetERC20Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetERC20Vault | -| _pendingOwner | address | 101 | 0 | 20 | MainnetERC20Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetERC20Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ----------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetERC20Vault | +| \_initializing | bool | 0 | 1 | 1 | MainnetERC20Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetERC20Vault | +| \_owner | address | 51 | 0 | 20 | MainnetERC20Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetERC20Vault | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetERC20Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetERC20Vault | | addressManager | address | 151 | 0 | 20 | MainnetERC20Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetERC20Vault | -| __reentry | uint8 | 201 | 0 | 1 | MainnetERC20Vault | -| __paused | uint8 | 201 | 1 | 1 | MainnetERC20Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC20Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetERC20Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetERC20Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetERC20Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetERC20Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetERC20Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC20Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetERC20Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetERC20Vault | | bridgedToCanonical | mapping(address => struct ERC20Vault.CanonicalERC20) | 301 | 0 | 32 | MainnetERC20Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | MainnetERC20Vault | | btokenDenylist | mapping(address => bool) | 303 | 0 | 32 | MainnetERC20Vault | | lastMigrationStart | mapping(uint256 => mapping(address => uint256)) | 304 | 0 | 32 | MainnetERC20Vault | -| __gap | uint256[46] | 305 | 0 | 1472 | MainnetERC20Vault | +| \_\_gap | uint256[46] | 305 | 0 | 1472 | MainnetERC20Vault | ## MainnetERC1155Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|----------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetERC1155Vault | -| _initializing | bool | 0 | 1 | 1 | MainnetERC1155Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetERC1155Vault | -| _owner | address | 51 | 0 | 20 | MainnetERC1155Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetERC1155Vault | -| _pendingOwner | address | 101 | 0 | 20 | MainnetERC1155Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetERC1155Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetERC1155Vault | +| \_initializing | bool | 0 | 1 | 1 | MainnetERC1155Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetERC1155Vault | +| \_owner | address | 51 | 0 | 20 | MainnetERC1155Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetERC1155Vault | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetERC1155Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetERC1155Vault | | addressManager | address | 151 | 0 | 20 | MainnetERC1155Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetERC1155Vault | -| __reentry | uint8 | 201 | 0 | 1 | MainnetERC1155Vault | -| __paused | uint8 | 201 | 1 | 1 | MainnetERC1155Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC1155Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetERC1155Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetERC1155Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetERC1155Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetERC1155Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetERC1155Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC1155Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetERC1155Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetERC1155Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | MainnetERC1155Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | MainnetERC1155Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | MainnetERC1155Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | MainnetERC1155Vault | -| __gap | uint256[50] | 401 | 0 | 1600 | MainnetERC1155Vault | -| __gap | uint256[50] | 451 | 0 | 1600 | MainnetERC1155Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | MainnetERC1155Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | MainnetERC1155Vault | +| \_\_gap | uint256[50] | 401 | 0 | 1600 | MainnetERC1155Vault | +| \_\_gap | uint256[50] | 451 | 0 | 1600 | MainnetERC1155Vault | ## MainnetERC721Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|--------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetERC721Vault | -| _initializing | bool | 0 | 1 | 1 | MainnetERC721Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetERC721Vault | -| _owner | address | 51 | 0 | 20 | MainnetERC721Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetERC721Vault | -| _pendingOwner | address | 101 | 0 | 20 | MainnetERC721Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetERC721Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ------------------ | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetERC721Vault | +| \_initializing | bool | 0 | 1 | 1 | MainnetERC721Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetERC721Vault | +| \_owner | address | 51 | 0 | 20 | MainnetERC721Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetERC721Vault | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetERC721Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetERC721Vault | | addressManager | address | 151 | 0 | 20 | MainnetERC721Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetERC721Vault | -| __reentry | uint8 | 201 | 0 | 1 | MainnetERC721Vault | -| __paused | uint8 | 201 | 1 | 1 | MainnetERC721Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC721Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetERC721Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetERC721Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetERC721Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetERC721Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetERC721Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetERC721Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetERC721Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetERC721Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | MainnetERC721Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | MainnetERC721Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | MainnetERC721Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | MainnetERC721Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | MainnetERC721Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | MainnetERC721Vault | ## MainnetSharedAddressManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|--------------------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetSharedAddressManager | -| _initializing | bool | 0 | 1 | 1 | MainnetSharedAddressManager | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetSharedAddressManager | -| _owner | address | 51 | 0 | 20 | MainnetSharedAddressManager | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetSharedAddressManager | -| _pendingOwner | address | 101 | 0 | 20 | MainnetSharedAddressManager | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetSharedAddressManager | -| addressManager | address | 151 | 0 | 20 | MainnetSharedAddressManager | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetSharedAddressManager | -| __reentry | uint8 | 201 | 0 | 1 | MainnetSharedAddressManager | -| __paused | uint8 | 201 | 1 | 1 | MainnetSharedAddressManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSharedAddressManager | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetSharedAddressManager | -| __addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | MainnetSharedAddressManager | -| __gap | uint256[49] | 252 | 0 | 1568 | MainnetSharedAddressManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | --------------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetSharedAddressManager | +| \_initializing | bool | 0 | 1 | 1 | MainnetSharedAddressManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetSharedAddressManager | +| \_owner | address | 51 | 0 | 20 | MainnetSharedAddressManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetSharedAddressManager | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetSharedAddressManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetSharedAddressManager | +| addressManager | address | 151 | 0 | 20 | MainnetSharedAddressManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetSharedAddressManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetSharedAddressManager | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetSharedAddressManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSharedAddressManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetSharedAddressManager | +| \_\_addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | MainnetSharedAddressManager | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | MainnetSharedAddressManager | ## RollupAddressCache + | Name | Type | Slot | Offset | Bytes | Contract | -|------|------|------|--------|-------|----------| +| ---- | ---- | ---- | ------ | ----- | -------- | ## SharedAddressCache + | Name | Type | Slot | Offset | Bytes | Contract | -|------|------|------|--------|-------|----------| +| ---- | ---- | ---- | ------ | ----- | -------- | ## AddressCache + | Name | Type | Slot | Offset | Bytes | Contract | -|------|------|------|--------|-------|----------| +| ---- | ---- | ---- | ------ | ----- | -------- | ## MainnetSgxVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|-------------------|-------------------------------------------------|------|--------|-------|-------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetSgxVerifier | -| _initializing | bool | 0 | 1 | 1 | MainnetSgxVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetSgxVerifier | -| _owner | address | 51 | 0 | 20 | MainnetSgxVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetSgxVerifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetSgxVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetSgxVerifier | -| addressManager | address | 151 | 0 | 20 | MainnetSgxVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetSgxVerifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetSgxVerifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetSgxVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSgxVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetSgxVerifier | -| nextInstanceId | uint256 | 251 | 0 | 32 | MainnetSgxVerifier | -| instances | mapping(uint256 => struct SgxVerifier.Instance) | 252 | 0 | 32 | MainnetSgxVerifier | -| addressRegistered | mapping(address => bool) | 253 | 0 | 32 | MainnetSgxVerifier | -| __gap | uint256[47] | 254 | 0 | 1504 | MainnetSgxVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | ------------------ | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetSgxVerifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetSgxVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetSgxVerifier | +| \_owner | address | 51 | 0 | 20 | MainnetSgxVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetSgxVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetSgxVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetSgxVerifier | +| addressManager | address | 151 | 0 | 20 | MainnetSgxVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetSgxVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetSgxVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetSgxVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSgxVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetSgxVerifier | +| nextInstanceId | uint256 | 251 | 0 | 32 | MainnetSgxVerifier | +| instances | mapping(uint256 => struct SgxVerifier.Instance) | 252 | 0 | 32 | MainnetSgxVerifier | +| addressRegistered | mapping(address => bool) | 253 | 0 | 32 | MainnetSgxVerifier | +| \_\_gap | uint256[47] | 254 | 0 | 1504 | MainnetSgxVerifier | ## MainnetSP1Verifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|-------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetSP1Verifier | -| _initializing | bool | 0 | 1 | 1 | MainnetSP1Verifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetSP1Verifier | -| _owner | address | 51 | 0 | 20 | MainnetSP1Verifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetSP1Verifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetSP1Verifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetSP1Verifier | -| addressManager | address | 151 | 0 | 20 | MainnetSP1Verifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetSP1Verifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetSP1Verifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetSP1Verifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSP1Verifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetSP1Verifier | -| isProgramTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | MainnetSP1Verifier | -| __gap | uint256[49] | 252 | 0 | 1568 | MainnetSP1Verifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | ------------------ | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetSP1Verifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetSP1Verifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetSP1Verifier | +| \_owner | address | 51 | 0 | 20 | MainnetSP1Verifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetSP1Verifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetSP1Verifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetSP1Verifier | +| addressManager | address | 151 | 0 | 20 | MainnetSP1Verifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetSP1Verifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetSP1Verifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetSP1Verifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetSP1Verifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetSP1Verifier | +| isProgramTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | MainnetSP1Verifier | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | MainnetSP1Verifier | ## MainnetZkAnyVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|-----------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetZkAnyVerifier | -| _initializing | bool | 0 | 1 | 1 | MainnetZkAnyVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetZkAnyVerifier | -| _owner | address | 51 | 0 | 20 | MainnetZkAnyVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetZkAnyVerifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetZkAnyVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetZkAnyVerifier | -| addressManager | address | 151 | 0 | 20 | MainnetZkAnyVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetZkAnyVerifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetZkAnyVerifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetZkAnyVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetZkAnyVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetZkAnyVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetZkAnyVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | MainnetZkAnyVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | -------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetZkAnyVerifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetZkAnyVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetZkAnyVerifier | +| \_owner | address | 51 | 0 | 20 | MainnetZkAnyVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetZkAnyVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetZkAnyVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetZkAnyVerifier | +| addressManager | address | 151 | 0 | 20 | MainnetZkAnyVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetZkAnyVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetZkAnyVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetZkAnyVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetZkAnyVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetZkAnyVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetZkAnyVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | MainnetZkAnyVerifier | ## MainnetRisc0Verifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|-----------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetRisc0Verifier | -| _initializing | bool | 0 | 1 | 1 | MainnetRisc0Verifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetRisc0Verifier | -| _owner | address | 51 | 0 | 20 | MainnetRisc0Verifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetRisc0Verifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetRisc0Verifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetRisc0Verifier | -| addressManager | address | 151 | 0 | 20 | MainnetRisc0Verifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetRisc0Verifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetRisc0Verifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetRisc0Verifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetRisc0Verifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetRisc0Verifier | -| isImageTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | MainnetRisc0Verifier | -| __gap | uint256[49] | 252 | 0 | 1568 | MainnetRisc0Verifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | -------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetRisc0Verifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetRisc0Verifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetRisc0Verifier | +| \_owner | address | 51 | 0 | 20 | MainnetRisc0Verifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetRisc0Verifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetRisc0Verifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetRisc0Verifier | +| addressManager | address | 151 | 0 | 20 | MainnetRisc0Verifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetRisc0Verifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetRisc0Verifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetRisc0Verifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetRisc0Verifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetRisc0Verifier | +| isImageTrusted | mapping(bytes32 => bool) | 251 | 0 | 32 | MainnetRisc0Verifier | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | MainnetRisc0Verifier | ## MainnetZkAndTeeVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|-----------------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetZkAndTeeVerifier | -| _initializing | bool | 0 | 1 | 1 | MainnetZkAndTeeVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetZkAndTeeVerifier | -| _owner | address | 51 | 0 | 20 | MainnetZkAndTeeVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetZkAndTeeVerifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetZkAndTeeVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetZkAndTeeVerifier | -| addressManager | address | 151 | 0 | 20 | MainnetZkAndTeeVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetZkAndTeeVerifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetZkAndTeeVerifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetZkAndTeeVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetZkAndTeeVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetZkAndTeeVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetZkAndTeeVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | MainnetZkAndTeeVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ----------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetZkAndTeeVerifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetZkAndTeeVerifier | +| \_owner | address | 51 | 0 | 20 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetZkAndTeeVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetZkAndTeeVerifier | +| addressManager | address | 151 | 0 | 20 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetZkAndTeeVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetZkAndTeeVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetZkAndTeeVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetZkAndTeeVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | MainnetZkAndTeeVerifier | ## MainnetTeeAnyVerifier -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|-------------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetTeeAnyVerifier | -| _initializing | bool | 0 | 1 | 1 | MainnetTeeAnyVerifier | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetTeeAnyVerifier | -| _owner | address | 51 | 0 | 20 | MainnetTeeAnyVerifier | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetTeeAnyVerifier | -| _pendingOwner | address | 101 | 0 | 20 | MainnetTeeAnyVerifier | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetTeeAnyVerifier | -| addressManager | address | 151 | 0 | 20 | MainnetTeeAnyVerifier | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetTeeAnyVerifier | -| __reentry | uint8 | 201 | 0 | 1 | MainnetTeeAnyVerifier | -| __paused | uint8 | 201 | 1 | 1 | MainnetTeeAnyVerifier | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTeeAnyVerifier | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetTeeAnyVerifier | -| __gap | uint256[50] | 251 | 0 | 1600 | MainnetTeeAnyVerifier | -| __gap | uint256[50] | 301 | 0 | 1600 | MainnetTeeAnyVerifier | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | --------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetTeeAnyVerifier | +| \_initializing | bool | 0 | 1 | 1 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetTeeAnyVerifier | +| \_owner | address | 51 | 0 | 20 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetTeeAnyVerifier | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetTeeAnyVerifier | +| addressManager | address | 151 | 0 | 20 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetTeeAnyVerifier | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetTeeAnyVerifier | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetTeeAnyVerifier | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | MainnetTeeAnyVerifier | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | MainnetTeeAnyVerifier | ## MainnetGuardianProver -| Name | Type | Slot | Offset | Bytes | Contract | -|-------------------------|-------------------------------------------------|------|--------|-------|---------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetGuardianProver | -| _initializing | bool | 0 | 1 | 1 | MainnetGuardianProver | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetGuardianProver | -| _owner | address | 51 | 0 | 20 | MainnetGuardianProver | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetGuardianProver | -| _pendingOwner | address | 101 | 0 | 20 | MainnetGuardianProver | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetGuardianProver | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ----------------------- | ----------------------------------------------- | ---- | ------ | ----- | --------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetGuardianProver | +| \_initializing | bool | 0 | 1 | 1 | MainnetGuardianProver | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetGuardianProver | +| \_owner | address | 51 | 0 | 20 | MainnetGuardianProver | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetGuardianProver | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetGuardianProver | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetGuardianProver | | addressManager | address | 151 | 0 | 20 | MainnetGuardianProver | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetGuardianProver | -| __reentry | uint8 | 201 | 0 | 1 | MainnetGuardianProver | -| __paused | uint8 | 201 | 1 | 1 | MainnetGuardianProver | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetGuardianProver | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetGuardianProver | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetGuardianProver | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetGuardianProver | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetGuardianProver | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetGuardianProver | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetGuardianProver | | guardianIds | mapping(address => uint256) | 251 | 0 | 32 | MainnetGuardianProver | | approvals | mapping(uint256 => mapping(bytes32 => uint256)) | 252 | 0 | 32 | MainnetGuardianProver | | guardians | address[] | 253 | 0 | 32 | MainnetGuardianProver | @@ -817,128 +858,135 @@ | minGuardians | uint32 | 254 | 4 | 4 | MainnetGuardianProver | | provingAutoPauseEnabled | bool | 254 | 8 | 1 | MainnetGuardianProver | | latestProofHash | mapping(uint256 => mapping(uint256 => bytes32)) | 255 | 0 | 32 | MainnetGuardianProver | -| __gap | uint256[45] | 256 | 0 | 1440 | MainnetGuardianProver | +| \_\_gap | uint256[45] | 256 | 0 | 1440 | MainnetGuardianProver | ## MainnetTaikoL1 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|------------------------|------|--------|-------|-------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetTaikoL1 | -| _initializing | bool | 0 | 1 | 1 | MainnetTaikoL1 | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetTaikoL1 | -| _owner | address | 51 | 0 | 20 | MainnetTaikoL1 | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetTaikoL1 | -| _pendingOwner | address | 101 | 0 | 20 | MainnetTaikoL1 | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetTaikoL1 | -| addressManager | address | 151 | 0 | 20 | MainnetTaikoL1 | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetTaikoL1 | -| __reentry | uint8 | 201 | 0 | 1 | MainnetTaikoL1 | -| __paused | uint8 | 201 | 1 | 1 | MainnetTaikoL1 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTaikoL1 | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetTaikoL1 | -| state | struct TaikoData.State | 251 | 0 | 1600 | MainnetTaikoL1 | -| __gap | uint256[50] | 301 | 0 | 1600 | MainnetTaikoL1 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetTaikoL1 | +| \_initializing | bool | 0 | 1 | 1 | MainnetTaikoL1 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetTaikoL1 | +| \_owner | address | 51 | 0 | 20 | MainnetTaikoL1 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetTaikoL1 | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetTaikoL1 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetTaikoL1 | +| addressManager | address | 151 | 0 | 20 | MainnetTaikoL1 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetTaikoL1 | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetTaikoL1 | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetTaikoL1 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTaikoL1 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetTaikoL1 | +| state | struct TaikoData.State | 251 | 0 | 1600 | MainnetTaikoL1 | +| \_\_gap | uint256[50] | 301 | 0 | 1600 | MainnetTaikoL1 | ## MainnetRollupAddressManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|---------------------------------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetRollupAddressManager | -| _initializing | bool | 0 | 1 | 1 | MainnetRollupAddressManager | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetRollupAddressManager | -| _owner | address | 51 | 0 | 20 | MainnetRollupAddressManager | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetRollupAddressManager | -| _pendingOwner | address | 101 | 0 | 20 | MainnetRollupAddressManager | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetRollupAddressManager | -| addressManager | address | 151 | 0 | 20 | MainnetRollupAddressManager | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetRollupAddressManager | -| __reentry | uint8 | 201 | 0 | 1 | MainnetRollupAddressManager | -| __paused | uint8 | 201 | 1 | 1 | MainnetRollupAddressManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetRollupAddressManager | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetRollupAddressManager | -| __addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | MainnetRollupAddressManager | -| __gap | uint256[49] | 252 | 0 | 1568 | MainnetRollupAddressManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | --------------------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetRollupAddressManager | +| \_initializing | bool | 0 | 1 | 1 | MainnetRollupAddressManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetRollupAddressManager | +| \_owner | address | 51 | 0 | 20 | MainnetRollupAddressManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetRollupAddressManager | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetRollupAddressManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetRollupAddressManager | +| addressManager | address | 151 | 0 | 20 | MainnetRollupAddressManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetRollupAddressManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetRollupAddressManager | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetRollupAddressManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetRollupAddressManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetRollupAddressManager | +| \_\_addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | MainnetRollupAddressManager | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | MainnetRollupAddressManager | ## MainnetTierRouter + | Name | Type | Slot | Offset | Bytes | Contract | -|------|------|------|--------|-------|----------| +| ---- | ---- | ---- | ------ | ----- | -------- | ## MainnetProverSet -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|-----------------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetProverSet | -| _initializing | bool | 0 | 1 | 1 | MainnetProverSet | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetProverSet | -| _owner | address | 51 | 0 | 20 | MainnetProverSet | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetProverSet | -| _pendingOwner | address | 101 | 0 | 20 | MainnetProverSet | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetProverSet | -| addressManager | address | 151 | 0 | 20 | MainnetProverSet | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetProverSet | -| __reentry | uint8 | 201 | 0 | 1 | MainnetProverSet | -| __paused | uint8 | 201 | 1 | 1 | MainnetProverSet | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetProverSet | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetProverSet | -| isProver | mapping(address => bool) | 251 | 0 | 32 | MainnetProverSet | -| admin | address | 252 | 0 | 20 | MainnetProverSet | -| __gap | uint256[48] | 253 | 0 | 1536 | MainnetProverSet | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | ---------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetProverSet | +| \_initializing | bool | 0 | 1 | 1 | MainnetProverSet | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetProverSet | +| \_owner | address | 51 | 0 | 20 | MainnetProverSet | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetProverSet | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetProverSet | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetProverSet | +| addressManager | address | 151 | 0 | 20 | MainnetProverSet | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetProverSet | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetProverSet | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetProverSet | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetProverSet | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetProverSet | +| isProver | mapping(address => bool) | 251 | 0 | 32 | MainnetProverSet | +| admin | address | 252 | 0 | 20 | MainnetProverSet | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | MainnetProverSet | ## TokenUnlock -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|---------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | TokenUnlock | -| _initializing | bool | 0 | 1 | 1 | TokenUnlock | -| __gap | uint256[50] | 1 | 0 | 1600 | TokenUnlock | -| _owner | address | 51 | 0 | 20 | TokenUnlock | -| __gap | uint256[49] | 52 | 0 | 1568 | TokenUnlock | -| _pendingOwner | address | 101 | 0 | 20 | TokenUnlock | -| __gap | uint256[49] | 102 | 0 | 1568 | TokenUnlock | -| addressManager | address | 151 | 0 | 20 | TokenUnlock | -| __gap | uint256[49] | 152 | 0 | 1568 | TokenUnlock | -| __reentry | uint8 | 201 | 0 | 1 | TokenUnlock | -| __paused | uint8 | 201 | 1 | 1 | TokenUnlock | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | TokenUnlock | -| __gap | uint256[49] | 202 | 0 | 1568 | TokenUnlock | -| amountVested | uint256 | 251 | 0 | 32 | TokenUnlock | -| recipient | address | 252 | 0 | 20 | TokenUnlock | -| tgeTimestamp | uint64 | 252 | 20 | 8 | TokenUnlock | -| isProverSet | mapping(address => bool) | 253 | 0 | 32 | TokenUnlock | -| __gap | uint256[47] | 254 | 0 | 1504 | TokenUnlock | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | ----------- | +| \_initialized | uint8 | 0 | 0 | 1 | TokenUnlock | +| \_initializing | bool | 0 | 1 | 1 | TokenUnlock | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | TokenUnlock | +| \_owner | address | 51 | 0 | 20 | TokenUnlock | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | TokenUnlock | +| \_pendingOwner | address | 101 | 0 | 20 | TokenUnlock | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | TokenUnlock | +| addressManager | address | 151 | 0 | 20 | TokenUnlock | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | TokenUnlock | +| \_\_reentry | uint8 | 201 | 0 | 1 | TokenUnlock | +| \_\_paused | uint8 | 201 | 1 | 1 | TokenUnlock | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | TokenUnlock | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | TokenUnlock | +| amountVested | uint256 | 251 | 0 | 32 | TokenUnlock | +| recipient | address | 252 | 0 | 20 | TokenUnlock | +| tgeTimestamp | uint64 | 252 | 20 | 8 | TokenUnlock | +| isProverSet | mapping(address => bool) | 253 | 0 | 32 | TokenUnlock | +| \_\_gap | uint256[47] | 254 | 0 | 1504 | TokenUnlock | ## ProverSet -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|--------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ProverSet | -| _initializing | bool | 0 | 1 | 1 | ProverSet | -| __gap | uint256[50] | 1 | 0 | 1600 | ProverSet | -| _owner | address | 51 | 0 | 20 | ProverSet | -| __gap | uint256[49] | 52 | 0 | 1568 | ProverSet | -| _pendingOwner | address | 101 | 0 | 20 | ProverSet | -| __gap | uint256[49] | 102 | 0 | 1568 | ProverSet | -| addressManager | address | 151 | 0 | 20 | ProverSet | -| __gap | uint256[49] | 152 | 0 | 1568 | ProverSet | -| __reentry | uint8 | 201 | 0 | 1 | ProverSet | -| __paused | uint8 | 201 | 1 | 1 | ProverSet | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ProverSet | -| __gap | uint256[49] | 202 | 0 | 1568 | ProverSet | -| isProver | mapping(address => bool) | 251 | 0 | 32 | ProverSet | -| admin | address | 252 | 0 | 20 | ProverSet | -| __gap | uint256[48] | 253 | 0 | 1536 | ProverSet | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------ | ---- | ------ | ----- | --------- | +| \_initialized | uint8 | 0 | 0 | 1 | ProverSet | +| \_initializing | bool | 0 | 1 | 1 | ProverSet | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ProverSet | +| \_owner | address | 51 | 0 | 20 | ProverSet | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ProverSet | +| \_pendingOwner | address | 101 | 0 | 20 | ProverSet | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ProverSet | +| addressManager | address | 151 | 0 | 20 | ProverSet | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ProverSet | +| \_\_reentry | uint8 | 201 | 0 | 1 | ProverSet | +| \_\_paused | uint8 | 201 | 1 | 1 | ProverSet | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ProverSet | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ProverSet | +| isProver | mapping(address => bool) | 251 | 0 | 32 | ProverSet | +| admin | address | 252 | 0 | 20 | ProverSet | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | ProverSet | ## GuardianProver -| Name | Type | Slot | Offset | Bytes | Contract | -|-------------------------|-------------------------------------------------|------|--------|-------|------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | GuardianProver | -| _initializing | bool | 0 | 1 | 1 | GuardianProver | -| __gap | uint256[50] | 1 | 0 | 1600 | GuardianProver | -| _owner | address | 51 | 0 | 20 | GuardianProver | -| __gap | uint256[49] | 52 | 0 | 1568 | GuardianProver | -| _pendingOwner | address | 101 | 0 | 20 | GuardianProver | -| __gap | uint256[49] | 102 | 0 | 1568 | GuardianProver | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ----------------------- | ----------------------------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | GuardianProver | +| \_initializing | bool | 0 | 1 | 1 | GuardianProver | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | GuardianProver | +| \_owner | address | 51 | 0 | 20 | GuardianProver | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | GuardianProver | +| \_pendingOwner | address | 101 | 0 | 20 | GuardianProver | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | GuardianProver | | addressManager | address | 151 | 0 | 20 | GuardianProver | -| __gap | uint256[49] | 152 | 0 | 1568 | GuardianProver | -| __reentry | uint8 | 201 | 0 | 1 | GuardianProver | -| __paused | uint8 | 201 | 1 | 1 | GuardianProver | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | GuardianProver | -| __gap | uint256[49] | 202 | 0 | 1568 | GuardianProver | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | GuardianProver | +| \_\_reentry | uint8 | 201 | 0 | 1 | GuardianProver | +| \_\_paused | uint8 | 201 | 1 | 1 | GuardianProver | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | GuardianProver | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | GuardianProver | | guardianIds | mapping(address => uint256) | 251 | 0 | 32 | GuardianProver | | approvals | mapping(uint256 => mapping(bytes32 => uint256)) | 252 | 0 | 32 | GuardianProver | | guardians | address[] | 253 | 0 | 32 | GuardianProver | @@ -946,5 +994,4 @@ | minGuardians | uint32 | 254 | 4 | 4 | GuardianProver | | provingAutoPauseEnabled | bool | 254 | 8 | 1 | GuardianProver | | latestProofHash | mapping(uint256 => mapping(uint256 => bytes32)) | 255 | 0 | 32 | GuardianProver | -| __gap | uint256[45] | 256 | 0 | 1440 | GuardianProver | - +| \_\_gap | uint256[45] | 256 | 0 | 1440 | GuardianProver | diff --git a/packages/protocol/contract_layout_layer2.md b/packages/protocol/contract_layout_layer2.md index e0f97f06590..eccd1486b86 100644 --- a/packages/protocol/contract_layout_layer2.md +++ b/packages/protocol/contract_layout_layer2.md @@ -1,431 +1,448 @@ ## ERC1155Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC1155Vault | -| _initializing | bool | 0 | 1 | 1 | ERC1155Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC1155Vault | -| _owner | address | 51 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC1155Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC1155Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | ERC1155Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC1155Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC1155Vault | +| \_owner | address | 51 | 0 | 20 | ERC1155Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC1155Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC1155Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC1155Vault | | addressManager | address | 151 | 0 | 20 | ERC1155Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC1155Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC1155Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC1155Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC1155Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC1155Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC1155Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC1155Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC1155Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC1155Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC1155Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC1155Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | ERC1155Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC1155Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | ERC1155Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | ERC1155Vault | -| __gap | uint256[50] | 401 | 0 | 1600 | ERC1155Vault | -| __gap | uint256[50] | 451 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | ERC1155Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[50] | 401 | 0 | 1600 | ERC1155Vault | +| \_\_gap | uint256[50] | 451 | 0 | 1600 | ERC1155Vault | ## ERC20Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|-------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC20Vault | -| _initializing | bool | 0 | 1 | 1 | ERC20Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC20Vault | -| _owner | address | 51 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC20Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC20Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ---------- | +| \_initialized | uint8 | 0 | 0 | 1 | ERC20Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC20Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC20Vault | +| \_owner | address | 51 | 0 | 20 | ERC20Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC20Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC20Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC20Vault | | addressManager | address | 151 | 0 | 20 | ERC20Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC20Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC20Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC20Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC20Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC20Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC20Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC20Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC20Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC20Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC20Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC20Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC20Vault | | bridgedToCanonical | mapping(address => struct ERC20Vault.CanonicalERC20) | 301 | 0 | 32 | ERC20Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC20Vault | | btokenDenylist | mapping(address => bool) | 303 | 0 | 32 | ERC20Vault | | lastMigrationStart | mapping(uint256 => mapping(address => uint256)) | 304 | 0 | 32 | ERC20Vault | -| __gap | uint256[46] | 305 | 0 | 1472 | ERC20Vault | +| \_\_gap | uint256[46] | 305 | 0 | 1472 | ERC20Vault | ## ERC721Vault -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|------------------------------------------------------|------|--------|-------|---------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | ERC721Vault | -| _initializing | bool | 0 | 1 | 1 | ERC721Vault | -| __gap | uint256[50] | 1 | 0 | 1600 | ERC721Vault | -| _owner | address | 51 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 52 | 0 | 1568 | ERC721Vault | -| _pendingOwner | address | 101 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 102 | 0 | 1568 | ERC721Vault | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ---------------------------------------------------- | ---- | ------ | ----- | ----------- | +| \_initialized | uint8 | 0 | 0 | 1 | ERC721Vault | +| \_initializing | bool | 0 | 1 | 1 | ERC721Vault | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | ERC721Vault | +| \_owner | address | 51 | 0 | 20 | ERC721Vault | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | ERC721Vault | +| \_pendingOwner | address | 101 | 0 | 20 | ERC721Vault | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | ERC721Vault | | addressManager | address | 151 | 0 | 20 | ERC721Vault | -| __gap | uint256[49] | 152 | 0 | 1568 | ERC721Vault | -| __reentry | uint8 | 201 | 0 | 1 | ERC721Vault | -| __paused | uint8 | 201 | 1 | 1 | ERC721Vault | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC721Vault | -| __gap | uint256[49] | 202 | 0 | 1568 | ERC721Vault | -| __gap | uint256[50] | 251 | 0 | 1600 | ERC721Vault | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | ERC721Vault | +| \_\_reentry | uint8 | 201 | 0 | 1 | ERC721Vault | +| \_\_paused | uint8 | 201 | 1 | 1 | ERC721Vault | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | ERC721Vault | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | ERC721Vault | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | ERC721Vault | | bridgedToCanonical | mapping(address => struct BaseNFTVault.CanonicalNFT) | 301 | 0 | 32 | ERC721Vault | | canonicalToBridged | mapping(uint256 => mapping(address => address)) | 302 | 0 | 32 | ERC721Vault | -| __gap | uint256[48] | 303 | 0 | 1536 | ERC721Vault | -| __gap | uint256[50] | 351 | 0 | 1600 | ERC721Vault | +| \_\_gap | uint256[48] | 303 | 0 | 1536 | ERC721Vault | +| \_\_gap | uint256[50] | 351 | 0 | 1600 | ERC721Vault | ## BridgedERC20 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC20 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC20 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20 | -| _owner | address | 51 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20 | -| addressManager | address | 151 | 0 | 20 | BridgedERC20 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC20 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC20 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20 | -| _balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20 | -| _allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20 | -| _totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20 | -| _name | string | 254 | 0 | 32 | BridgedERC20 | -| _symbol | string | 255 | 0 | 32 | BridgedERC20 | -| __gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20 | -| srcToken | address | 301 | 0 | 20 | BridgedERC20 | -| __srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20 | -| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20 | -| migratingAddress | address | 303 | 0 | 20 | BridgedERC20 | -| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC20 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC20 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20 | +| \_owner | address | 51 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20 | +| addressManager | address | 151 | 0 | 20 | BridgedERC20 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC20 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC20 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20 | +| \_balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20 | +| \_allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20 | +| \_totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20 | +| \_name | string | 254 | 0 | 32 | BridgedERC20 | +| \_symbol | string | 255 | 0 | 32 | BridgedERC20 | +| \_\_gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20 | +| srcToken | address | 301 | 0 | 20 | BridgedERC20 | +| \_\_srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20 | +| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20 | +| migratingAddress | address | 303 | 0 | 20 | BridgedERC20 | +| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20 | ## BridgedERC20V2 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------------------------------------|------|--------|-------|---------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC20V2 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC20V2 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20V2 | -| _owner | address | 51 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20V2 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20V2 | -| addressManager | address | 151 | 0 | 20 | BridgedERC20V2 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20V2 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC20V2 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC20V2 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20V2 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20V2 | -| _balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20V2 | -| _allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20V2 | -| _totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20V2 | -| _name | string | 254 | 0 | 32 | BridgedERC20V2 | -| _symbol | string | 255 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20V2 | -| srcToken | address | 301 | 0 | 20 | BridgedERC20V2 | -| __srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20V2 | -| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20V2 | -| migratingAddress | address | 303 | 0 | 20 | BridgedERC20V2 | -| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20V2 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20V2 | -| _hashedName | bytes32 | 351 | 0 | 32 | BridgedERC20V2 | -| _hashedVersion | bytes32 | 352 | 0 | 32 | BridgedERC20V2 | -| _name | string | 353 | 0 | 32 | BridgedERC20V2 | -| _version | string | 354 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[48] | 355 | 0 | 1536 | BridgedERC20V2 | -| _nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedERC20V2 | -| __gap | uint256[49] | 404 | 0 | 1568 | BridgedERC20V2 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ------------------------------------------------------ | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC20V2 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC20V2 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC20V2 | +| \_owner | address | 51 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC20V2 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC20V2 | +| addressManager | address | 151 | 0 | 20 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC20V2 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC20V2 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC20V2 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC20V2 | +| \_balances | mapping(address => uint256) | 251 | 0 | 32 | BridgedERC20V2 | +| \_allowances | mapping(address => mapping(address => uint256)) | 252 | 0 | 32 | BridgedERC20V2 | +| \_totalSupply | uint256 | 253 | 0 | 32 | BridgedERC20V2 | +| \_name | string | 254 | 0 | 32 | BridgedERC20V2 | +| \_symbol | string | 255 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[45] | 256 | 0 | 1440 | BridgedERC20V2 | +| srcToken | address | 301 | 0 | 20 | BridgedERC20V2 | +| \_\_srcDecimals | uint8 | 301 | 20 | 1 | BridgedERC20V2 | +| srcChainId | uint256 | 302 | 0 | 32 | BridgedERC20V2 | +| migratingAddress | address | 303 | 0 | 20 | BridgedERC20V2 | +| migratingInbound | bool | 303 | 20 | 1 | BridgedERC20V2 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC20V2 | +| \_hashedName | bytes32 | 351 | 0 | 32 | BridgedERC20V2 | +| \_hashedVersion | bytes32 | 352 | 0 | 32 | BridgedERC20V2 | +| \_name | string | 353 | 0 | 32 | BridgedERC20V2 | +| \_version | string | 354 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[48] | 355 | 0 | 1536 | BridgedERC20V2 | +| \_nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedERC20V2 | +| \_\_gap | uint256[49] | 404 | 0 | 1568 | BridgedERC20V2 | ## BridgedERC721 -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|----------------------------------------------|------|--------|-------|-------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC721 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC721 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC721 | -| _owner | address | 51 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC721 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC721 | -| addressManager | address | 151 | 0 | 20 | BridgedERC721 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC721 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC721 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC721 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC721 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC721 | -| __gap | uint256[50] | 251 | 0 | 1600 | BridgedERC721 | -| _name | string | 301 | 0 | 32 | BridgedERC721 | -| _symbol | string | 302 | 0 | 32 | BridgedERC721 | -| _owners | mapping(uint256 => address) | 303 | 0 | 32 | BridgedERC721 | -| _balances | mapping(address => uint256) | 304 | 0 | 32 | BridgedERC721 | -| _tokenApprovals | mapping(uint256 => address) | 305 | 0 | 32 | BridgedERC721 | -| _operatorApprovals | mapping(address => mapping(address => bool)) | 306 | 0 | 32 | BridgedERC721 | -| __gap | uint256[44] | 307 | 0 | 1408 | BridgedERC721 | -| srcToken | address | 351 | 0 | 20 | BridgedERC721 | -| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC721 | -| __gap | uint256[48] | 353 | 0 | 1536 | BridgedERC721 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------- | -------------------------------------------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC721 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC721 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC721 | +| \_owner | address | 51 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC721 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC721 | +| addressManager | address | 151 | 0 | 20 | BridgedERC721 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC721 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC721 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC721 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC721 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC721 | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | BridgedERC721 | +| \_name | string | 301 | 0 | 32 | BridgedERC721 | +| \_symbol | string | 302 | 0 | 32 | BridgedERC721 | +| \_owners | mapping(uint256 => address) | 303 | 0 | 32 | BridgedERC721 | +| \_balances | mapping(address => uint256) | 304 | 0 | 32 | BridgedERC721 | +| \_tokenApprovals | mapping(uint256 => address) | 305 | 0 | 32 | BridgedERC721 | +| \_operatorApprovals | mapping(address => mapping(address => bool)) | 306 | 0 | 32 | BridgedERC721 | +| \_\_gap | uint256[44] | 307 | 0 | 1408 | BridgedERC721 | +| srcToken | address | 351 | 0 | 20 | BridgedERC721 | +| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC721 | +| \_\_gap | uint256[48] | 353 | 0 | 1536 | BridgedERC721 | ## BridgedERC1155 -| Name | Type | Slot | Offset | Bytes | Contract | -|--------------------|-------------------------------------------------|------|--------|-------|---------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedERC1155 | -| _initializing | bool | 0 | 1 | 1 | BridgedERC1155 | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedERC1155 | -| _owner | address | 51 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedERC1155 | -| _pendingOwner | address | 101 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedERC1155 | -| addressManager | address | 151 | 0 | 20 | BridgedERC1155 | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedERC1155 | -| __reentry | uint8 | 201 | 0 | 1 | BridgedERC1155 | -| __paused | uint8 | 201 | 1 | 1 | BridgedERC1155 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC1155 | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedERC1155 | -| __gap | uint256[50] | 251 | 0 | 1600 | BridgedERC1155 | -| _balances | mapping(uint256 => mapping(address => uint256)) | 301 | 0 | 32 | BridgedERC1155 | -| _operatorApprovals | mapping(address => mapping(address => bool)) | 302 | 0 | 32 | BridgedERC1155 | -| _uri | string | 303 | 0 | 32 | BridgedERC1155 | -| __gap | uint256[47] | 304 | 0 | 1504 | BridgedERC1155 | -| srcToken | address | 351 | 0 | 20 | BridgedERC1155 | -| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC1155 | -| symbol | string | 353 | 0 | 32 | BridgedERC1155 | -| name | string | 354 | 0 | 32 | BridgedERC1155 | -| __gap | uint256[46] | 355 | 0 | 1472 | BridgedERC1155 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------- | ----------------------------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedERC1155 | +| \_initializing | bool | 0 | 1 | 1 | BridgedERC1155 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedERC1155 | +| \_owner | address | 51 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedERC1155 | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedERC1155 | +| addressManager | address | 151 | 0 | 20 | BridgedERC1155 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedERC1155 | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedERC1155 | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedERC1155 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedERC1155 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedERC1155 | +| \_\_gap | uint256[50] | 251 | 0 | 1600 | BridgedERC1155 | +| \_balances | mapping(uint256 => mapping(address => uint256)) | 301 | 0 | 32 | BridgedERC1155 | +| \_operatorApprovals | mapping(address => mapping(address => bool)) | 302 | 0 | 32 | BridgedERC1155 | +| \_uri | string | 303 | 0 | 32 | BridgedERC1155 | +| \_\_gap | uint256[47] | 304 | 0 | 1504 | BridgedERC1155 | +| srcToken | address | 351 | 0 | 20 | BridgedERC1155 | +| srcChainId | uint256 | 352 | 0 | 32 | BridgedERC1155 | +| symbol | string | 353 | 0 | 32 | BridgedERC1155 | +| name | string | 354 | 0 | 32 | BridgedERC1155 | +| \_\_gap | uint256[46] | 355 | 0 | 1472 | BridgedERC1155 | ## Bridge -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------|------|--------|-------|-------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | Bridge | -| _initializing | bool | 0 | 1 | 1 | Bridge | -| __gap | uint256[50] | 1 | 0 | 1600 | Bridge | -| _owner | address | 51 | 0 | 20 | Bridge | -| __gap | uint256[49] | 52 | 0 | 1568 | Bridge | -| _pendingOwner | address | 101 | 0 | 20 | Bridge | -| __gap | uint256[49] | 102 | 0 | 1568 | Bridge | -| addressManager | address | 151 | 0 | 20 | Bridge | -| __gap | uint256[49] | 152 | 0 | 1568 | Bridge | -| __reentry | uint8 | 201 | 0 | 1 | Bridge | -| __paused | uint8 | 201 | 1 | 1 | Bridge | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | Bridge | -| __gap | uint256[49] | 202 | 0 | 1568 | Bridge | -| __reserved1 | uint64 | 251 | 0 | 8 | Bridge | -| nextMessageId | uint64 | 251 | 8 | 8 | Bridge | -| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | Bridge | -| __ctx | struct IBridge.Context | 253 | 0 | 64 | Bridge | -| __reserved2 | uint256 | 255 | 0 | 32 | Bridge | -| __reserved3 | uint256 | 256 | 0 | 32 | Bridge | -| __gap | uint256[44] | 257 | 0 | 1408 | Bridge | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------- | ---- | ------ | ----- | -------- | +| \_initialized | uint8 | 0 | 0 | 1 | Bridge | +| \_initializing | bool | 0 | 1 | 1 | Bridge | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | Bridge | +| \_owner | address | 51 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | Bridge | +| \_pendingOwner | address | 101 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | Bridge | +| addressManager | address | 151 | 0 | 20 | Bridge | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | Bridge | +| \_\_reentry | uint8 | 201 | 0 | 1 | Bridge | +| \_\_paused | uint8 | 201 | 1 | 1 | Bridge | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | Bridge | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | Bridge | +| \_\_reserved1 | uint64 | 251 | 0 | 8 | Bridge | +| nextMessageId | uint64 | 251 | 8 | 8 | Bridge | +| messageStatus | mapping(bytes32 => enum IBridge.Status) | 252 | 0 | 32 | Bridge | +| \_\_ctx | struct IBridge.Context | 253 | 0 | 64 | Bridge | +| \_\_reserved2 | uint256 | 255 | 0 | 32 | Bridge | +| \_\_reserved3 | uint256 | 256 | 0 | 32 | Bridge | +| \_\_gap | uint256[44] | 257 | 0 | 1408 | Bridge | ## QuotaManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------------|------|--------|-------|-------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | QuotaManager | -| _initializing | bool | 0 | 1 | 1 | QuotaManager | -| __gap | uint256[50] | 1 | 0 | 1600 | QuotaManager | -| _owner | address | 51 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 52 | 0 | 1568 | QuotaManager | -| _pendingOwner | address | 101 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 102 | 0 | 1568 | QuotaManager | -| addressManager | address | 151 | 0 | 20 | QuotaManager | -| __gap | uint256[49] | 152 | 0 | 1568 | QuotaManager | -| __reentry | uint8 | 201 | 0 | 1 | QuotaManager | -| __paused | uint8 | 201 | 1 | 1 | QuotaManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | QuotaManager | -| __gap | uint256[49] | 202 | 0 | 1568 | QuotaManager | -| tokenQuota | mapping(address => struct QuotaManager.Quota) | 251 | 0 | 32 | QuotaManager | -| quotaPeriod | uint24 | 252 | 0 | 3 | QuotaManager | -| __gap | uint256[48] | 253 | 0 | 1536 | QuotaManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | QuotaManager | +| \_initializing | bool | 0 | 1 | 1 | QuotaManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | QuotaManager | +| \_owner | address | 51 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | QuotaManager | +| \_pendingOwner | address | 101 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | QuotaManager | +| addressManager | address | 151 | 0 | 20 | QuotaManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | QuotaManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | QuotaManager | +| \_\_paused | uint8 | 201 | 1 | 1 | QuotaManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | QuotaManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | QuotaManager | +| tokenQuota | mapping(address => struct QuotaManager.Quota) | 251 | 0 | 32 | QuotaManager | +| quotaPeriod | uint24 | 252 | 0 | 3 | QuotaManager | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | QuotaManager | ## AddressManager -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------------------------------------------|------|--------|-------|-----------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | AddressManager | -| _initializing | bool | 0 | 1 | 1 | AddressManager | -| __gap | uint256[50] | 1 | 0 | 1600 | AddressManager | -| _owner | address | 51 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 52 | 0 | 1568 | AddressManager | -| _pendingOwner | address | 101 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 102 | 0 | 1568 | AddressManager | -| addressManager | address | 151 | 0 | 20 | AddressManager | -| __gap | uint256[49] | 152 | 0 | 1568 | AddressManager | -| __reentry | uint8 | 201 | 0 | 1 | AddressManager | -| __paused | uint8 | 201 | 1 | 1 | AddressManager | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | AddressManager | -| __gap | uint256[49] | 202 | 0 | 1568 | AddressManager | -| __addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | AddressManager | -| __gap | uint256[49] | 252 | 0 | 1568 | AddressManager | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------------------------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | AddressManager | +| \_initializing | bool | 0 | 1 | 1 | AddressManager | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | AddressManager | +| \_owner | address | 51 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | AddressManager | +| \_pendingOwner | address | 101 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | AddressManager | +| addressManager | address | 151 | 0 | 20 | AddressManager | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | AddressManager | +| \_\_reentry | uint8 | 201 | 0 | 1 | AddressManager | +| \_\_paused | uint8 | 201 | 1 | 1 | AddressManager | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | AddressManager | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | AddressManager | +| \_\_addresses | mapping(uint256 => mapping(bytes32 => address)) | 251 | 0 | 32 | AddressManager | +| \_\_gap | uint256[49] | 252 | 0 | 1568 | AddressManager | ## AddressResolver -| Name | Type | Slot | Offset | Bytes | Contract | -|----------------|-------------|------|--------|-------|-------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | AddressResolver | -| _initializing | bool | 0 | 1 | 1 | AddressResolver | + +| Name | Type | Slot | Offset | Bytes | Contract | +| -------------- | ----------- | ---- | ------ | ----- | --------------- | +| \_initialized | uint8 | 0 | 0 | 1 | AddressResolver | +| \_initializing | bool | 0 | 1 | 1 | AddressResolver | | addressManager | address | 0 | 2 | 20 | AddressResolver | -| __gap | uint256[49] | 1 | 0 | 1568 | AddressResolver | +| \_\_gap | uint256[49] | 1 | 0 | 1568 | AddressResolver | ## EssentialContract -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|-----------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | EssentialContract | -| _initializing | bool | 0 | 1 | 1 | EssentialContract | -| __gap | uint256[50] | 1 | 0 | 1600 | EssentialContract | -| _owner | address | 51 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 52 | 0 | 1568 | EssentialContract | -| _pendingOwner | address | 101 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 102 | 0 | 1568 | EssentialContract | -| addressManager | address | 151 | 0 | 20 | EssentialContract | -| __gap | uint256[49] | 152 | 0 | 1568 | EssentialContract | -| __reentry | uint8 | 201 | 0 | 1 | EssentialContract | -| __paused | uint8 | 201 | 1 | 1 | EssentialContract | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | EssentialContract | -| __gap | uint256[49] | 202 | 0 | 1568 | EssentialContract | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ----------------- | +| \_initialized | uint8 | 0 | 0 | 1 | EssentialContract | +| \_initializing | bool | 0 | 1 | 1 | EssentialContract | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | EssentialContract | +| \_owner | address | 51 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | EssentialContract | +| \_pendingOwner | address | 101 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | EssentialContract | +| addressManager | address | 151 | 0 | 20 | EssentialContract | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | EssentialContract | +| \_\_reentry | uint8 | 201 | 0 | 1 | EssentialContract | +| \_\_paused | uint8 | 201 | 1 | 1 | EssentialContract | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | EssentialContract | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | EssentialContract | ## SignalService -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------------------------|------|--------|-------|---------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | SignalService | -| _initializing | bool | 0 | 1 | 1 | SignalService | -| __gap | uint256[50] | 1 | 0 | 1600 | SignalService | -| _owner | address | 51 | 0 | 20 | SignalService | -| __gap | uint256[49] | 52 | 0 | 1568 | SignalService | -| _pendingOwner | address | 101 | 0 | 20 | SignalService | -| __gap | uint256[49] | 102 | 0 | 1568 | SignalService | -| addressManager | address | 151 | 0 | 20 | SignalService | -| __gap | uint256[49] | 152 | 0 | 1568 | SignalService | -| __reentry | uint8 | 201 | 0 | 1 | SignalService | -| __paused | uint8 | 201 | 1 | 1 | SignalService | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | SignalService | -| __gap | uint256[49] | 202 | 0 | 1568 | SignalService | -| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | SignalService | -| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | SignalService | -| __gap | uint256[48] | 253 | 0 | 1536 | SignalService | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------------------------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | SignalService | +| \_initializing | bool | 0 | 1 | 1 | SignalService | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | SignalService | +| \_owner | address | 51 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | SignalService | +| \_pendingOwner | address | 101 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | SignalService | +| addressManager | address | 151 | 0 | 20 | SignalService | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | SignalService | +| \_\_reentry | uint8 | 201 | 0 | 1 | SignalService | +| \_\_paused | uint8 | 201 | 1 | 1 | SignalService | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | SignalService | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | SignalService | +| topBlockId | mapping(uint64 => mapping(bytes32 => uint64)) | 251 | 0 | 32 | SignalService | +| isAuthorized | mapping(address => bool) | 252 | 0 | 32 | SignalService | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | SignalService | ## BridgedTaikoToken -| Name | Type | Slot | Offset | Bytes | Contract | -|-----------------------------------------------------|---------------------------------------------------------------|------|--------|-------|----------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | BridgedTaikoToken | -| _initializing | bool | 0 | 1 | 1 | BridgedTaikoToken | -| __gap | uint256[50] | 1 | 0 | 1600 | BridgedTaikoToken | -| _owner | address | 51 | 0 | 20 | BridgedTaikoToken | -| __gap | uint256[49] | 52 | 0 | 1568 | BridgedTaikoToken | -| _pendingOwner | address | 101 | 0 | 20 | BridgedTaikoToken | -| __gap | uint256[49] | 102 | 0 | 1568 | BridgedTaikoToken | -| addressManager | address | 151 | 0 | 20 | BridgedTaikoToken | -| __gap | uint256[49] | 152 | 0 | 1568 | BridgedTaikoToken | -| __reentry | uint8 | 201 | 0 | 1 | BridgedTaikoToken | -| __paused | uint8 | 201 | 1 | 1 | BridgedTaikoToken | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedTaikoToken | -| __gap | uint256[49] | 202 | 0 | 1568 | BridgedTaikoToken | -| __slots_previously_used_by_ERC20SnapshotUpgradeable | uint256[50] | 251 | 0 | 1600 | BridgedTaikoToken | -| _balances | mapping(address => uint256) | 301 | 0 | 32 | BridgedTaikoToken | -| _allowances | mapping(address => mapping(address => uint256)) | 302 | 0 | 32 | BridgedTaikoToken | -| _totalSupply | uint256 | 303 | 0 | 32 | BridgedTaikoToken | -| _name | string | 304 | 0 | 32 | BridgedTaikoToken | -| _symbol | string | 305 | 0 | 32 | BridgedTaikoToken | -| __gap | uint256[45] | 306 | 0 | 1440 | BridgedTaikoToken | -| _hashedName | bytes32 | 351 | 0 | 32 | BridgedTaikoToken | -| _hashedVersion | bytes32 | 352 | 0 | 32 | BridgedTaikoToken | -| _name | string | 353 | 0 | 32 | BridgedTaikoToken | -| _version | string | 354 | 0 | 32 | BridgedTaikoToken | -| __gap | uint256[48] | 355 | 0 | 1536 | BridgedTaikoToken | -| _nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedTaikoToken | -| _PERMIT_TYPEHASH_DEPRECATED_SLOT | bytes32 | 404 | 0 | 32 | BridgedTaikoToken | -| __gap | uint256[49] | 405 | 0 | 1568 | BridgedTaikoToken | -| _delegates | mapping(address => address) | 454 | 0 | 32 | BridgedTaikoToken | -| _checkpoints | mapping(address => struct ERC20VotesUpgradeable.Checkpoint[]) | 455 | 0 | 32 | BridgedTaikoToken | -| _totalSupplyCheckpoints | struct ERC20VotesUpgradeable.Checkpoint[] | 456 | 0 | 32 | BridgedTaikoToken | -| __gap | uint256[47] | 457 | 0 | 1504 | BridgedTaikoToken | -| __gap | uint256[50] | 504 | 0 | 1600 | BridgedTaikoToken | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ----------------------------------------------------- | ------------------------------------------------------------- | ---- | ------ | ----- | ----------------- | +| \_initialized | uint8 | 0 | 0 | 1 | BridgedTaikoToken | +| \_initializing | bool | 0 | 1 | 1 | BridgedTaikoToken | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | BridgedTaikoToken | +| \_owner | address | 51 | 0 | 20 | BridgedTaikoToken | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | BridgedTaikoToken | +| \_pendingOwner | address | 101 | 0 | 20 | BridgedTaikoToken | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | BridgedTaikoToken | +| addressManager | address | 151 | 0 | 20 | BridgedTaikoToken | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | BridgedTaikoToken | +| \_\_reentry | uint8 | 201 | 0 | 1 | BridgedTaikoToken | +| \_\_paused | uint8 | 201 | 1 | 1 | BridgedTaikoToken | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | BridgedTaikoToken | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | BridgedTaikoToken | +| \_\_slots_previously_used_by_ERC20SnapshotUpgradeable | uint256[50] | 251 | 0 | 1600 | BridgedTaikoToken | +| \_balances | mapping(address => uint256) | 301 | 0 | 32 | BridgedTaikoToken | +| \_allowances | mapping(address => mapping(address => uint256)) | 302 | 0 | 32 | BridgedTaikoToken | +| \_totalSupply | uint256 | 303 | 0 | 32 | BridgedTaikoToken | +| \_name | string | 304 | 0 | 32 | BridgedTaikoToken | +| \_symbol | string | 305 | 0 | 32 | BridgedTaikoToken | +| \_\_gap | uint256[45] | 306 | 0 | 1440 | BridgedTaikoToken | +| \_hashedName | bytes32 | 351 | 0 | 32 | BridgedTaikoToken | +| \_hashedVersion | bytes32 | 352 | 0 | 32 | BridgedTaikoToken | +| \_name | string | 353 | 0 | 32 | BridgedTaikoToken | +| \_version | string | 354 | 0 | 32 | BridgedTaikoToken | +| \_\_gap | uint256[48] | 355 | 0 | 1536 | BridgedTaikoToken | +| \_nonces | mapping(address => struct CountersUpgradeable.Counter) | 403 | 0 | 32 | BridgedTaikoToken | +| \_PERMIT_TYPEHASH_DEPRECATED_SLOT | bytes32 | 404 | 0 | 32 | BridgedTaikoToken | +| \_\_gap | uint256[49] | 405 | 0 | 1568 | BridgedTaikoToken | +| \_delegates | mapping(address => address) | 454 | 0 | 32 | BridgedTaikoToken | +| \_checkpoints | mapping(address => struct ERC20VotesUpgradeable.Checkpoint[]) | 455 | 0 | 32 | BridgedTaikoToken | +| \_totalSupplyCheckpoints | struct ERC20VotesUpgradeable.Checkpoint[] | 456 | 0 | 32 | BridgedTaikoToken | +| \_\_gap | uint256[47] | 457 | 0 | 1504 | BridgedTaikoToken | +| \_\_gap | uint256[50] | 504 | 0 | 1600 | BridgedTaikoToken | ## DelegateOwner -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-------------|------|--------|-------|--------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | DelegateOwner | -| _initializing | bool | 0 | 1 | 1 | DelegateOwner | -| __gap | uint256[50] | 1 | 0 | 1600 | DelegateOwner | -| _owner | address | 51 | 0 | 20 | DelegateOwner | -| __gap | uint256[49] | 52 | 0 | 1568 | DelegateOwner | -| _pendingOwner | address | 101 | 0 | 20 | DelegateOwner | -| __gap | uint256[49] | 102 | 0 | 1568 | DelegateOwner | -| addressManager | address | 151 | 0 | 20 | DelegateOwner | -| __gap | uint256[49] | 152 | 0 | 1568 | DelegateOwner | -| __reentry | uint8 | 201 | 0 | 1 | DelegateOwner | -| __paused | uint8 | 201 | 1 | 1 | DelegateOwner | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | DelegateOwner | -| __gap | uint256[49] | 202 | 0 | 1568 | DelegateOwner | -| remoteChainId | uint64 | 251 | 0 | 8 | DelegateOwner | -| admin | address | 251 | 8 | 20 | DelegateOwner | -| nextTxId | uint64 | 252 | 0 | 8 | DelegateOwner | -| remoteOwner | address | 252 | 8 | 20 | DelegateOwner | -| __gap | uint256[48] | 253 | 0 | 1536 | DelegateOwner | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | ----------- | ---- | ------ | ----- | ------------- | +| \_initialized | uint8 | 0 | 0 | 1 | DelegateOwner | +| \_initializing | bool | 0 | 1 | 1 | DelegateOwner | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | DelegateOwner | +| \_owner | address | 51 | 0 | 20 | DelegateOwner | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | DelegateOwner | +| \_pendingOwner | address | 101 | 0 | 20 | DelegateOwner | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | DelegateOwner | +| addressManager | address | 151 | 0 | 20 | DelegateOwner | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | DelegateOwner | +| \_\_reentry | uint8 | 201 | 0 | 1 | DelegateOwner | +| \_\_paused | uint8 | 201 | 1 | 1 | DelegateOwner | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | DelegateOwner | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | DelegateOwner | +| remoteChainId | uint64 | 251 | 0 | 8 | DelegateOwner | +| admin | address | 251 | 8 | 20 | DelegateOwner | +| nextTxId | uint64 | 252 | 0 | 8 | DelegateOwner | +| remoteOwner | address | 252 | 8 | 20 | DelegateOwner | +| \_\_gap | uint256[48] | 253 | 0 | 1536 | DelegateOwner | ## TaikoL2 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------|------|--------|-------|--------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | TaikoL2 | -| _initializing | bool | 0 | 1 | 1 | TaikoL2 | -| __gap | uint256[50] | 1 | 0 | 1600 | TaikoL2 | -| _owner | address | 51 | 0 | 20 | TaikoL2 | -| __gap | uint256[49] | 52 | 0 | 1568 | TaikoL2 | -| _pendingOwner | address | 101 | 0 | 20 | TaikoL2 | -| __gap | uint256[49] | 102 | 0 | 1568 | TaikoL2 | -| addressManager | address | 151 | 0 | 20 | TaikoL2 | -| __gap | uint256[49] | 152 | 0 | 1568 | TaikoL2 | -| __reentry | uint8 | 201 | 0 | 1 | TaikoL2 | -| __paused | uint8 | 201 | 1 | 1 | TaikoL2 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoL2 | -| __gap | uint256[49] | 202 | 0 | 1568 | TaikoL2 | -| _blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | TaikoL2 | -| publicInputHash | bytes32 | 252 | 0 | 32 | TaikoL2 | -| parentGasExcess | uint64 | 253 | 0 | 8 | TaikoL2 | -| lastSyncedBlock | uint64 | 253 | 8 | 8 | TaikoL2 | -| parentTimestamp | uint64 | 253 | 16 | 8 | TaikoL2 | -| parentGasTarget | uint64 | 253 | 24 | 8 | TaikoL2 | -| l1ChainId | uint64 | 254 | 0 | 8 | TaikoL2 | -| __gap | uint256[46] | 255 | 0 | 1472 | TaikoL2 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------- | ---- | ------ | ----- | -------- | +| \_initialized | uint8 | 0 | 0 | 1 | TaikoL2 | +| \_initializing | bool | 0 | 1 | 1 | TaikoL2 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | TaikoL2 | +| \_owner | address | 51 | 0 | 20 | TaikoL2 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | TaikoL2 | +| \_pendingOwner | address | 101 | 0 | 20 | TaikoL2 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | TaikoL2 | +| addressManager | address | 151 | 0 | 20 | TaikoL2 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | TaikoL2 | +| \_\_reentry | uint8 | 201 | 0 | 1 | TaikoL2 | +| \_\_paused | uint8 | 201 | 1 | 1 | TaikoL2 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | TaikoL2 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | TaikoL2 | +| \_blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | TaikoL2 | +| publicInputHash | bytes32 | 252 | 0 | 32 | TaikoL2 | +| parentGasExcess | uint64 | 253 | 0 | 8 | TaikoL2 | +| lastSyncedBlock | uint64 | 253 | 8 | 8 | TaikoL2 | +| parentTimestamp | uint64 | 253 | 16 | 8 | TaikoL2 | +| parentGasTarget | uint64 | 253 | 24 | 8 | TaikoL2 | +| l1ChainId | uint64 | 254 | 0 | 8 | TaikoL2 | +| \_\_gap | uint256[46] | 255 | 0 | 1472 | TaikoL2 | ## HeklaTaikoL2 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------|------|--------|-------|------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | HeklaTaikoL2 | -| _initializing | bool | 0 | 1 | 1 | HeklaTaikoL2 | -| __gap | uint256[50] | 1 | 0 | 1600 | HeklaTaikoL2 | -| _owner | address | 51 | 0 | 20 | HeklaTaikoL2 | -| __gap | uint256[49] | 52 | 0 | 1568 | HeklaTaikoL2 | -| _pendingOwner | address | 101 | 0 | 20 | HeklaTaikoL2 | -| __gap | uint256[49] | 102 | 0 | 1568 | HeklaTaikoL2 | -| addressManager | address | 151 | 0 | 20 | HeklaTaikoL2 | -| __gap | uint256[49] | 152 | 0 | 1568 | HeklaTaikoL2 | -| __reentry | uint8 | 201 | 0 | 1 | HeklaTaikoL2 | -| __paused | uint8 | 201 | 1 | 1 | HeklaTaikoL2 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | HeklaTaikoL2 | -| __gap | uint256[49] | 202 | 0 | 1568 | HeklaTaikoL2 | -| _blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | HeklaTaikoL2 | -| publicInputHash | bytes32 | 252 | 0 | 32 | HeklaTaikoL2 | -| parentGasExcess | uint64 | 253 | 0 | 8 | HeklaTaikoL2 | -| lastSyncedBlock | uint64 | 253 | 8 | 8 | HeklaTaikoL2 | -| parentTimestamp | uint64 | 253 | 16 | 8 | HeklaTaikoL2 | -| parentGasTarget | uint64 | 253 | 24 | 8 | HeklaTaikoL2 | -| l1ChainId | uint64 | 254 | 0 | 8 | HeklaTaikoL2 | -| __gap | uint256[46] | 255 | 0 | 1472 | HeklaTaikoL2 | + +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------- | ---- | ------ | ----- | ------------ | +| \_initialized | uint8 | 0 | 0 | 1 | HeklaTaikoL2 | +| \_initializing | bool | 0 | 1 | 1 | HeklaTaikoL2 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | HeklaTaikoL2 | +| \_owner | address | 51 | 0 | 20 | HeklaTaikoL2 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | HeklaTaikoL2 | +| \_pendingOwner | address | 101 | 0 | 20 | HeklaTaikoL2 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | HeklaTaikoL2 | +| addressManager | address | 151 | 0 | 20 | HeklaTaikoL2 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | HeklaTaikoL2 | +| \_\_reentry | uint8 | 201 | 0 | 1 | HeklaTaikoL2 | +| \_\_paused | uint8 | 201 | 1 | 1 | HeklaTaikoL2 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | HeklaTaikoL2 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | HeklaTaikoL2 | +| \_blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | HeklaTaikoL2 | +| publicInputHash | bytes32 | 252 | 0 | 32 | HeklaTaikoL2 | +| parentGasExcess | uint64 | 253 | 0 | 8 | HeklaTaikoL2 | +| lastSyncedBlock | uint64 | 253 | 8 | 8 | HeklaTaikoL2 | +| parentTimestamp | uint64 | 253 | 16 | 8 | HeklaTaikoL2 | +| parentGasTarget | uint64 | 253 | 24 | 8 | HeklaTaikoL2 | +| l1ChainId | uint64 | 254 | 0 | 8 | HeklaTaikoL2 | +| \_\_gap | uint256[46] | 255 | 0 | 1472 | HeklaTaikoL2 | ## MainnetTaikoL2 -| Name | Type | Slot | Offset | Bytes | Contract | -|------------------|-----------------------------|------|--------|-------|------------------------------------------------------------| -| _initialized | uint8 | 0 | 0 | 1 | MainnetTaikoL2 | -| _initializing | bool | 0 | 1 | 1 | MainnetTaikoL2 | -| __gap | uint256[50] | 1 | 0 | 1600 | MainnetTaikoL2 | -| _owner | address | 51 | 0 | 20 | MainnetTaikoL2 | -| __gap | uint256[49] | 52 | 0 | 1568 | MainnetTaikoL2 | -| _pendingOwner | address | 101 | 0 | 20 | MainnetTaikoL2 | -| __gap | uint256[49] | 102 | 0 | 1568 | MainnetTaikoL2 | -| addressManager | address | 151 | 0 | 20 | MainnetTaikoL2 | -| __gap | uint256[49] | 152 | 0 | 1568 | MainnetTaikoL2 | -| __reentry | uint8 | 201 | 0 | 1 | MainnetTaikoL2 | -| __paused | uint8 | 201 | 1 | 1 | MainnetTaikoL2 | -| __lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTaikoL2 | -| __gap | uint256[49] | 202 | 0 | 1568 | MainnetTaikoL2 | -| _blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | MainnetTaikoL2 | -| publicInputHash | bytes32 | 252 | 0 | 32 | MainnetTaikoL2 | -| parentGasExcess | uint64 | 253 | 0 | 8 | MainnetTaikoL2 | -| lastSyncedBlock | uint64 | 253 | 8 | 8 | MainnetTaikoL2 | -| parentTimestamp | uint64 | 253 | 16 | 8 | MainnetTaikoL2 | -| parentGasTarget | uint64 | 253 | 24 | 8 | MainnetTaikoL2 | -| l1ChainId | uint64 | 254 | 0 | 8 | MainnetTaikoL2 | -| __gap | uint256[46] | 255 | 0 | 1472 | MainnetTaikoL2 | +| Name | Type | Slot | Offset | Bytes | Contract | +| ------------------ | --------------------------- | ---- | ------ | ----- | -------------- | +| \_initialized | uint8 | 0 | 0 | 1 | MainnetTaikoL2 | +| \_initializing | bool | 0 | 1 | 1 | MainnetTaikoL2 | +| \_\_gap | uint256[50] | 1 | 0 | 1600 | MainnetTaikoL2 | +| \_owner | address | 51 | 0 | 20 | MainnetTaikoL2 | +| \_\_gap | uint256[49] | 52 | 0 | 1568 | MainnetTaikoL2 | +| \_pendingOwner | address | 101 | 0 | 20 | MainnetTaikoL2 | +| \_\_gap | uint256[49] | 102 | 0 | 1568 | MainnetTaikoL2 | +| addressManager | address | 151 | 0 | 20 | MainnetTaikoL2 | +| \_\_gap | uint256[49] | 152 | 0 | 1568 | MainnetTaikoL2 | +| \_\_reentry | uint8 | 201 | 0 | 1 | MainnetTaikoL2 | +| \_\_paused | uint8 | 201 | 1 | 1 | MainnetTaikoL2 | +| \_\_lastUnpausedAt | uint64 | 201 | 2 | 8 | MainnetTaikoL2 | +| \_\_gap | uint256[49] | 202 | 0 | 1568 | MainnetTaikoL2 | +| \_blockhashes | mapping(uint256 => bytes32) | 251 | 0 | 32 | MainnetTaikoL2 | +| publicInputHash | bytes32 | 252 | 0 | 32 | MainnetTaikoL2 | +| parentGasExcess | uint64 | 253 | 0 | 8 | MainnetTaikoL2 | +| lastSyncedBlock | uint64 | 253 | 8 | 8 | MainnetTaikoL2 | +| parentTimestamp | uint64 | 253 | 16 | 8 | MainnetTaikoL2 | +| parentGasTarget | uint64 | 253 | 24 | 8 | MainnetTaikoL2 | +| l1ChainId | uint64 | 254 | 0 | 8 | MainnetTaikoL2 | +| \_\_gap | uint256[46] | 255 | 0 | 1472 | MainnetTaikoL2 | diff --git a/packages/taiko-client/.swaggo b/packages/taiko-client/.swaggo index 8cc34d878a4..e69de29bb2d 100644 --- a/packages/taiko-client/.swaggo +++ b/packages/taiko-client/.swaggo @@ -1,2 +0,0 @@ -replace common.Address string -replace encoding.TierFee uint64 \ No newline at end of file diff --git a/packages/taiko-client/bindings/.githead b/packages/taiko-client/bindings/.githead index e5421357157..317ea121bb9 100644 --- a/packages/taiko-client/bindings/.githead +++ b/packages/taiko-client/bindings/.githead @@ -1 +1 @@ -71cfc5ce1ef06dcf099a4ce9b22bea6100406148 +4adab8b735d7c4dde9a58c3692925e87a580e2d0 diff --git a/packages/taiko-client/bindings/encoding/input.go b/packages/taiko-client/bindings/encoding/input.go index 9be7c456a06..5fbb83b52d4 100644 --- a/packages/taiko-client/bindings/encoding/input.go +++ b/packages/taiko-client/bindings/encoding/input.go @@ -3,6 +3,7 @@ package encoding import ( "errors" "fmt" + "math/big" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/log" @@ -294,6 +295,9 @@ var ( {Name: "TaikoData.Transition", Type: transitionComponentsType}, {Name: "TaikoData.TierProof", Type: tierProofComponentsType}, } + stringType, _ = abi.NewType("string", "TAIKO_DIFFICULTY", nil) + uint64Type, _ = abi.NewType("uint64", "local.b.numBlocks", nil) + difficultyCalculationInputArgs = abi.Arguments{{Type: stringType}, {Type: uint64Type}} ) // Contract ABIs. @@ -423,6 +427,16 @@ func EncodeProveBlockInput( return b, nil } +// EncodeDifficultCalcutionParams performs the solidity `abi.encode` for the +// `block.difficulty` hash payload. +func EncodeDifficultyCalcutionParams(numBlocks uint64) ([]byte, error) { + b, err := difficultyCalculationInputArgs.Pack("TAIKO_DIFFICULTY", numBlocks) + if err != nil { + return nil, fmt.Errorf("failed to abi.encode `block.difficulty` hash payload, %w", err) + } + return b, nil +} + // UnpackTxListBytes unpacks the input data of a TaikoL1.proposeBlock transaction, and returns the txList bytes. func UnpackTxListBytes(txData []byte) ([]byte, error) { method, err := TaikoL1ABI.MethodById(txData) @@ -449,3 +463,13 @@ func UnpackTxListBytes(txData []byte) ([]byte, error) { return inputs, nil } + +// EncodeBaseFeeConfig encodes the block.extraData field from the given base fee config. +func EncodeBaseFeeConfig(baseFeeConfig *bindings.LibSharedDataBaseFeeConfig) [32]byte { + var ( + bytes32Value [32]byte + uintValue = new(big.Int).SetUint64(uint64(baseFeeConfig.SharingPctg)) + ) + copy(bytes32Value[32-len(uintValue.Bytes()):], uintValue.Bytes()) + return bytes32Value +} diff --git a/packages/taiko-client/cmd/flags/driver.go b/packages/taiko-client/cmd/flags/driver.go index 3c28dc7571a..db1e36db29c 100644 --- a/packages/taiko-client/cmd/flags/driver.go +++ b/packages/taiko-client/cmd/flags/driver.go @@ -52,6 +52,33 @@ var ( Category: driverCategory, EnvVars: []string{"BLOB_SOCIAL_SCAN_ENDPOINT"}, } + // soft block server + SoftBlockServerPort = &cli.Uint64Flag{ + Name: "softBlock.port", + Usage: "HTTP port of the soft block server, 0 means disabled", + Category: driverCategory, + EnvVars: []string{"SOFT_BLOCK_SERVER_PORT"}, + } + SoftBlockServerJWTSecret = &cli.StringFlag{ + Name: "softBlock.jwtSecret", + Usage: "Path to a JWT secret to use for the soft block server", + Category: driverCategory, + EnvVars: []string{"SOFT_BLOCK_SERVER_JWT_SECRET"}, + } + SoftBlockServerCORSOrigins = &cli.StringFlag{ + Name: "softBlock.corsOrigins", + Usage: "CORS Origins settings for the soft block server", + Category: driverCategory, + Value: "*", + EnvVars: []string{"SOFT_BLOCK_SERVER_CORS_ORIGINS"}, + } + SoftBlockServerCheckSig = &cli.BoolFlag{ + Name: "softBlock.signatureCheck", + Usage: "If the soft block server will check the signature of the incoming transactions batches", + Category: driverCategory, + Value: true, + EnvVars: []string{"SOFT_BLOCK_SERVER_SIGNATURE_CHECK"}, + } ) // DriverFlags All driver flags. @@ -66,4 +93,8 @@ var DriverFlags = MergeFlags(CommonFlags, []cli.Flag{ MaxExponent, BlobServerEndpoint, SocialScanEndpoint, + SoftBlockServerPort, + SoftBlockServerJWTSecret, + SoftBlockServerCORSOrigins, + SoftBlockServerCheckSig, }) diff --git a/packages/taiko-client/docs/docs.go b/packages/taiko-client/docs/docs.go new file mode 100644 index 00000000000..716fc382652 --- /dev/null +++ b/packages/taiko-client/docs/docs.go @@ -0,0 +1,373 @@ +// Package docs Code generated by swaggo/swag. DO NOT EDIT +package docs + +import "github.com/swaggo/swag" + +const docTemplate = `{ + "schemes": {{ marshal .Schemes }}, + "swagger": "2.0", + "info": { + "description": "{{escape .Description}}", + "title": "{{.Title}}", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "name": "API Support", + "url": "https://community.taiko.xyz/", + "email": "info@taiko.xyz" + }, + "license": { + "name": "MIT", + "url": "https://github.com/taikoxyz/taiko-mono/blob/main/LICENSE.md" + }, + "version": "{{.Version}}" + }, + "host": "{{.Host}}", + "basePath": "{{.BasePath}}", + "paths": { + "/healthz": { + "get": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "summary": "Get current server health status", + "operationId": "health-check", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "string" + } + } + } + } + }, + "/softBlocks": { + "post": { + "description": "Insert a group of transactions into a soft block for preconfirmation. If the group is the\nfirst for a block, a new soft block will be created. Otherwise, the transactions will\nbe appended to the existing soft block. The API will fail if:\n1) the block is not soft\n2) block-level parameters are invalid or do not match the current soft block’s parameters\n3) the group ID is not exactly 1 greater than the previous one\n4) the last group of the block indicates no further transactions are allowed", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "soft block creation request body", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/softblocks.BuildSoftBlockRequestBody" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/softblocks.BuildSoftBlockResponseBody" + } + } + } + }, + "delete": { + "description": "Remove all soft blocks from the blockchain beyond the specified block height,\nensuring the latest block ID does not exceed the given height. This method will fail if\nthe block with an ID one greater than the specified height is not a soft block. If the\nspecified block height is greater than the latest soft block ID, the method will succeed\nwithout modifying the blockchain.", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "soft blocks removing request body", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/softblocks.RemoveSoftBlocksRequestBody" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/softblocks.RemoveSoftBlocksResponseBody" + } + } + } + } + } + }, + "definitions": { + "big.Int": { + "type": "object" + }, + "softblocks.BuildSoftBlockRequestBody": { + "type": "object", + "properties": { + "transactionBatch": { + "description": "@param transactionBatch TransactionBatch Transaction batch to be inserted into the soft block", + "allOf": [ + { + "$ref": "#/definitions/softblocks.TransactionBatch" + } + ] + } + } + }, + "softblocks.BuildSoftBlockResponseBody": { + "type": "object", + "properties": { + "blockHeader": { + "description": "@param blockHeader types.Header Header of the soft block", + "allOf": [ + { + "$ref": "#/definitions/types.Header" + } + ] + } + } + }, + "softblocks.RemoveSoftBlocksRequestBody": { + "type": "object", + "properties": { + "newLastBlockId": { + "description": "@param newLastBlockID uint64 New last block ID of the blockchain, it should\n@param not smaller than the canonical chain's highest block ID.", + "type": "integer" + } + } + }, + "softblocks.RemoveSoftBlocksResponseBody": { + "type": "object", + "properties": { + "headsRemoved": { + "description": "@param headsRemoved uint64 Number of soft heads removed", + "type": "integer" + }, + "lastBlockId": { + "description": "@param lastBlockID uint64 Current highest block ID of the blockchain (including soft blocks)", + "type": "integer" + }, + "lastProposedBlockID": { + "description": "@param lastProposedBlockID uint64 Highest block ID of the cnonical chain", + "type": "integer" + } + } + }, + "softblocks.SoftBlockParams": { + "type": "object", + "properties": { + "anchorBlockID": { + "description": "@param anchorBlockID uint64 ` + "`" + `_anchorBlockId` + "`" + ` parameter of the ` + "`" + `anchorV2` + "`" + ` transaction in soft block", + "type": "integer" + }, + "anchorStateRoot": { + "description": "@param anchorStateRoot string ` + "`" + `_anchorStateRoot` + "`" + ` parameter of the ` + "`" + `anchorV2` + "`" + ` transaction in soft block", + "type": "array", + "items": { + "type": "integer" + } + }, + "coinbase": { + "description": "@param coinbase uint64 Coinbase of the soft block", + "type": "string" + }, + "timestamp": { + "description": "@param timestamp uint64 Timestamp of the soft block", + "type": "integer" + } + } + }, + "softblocks.TransactionBatch": { + "type": "object", + "properties": { + "batchId": { + "description": "@param batchId uint64 ID of this transaction batch", + "type": "integer" + }, + "batchType": { + "description": "@param batchType TransactionBatchMarker Marker of the transaction batch,\n@param either ` + "`" + `end_of_block` + "`" + `, ` + "`" + `end_of_preconf` + "`" + ` or empty", + "allOf": [ + { + "$ref": "#/definitions/softblocks.TransactionBatchMarker" + } + ] + }, + "blockId": { + "description": "@param blockId uint64 Block ID of the soft block", + "type": "integer" + }, + "blockParams": { + "description": "@param blockParams SoftBlockParams Block parameters of the soft block", + "allOf": [ + { + "$ref": "#/definitions/softblocks.SoftBlockParams" + } + ] + }, + "signature": { + "description": "@param signature string Signature of this transaction batch", + "type": "string" + }, + "transactions": { + "description": "@param transactions string zlib compressed RLP encoded bytes of a transactions list", + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "softblocks.TransactionBatchMarker": { + "type": "string", + "enum": [ + "end_of_block", + "end_of_preconf" + ], + "x-enum-varnames": [ + "BatchMarkerEOB", + "BatchMarkerEOP" + ] + }, + "types.Header": { + "type": "object", + "properties": { + "baseFeePerGas": { + "description": "BaseFee was added by EIP-1559 and is ignored in legacy headers.", + "allOf": [ + { + "$ref": "#/definitions/big.Int" + } + ] + }, + "blobGasUsed": { + "description": "BlobGasUsed was added by EIP-4844 and is ignored in legacy headers.", + "type": "integer" + }, + "difficulty": { + "$ref": "#/definitions/big.Int" + }, + "excessBlobGas": { + "description": "ExcessBlobGas was added by EIP-4844 and is ignored in legacy headers.", + "type": "integer" + }, + "extraData": { + "type": "array", + "items": { + "type": "integer" + } + }, + "gasLimit": { + "type": "integer" + }, + "gasUsed": { + "type": "integer" + }, + "logsBloom": { + "type": "array", + "items": { + "type": "integer" + } + }, + "miner": { + "type": "array", + "items": { + "type": "integer" + } + }, + "mixHash": { + "type": "array", + "items": { + "type": "integer" + } + }, + "nonce": { + "type": "array", + "items": { + "type": "integer" + } + }, + "number": { + "$ref": "#/definitions/big.Int" + }, + "parentBeaconBlockRoot": { + "description": "ParentBeaconRoot was added by EIP-4788 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + }, + "parentHash": { + "type": "array", + "items": { + "type": "integer" + } + }, + "receiptsRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "requestsRoot": { + "description": "RequestsHash was added by EIP-7685 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + }, + "sha3Uncles": { + "type": "array", + "items": { + "type": "integer" + } + }, + "stateRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "timestamp": { + "type": "integer" + }, + "transactionsRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "withdrawalsRoot": { + "description": "WithdrawalsHash was added by EIP-4895 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + } + } + } + } +}` + +// SwaggerInfo holds exported Swagger Info so clients can modify it +var SwaggerInfo = &swag.Spec{ + Version: "1.0", + Host: "", + BasePath: "", + Schemes: []string{}, + Title: "Taiko Soft Block Server API", + Description: "", + InfoInstanceName: "swagger", + SwaggerTemplate: docTemplate, + LeftDelim: "{{", + RightDelim: "}}", +} + +func init() { + swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo) +} diff --git a/packages/taiko-client/docs/index.html b/packages/taiko-client/docs/index.html new file mode 100644 index 00000000000..fd6da6d8abf --- /dev/null +++ b/packages/taiko-client/docs/index.html @@ -0,0 +1,29 @@ + + + + + + Taiko Preconfirmation Server API + + +
+ + + diff --git a/packages/taiko-client/docs/swagger.json b/packages/taiko-client/docs/swagger.json new file mode 100644 index 00000000000..078524beb0b --- /dev/null +++ b/packages/taiko-client/docs/swagger.json @@ -0,0 +1,328 @@ +{ + "swagger": "2.0", + "info": { + "title": "Taiko Soft Block Server API", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "name": "API Support", + "url": "https://community.taiko.xyz/", + "email": "info@taiko.xyz" + }, + "license": { + "name": "MIT", + "url": "https://github.com/taikoxyz/taiko-mono/blob/main/LICENSE.md" + }, + "version": "1.0" + }, + "paths": { + "/healthz": { + "get": { + "consumes": ["application/json"], + "produces": ["application/json"], + "summary": "Get current server health status", + "operationId": "health-check", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "string" + } + } + } + } + }, + "/softBlocks": { + "post": { + "description": "Insert a group of transactions into a soft block for preconfirmation. If the group is the\nfirst for a block, a new soft block will be created. Otherwise, the transactions will\nbe appended to the existing soft block. The API will fail if:\n1) the block is not soft\n2) block-level parameters are invalid or do not match the current soft block’s parameters\n3) the group ID is not exactly 1 greater than the previous one\n4) the last group of the block indicates no further transactions are allowed", + "consumes": ["application/json"], + "produces": ["application/json"], + "parameters": [ + { + "description": "soft block creation request body", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/softblocks.BuildSoftBlockRequestBody" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/softblocks.BuildSoftBlockResponseBody" + } + } + } + }, + "delete": { + "description": "Remove all soft blocks from the blockchain beyond the specified block height,\nensuring the latest block ID does not exceed the given height. This method will fail if\nthe block with an ID one greater than the specified height is not a soft block. If the\nspecified block height is greater than the latest soft block ID, the method will succeed\nwithout modifying the blockchain.", + "consumes": ["application/json"], + "produces": ["application/json"], + "parameters": [ + { + "description": "soft blocks removing request body", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/softblocks.RemoveSoftBlocksRequestBody" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/softblocks.RemoveSoftBlocksResponseBody" + } + } + } + } + } + }, + "definitions": { + "big.Int": { + "type": "object" + }, + "softblocks.BuildSoftBlockRequestBody": { + "type": "object", + "properties": { + "transactionBatch": { + "description": "@param transactionBatch TransactionBatch Transaction batch to be inserted into the soft block", + "allOf": [ + { + "$ref": "#/definitions/softblocks.TransactionBatch" + } + ] + } + } + }, + "softblocks.BuildSoftBlockResponseBody": { + "type": "object", + "properties": { + "blockHeader": { + "description": "@param blockHeader types.Header Header of the soft block", + "allOf": [ + { + "$ref": "#/definitions/types.Header" + } + ] + } + } + }, + "softblocks.RemoveSoftBlocksRequestBody": { + "type": "object", + "properties": { + "newLastBlockId": { + "description": "@param newLastBlockID uint64 New last block ID of the blockchain, it should\n@param not smaller than the canonical chain's highest block ID.", + "type": "integer" + } + } + }, + "softblocks.RemoveSoftBlocksResponseBody": { + "type": "object", + "properties": { + "headsRemoved": { + "description": "@param headsRemoved uint64 Number of soft heads removed", + "type": "integer" + }, + "lastBlockId": { + "description": "@param lastBlockID uint64 Current highest block ID of the blockchain (including soft blocks)", + "type": "integer" + }, + "lastProposedBlockID": { + "description": "@param lastProposedBlockID uint64 Highest block ID of the cnonical chain", + "type": "integer" + } + } + }, + "softblocks.SoftBlockParams": { + "type": "object", + "properties": { + "anchorBlockID": { + "description": "@param anchorBlockID uint64 `_anchorBlockId` parameter of the `anchorV2` transaction in soft block", + "type": "integer" + }, + "anchorStateRoot": { + "description": "@param anchorStateRoot string `_anchorStateRoot` parameter of the `anchorV2` transaction in soft block", + "type": "array", + "items": { + "type": "integer" + } + }, + "coinbase": { + "description": "@param coinbase uint64 Coinbase of the soft block", + "type": "string" + }, + "timestamp": { + "description": "@param timestamp uint64 Timestamp of the soft block", + "type": "integer" + } + } + }, + "softblocks.TransactionBatch": { + "type": "object", + "properties": { + "batchId": { + "description": "@param batchId uint64 ID of this transaction batch", + "type": "integer" + }, + "batchType": { + "description": "@param batchType TransactionBatchMarker Marker of the transaction batch,\n@param either `end_of_block`, `end_of_preconf` or empty", + "allOf": [ + { + "$ref": "#/definitions/softblocks.TransactionBatchMarker" + } + ] + }, + "blockId": { + "description": "@param blockId uint64 Block ID of the soft block", + "type": "integer" + }, + "blockParams": { + "description": "@param blockParams SoftBlockParams Block parameters of the soft block", + "allOf": [ + { + "$ref": "#/definitions/softblocks.SoftBlockParams" + } + ] + }, + "signature": { + "description": "@param signature string Signature of this transaction batch", + "type": "string" + }, + "transactions": { + "description": "@param transactions string zlib compressed RLP encoded bytes of a transactions list", + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "softblocks.TransactionBatchMarker": { + "type": "string", + "enum": ["end_of_block", "end_of_preconf"], + "x-enum-varnames": ["BatchMarkerEOB", "BatchMarkerEOP"] + }, + "types.Header": { + "type": "object", + "properties": { + "baseFeePerGas": { + "description": "BaseFee was added by EIP-1559 and is ignored in legacy headers.", + "allOf": [ + { + "$ref": "#/definitions/big.Int" + } + ] + }, + "blobGasUsed": { + "description": "BlobGasUsed was added by EIP-4844 and is ignored in legacy headers.", + "type": "integer" + }, + "difficulty": { + "$ref": "#/definitions/big.Int" + }, + "excessBlobGas": { + "description": "ExcessBlobGas was added by EIP-4844 and is ignored in legacy headers.", + "type": "integer" + }, + "extraData": { + "type": "array", + "items": { + "type": "integer" + } + }, + "gasLimit": { + "type": "integer" + }, + "gasUsed": { + "type": "integer" + }, + "logsBloom": { + "type": "array", + "items": { + "type": "integer" + } + }, + "miner": { + "type": "array", + "items": { + "type": "integer" + } + }, + "mixHash": { + "type": "array", + "items": { + "type": "integer" + } + }, + "nonce": { + "type": "array", + "items": { + "type": "integer" + } + }, + "number": { + "$ref": "#/definitions/big.Int" + }, + "parentBeaconBlockRoot": { + "description": "ParentBeaconRoot was added by EIP-4788 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + }, + "parentHash": { + "type": "array", + "items": { + "type": "integer" + } + }, + "receiptsRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "requestsRoot": { + "description": "RequestsHash was added by EIP-7685 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + }, + "sha3Uncles": { + "type": "array", + "items": { + "type": "integer" + } + }, + "stateRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "timestamp": { + "type": "integer" + }, + "transactionsRoot": { + "type": "array", + "items": { + "type": "integer" + } + }, + "withdrawalsRoot": { + "description": "WithdrawalsHash was added by EIP-4895 and is ignored in legacy headers.", + "type": "array", + "items": { + "type": "integer" + } + } + } + } + } +} diff --git a/packages/taiko-client/docs/swagger.yaml b/packages/taiko-client/docs/swagger.yaml new file mode 100644 index 00000000000..fa62613b65a --- /dev/null +++ b/packages/taiko-client/docs/swagger.yaml @@ -0,0 +1,262 @@ +definitions: + big.Int: + type: object + softblocks.BuildSoftBlockRequestBody: + properties: + transactionBatch: + allOf: + - $ref: "#/definitions/softblocks.TransactionBatch" + description: + "@param transactionBatch TransactionBatch Transaction batch to + be inserted into the soft block" + type: object + softblocks.BuildSoftBlockResponseBody: + properties: + blockHeader: + allOf: + - $ref: "#/definitions/types.Header" + description: "@param blockHeader types.Header Header of the soft block" + type: object + softblocks.RemoveSoftBlocksRequestBody: + properties: + newLastBlockId: + description: |- + @param newLastBlockID uint64 New last block ID of the blockchain, it should + @param not smaller than the canonical chain's highest block ID. + type: integer + type: object + softblocks.RemoveSoftBlocksResponseBody: + properties: + headsRemoved: + description: "@param headsRemoved uint64 Number of soft heads removed" + type: integer + lastBlockId: + description: + "@param lastBlockID uint64 Current highest block ID of the blockchain + (including soft blocks)" + type: integer + lastProposedBlockID: + description: + "@param lastProposedBlockID uint64 Highest block ID of the cnonical + chain" + type: integer + type: object + softblocks.SoftBlockParams: + properties: + anchorBlockID: + description: + "@param anchorBlockID uint64 `_anchorBlockId` parameter of the + `anchorV2` transaction in soft block" + type: integer + anchorStateRoot: + description: + "@param anchorStateRoot string `_anchorStateRoot` parameter of + the `anchorV2` transaction in soft block" + items: + type: integer + type: array + coinbase: + description: "@param coinbase uint64 Coinbase of the soft block" + type: string + timestamp: + description: "@param timestamp uint64 Timestamp of the soft block" + type: integer + type: object + softblocks.TransactionBatch: + properties: + batchId: + description: "@param batchId uint64 ID of this transaction batch" + type: integer + batchType: + allOf: + - $ref: "#/definitions/softblocks.TransactionBatchMarker" + description: |- + @param batchType TransactionBatchMarker Marker of the transaction batch, + @param either `end_of_block`, `end_of_preconf` or empty + blockId: + description: "@param blockId uint64 Block ID of the soft block" + type: integer + blockParams: + allOf: + - $ref: "#/definitions/softblocks.SoftBlockParams" + description: + "@param blockParams SoftBlockParams Block parameters of the soft + block" + signature: + description: "@param signature string Signature of this transaction batch" + type: string + transactions: + description: + "@param transactions string zlib compressed RLP encoded bytes + of a transactions list" + items: + type: integer + type: array + type: object + softblocks.TransactionBatchMarker: + enum: + - end_of_block + - end_of_preconf + type: string + x-enum-varnames: + - BatchMarkerEOB + - BatchMarkerEOP + types.Header: + properties: + baseFeePerGas: + allOf: + - $ref: "#/definitions/big.Int" + description: BaseFee was added by EIP-1559 and is ignored in legacy headers. + blobGasUsed: + description: BlobGasUsed was added by EIP-4844 and is ignored in legacy headers. + type: integer + difficulty: + $ref: "#/definitions/big.Int" + excessBlobGas: + description: + ExcessBlobGas was added by EIP-4844 and is ignored in legacy + headers. + type: integer + extraData: + items: + type: integer + type: array + gasLimit: + type: integer + gasUsed: + type: integer + logsBloom: + items: + type: integer + type: array + miner: + items: + type: integer + type: array + mixHash: + items: + type: integer + type: array + nonce: + items: + type: integer + type: array + number: + $ref: "#/definitions/big.Int" + parentBeaconBlockRoot: + description: + ParentBeaconRoot was added by EIP-4788 and is ignored in legacy + headers. + items: + type: integer + type: array + parentHash: + items: + type: integer + type: array + receiptsRoot: + items: + type: integer + type: array + requestsRoot: + description: RequestsHash was added by EIP-7685 and is ignored in legacy headers. + items: + type: integer + type: array + sha3Uncles: + items: + type: integer + type: array + stateRoot: + items: + type: integer + type: array + timestamp: + type: integer + transactionsRoot: + items: + type: integer + type: array + withdrawalsRoot: + description: + WithdrawalsHash was added by EIP-4895 and is ignored in legacy + headers. + items: + type: integer + type: array + type: object +info: + contact: + email: info@taiko.xyz + name: API Support + url: https://community.taiko.xyz/ + license: + name: MIT + url: https://github.com/taikoxyz/taiko-mono/blob/main/LICENSE.md + termsOfService: http://swagger.io/terms/ + title: Taiko Soft Block Server API + version: "1.0" +paths: + /healthz: + get: + consumes: + - application/json + operationId: health-check + produces: + - application/json + responses: + "200": + description: OK + schema: + type: string + summary: Get current server health status + /softBlocks: + delete: + consumes: + - application/json + description: |- + Remove all soft blocks from the blockchain beyond the specified block height, + ensuring the latest block ID does not exceed the given height. This method will fail if + the block with an ID one greater than the specified height is not a soft block. If the + specified block height is greater than the latest soft block ID, the method will succeed + without modifying the blockchain. + parameters: + - description: soft blocks removing request body + in: body + name: body + required: true + schema: + $ref: "#/definitions/softblocks.RemoveSoftBlocksRequestBody" + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: "#/definitions/softblocks.RemoveSoftBlocksResponseBody" + post: + consumes: + - application/json + description: |- + Insert a group of transactions into a soft block for preconfirmation. If the group is the + first for a block, a new soft block will be created. Otherwise, the transactions will + be appended to the existing soft block. The API will fail if: + 1) the block is not soft + 2) block-level parameters are invalid or do not match the current soft block’s parameters + 3) the group ID is not exactly 1 greater than the previous one + 4) the last group of the block indicates no further transactions are allowed + parameters: + - description: soft block creation request body + in: body + name: body + required: true + schema: + $ref: "#/definitions/softblocks.BuildSoftBlockRequestBody" + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: "#/definitions/softblocks.BuildSoftBlockResponseBody" +swagger: "2.0" diff --git a/packages/taiko-client/driver/chain_syncer/blob/soft_block.go b/packages/taiko-client/driver/chain_syncer/blob/soft_block.go new file mode 100644 index 00000000000..cbf00037f2d --- /dev/null +++ b/packages/taiko-client/driver/chain_syncer/blob/soft_block.go @@ -0,0 +1,277 @@ +package blob + +import ( + "context" + "errors" + "fmt" + "math/big" + + "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/beacon/engine" + "github.com/ethereum/go-ethereum/common" + consensus "github.com/ethereum/go-ethereum/consensus/taiko" + "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/rlp" + + "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/encoding" + softblocks "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/soft_blocks" + "github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/utils" + "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc" +) + +// InsertSoftBlockFromTransactionsBatch inserts a soft block into the L2 execution engine's blockchain +// from the given transactions batch. +func (s *Syncer) InsertSoftBlockFromTransactionsBatch( + ctx context.Context, + blockID uint64, + batchID uint64, + txListBytes []byte, + batchMarker softblocks.TransactionBatchMarker, + blockParams *softblocks.SoftBlockParams, +) (*types.Header, error) { + s.mutex.Lock() + defer s.mutex.Unlock() + + parent, err := s.rpc.L2.HeaderByNumber(ctx, new(big.Int).Sub(new(big.Int).SetUint64(blockID), common.Big1)) + if err != nil { + return nil, err + } + + if parent.Number.Uint64()+1 != blockID { + return nil, fmt.Errorf("parent block number (%d) is not equal to blockID - 1 (%d)", parent.Number.Uint64(), blockID) + } + + // Calculate the other block parameters + difficultyHashPaylaod, err := encoding.EncodeDifficultyCalcutionParams(blockID) + if err != nil { + return nil, fmt.Errorf("failed to encode `block.difficulty` calculation parameters: %w", err) + } + protocolConfigs, err := rpc.GetProtocolConfigs(s.rpc.TaikoL1, &bind.CallOpts{Context: ctx}) + if err != nil { + return nil, fmt.Errorf("failed to fetch protocol configs: %w", err) + } + + var ( + txList []*types.Transaction + fc = &engine.ForkchoiceStateV1{HeadBlockHash: parent.Hash()} + difficulty = crypto.Keccak256Hash(difficultyHashPaylaod) + extraData = encoding.EncodeBaseFeeConfig(&protocolConfigs.BaseFeeConfig) + ) + + if err := rlp.DecodeBytes(txListBytes, &txList); err != nil { + return nil, fmt.Errorf("failed to RLP decode txList bytes: %w", err) + } + + baseFee, err := s.rpc.CalculateBaseFee( + ctx, + parent, + new(big.Int).SetUint64(blockParams.AnchorBlockID), + true, + &protocolConfigs.BaseFeeConfig, + blockParams.Timestamp, + ) + if err != nil { + return nil, fmt.Errorf("failed to calculate base fee: %w", err) + } + + // Insert the anchor transaction at the head of the transactions list. + if batchID == 0 { + // Assemble a TaikoL2.anchorV2 transaction. + anchorTx, err := s.anchorConstructor.AssembleAnchorV2Tx( + ctx, + new(big.Int).SetUint64(blockParams.AnchorBlockID), + blockParams.AnchorStateRoot, + parent.GasUsed, + &protocolConfigs.BaseFeeConfig, + new(big.Int).SetUint64(blockID), + baseFee, + ) + if err != nil { + return nil, fmt.Errorf("failed to create TaikoL2.anchorV2 transaction: %w", err) + } + + txList = append([]*types.Transaction{anchorTx}, txList...) + } else { + prevSoftBlock, err := s.rpc.L2.BlockByNumber(ctx, new(big.Int).SetUint64(blockID)) + if err != nil { + return nil, fmt.Errorf("failed to fetch previous soft block (%d): %w", blockID, err) + } + + // Check the previous soft block status. + l1Origin, err := s.rpc.L2.L1OriginByID(ctx, prevSoftBlock.Number()) + if err != nil { + return nil, fmt.Errorf("failed to fetch L1 origin for block %d: %w", blockID, err) + } + if l1Origin.BatchID.Uint64()+1 != batchID { + return nil, fmt.Errorf("batch ID mismatch: expected %d, got %d", l1Origin.BatchID.Uint64()+1, batchID) + } + if l1Origin.EndOfBlock { + return nil, fmt.Errorf("soft block %d has already been marked as ended", blockID) + } + if l1Origin.EndOfPreconf { + return nil, fmt.Errorf("preconfirmation from %s has already been marked as ended", blockParams.Coinbase) + } + + txList = append(prevSoftBlock.Transactions(), txList...) + } + + if txListBytes, err = rlp.EncodeToBytes(txList); err != nil { + log.Error("Encode txList error", "blockID", blockID, "error", err) + return nil, err + } + + attributes := &engine.PayloadAttributes{ + Timestamp: blockParams.Timestamp, + Random: difficulty, + SuggestedFeeRecipient: blockParams.Coinbase, + Withdrawals: []*types.Withdrawal{}, + BlockMetadata: &engine.BlockMetadata{ + Beneficiary: blockParams.Coinbase, + GasLimit: uint64(protocolConfigs.BlockMaxGasLimit) + consensus.AnchorGasLimit, + Timestamp: blockParams.Timestamp, + TxList: txListBytes, + MixHash: difficulty, + ExtraData: extraData[:], + }, + BaseFeePerGas: baseFee, + L1Origin: &rawdb.L1Origin{ + BlockID: new(big.Int).SetUint64(blockID), + L2BlockHash: common.Hash{}, // Will be set by taiko-geth. + L1BlockHeight: nil, // No L1 block height for soft blocks. + BatchID: new(big.Int).SetUint64(batchID), + EndOfBlock: batchMarker == softblocks.BatchMarkerEOB, + EndOfPreconf: batchMarker == softblocks.BatchMarkerEOP, + Preconfer: blockParams.Coinbase, + }, + } + + log.Info( + "Soft block payloadAttributes", + "blockID", blockID, + "timestamp", attributes.Timestamp, + "random", attributes.Random, + "suggestedFeeRecipient", attributes.SuggestedFeeRecipient, + "withdrawals", len(attributes.Withdrawals), + "gasLimit", attributes.BlockMetadata.GasLimit, + "timestamp", attributes.BlockMetadata.Timestamp, + "mixHash", attributes.BlockMetadata.MixHash, + "baseFee", utils.WeiToGWei(attributes.BaseFeePerGas), + "extraData", common.Bytes2Hex(attributes.BlockMetadata.ExtraData), + "transactions", len(txList), + ) + + // Step 1, prepare a payload + fcRes, err := s.rpc.L2Engine.ForkchoiceUpdate(ctx, fc, attributes) + if err != nil { + return nil, fmt.Errorf("failed to update fork choice: %w", err) + } + if fcRes.PayloadStatus.Status != engine.VALID { + return nil, fmt.Errorf("unexpected ForkchoiceUpdate response status: %s", fcRes.PayloadStatus.Status) + } + if fcRes.PayloadID == nil { + return nil, errors.New("empty payload ID") + } + + // Step 2, get the payload + payload, err := s.rpc.L2Engine.GetPayload(ctx, fcRes.PayloadID) + if err != nil { + return nil, fmt.Errorf("failed to get payload: %w", err) + } + + log.Info( + "Soft block payload", + "blockID", blockID, + "baseFee", utils.WeiToGWei(payload.BaseFeePerGas), + "number", payload.Number, + "hash", payload.BlockHash, + "gasLimit", payload.GasLimit, + "gasUsed", payload.GasUsed, + "timestamp", payload.Timestamp, + "withdrawalsHash", payload.WithdrawalsHash, + ) + + // Step 3, execute the payload + execStatus, err := s.rpc.L2Engine.NewPayload(ctx, payload) + if err != nil { + return nil, fmt.Errorf("failed to create a new payload: %w", err) + } + if execStatus.Status != engine.VALID { + return nil, fmt.Errorf("unexpected NewPayload response status: %s", execStatus.Status) + } + + lastVerifiedBlockHash, err := s.rpc.GetLastVerifiedBlockHash(ctx) + if err != nil { + return nil, fmt.Errorf("failed to fetch last verified block hash: %w", err) + } + + canonicalHead, err := s.rpc.L2.HeadL1Origin(ctx) + if err != nil { + return nil, fmt.Errorf("failed to fetch canonical head: %w", err) + } + + // Step 4, update the fork choice + fc = &engine.ForkchoiceStateV1{ + HeadBlockHash: payload.BlockHash, + SafeBlockHash: canonicalHead.L2BlockHash, + FinalizedBlockHash: lastVerifiedBlockHash, + } + fcRes, err = s.rpc.L2Engine.ForkchoiceUpdate(ctx, fc, nil) + if err != nil { + return nil, err + } + if fcRes.PayloadStatus.Status != engine.VALID { + return nil, fmt.Errorf("unexpected ForkchoiceUpdate response status: %s", fcRes.PayloadStatus.Status) + } + + header, err := s.rpc.L2.HeaderByHash(ctx, payload.BlockHash) + if err != nil { + return nil, err + } + + log.Info( + "⏰ New soft L2 block inserted", + "blockID", blockID, + "hash", header.Hash(), + "transactions", len(payload.Transactions), + "baseFee", utils.WeiToGWei(header.BaseFee), + "withdrawals", len(payload.Withdrawals), + "endOfBlock", attributes.L1Origin.EndOfBlock, + "endOfPreconf", attributes.L1Origin.EndOfPreconf, + ) + + return header, nil +} + +// RemoveSoftBlocks removes soft blocks from the L2 execution engine's blockchain. +func (s *Syncer) RemoveSoftBlocks(ctx context.Context, newLastBlockID uint64) error { + s.mutex.Lock() + defer s.mutex.Unlock() + + newHead, err := s.rpc.L2.HeaderByNumber(ctx, new(big.Int).SetUint64(newLastBlockID)) + if err != nil { + return err + } + + lastVerifiedBlockHash, err := s.rpc.GetLastVerifiedBlockHash(ctx) + if err != nil { + return fmt.Errorf("failed to fetch last verified block hash: %w", err) + } + + fc := &engine.ForkchoiceStateV1{ + HeadBlockHash: newHead.Hash(), + SafeBlockHash: newHead.Hash(), + FinalizedBlockHash: lastVerifiedBlockHash, + } + fcRes, err := s.rpc.L2Engine.ForkchoiceUpdate(ctx, fc, nil) + if err != nil { + return err + } + if fcRes.PayloadStatus.Status != engine.VALID { + return fmt.Errorf("unexpected ForkchoiceUpdate response status: %s", fcRes.PayloadStatus.Status) + } + + return nil +} diff --git a/packages/taiko-client/driver/chain_syncer/blob/syncer.go b/packages/taiko-client/driver/chain_syncer/blob/syncer.go index 2abb04395d0..da03ffbfff2 100644 --- a/packages/taiko-client/driver/chain_syncer/blob/syncer.go +++ b/packages/taiko-client/driver/chain_syncer/blob/syncer.go @@ -6,6 +6,7 @@ import ( "fmt" "math/big" "net/url" + "sync" "time" "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings" @@ -47,6 +48,7 @@ type Syncer struct { reorgDetectedFlag bool maxRetrieveExponent uint64 blobDatasource *rpc.BlobDataSource + mutex sync.Mutex } // NewSyncer creates a new syncer instance. @@ -93,6 +95,8 @@ func NewSyncer( // ProcessL1Blocks fetches all `TaikoL1.BlockProposed` events between given // L1 block heights, and then tries inserting them into L2 execution engine's blockchain. func (s *Syncer) ProcessL1Blocks(ctx context.Context) error { + s.mutex.Lock() + defer s.mutex.Unlock() for { if err := s.processL1Blocks(ctx); err != nil { return err @@ -287,7 +291,6 @@ func (s *Syncer) onBlockProposed( log.Info( "🔗 New L2 block inserted", "blockID", meta.GetBlockID(), - "height", payloadData.Number, "hash", payloadData.BlockHash, "transactions", len(payloadData.Transactions), "baseFee", utils.WeiToGWei(payloadData.BaseFeePerGas), @@ -428,7 +431,7 @@ func (s *Syncer) insertNewHead( fc := &engine.ForkchoiceStateV1{ HeadBlockHash: payload.BlockHash, - SafeBlockHash: lastVerifiedBlockHash, + SafeBlockHash: payload.BlockHash, FinalizedBlockHash: lastVerifiedBlockHash, } @@ -484,7 +487,7 @@ func (s *Syncer) createExecutionPayloads( "timestamp", attributes.BlockMetadata.Timestamp, "mixHash", attributes.BlockMetadata.MixHash, "baseFee", utils.WeiToGWei(attributes.BaseFeePerGas), - "extraData", string(attributes.BlockMetadata.ExtraData), + "extraData", common.Bytes2Hex(attributes.BlockMetadata.ExtraData), "l1OriginHeight", attributes.L1Origin.L1BlockHeight, "l1OriginHash", attributes.L1Origin.L1BlockHash, ) diff --git a/packages/taiko-client/driver/config.go b/packages/taiko-client/driver/config.go index 3eb3b95e236..e393128c33b 100644 --- a/packages/taiko-client/driver/config.go +++ b/packages/taiko-client/driver/config.go @@ -17,12 +17,16 @@ import ( // Config contains the configurations to initialize a Taiko driver. type Config struct { *rpc.ClientConfig - P2PSync bool - P2PSyncTimeout time.Duration - RetryInterval time.Duration - MaxExponent uint64 - BlobServerEndpoint *url.URL - SocialScanEndpoint *url.URL + P2PSync bool + P2PSyncTimeout time.Duration + RetryInterval time.Duration + MaxExponent uint64 + BlobServerEndpoint *url.URL + SocialScanEndpoint *url.URL + SoftBlockServerPort uint64 + SoftBlockServerJWTSecret []byte + SoftBlockServerCORSOrigins string + SoftBlockServerCheckSig bool } // NewConfigFromCliContext creates a new config instance from @@ -69,6 +73,15 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { return nil, errors.New("empty L1 beacon endpoint, blob server and Social Scan endpoint") } + var softBlockServerJWTSecret []byte + if c.String(flags.SoftBlockServerJWTSecret.Name) != "" { + if softBlockServerJWTSecret, err = jwt.ParseSecretFromFile( + c.String(flags.SoftBlockServerJWTSecret.Name), + ); err != nil { + return nil, fmt.Errorf("invalid JWT secret file: %w", err) + } + } + var timeout = c.Duration(flags.RPCTimeout.Name) return &Config{ ClientConfig: &rpc.ClientConfig{ @@ -82,11 +95,15 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { JwtSecret: string(jwtSecret), Timeout: timeout, }, - RetryInterval: c.Duration(flags.BackOffRetryInterval.Name), - P2PSync: p2pSync, - P2PSyncTimeout: c.Duration(flags.P2PSyncTimeout.Name), - MaxExponent: c.Uint64(flags.MaxExponent.Name), - BlobServerEndpoint: blobServerEndpoint, - SocialScanEndpoint: socialScanEndpoint, + RetryInterval: c.Duration(flags.BackOffRetryInterval.Name), + P2PSync: p2pSync, + P2PSyncTimeout: c.Duration(flags.P2PSyncTimeout.Name), + MaxExponent: c.Uint64(flags.MaxExponent.Name), + BlobServerEndpoint: blobServerEndpoint, + SocialScanEndpoint: socialScanEndpoint, + SoftBlockServerPort: c.Uint64(flags.SoftBlockServerPort.Name), + SoftBlockServerJWTSecret: softBlockServerJWTSecret, + SoftBlockServerCORSOrigins: c.String(flags.SoftBlockServerCORSOrigins.Name), + SoftBlockServerCheckSig: c.Bool(flags.SoftBlockServerCheckSig.Name), }, nil } diff --git a/packages/taiko-client/driver/driver.go b/packages/taiko-client/driver/driver.go index a5990139dcb..64993c77602 100644 --- a/packages/taiko-client/driver/driver.go +++ b/packages/taiko-client/driver/driver.go @@ -16,6 +16,7 @@ import ( "github.com/urfave/cli/v2" chainSyncer "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/chain_syncer" + softblocks "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/soft_blocks" "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/state" "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc" ) @@ -29,9 +30,10 @@ const ( // contract. type Driver struct { *Config - rpc *rpc.Client - l2ChainSyncer *chainSyncer.L2ChainSyncer - state *state.State + rpc *rpc.Client + l2ChainSyncer *chainSyncer.L2ChainSyncer + softblockServer *softblocks.SoftBlockAPIServer + state *state.State l1HeadCh chan *types.Header l1HeadSub event.Subscription @@ -88,6 +90,18 @@ func (d *Driver) InitFromConfig(ctx context.Context, cfg *Config) (err error) { d.l1HeadSub = d.state.SubL1HeadsFeed(d.l1HeadCh) + if d.SoftBlockServerPort > 0 { + if d.softblockServer, err = softblocks.New( + d.SoftBlockServerCORSOrigins, + d.SoftBlockServerJWTSecret, + d.l2ChainSyncer.BlobSyncer(), + d.rpc, + d.Config.SoftBlockServerCheckSig, + ); err != nil { + return err + } + } + return nil } @@ -97,6 +111,15 @@ func (d *Driver) Start() error { go d.reportProtocolStatus() go d.exchangeTransitionConfigLoop() + // Start the soft block server if it is enabled. + if d.softblockServer != nil { + go func() { + if err := d.softblockServer.Start(d.SoftBlockServerPort); err != nil { + log.Crit("Failed to start soft block server", "error", err) + } + }() + } + return nil } @@ -104,6 +127,12 @@ func (d *Driver) Start() error { func (d *Driver) Close(_ context.Context) { d.l1HeadSub.Unsubscribe() d.state.Close() + // Close the soft block server if it is enabled. + if d.softblockServer != nil { + if err := d.softblockServer.Shutdown(d.ctx); err != nil { + log.Error("Failed to shutdown soft block server", "error", err) + } + } d.wg.Wait() } diff --git a/packages/taiko-client/driver/driver_test.go b/packages/taiko-client/driver/driver_test.go index b0a97cc4818..4a23a6ffeab 100644 --- a/packages/taiko-client/driver/driver_test.go +++ b/packages/taiko-client/driver/driver_test.go @@ -1,18 +1,28 @@ package driver import ( + "bytes" + "compress/zlib" "context" + "fmt" "math/big" + "net/url" "os" "testing" "time" "github.com/ethereum-optimism/optimism/op-service/txmgr" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/params" + "github.com/ethereum/go-ethereum/rlp" + "github.com/go-resty/resty/v2" "github.com/stretchr/testify/suite" "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/encoding" + softblocks "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/soft_blocks" "github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/testutils" "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/jwt" "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc" @@ -344,6 +354,301 @@ func (s *DriverTestSuite) InitProposer() { s.p = p } +func (s *DriverTestSuite) TestInsertSoftBlocks() { + var ( + port = uint64(testutils.RandomPort()) + err error + ) + s.d.softblockServer, err = softblocks.New("*", nil, s.d.ChainSyncer().BlobSyncer(), s.RPCClient, true) + s.Nil(err) + go func() { s.NotNil(s.d.softblockServer.Start(port)) }() + defer func() { s.Nil(s.d.softblockServer.Shutdown(s.d.ctx)) }() + + url, err := url.Parse(fmt.Sprintf("http://localhost:%v", port)) + s.Nil(err) + + l2Head1, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + s.Nil(s.d.ChainSyncer().BlobSyncer().ProcessL1Blocks(context.Background())) + + // Propose a valid L2 block + s.ProposeAndInsertValidBlock(s.p, s.d.ChainSyncer().BlobSyncer()) + + l2Head2, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + l1Head1, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + s.Greater(l2Head2.Number.Uint64(), l2Head1.Number.Uint64()) + + res, err := resty.New().R().Get(url.String() + "/healthz") + s.Nil(err) + s.True(res.IsSuccess()) + + // Try to insert a soft block with batch ID 0 + s.True(s.insertSoftBlock(url, l1Head1, l2Head2.Number.Uint64()+1, 0, false, false).IsSuccess()) + l2Head3, err := s.d.rpc.L2.BlockByNumber(context.Background(), nil) + s.Nil(err) + + s.Equal(2, len(l2Head3.Transactions())) + + l1Origin, err := s.RPCClient.L2.L1OriginByID(context.Background(), new(big.Int).Add(l2Head2.Number, common.Big1)) + s.Nil(err) + s.Equal(l2Head3.Number().Uint64(), l1Origin.BlockID.Uint64()) + s.Equal(l2Head3.Hash(), l1Origin.L2BlockHash) + s.Equal(uint64(0), l1Origin.L1BlockHeight.Uint64()) + s.Equal(common.Hash{}, l1Origin.L1BlockHash) + s.Equal(false, l1Origin.EndOfBlock) + s.Equal(false, l1Origin.EndOfPreconf) + s.Equal(uint64(0), l1Origin.BatchID.Uint64()) + s.True(l1Origin.IsSoftblock()) + + // Try to patch a soft block with batch ID 1 + s.True(s.insertSoftBlock(url, l1Head1, l2Head2.Number.Uint64()+1, 1, true, false).IsSuccess()) + l2Head4, err := s.d.rpc.L2.BlockByNumber(context.Background(), nil) + s.Nil(err) + s.Equal(3, len(l2Head4.Transactions())) + s.Equal(l2Head3.Number().Uint64(), l2Head4.Number().Uint64()) + s.NotEqual(l2Head3.Hash(), l2Head4.Hash()) + + l1Origin2, err := s.RPCClient.L2.L1OriginByID(context.Background(), new(big.Int).Add(l2Head2.Number, common.Big1)) + s.Nil(err) + s.Equal(l2Head4.Number().Uint64(), l1Origin2.BlockID.Uint64()) + s.Equal(l2Head4.Hash(), l1Origin2.L2BlockHash) + s.Equal(uint64(0), l1Origin2.L1BlockHeight.Uint64()) + s.Equal(common.Hash{}, l1Origin2.L1BlockHash) + s.Equal(true, l1Origin2.EndOfBlock) + s.Equal(false, l1Origin2.EndOfPreconf) + s.Equal(uint64(1), l1Origin2.BatchID.Uint64()) + s.True(l1Origin2.IsSoftblock()) + + canonicalL1Origin, err := s.RPCClient.L2.HeadL1Origin(context.Background()) + s.Nil(err) + s.Equal(l2Head2.Number.Uint64(), canonicalL1Origin.BlockID.Uint64()) + + // Try to patch an ended soft block + s.False(s.insertSoftBlock(url, l1Head1, l2Head2.Number.Uint64()+1, 1, true, false).IsSuccess()) + + // Try to insert a new soft block with batch ID 0 + s.True(s.insertSoftBlock(url, l1Head1, l2Head2.Number.Uint64()+2, 0, false, false).IsSuccess()) + l2Head5, err := s.d.rpc.L2.BlockByNumber(context.Background(), nil) + s.Nil(err) + s.Equal(2, len(l2Head5.Transactions())) + + // Propose 3 valid L2 blocks + s.ProposeAndInsertEmptyBlocks(s.p, s.d.ChainSyncer().BlobSyncer()) + + l2Head6, err := s.d.rpc.L2.BlockByNumber(context.Background(), l2Head3.Number()) + s.Nil(err) + s.Equal(l2Head3.Number().Uint64(), l2Head6.Number().Uint64()) + s.Equal(1, len(l2Head6.Transactions())) + + l1Origin3, err := s.RPCClient.L2.L1OriginByID(context.Background(), l2Head6.Number()) + s.Nil(err) + s.Equal(l2Head3.Number().Uint64(), l1Origin3.BlockID.Uint64()) + s.Equal(l2Head6.Hash(), l1Origin3.L2BlockHash) + s.NotZero(l1Origin3.L1BlockHeight.Uint64()) + s.NotEmpty(l1Origin3.L1BlockHash) + s.Equal(false, l1Origin3.EndOfBlock) + s.Equal(false, l1Origin3.EndOfPreconf) + s.Equal(uint64(0), l1Origin3.BatchID.Uint64()) + s.False(l1Origin3.IsSoftblock()) +} + +func (s *DriverTestSuite) TestInsertSoftBlocksAfterEOB() { + var ( + port = uint64(testutils.RandomPort()) + epochs = testutils.RandomHash().Big().Uint64() % 5 + err error + ) + s.d.softblockServer, err = softblocks.New("*", nil, s.d.ChainSyncer().BlobSyncer(), s.RPCClient, true) + s.Nil(err) + go func() { s.NotNil(s.d.softblockServer.Start(port)) }() + defer func() { s.Nil(s.d.softblockServer.Shutdown(s.d.ctx)) }() + + url, err := url.Parse(fmt.Sprintf("http://localhost:%v", port)) + s.Nil(err) + + headL1Origin, err := s.RPCClient.L2.HeadL1Origin(context.Background()) + s.Nil(err) + + for range headL1Origin.BlockID.Uint64() + epochs + 1 { + s.ProposeAndInsertEmptyBlocks(s.p, s.d.ChainSyncer().BlobSyncer()) + } + + l1Head, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + l2Head, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + for i := range epochs { + s.True(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, i, false, false).IsSuccess()) + } + s.True(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, epochs, true, false).IsSuccess()) + s.False(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, epochs+1, false, false).IsSuccess()) +} + +func (s *DriverTestSuite) TestInsertSoftBlocksAfterEOP() { + var ( + port = uint64(testutils.RandomPort()) + epochs = testutils.RandomHash().Big().Uint64() % 5 + err error + ) + s.d.softblockServer, err = softblocks.New("*", nil, s.d.ChainSyncer().BlobSyncer(), s.RPCClient, true) + s.Nil(err) + go func() { s.NotNil(s.d.softblockServer.Start(port)) }() + defer func() { s.Nil(s.d.softblockServer.Shutdown(s.d.ctx)) }() + + url, err := url.Parse(fmt.Sprintf("http://localhost:%v", port)) + s.Nil(err) + + headL1Origin, err := s.RPCClient.L2.HeadL1Origin(context.Background()) + s.Nil(err) + + for range headL1Origin.BlockID.Uint64() + epochs + 1 { + s.ProposeAndInsertEmptyBlocks(s.p, s.d.ChainSyncer().BlobSyncer()) + } + + l1Head, err := s.d.rpc.L1.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + l2Head, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + for i := range epochs { + s.True(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, i, false, false).IsSuccess()) + } + s.True(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, epochs, false, true).IsSuccess()) + s.False(s.insertSoftBlock(url, l1Head, l2Head.Number.Uint64()+1, epochs+1, false, false).IsSuccess()) + + l2Head2, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + + // Remove soft blocks + res, err := resty.New(). + R(). + SetBody(&softblocks.RemoveSoftBlocksRequestBody{ + NewLastBlockID: l2Head2.Number.Uint64() - 1, + }). + Delete(url.String() + "/softBlocks") + s.Nil(err) + s.True(res.IsSuccess()) + + l2Head3, err := s.d.rpc.L2.HeaderByNumber(context.Background(), nil) + s.Nil(err) + s.Equal(l2Head2.Number.Uint64()-1, l2Head3.Number.Uint64()) +} + func TestDriverTestSuite(t *testing.T) { suite.Run(t, new(DriverTestSuite)) } + +// insertSoftBlock inserts a soft block with the given parameters. +func (s *DriverTestSuite) insertSoftBlock( + url *url.URL, + anchoredL1Block *types.Header, + l2BlockID uint64, + batchID uint64, + endOfBlock bool, + endOfPreconf bool, +) *resty.Response { + preconferPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROPOSER_PRIVATE_KEY"))) + s.Nil(err) + + preconferAddress := crypto.PubkeyToAddress(preconferPrivKey.PublicKey) + + nonce, err := s.RPCClient.L2.NonceAt(context.Background(), s.TestAddr, nil) + s.Nil(err) + + tx := types.NewTransaction( + nonce, + common.BytesToAddress(testutils.RandomBytes(32)), + common.Big0, + 100_000, + new(big.Int).SetUint64(uint64(10*params.GWei)), + []byte{}, + ) + signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(s.RPCClient.L2.ChainID), s.TestAddrPrivKey) + s.Nil(err) + + // If the transaction is underpriced, we just ingore it. + err = s.RPCClient.L2.SendTransaction(context.Background(), signedTx) + if err != nil { + s.Equal("replacement transaction underpriced", err.Error()) + } + + b, err := encodeAndCompressTxList([]*types.Transaction{signedTx}) + s.Nil(err) + + var marker softblocks.TransactionBatchMarker + if endOfBlock { + marker = softblocks.BatchMarkerEOB + } else if endOfPreconf { + marker = softblocks.BatchMarkerEOP + } else { + marker = softblocks.BatchMarkerEmpty + } + + txBatch := &softblocks.TransactionBatch{ + BlockID: l2BlockID, + ID: batchID, + TransactionsList: b, + BatchMarker: marker, + Signature: "", + BlockParams: &softblocks.SoftBlockParams{ + AnchorBlockID: anchoredL1Block.Number.Uint64(), + AnchorStateRoot: anchoredL1Block.Root, + Timestamp: anchoredL1Block.Time + 12, + Coinbase: preconferAddress, + }, + } + + payload, err := rlp.EncodeToBytes(txBatch) + s.Nil(err) + s.NotEmpty(payload) + + sig, err := crypto.Sign(crypto.Keccak256(payload), preconferPrivKey) + s.Nil(err) + txBatch.Signature = common.Bytes2Hex(sig) + + // Try to propose a soft block with batch ID 0 + res, err := resty.New(). + R(). + SetBody(&softblocks.BuildSoftBlockRequestBody{ + TransactionBatch: txBatch, + }). + Post(url.String() + "/softBlocks") + s.Nil(err) + log.Info("Soft block response", "body", res.String()) + return res +} + +// compress compresses the given txList bytes using zlib. +func compress(txListBytes []byte) ([]byte, error) { + var b bytes.Buffer + w := zlib.NewWriter(&b) + defer w.Close() + + if _, err := w.Write(txListBytes); err != nil { + return nil, err + } + + if err := w.Flush(); err != nil { + return nil, err + } + + return b.Bytes(), nil +} + +// encodeAndCompressTxList encodes and compresses the given transactions list. +func encodeAndCompressTxList(txs types.Transactions) ([]byte, error) { + b, err := rlp.EncodeToBytes(txs) + if err != nil { + return nil, err + } + + return compress(b) +} diff --git a/packages/taiko-client/driver/soft_blocks/api.go b/packages/taiko-client/driver/soft_blocks/api.go new file mode 100644 index 00000000000..1f818e7ce36 --- /dev/null +++ b/packages/taiko-client/driver/soft_blocks/api.go @@ -0,0 +1,307 @@ +package softblocks + +import ( + "errors" + "math/big" + "net/http" + + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/rlp" + "github.com/labstack/echo/v4" +) + +// TransactionBatchMarker represents the status of a soft block transactions group. +type TransactionBatchMarker string + +// BatchMarker valid values. +const ( + BatchMarkerEmpty TransactionBatchMarker = "" + BatchMarkerEOB TransactionBatchMarker = "endOfBlock" + BatchMarkerEOP TransactionBatchMarker = "endOfPreconf" +) + +// SoftBlockParams represents the parameters for building a soft block. +type SoftBlockParams struct { + // @param timestamp uint64 Timestamp of the soft block + Timestamp uint64 `json:"timestamp"` + // @param coinbase string Coinbase of the soft block + Coinbase common.Address `json:"coinbase"` + + // @param anchorBlockID uint64 `_anchorBlockId` parameter of the `anchorV2` transaction in soft block + AnchorBlockID uint64 `json:"anchorBlockID"` + // @param anchorStateRoot string `_anchorStateRoot` parameter of the `anchorV2` transaction in soft block + AnchorStateRoot common.Hash `json:"anchorStateRoot"` +} + +// TransactionBatch represents a soft block group. +type TransactionBatch struct { + // @param blockId uint64 Block ID of the soft block + BlockID uint64 `json:"blockId"` + // @param batchId uint64 ID of this transaction batch + ID uint64 `json:"batchId"` + // @param transactions string zlib compressed RLP encoded bytes of a transactions list + TransactionsList []byte `json:"transactions"` + // @param batchType TransactionBatchMarker Marker of the transaction batch, + // @param either `end_of_block`, `end_of_preconf` or empty + BatchMarker TransactionBatchMarker `json:"batchType"` + // @param signature string Signature of this transaction batch + Signature string `json:"signature"` + // @param blockParams SoftBlockParams Block parameters of the soft block + BlockParams *SoftBlockParams `json:"blockParams"` +} + +// ValidateSignature validates the signature of the transaction batch. +func (b *TransactionBatch) ValidateSignature() (bool, error) { + batchWithoutSig := *b + batchWithoutSig.Signature = "" + + payload, err := rlp.EncodeToBytes(batchWithoutSig) + if err != nil { + return false, err + } + + pubKey, err := crypto.SigToPub(crypto.Keccak256(payload), common.FromHex(b.Signature)) + if err != nil { + return false, err + } + + return crypto.PubkeyToAddress(*pubKey).Hex() == b.BlockParams.Coinbase.Hex(), nil +} + +// BuildSoftBlockRequestBody represents a request body when handling +// soft blocks creation requests. +type BuildSoftBlockRequestBody struct { + // @param transactionBatch TransactionBatch Transaction batch to be inserted into the soft block + TransactionBatch *TransactionBatch `json:"transactionBatch"` +} + +// CreateOrUpdateBlocksFromBatchResponseBody represents a response body when handling soft +// blocks creation requests. +type BuildSoftBlockResponseBody struct { + // @param blockHeader types.Header Header of the soft block + BlockHeader *types.Header `json:"blockHeader"` +} + +// BuildSoftBlock handles a soft block creation request, +// if the soft block group in request are valid, it will insert the correspoinding new soft +// block to the backend L2 execution engine and return a success response. +// +// @Description Insert a group of transactions into a soft block for preconfirmation. If the group is the +// @Description first for a block, a new soft block will be created. Otherwise, the transactions will +// @Description be appended to the existing soft block. The API will fail if: +// @Description 1) the block is not soft +// @Description 2) block-level parameters are invalid or do not match the current soft block’s parameters +// @Description 3) the group ID is not exactly 1 greater than the previous one +// @Description 4) the last group of the block indicates no further transactions are allowed +// @Param body body BuildSoftBlockRequestBody true "soft block creation request body" +// @Accept json +// @Produce json +// @Success 200 {object} BuildSoftBlockResponseBody +// @Router /softBlocks [post] +func (s *SoftBlockAPIServer) BuildSoftBlock(c echo.Context) error { + // Parse the request body. + reqBody := new(BuildSoftBlockRequestBody) + if err := c.Bind(reqBody); err != nil { + return s.returnError(c, http.StatusUnprocessableEntity, err) + } + if reqBody.TransactionBatch == nil { + return s.returnError(c, http.StatusBadRequest, errors.New("transactionBatch is required")) + } + + log.Info( + "New soft block building request", + "blockID", reqBody.TransactionBatch.BlockID, + "batchID", reqBody.TransactionBatch.ID, + "batchMarker", reqBody.TransactionBatch.BatchMarker, + "transactionsListBytes", len(reqBody.TransactionBatch.TransactionsList), + "signature", reqBody.TransactionBatch.Signature, + "timestamp", reqBody.TransactionBatch.BlockParams.Timestamp, + "coinbase", reqBody.TransactionBatch.BlockParams.Coinbase, + "anchorBlockID", reqBody.TransactionBatch.BlockParams.AnchorBlockID, + "anchorStateRoot", reqBody.TransactionBatch.BlockParams.AnchorStateRoot, + ) + + // Request body validation. + if reqBody.TransactionBatch.BlockParams == nil { + return s.returnError(c, http.StatusBadRequest, errors.New("blockParams is required")) + } + if reqBody.TransactionBatch.BlockParams.AnchorBlockID == 0 { + return s.returnError(c, http.StatusBadRequest, errors.New("non-zero anchorBlockID is required")) + } + if reqBody.TransactionBatch.BlockParams.AnchorStateRoot == (common.Hash{}) { + return s.returnError(c, http.StatusBadRequest, errors.New("empty anchorStateRoot")) + } + if reqBody.TransactionBatch.BlockParams.Timestamp == 0 { + return s.returnError(c, http.StatusBadRequest, errors.New("non-zero timestamp is required")) + } + if reqBody.TransactionBatch.BlockParams.Coinbase == (common.Address{}) { + return s.returnError(c, http.StatusBadRequest, errors.New("empty coinbase")) + } + + // If the `--softBlock.signatureCheck` flag is enabled, validate the signature. + if s.checkSig { + ok, err := reqBody.TransactionBatch.ValidateSignature() + if err != nil { + return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()}) + } + if !ok { + log.Warn( + "Invalid signature", + "signature", reqBody.TransactionBatch.Signature, + "coinbase", reqBody.TransactionBatch.BlockParams.Coinbase.Hex(), + ) + return s.returnError(c, http.StatusBadRequest, errors.New("invalid signature")) + } + } + + // Check if the L2 execution engine is syncing from L1. + progress, err := s.rpc.L2ExecutionEngineSyncProgress(c.Request().Context()) + if err != nil { + return c.JSON(http.StatusInternalServerError, map[string]string{"error": err.Error()}) + } + if progress.IsSyncing() { + return s.returnError(c, http.StatusBadRequest, errors.New("L2 execution engine is syncing")) + } + + // Check if the softblock batch or the current preconf process is ended. + l1Origin, err := s.rpc.L2.L1OriginByID( + c.Request().Context(), + new(big.Int).SetUint64(reqBody.TransactionBatch.BlockID), + ) + if err != nil && err.Error() != ethereum.NotFound.Error() { + return s.returnError(c, http.StatusInternalServerError, err) + } + if l1Origin != nil { + if l1Origin.EndOfBlock { + return s.returnError(c, http.StatusBadRequest, errors.New("soft block has already been marked as ended")) + } + if l1Origin.EndOfPreconf { + return s.returnError( + c, + http.StatusBadRequest, + errors.New("preconfirmation has already been marked as ended"), + ) + } + } + + // Insert the soft block. + header, err := s.chainSyncer.InsertSoftBlockFromTransactionsBatch( + c.Request().Context(), + reqBody.TransactionBatch.BlockID, + reqBody.TransactionBatch.ID, + s.txListDecompressor.TryDecompress( + s.rpc.L2.ChainID, + new(big.Int).SetUint64(reqBody.TransactionBatch.BlockID), + reqBody.TransactionBatch.TransactionsList, + true, + ), + reqBody.TransactionBatch.BatchMarker, + reqBody.TransactionBatch.BlockParams, + ) + if err != nil { + return s.returnError(c, http.StatusInternalServerError, err) + } + + return c.JSON(http.StatusOK, BuildSoftBlockResponseBody{BlockHeader: header}) +} + +// RemoveSoftBlocksRequestBody represents a request body when resetting the backend +// L2 execution engine soft head. +type RemoveSoftBlocksRequestBody struct { + // @param newLastBlockID uint64 New last block ID of the blockchain, it should + // @param not smaller than the canonical chain's highest block ID. + NewLastBlockID uint64 `json:"newLastBlockId"` +} + +// RemoveSoftBlocksResponseBody represents a response body when resetting the backend +// L2 execution engine soft head. +type RemoveSoftBlocksResponseBody struct { + // @param lastBlockID uint64 Current highest block ID of the blockchain (including soft blocks) + LastBlockID uint64 `json:"lastBlockId"` + // @param lastProposedBlockID uint64 Highest block ID of the cnonical chain + LastProposedBlockID uint64 `json:"lastProposedBlockID"` + // @param headsRemoved uint64 Number of soft heads removed + HeadsRemoved uint64 `json:"headsRemoved"` +} + +// RemoveSoftBlocks removes the backend L2 execution engine soft head. +// +// @Description Remove all soft blocks from the blockchain beyond the specified block height, +// @Description ensuring the latest block ID does not exceed the given height. This method will fail if +// @Description the block with an ID one greater than the specified height is not a soft block. If the +// @Description specified block height is greater than the latest soft block ID, the method will succeed +// @Description without modifying the blockchain. +// @Param body body RemoveSoftBlocksRequestBody true "soft blocks removing request body" +// @Accept json +// @Produce json +// @Success 200 {object} RemoveSoftBlocksResponseBody +// @Router /softBlocks [delete] +func (s *SoftBlockAPIServer) RemoveSoftBlocks(c echo.Context) error { + // Parse the request body. + reqBody := new(RemoveSoftBlocksRequestBody) + if err := c.Bind(reqBody); err != nil { + return s.returnError(c, http.StatusUnprocessableEntity, err) + } + + // Request body validation. + canonicalHeadL1Origin, err := s.rpc.L2.HeadL1Origin(c.Request().Context()) + if err != nil { + return s.returnError(c, http.StatusInternalServerError, err) + } + + currentHead, err := s.rpc.L2.HeaderByNumber(c.Request().Context(), nil) + if err != nil { + return s.returnError(c, http.StatusInternalServerError, err) + } + + log.Info( + "New soft block removing request", + "newLastBlockId", reqBody.NewLastBlockID, + "canonicalHead", canonicalHeadL1Origin.BlockID.Uint64(), + "currentHead", currentHead.Number.Uint64(), + ) + + if reqBody.NewLastBlockID < canonicalHeadL1Origin.BlockID.Uint64() { + return s.returnError( + c, + http.StatusBadRequest, + errors.New("newLastBlockId must not be smaller than the canonical chain's highest block ID"), + ) + } + + if err := s.chainSyncer.RemoveSoftBlocks(c.Request().Context(), reqBody.NewLastBlockID); err != nil { + return s.returnError(c, http.StatusBadRequest, err) + } + + newHead, err := s.rpc.L2.HeaderByNumber(c.Request().Context(), nil) + if err != nil { + return s.returnError(c, http.StatusInternalServerError, err) + } + + return c.JSON(http.StatusOK, RemoveSoftBlocksResponseBody{ + LastBlockID: newHead.Number.Uint64(), + LastProposedBlockID: canonicalHeadL1Origin.BlockID.Uint64(), + HeadsRemoved: currentHead.Number.Uint64() - newHead.Number.Uint64(), + }) +} + +// HealthCheck is the endpoints for probes. +// +// @Summary Get current server health status +// @ID health-check +// @Accept json +// @Produce json +// @Success 200 {object} string +// @Router /healthz [get] +func (s *SoftBlockAPIServer) HealthCheck(c echo.Context) error { + return c.NoContent(http.StatusOK) +} + +// returnError is a helper function to return an error response. +func (s *SoftBlockAPIServer) returnError(c echo.Context, statusCode int, err error) error { + return c.JSON(statusCode, map[string]string{"error": err.Error()}) +} diff --git a/packages/taiko-client/driver/soft_blocks/server.go b/packages/taiko-client/driver/soft_blocks/server.go new file mode 100644 index 00000000000..e27cac912fd --- /dev/null +++ b/packages/taiko-client/driver/soft_blocks/server.go @@ -0,0 +1,130 @@ +package softblocks + +import ( + "context" + "fmt" + "os" + + "github.com/ethereum/go-ethereum/core/types" + echojwt "github.com/labstack/echo-jwt/v4" + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" + + txListDecompressor "github.com/taikoxyz/taiko-mono/packages/taiko-client/driver/txlist_decompressor" + "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc" +) + +// softBlockChainSyncer is an interface for soft block chain syncer. +type softBlockChainSyncer interface { + InsertSoftBlockFromTransactionsBatch( + ctx context.Context, + blockID uint64, + batchID uint64, + txListBytes []byte, + batchMarker TransactionBatchMarker, + softBlockParams *SoftBlockParams, + ) (*types.Header, error) + RemoveSoftBlocks(ctx context.Context, newLastBlockID uint64) error +} + +// @title Taiko Soft Block Server API +// @version 1.0 +// @termsOfService http://swagger.io/terms/ + +// @contact.name API Support +// @contact.url https://community.taiko.xyz/ +// @contact.email info@taiko.xyz + +// @license.name MIT +// @license.url https://github.com/taikoxyz/taiko-mono/blob/main/LICENSE.md +// SoftBlockAPIServer represents a soft blcok server instance. +type SoftBlockAPIServer struct { + echo *echo.Echo + chainSyncer softBlockChainSyncer + rpc *rpc.Client + txListDecompressor *txListDecompressor.TxListDecompressor + checkSig bool +} + +// New creates a new soft blcok server instance, and starts the server. +func New( + cors string, + jwtSecret []byte, + chainSyncer softBlockChainSyncer, + cli *rpc.Client, + checkSig bool, +) (*SoftBlockAPIServer, error) { + protocolConfigs, err := rpc.GetProtocolConfigs(cli.TaikoL1, nil) + if err != nil { + return nil, fmt.Errorf("failed to fetch protocol configs: %w", err) + } + + server := &SoftBlockAPIServer{ + echo: echo.New(), + chainSyncer: chainSyncer, + txListDecompressor: txListDecompressor.NewTxListDecompressor( + uint64(protocolConfigs.BlockMaxGasLimit), + rpc.BlockMaxTxListBytes, + cli.L2.ChainID, + ), + rpc: cli, + checkSig: checkSig, + } + + server.echo.HideBanner = true + server.configureMiddleware([]string{cors}) + server.configureRoutes() + if jwtSecret != nil { + server.echo.Use(echojwt.JWT(jwtSecret)) + } + + return server, nil +} + +// LogSkipper implements the `middleware.Skipper` interface. +func LogSkipper(c echo.Context) bool { + switch c.Request().URL.Path { + case "/healthz": + return true + default: + return true + } +} + +// configureMiddleware configures the server middlewares. +func (s *SoftBlockAPIServer) configureMiddleware(corsOrigins []string) { + s.echo.Use(middleware.RequestID()) + + s.echo.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ + Skipper: LogSkipper, + Format: `{"time":"${time_rfc3339_nano}","level":"INFO","message":{"id":"${id}","remote_ip":"${remote_ip}",` + + `"host":"${host}","method":"${method}","uri":"${uri}","user_agent":"${user_agent}",` + + `"response_status":${status},"error":"${error}","latency":${latency},"latency_human":"${latency_human}",` + + `"bytes_in":${bytes_in},"bytes_out":${bytes_out}}}` + "\n", + Output: os.Stdout, + })) + + // Add CORS middleware + s.echo.Use(middleware.CORSWithConfig(middleware.CORSConfig{ + AllowOrigins: corsOrigins, + AllowCredentials: true, + })) +} + +// Start starts the HTTP server. +func (s *SoftBlockAPIServer) Start(port uint64) error { + return s.echo.Start(fmt.Sprintf(":%v", port)) +} + +// Shutdown shuts down the HTTP server. +func (s *SoftBlockAPIServer) Shutdown(ctx context.Context) error { + return s.echo.Shutdown(ctx) +} + +// configureRoutes contains all routes which will be used by prover server. +func (s *SoftBlockAPIServer) configureRoutes() { + s.echo.GET("/", s.HealthCheck) + s.echo.GET("/healthz", s.HealthCheck) + s.echo.POST("/softBlocks", s.BuildSoftBlock) + s.echo.DELETE("/softBlocks", s.RemoveSoftBlocks) +} diff --git a/packages/taiko-client/driver/soft_blocks/server_test.go b/packages/taiko-client/driver/soft_blocks/server_test.go new file mode 100644 index 00000000000..c1aa66d1777 --- /dev/null +++ b/packages/taiko-client/driver/soft_blocks/server_test.go @@ -0,0 +1,36 @@ +package softblocks + +import ( + "context" + "testing" + + "github.com/ethereum/go-ethereum/log" + "github.com/stretchr/testify/suite" + + "github.com/taikoxyz/taiko-mono/packages/taiko-client/internal/testutils" +) + +type SoftBlockAPIServerTestSuite struct { + testutils.ClientTestSuite + s *SoftBlockAPIServer +} + +func (s *SoftBlockAPIServerTestSuite) SetupTest() { + s.ClientTestSuite.SetupTest() + server, err := New("*", nil, nil, s.RPCClient, true) + s.Nil(err) + s.s = server + go func() { + s.NotPanics(func() { + log.Error("Start test soft block server", "error", s.s.Start(uint64(testutils.RandomPort()))) + }) + }() +} + +func (s *SoftBlockAPIServerTestSuite) TestShutdown() { + s.Nil(s.s.Shutdown(context.Background())) +} + +func TestSoftBlockAPIServerTestSuite(t *testing.T) { + suite.Run(t, new(SoftBlockAPIServerTestSuite)) +} diff --git a/packages/taiko-client/internal/docker/nodes/docker-compose.yml b/packages/taiko-client/internal/docker/nodes/docker-compose.yml index 1c81f01f92c..ff7f73ace51 100644 --- a/packages/taiko-client/internal/docker/nodes/docker-compose.yml +++ b/packages/taiko-client/internal/docker/nodes/docker-compose.yml @@ -18,7 +18,7 @@ services: l2_geth: container_name: l2_geth - image: us-docker.pkg.dev/evmchain/images/taiko-geth:taiko + image: us-docker.pkg.dev/evmchain/images/taiko-geth:softblock restart: unless-stopped pull_policy: always volumes: diff --git a/packages/taiko-client/pkg/rpc/methods.go b/packages/taiko-client/pkg/rpc/methods.go index e89a79385ad..53108eb9356 100644 --- a/packages/taiko-client/pkg/rpc/methods.go +++ b/packages/taiko-client/pkg/rpc/methods.go @@ -119,7 +119,7 @@ func (c *Client) WaitTillL2ExecutionEngineSynced(ctx context.Context) error { return err } - if progress.isSyncing() { + if progress.IsSyncing() { log.Info( "L2 execution engine is syncing", "currentBlockID", progress.CurrentBlockID, @@ -374,23 +374,50 @@ func (c *Client) GetPoolContent( ctxWithTimeout, cancel := CtxWithTimeoutOrDefault(ctx, defaultTimeout) defer cancel() - l1Head, err := c.L1.HeaderByNumber(ctx, nil) + // Get the latest L2 block header at first. + l2Head, err := c.L2.HeaderByNumber(ctx, nil) if err != nil { return nil, err } - l2Head, err := c.L2.HeaderByNumber(ctx, nil) + l1Origin, err := c.L2.L1OriginByID(ctx, l2Head.Number) + if err != nil && err.Error() != ethereum.NotFound.Error() { + return nil, err + } + + var ( + L1HeadNum *big.Int + L2HeadNum *big.Int + timestamp = uint64(time.Now().Unix()) + ) + + if l1Origin != nil && l1Origin.IsSoftblock() && !l1Origin.EndOfPreconf && !l1Origin.EndOfBlock { + // Check if this is an unfinished soft block, if not, we will use the latest L1 / L2 block number from the L1Origin. + // Otherwise, we will use the L1 / L2 block number in L1Origin. + L1HeadNum = l1Origin.L1BlockHeight + L2HeadNum = new(big.Int).Sub(l1Origin.BlockID, common.Big1) + } + + l1Head, err := c.L1.HeaderByNumber(ctx, L1HeadNum) if err != nil { return nil, err } + if L2HeadNum != nil { + timestamp = l2Head.Time + l2Head, err = c.L2.HeaderByNumber(ctx, L2HeadNum) + if err != nil { + return nil, err + } + } + baseFee, err := c.CalculateBaseFee( ctx, l2Head, l1Head.Number, - chainConfig.IsOntake(new(big.Int).Add(l2Head.Number, common.Big1)), + true, &chainConfig.ProtocolConfigs.BaseFeeConfig, - uint64(time.Now().Unix()), + timestamp, ) if err != nil { return nil, err @@ -435,8 +462,8 @@ type L2SyncProgress struct { HighestBlockID *big.Int } -// isSyncing returns true if the L2 execution engine is syncing with L1. -func (p *L2SyncProgress) isSyncing() bool { +// IsSyncing returns true if the L2 execution engine is syncing with L1. +func (p *L2SyncProgress) IsSyncing() bool { if p.SyncProgress == nil { return false } diff --git a/packages/taiko-client/scripts/gen_swagger_json.sh b/packages/taiko-client/scripts/gen_swagger_json.sh index 59dce311dbd..6d3a297c984 100755 --- a/packages/taiko-client/scripts/gen_swagger_json.sh +++ b/packages/taiko-client/scripts/gen_swagger_json.sh @@ -1,3 +1,3 @@ #/bin/sh -swag init -g api.go -d prover/server --pd +swag init -g server.go -d driver/soft_blocks --pd