Skip to content

Commit 51b1fce

Browse files
authored
l2ep wrappers & v1.0.0 release folder (#404)
* l2ep wrappers & v1.0.0 release folder * bump OZ * fix golang lint * remove OZ 4.7.3
1 parent 2dca02f commit 51b1fce

62 files changed

Lines changed: 35703 additions & 143 deletions

File tree

Some content is hidden

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

.github/workflows/golangci-lint.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
id-token: write
1010
contents: read
1111
actions: read
12+
env:
13+
ALLOW_FAILURE: ${{ contains(join(github.event.pull_request.labels.*.name, ' '), 'allow-lint-issues') }}
1214
steps:
1315
- name: Setup tar default options
1416
shell: bash
@@ -26,8 +28,13 @@ jobs:
2628
go-version-file: go.mod
2729

2830
- name: Run golangci-lint
31+
if: ${{ env.ALLOW_FAILURE != 'true' }}
2932
uses: smartcontractkit/.github/actions/ci-lint-go@bd2ca3d8fa2dc89f98b49b297e9b72c2e3e68cdc # v3.1.0
3033
with:
3134
golangci-lint-version: v2.6.1
3235
only-new-issues: true
33-
working-directory: pkg
36+
go-directory: pkg
37+
38+
- name: Skip golangci-lint (allow-lint-issues)
39+
if: ${{ env.ALLOW_FAILURE == 'true' }}
40+
run: echo "Skipping golangci-lint because PR has the allow-lint-issues label"

contracts/GNUmakefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ wrappers: pnpmdep mockery abigen ## Recompiles solidity contracts and their go w
7878
./scripts/native_solc_compile_all_$(FOUNDRY_PROFILE)
7979
cd ../gethwrappers; go generate ./$(FOUNDRY_PROFILE)
8080

81+
wrappers-release: export metadata=true
82+
.PHONY: wrappers-release
83+
wrappers-release: ## Generate the gethwrappers for release which includes metadata.
84+
make wrappers
8185

8286
# This call generates all gethwrappers for all products. It does so based on the
8387
# assumption that native_solc_compile_all contains sub-calls to each product, and

contracts/gas-snapshots/l2ep.gas-snapshot

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ArbitrumCrossDomainForwarder_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 37563)
22
ArbitrumCrossDomainForwarder_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 12954)
33
ArbitrumCrossDomainForwarder_Constructor:test_InitialState() (gas: 22111)
4-
ArbitrumCrossDomainForwarder_Forward:test_Forward() (gas: 47793)
5-
ArbitrumCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 22258)
4+
ArbitrumCrossDomainForwarder_Forward:test_Forward() (gas: 47761)
5+
ArbitrumCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 22090)
66
ArbitrumCrossDomainForwarder_Forward:test_NotCallableByUnknownAddress() (gas: 16083)
77
ArbitrumCrossDomainForwarder_TransferL1Ownership:test_CallableByL1Owner() (gas: 41434)
88
ArbitrumCrossDomainForwarder_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 19269)
@@ -11,15 +11,15 @@ ArbitrumCrossDomainForwarder_TransferL1Ownership:test_NotCallableByNonOwners() (
1111
ArbitrumCrossDomainGovernor_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 37563)
1212
ArbitrumCrossDomainGovernor_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 12954)
1313
ArbitrumCrossDomainGovernor_Constructor:test_InitialState() (gas: 22134)
14-
ArbitrumCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 49924)
15-
ArbitrumCrossDomainGovernor_Forward:test_Forward() (gas: 47840)
16-
ArbitrumCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 24367)
14+
ArbitrumCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 49879)
15+
ArbitrumCrossDomainGovernor_Forward:test_Forward() (gas: 47795)
16+
ArbitrumCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 24199)
1717
ArbitrumCrossDomainGovernor_Forward:test_NotCallableByUnknownAddress() (gas: 18216)
18-
ArbitrumCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 19437)
19-
ArbitrumCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 60762)
20-
ArbitrumCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 62890)
18+
ArbitrumCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 19272)
19+
ArbitrumCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 60718)
20+
ArbitrumCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 62846)
2121
ArbitrumCrossDomainGovernor_ForwardDelegate:test_NotCallableByUnknownAddress() (gas: 18271)
22-
ArbitrumCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 64375)
22+
ArbitrumCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 63919)
2323
ArbitrumCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 41434)
2424
ArbitrumCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 19269)
2525
ArbitrumCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 18644)
@@ -47,60 +47,60 @@ BaseSequencerUptimeFeed_UpdateStatus:test_updateStatus_UpdateWhen_StatusChangeAn
4747
BaseSequencerUptimeFeed_transferL1Sender:test_transferL1Sender_CorrectlyTransfersL1Sender() (gas: 1479295)
4848
BaseValidator_Constructor:test_Constructor_EmitsWhen_ConstructorIsSuccessfull() (gas: 715556)
4949
BaseValidator_GetAndSetGasLimit:test_GetAndSetGasLimit_CorrectlyHandlesGasLimit() (gas: 20114)
50-
OptimismCrossDomainForwarder_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47106)
51-
OptimismCrossDomainForwarder_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22135)
50+
OptimismCrossDomainForwarder_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 46952)
51+
OptimismCrossDomainForwarder_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22033)
5252
OptimismCrossDomainForwarder_Constructor:test_InitialState() (gas: 21947)
53-
OptimismCrossDomainForwarder_Forward:test_Forward() (gas: 58188)
54-
OptimismCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 32644)
53+
OptimismCrossDomainForwarder_Forward:test_Forward() (gas: 58095)
54+
OptimismCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 32410)
5555
OptimismCrossDomainForwarder_Forward:test_NotCallableByUnknownAddress() (gas: 13895)
56-
OptimismCrossDomainForwarder_TransferL1Ownership:test_CallableByL1Owner() (gas: 48907)
57-
OptimismCrossDomainForwarder_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28728)
56+
OptimismCrossDomainForwarder_TransferL1Ownership:test_CallableByL1Owner() (gas: 48811)
57+
OptimismCrossDomainForwarder_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28632)
5858
OptimismCrossDomainForwarder_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16456)
5959
OptimismCrossDomainForwarder_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11044)
60-
OptimismCrossDomainGovernor_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47106)
61-
OptimismCrossDomainGovernor_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22135)
60+
OptimismCrossDomainGovernor_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 46952)
61+
OptimismCrossDomainGovernor_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22033)
6262
OptimismCrossDomainGovernor_Constructor:test_InitialState() (gas: 21970)
63-
OptimismCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 47768)
64-
OptimismCrossDomainGovernor_Forward:test_Forward() (gas: 58255)
65-
OptimismCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 32668)
63+
OptimismCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 47723)
64+
OptimismCrossDomainGovernor_Forward:test_Forward() (gas: 58149)
65+
OptimismCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 32434)
6666
OptimismCrossDomainGovernor_Forward:test_NotCallableByUnknownAddress() (gas: 16031)
67-
OptimismCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 29227)
68-
OptimismCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 72811)
69-
OptimismCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 72816)
67+
OptimismCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 28984)
68+
OptimismCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 72772)
69+
OptimismCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 72777)
7070
OptimismCrossDomainGovernor_ForwardDelegate:test_NotCallableByUnknownAddress() (gas: 16086)
71-
OptimismCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 76144)
72-
OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 48907)
73-
OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28728)
71+
OptimismCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 75679)
72+
OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 48811)
73+
OptimismCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28632)
7474
OptimismCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16456)
7575
OptimismCrossDomainGovernor_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11044)
7676
OptimismSequencerUptimeFeed_Constructor:test_Constructor_InitialState() (gas: 1530881)
7777
OptimismSequencerUptimeFeed_ValidateSender:test_ValidateSender_UpdateStatusWhen_StatusChangeAndNoTimeChange() (gas: 15374)
7878
OptimismValidator_Validate:test_Validate_PostSequencerOffline() (gas: 79034)
7979
OptimismValidator_Validate:test_Validate_PostSequencerStatus_NoStatusChange() (gas: 79040)
80-
ScrollCrossDomainForwarder_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47192)
81-
ScrollCrossDomainForwarder_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22185)
82-
ScrollCrossDomainForwarder_Constructor:test_InitialState() (gas: 21623)
83-
ScrollCrossDomainForwarder_Forward:test_Forward() (gas: 58252)
84-
ScrollCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 32700)
80+
ScrollCrossDomainForwarder_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47039)
81+
ScrollCrossDomainForwarder_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22083)
82+
ScrollCrossDomainForwarder_Constructor:test_InitialState() (gas: 21939)
83+
ScrollCrossDomainForwarder_Forward:test_Forward() (gas: 58159)
84+
ScrollCrossDomainForwarder_Forward:test_ForwardRevert() (gas: 32466)
8585
ScrollCrossDomainForwarder_Forward:test_NotCallableByUnknownAddress() (gas: 13895)
86-
ScrollCrossDomainForwarder_TransferL1Ownership:test_CallableByL1Owner() (gas: 48970)
87-
ScrollCrossDomainForwarder_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28786)
86+
ScrollCrossDomainForwarder_TransferL1Ownership:test_CallableByL1Owner() (gas: 48874)
87+
ScrollCrossDomainForwarder_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28690)
8888
ScrollCrossDomainForwarder_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16456)
8989
ScrollCrossDomainForwarder_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11044)
90-
ScrollCrossDomainGovernor_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47192)
91-
ScrollCrossDomainGovernor_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22185)
92-
ScrollCrossDomainGovernor_Constructor:test_InitialState() (gas: 21646)
93-
ScrollCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 47763)
94-
ScrollCrossDomainGovernor_Forward:test_Forward() (gas: 58314)
95-
ScrollCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 32721)
90+
ScrollCrossDomainGovernor_AcceptL1Ownership:test_CallableByPendingL1Owner() (gas: 47039)
91+
ScrollCrossDomainGovernor_AcceptL1Ownership:test_NotCallableByNonPendingOwners() (gas: 22083)
92+
ScrollCrossDomainGovernor_Constructor:test_InitialState() (gas: 21962)
93+
ScrollCrossDomainGovernor_Forward:test_CallableByL2Owner() (gas: 47718)
94+
ScrollCrossDomainGovernor_Forward:test_Forward() (gas: 58208)
95+
ScrollCrossDomainGovernor_Forward:test_ForwardRevert() (gas: 32487)
9696
ScrollCrossDomainGovernor_Forward:test_NotCallableByUnknownAddress() (gas: 16028)
97-
ScrollCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 29285)
98-
ScrollCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 72875)
99-
ScrollCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 72880)
97+
ScrollCrossDomainGovernor_ForwardDelegate:test_BubbleUpRevert() (gas: 29042)
98+
ScrollCrossDomainGovernor_ForwardDelegate:test_CallableByCrossDomainMessengerAddressOrL1Owner() (gas: 72836)
99+
ScrollCrossDomainGovernor_ForwardDelegate:test_CallableByL2Owner() (gas: 72841)
100100
ScrollCrossDomainGovernor_ForwardDelegate:test_NotCallableByUnknownAddress() (gas: 16083)
101-
ScrollCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 76209)
102-
ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 48970)
103-
ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28786)
101+
ScrollCrossDomainGovernor_ForwardDelegate:test_RevertsBatchWhenOneCallFails() (gas: 75744)
102+
ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1Owner() (gas: 48874)
103+
ScrollCrossDomainGovernor_TransferL1Ownership:test_CallableByL1OwnerOrZeroAddress() (gas: 28690)
104104
ScrollCrossDomainGovernor_TransferL1Ownership:test_NotCallableByL2Owner() (gas: 16456)
105105
ScrollCrossDomainGovernor_TransferL1Ownership:test_NotCallableByNonOwners() (gas: 11044)
106106
ScrollSequencerUptimeFeed_Constructor:test_Constructor_InitialState_WhenValidL2XDomainMessenger() (gas: 1511902)

contracts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
"dependencies": {
7272
"@arbitrum/nitro-contracts": "3.0.0",
7373
"@eth-optimism/contracts": "0.6.0",
74-
"@openzeppelin/contracts-4.7.3": "npm:@openzeppelin/contracts@4.7.3",
7574
"@openzeppelin/contracts-4.8.3": "npm:@openzeppelin/contracts@4.8.3",
7675
"@openzeppelin/contracts-4.9.6": "npm:@openzeppelin/contracts@4.9.6",
7776
"@openzeppelin/contracts-5.0.2": "npm:@openzeppelin/contracts@5.0.2",
7877
"@openzeppelin/contracts-5.1.0": "npm:@openzeppelin/contracts@5.1.0",
78+
"@openzeppelin/contracts-5.3.0": "npm:@openzeppelin/contracts@5.3.0",
7979
"@openzeppelin/contracts-upgradeable": "4.9.6",
8080
"@scroll-tech/contracts": "2.0.0",
8181
"@zksync/contracts": "github:matter-labs/era-contracts#446d391d34bdb48255d5f8fef8a8248925fc98b9"

0 commit comments

Comments
 (0)