Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: upstream to optimism v1.3.0 #239

Merged
merged 835 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
835 commits
Select commit Hold shift + click to select a range
5a80dc9
Merge pull request #7830 from ethereum-optimism/jg/enable_canyon_in_d…
trianglesphere Oct 26, 2023
8b96404
op-bindings: regenerate
tynes Oct 26, 2023
a1e9186
Merge pull request #7873 from ethereum-optimism/fix/bindings
tynes Oct 26, 2023
d425771
build(deps): bump github.com/google/uuid from 1.3.1 to 1.4.0
dependabot[bot] Oct 26, 2023
ae67c7c
Verify Initializer Volues in Contract & Genesis Match
twoshark Oct 26, 2023
3f41ff9
docker image & fmt
twoshark Oct 26, 2023
93f38e6
defaults
twoshark Oct 26, 2023
b12fd0d
Merge pull request #7833 from keroro520/fix-ts-compile-BufferEncoding
smartcontracts Oct 26, 2023
03f5fd0
add awk script to ignore single and multi line comments & require onl…
twoshark Oct 26, 2023
27009c1
indent
twoshark Oct 26, 2023
31704c5
Merge pull request #7871 from ethereum-optimism/dependabot/go_modules…
tynes Oct 26, 2023
fb12a4a
CircleCI didn't like the << in my last script, switching to string li…
twoshark Oct 26, 2023
cd85e3d
chore: Improve chain-mon docker build
Oct 25, 2023
e02becb
move entrypoint to builder image
Oct 26, 2023
d647769
quote kind
twoshark Oct 26, 2023
fd19665
Merge pull request #7838 from LuisMarcano-antithesis/fix/race
tynes Oct 26, 2023
ef1dfdb
inline script
twoshark Oct 26, 2023
4c2d164
Merge pull request #7840 from ethereum-optimism/10-25-chore_Improve_c…
tynes Oct 26, 2023
b63da65
op-node: Pull in Canyon Time from superchain registry
trianglesphere Oct 26, 2023
fafcb05
export script to bash env
twoshark Oct 26, 2023
b591429
handle awk error
twoshark Oct 26, 2023
e0a8f3a
Merge pull request #7870 from ethereum-optimism/docker-publish-fix
protolambda Oct 26, 2023
584b8c8
Merge pull request #7844 from ethereum-optimism/dependabot/npm_and_ya…
tynes Oct 26, 2023
9ac454a
Merge pull request #7872 from ethereum-optimism/jg/superchain_canyon_…
trianglesphere Oct 26, 2023
ed4a486
ci: Add filters so op-stack-go-docker-build-release builds on tags.
ajsutton Oct 26, 2023
ebed8b7
Merge pull request #7878 from ethereum-optimism/aj/release-filter
ajsutton Oct 26, 2023
489055c
Merge pull request #7861 from ethereum-optimism/ctb/test-import-style
tynes Oct 26, 2023
af5ad1d
contracts-bedrock: fix test legibility
tynes Oct 26, 2023
78c6c7f
invariant-docs: regenerate
tynes Oct 26, 2023
43f9f7a
contracts-bedrock: gas snapshot
tynes Oct 26, 2023
16b0527
remove old line
twoshark Oct 26, 2023
e65c212
format
twoshark Oct 26, 2023
5821f29
Move value match and check logic to script
twoshark Oct 26, 2023
9146ab8
Merge branch 'develop' of github.com:ethereum-optimism/optimism into …
twoshark Oct 26, 2023
31d1b6f
ci: Use pipeline.git.tag not pipeline.git.branch when doing releases.
ajsutton Oct 26, 2023
e36d7e3
Merge pull request #7865 from ethereum-optimism/ctb/fix-test-legibility
tynes Oct 26, 2023
fdc2193
op-e2e: Disable cannon tests when using HTTP instead of WS
ajsutton Oct 26, 2023
6dc1816
Merge branch 'develop' into aj/tag-not-branch
ajsutton Oct 26, 2023
48c3d06
Merge pull request #7879 from ethereum-optimism/aj/tag-not-branch
ajsutton Oct 26, 2023
d542966
Merge pull request #7880 from ethereum-optimism/aj/disable-cannon-http
ajsutton Oct 26, 2023
8ec6427
ci: Configure docker auth before attempting to publish.
ajsutton Oct 26, 2023
ab6d0be
Specify that the recognized batch submitter account is stored in the …
Oct 26, 2023
ef2ceff
ci: Allow . and / in docker tags.
ajsutton Oct 26, 2023
6a7360b
Fixes docker-bake build targets for ci-builder and chain-mon
zhwrd Oct 26, 2023
485f9c6
ci: Disallow . and / in docker tags again.
ajsutton Oct 26, 2023
758af8b
Merge pull request #7884 from ethereum-optimism/zhwrd/fix-docker-buil…
zhwrd Oct 26, 2023
b62235a
op-e2e: Use a short wait for new claim when performing all possible d…
ajsutton Oct 26, 2023
857da03
Merge pull request #7882 from ethereum-optimism/aj/auth-before-publish
ajsutton Oct 26, 2023
fcfa17f
Merge pull request #7885 from ethereum-optimism/aj/e2e-short-wait
ajsutton Oct 26, 2023
40858b5
op-e2e: Fix race condition with removing included tx from the pool
ajsutton Oct 27, 2023
0b5074a
Merge pull request #7883 from ethereum-optimism/k1026/batcherhash
tynes Oct 27, 2023
9f38888
ci-builder: go version env var
tynes Oct 27, 2023
bb83c60
Merge pull request #7886 from ethereum-optimism/aj/txpool-race
ajsutton Oct 27, 2023
ea77d5a
ci: Notify slack when semgrep or docker publish fails on develop branch
ajsutton Oct 27, 2023
2ec6f8f
op-e2e: Disable cannon tests for external geth
ajsutton Oct 27, 2023
eb7e94e
Missing envvars setting for --override.canyon flag
mdehoog Oct 27, 2023
d9e44b5
op-e2e: Wait for external clients to terminate after Kill()
ajsutton Oct 27, 2023
f394f0a
Merge pull request #7890 from ethereum-optimism/aj/cannon-ws-only
ajsutton Oct 27, 2023
a37f81d
Merge pull request #7891 from mdehoog/michael/override-canyon-missing…
ajsutton Oct 27, 2023
ff2b887
op-e2e: Split e2e tests into two executors
ajsutton Oct 27, 2023
7d51ff3
op-e2e: Move some tests back to executor 0.
ajsutton Oct 27, 2023
04b4611
op-e2e: Use unsigned ints to avoid negatives.
ajsutton Oct 27, 2023
17de450
add timestamp to op-indexer withdrawals response
lukasrosario Oct 27, 2023
7eda941
Merge pull request #7898 from lukasrosario/add-timstamp-to-indexer-wi…
roninjin10 Oct 27, 2023
1a521c9
Parameterize python binary in Makefile
jyellick Oct 27, 2023
f0a8144
Merge pull request #7892 from ethereum-optimism/aj/external-stop
tynes Oct 27, 2023
0069ab4
Merge pull request #7889 from ethereum-optimism/aj/slack-notify
trianglesphere Oct 27, 2023
5393e64
ci: enable codecov comments for contracts
Inphi Oct 27, 2023
344e063
op-node: enable all network options by default
protolambda Oct 25, 2023
6b21778
op-node,op-program: update network flag error format
protolambda Oct 27, 2023
d75c85b
op-node: add extra-networks deprecaction warning log
protolambda Oct 27, 2023
950568e
Merge pull request #7902 from ethereum-optimism/inphi/enable-cov-diff
tynes Oct 27, 2023
d83d762
Merge pull request #7899 from bobanetwork/parameterize-python-binary
tynes Oct 27, 2023
26fdfb8
feat(proxyd): support eip-1898 in tag rewritting
felipe-op Oct 27, 2023
72fc3f0
remove etl batch metrics
hamdiallam Oct 27, 2023
e973741
report latest header of the connected client
hamdiallam Oct 27, 2023
2abe032
updated indexed l1/l2 heights in the bridge processor
hamdiallam Oct 27, 2023
1c3f642
interval_failures name
hamdiallam Oct 27, 2023
89c0148
Change revision of nightly foundry in devnet CI
clabby Oct 27, 2023
48c735e
Merge pull request #7909 from ethereum-optimism/cl/fix-devnet-ci
clabby Oct 27, 2023
80d619a
PoC init
clabby Oct 27, 2023
bc5e060
Add flag to `op-node`
clabby Oct 27, 2023
0d75266
Add error handling in dylib
clabby Oct 27, 2023
7d60326
test: hydrated receipts
clabby Oct 27, 2023
4aacef4
:broom:
clabby Oct 27, 2023
0a25b05
Stub out rethdb receipt fetcher with `rethdb` build tag
clabby Oct 27, 2023
7f12a6d
Update op-service/sources/reth_db_stub.go
clabby Oct 27, 2023
b2bc543
update comment
clabby Oct 27, 2023
51da1fc
:broom:
clabby Oct 27, 2023
e9a8f81
Add C header
clabby Oct 27, 2023
679eb23
:broom: dylib
clabby Oct 27, 2023
c87d94b
@inphi nits
clabby Oct 27, 2023
986b2b0
Merge pull request #7893 from ethereum-optimism/cl/op-node-db-fetch
clabby Oct 28, 2023
d766780
Remove version pin on `foundryup` in devnet job
clabby Oct 28, 2023
d916336
feat(ctb): Add outline for Safe liveness checks
maurelian Sep 27, 2023
55fe971
safe-tools: vendor in safe-tools lib
maurelian Oct 1, 2023
5910878
safe-tools: Light edits to fix compatibility issues
maurelian Oct 1, 2023
3de35b6
safe-tools: Add setGuard method
maurelian Oct 1, 2023
0d9784b
feat(ctb): Simplify check tests with safe-tools
maurelian Oct 1, 2023
da17f60
feat(ctb): Working signature recording
maurelian Oct 1, 2023
8e2a6de
safe-tools: Add some natspec comments
maurelian Oct 2, 2023
6b67dc7
feat(ctb): Emit SignersRecorded event
maurelian Oct 2, 2023
57a5f22
feat(ctb): Allow signers to call directly to prove liveness
maurelian Oct 2, 2023
fa0db2a
feat(ctb): Add showLiveness method
maurelian Oct 2, 2023
a56e6c7
feat(ctb): Add liveness module
maurelian Oct 4, 2023
f683806
feat(ctb): Add _verifyFinal state in removeOwner()
maurelian Oct 4, 2023
baa0fa5
test(ctb): Add test for transferring to fallback owner
maurelian Oct 4, 2023
0b69001
chore(ctb): Attribution for safe-tools
maurelian Oct 4, 2023
0e20302
feat(ctb): Remove notes/poc of guard removal prevention
maurelian Oct 6, 2023
8032387
feat(ctb): Make guard.safe var immutable
maurelian Oct 6, 2023
53fb127
feat(ctb): Make Safe Module and Guard ISemver
maurelian Oct 17, 2023
108f1fe
feat(ctb): Commenting cleanup
maurelian Oct 17, 2023
542bc57
feat(ctb): Add makeAddrsAndKeys to SafeTestTools
maurelian Oct 17, 2023
c5b6f88
refactor(ctb): Move _getNSigners() to inheritable contract
maurelian Oct 17, 2023
3f7947b
test(ctb): Add GetSigners diff test
maurelian Oct 17, 2023
017e048
feat(ctb): Record comment about numsignatures calc
maurelian Oct 19, 2023
5011159
test(ctb): Add eth_sign types to GetSigners test
maurelian Oct 19, 2023
0a443dd
feat(safe-tools): Do not force generated list of keys to be sorted
maurelian Oct 19, 2023
411da0f
refactor(safe-tools): Cache priv-key during sorting loop
maurelian Oct 20, 2023
040c34f
test(ctb): Add approved hash checking to GetSigners test
maurelian Oct 19, 2023
7636b5e
fix(ctb): getNSigners is limited to the threshold
maurelian Oct 20, 2023
a9312b7
test(ctb): Add contract signatures testing
maurelian Oct 20, 2023
0493c40
test(ctb): Fixes and improvements to checkTransaction test
maurelian Oct 20, 2023
d5600eb
chore(ctb): Remove todo note from LivenessGuard
maurelian Oct 20, 2023
b6a3804
specs: Add specs for Liveness Checking
maurelian Sep 29, 2023
3033dd6
feat(ctb): Remove redundant check in LivenessModule
maurelian Oct 20, 2023
0831cd6
feat(ctb): Ensure adding and removing owners is handled correctly
maurelian Oct 23, 2023
5a1baf8
feat(ctb): Clean up and comment the checkAfterExecution hook
maurelian Oct 23, 2023
e8f9e2e
specs: Apply suggested edits from review
maurelian Oct 23, 2023
38f828d
feat(ctb): Rename lastSigned to more accurate lastLive
maurelian Oct 23, 2023
2ce7314
feat(ctb): Add missing natspec to LivenessGuard and LivenessModule
maurelian Oct 23, 2023
aef990f
feat(ctb): Make guard state immutable
maurelian Oct 23, 2023
20a0c6c
feat(ctb): ensure guard has not changed before calling removeOwner
maurelian Oct 23, 2023
da8a1f2
refactor(ctb): Extract execTransactionFromModule calls into helper fu…
maurelian Oct 23, 2023
66a0eee
refactor(ctb): Abstract addOwner method to giveToFallbackOwner
maurelian Oct 23, 2023
139751a
feat(ctb): Clean up removeOwner method on module
maurelian Oct 23, 2023
b157425
feat(ctb): Add guard check to _verifyState
maurelian Oct 23, 2023
4a04235
refactor(ctb): Make GetSigners into a library rather than contract
maurelian Oct 23, 2023
2103d61
refactor(ctb): Extract guard check into _verifyGuard()
maurelian Oct 23, 2023
7f47459
chore(ctb): Rename lib to SafeSigners
maurelian Oct 24, 2023
6368229
refactor(ctb): Make function _isAboveMinOwners
maurelian Oct 24, 2023
c7d5b2b
refactor(ctb): Clean up in LivenessGuard
maurelian Oct 24, 2023
b51e604
feat(ctb): Improve commenting on LivenessGuard
maurelian Oct 24, 2023
2c7ddd0
refactor(ctb): Make immutables screaming snake in Liveness code
maurelian Oct 24, 2023
26c1ac5
feat(ctb): Document requirements for non-reverting in the Guard
maurelian Oct 24, 2023
8215444
feat(ctb): Remove redundant _verifyGuard call
maurelian Oct 24, 2023
410310e
fix(ctb): Add auth to guard checkAfterExecution
maurelian Oct 24, 2023
2d7e3ba
feat(ctb): Fix typo Livness in test files
maurelian Oct 24, 2023
a5a723d
feat(ctb): numOwnersAfter is a better var name
maurelian Oct 24, 2023
927bcaa
fix(ctb): Fix off-by-one in removeOwner
maurelian Oct 24, 2023
7ce3e4d
refactor(ctb): Only emit a single address from SignerRecorded
maurelian Oct 24, 2023
fbc6ade
docs(ctb): Some commenting fixes
maurelian Oct 24, 2023
7d97466
feat(ctb): Naming improvements
maurelian Oct 24, 2023
7efcfc3
specs: Apply code review suggestions
maurelian Oct 25, 2023
ce97143
docs(ctb): Some commenting fixes
maurelian Oct 24, 2023
e2eb747
feat(ctb): Add min owners sanity check in Liveness Module constructor
maurelian Oct 25, 2023
432f22c
WIP: Add mermaid graph
maurelian Oct 25, 2023
67a17c3
refactor(ctb): Change to removeOwners
maurelian Oct 25, 2023
377dcda
refactor(ctb): Simplify removal logic
maurelian Oct 26, 2023
40c997f
refactor(ctb): Reduce branching on pre-removal check
maurelian Oct 26, 2023
a725a3c
refactor(ctb): Better helper functions for pre-removal check
maurelian Oct 26, 2023
42d4f5e
refactor(ctb): Move pre-removal check to outer function
maurelian Oct 26, 2023
199cb31
test(ctb): Extract owner prevOwners generation into helper function
maurelian Oct 26, 2023
3f6470e
test(ctb): Add natspec to test functions
maurelian Oct 26, 2023
69f3cce
refactor(ctb): Add _onlySafe function
maurelian Oct 26, 2023
ade1650
test(ctb): Additional Liveness Module Testing
maurelian Oct 26, 2023
10a256f
test(ctb): Guard changed
maurelian Oct 26, 2023
63fceb3
refactor(ctb): Remove _requireGuard
maurelian Oct 26, 2023
7fe44b9
test(ctb): Add tests for all reverts in Liveness Module
maurelian Oct 26, 2023
a51e82f
feat(ctb): Add constructor check on threshold
maurelian Oct 26, 2023
854db43
feat(ctb): LivenessGuard record current owners in constructor
maurelian Oct 26, 2023
57cfa4d
feat(ctb): Address feedback
maurelian Oct 26, 2023
0cd4470
specs: Define deployment order for liveness contracts
maurelian Oct 26, 2023
7b82cba
specs: Add diagram and other details
maurelian Oct 26, 2023
f7ecd62
codecov: Ignore all files in contracts-bedrock/test
maurelian Oct 26, 2023
d52cc30
test(ctb): Add Guard owner management tests
maurelian Oct 26, 2023
30a4440
safe-tools: Refactor getPrevOwner() into lib
maurelian Oct 26, 2023
3787e70
safe-tools: Refactor getPrevOwners (plural) into lib
maurelian Oct 26, 2023
ab4a40c
safe-tools: Refactor to move free functions into SafeTestLib
maurelian Oct 26, 2023
beba38d
safe-tools: Reorder functions in SafeTestLib
maurelian Oct 26, 2023
e3ac851
safe-tools: Add owner management methods to SafeTestLib
maurelian Oct 26, 2023
2f3965f
test(ctb): Refactor tests to use owner management lib utils
maurelian Oct 26, 2023
41c9a3d
refactor(ctb): Simplify require statements by nesting in an if()
maurelian Oct 26, 2023
71bb67b
feat: Address feedback
maurelian Oct 27, 2023
d925a35
safe-tools: Fix address label string concatenation
maurelian Oct 27, 2023
2469eb3
safe-tools: Break up getPrevOwner() into multiple functions
maurelian Oct 27, 2023
30377e2
refactor(ctb): Move getters to just after constructor
maurelian Oct 27, 2023
7b5dfee
docs(ctb): Improved comments in SafeSigners.sol
maurelian Oct 27, 2023
a2b4bae
specs: Document deployment and updating of the liveness checking system
maurelian Oct 27, 2023
f2cf018
refactor(ctb): Extract module tests vm.warp into _warpPastLivenesInte…
maurelian Oct 27, 2023
24e9a03
refactor(ctb): Make canRemove a public function
maurelian Oct 27, 2023
81a8c10
refactor(ctb): Standardize on not caching the length in a for-loop
maurelian Oct 27, 2023
ec882b1
refactor(ctb): Fix placement of ownersCount
maurelian Oct 27, 2023
d1f965f
fix(ctb): Remove remaining entries from ownersBefore
maurelian Oct 27, 2023
d759e6f
fix(ctb): Module constructor allows higher than minimum threshold in …
maurelian Oct 27, 2023
8fd7b65
specs: Document deployment and updating of liveness module
maurelian Oct 27, 2023
ba0c2ac
test(ctb): Add multi-step add/remove/swap test
maurelian Oct 27, 2023
a1c2987
safe-tools: Make address label prefix configurable
maurelian Oct 27, 2023
5f56bd2
safe-tools: Add changeThreshold method
maurelian Oct 27, 2023
774dd1b
safe-tools: Fix bug in getPrevOwners
maurelian Oct 27, 2023
33c7c8b
test(ctb): Fuzz test removing an arbitrary number of owners
maurelian Oct 27, 2023
eb0e133
test(ctb): Add test for incomplete emptying below minOwners
maurelian Oct 28, 2023
5c0d322
test(ctb): Add test for not giving to fallback owner
maurelian Oct 28, 2023
2cb5443
test(ctb): Check all topics in guard.OwnerRecorded
maurelian Oct 28, 2023
dcd5a0f
test(ctb): Clean up and add assertions to testFuzz_removeOwners
maurelian Oct 28, 2023
ae90133
test(ctb): Ensure lastLive increments on signing
maurelian Oct 28, 2023
1873257
test(ctb): testFuzz_OwnerManagement increases timestamp on each action
maurelian Oct 28, 2023
43cb263
bind and lock and snap
maurelian Oct 28, 2023
cfc08e2
Merge pull request #7911 from ethereum-optimism/cl/revert-ver-pin
tynes Oct 28, 2023
0dab5fc
build(deps): bump viem from 1.17.1 to 1.18.0
dependabot[bot] Oct 28, 2023
96a7781
Merge pull request #7540 from ethereum-optimism/jm/safe-liveness
tynes Oct 28, 2023
1bc3691
Merge pull request #7915 from ethereum-optimism/dependabot/npm_and_ya…
tynes Oct 29, 2023
53a60ce
Persist Rust toolchain in final `ci-builder` image
clabby Oct 30, 2023
72ac254
Merge branch 'develop' into tushar/client-pod-issue-131/initializer-c…
mslipper Oct 30, 2023
06e048c
Merge pull request #7874 from ethereum-optimism/tushar/client-pod-iss…
tynes Oct 30, 2023
9599375
Merge pull request #7888 from ethereum-optimism/fix/ci-builder-go-ver…
mslipper Oct 30, 2023
db016e6
op-e2e: Remove manual test code.
ajsutton Oct 30, 2023
4bc28da
Merge pull request #7621 from ethereum-optimism/span-batch-derivation
protolambda Oct 30, 2023
9a6ed52
ci-builder: include solc 0.8.19
tynes Oct 30, 2023
381bbb8
derive: remove outdated channel-out TODOs
protolambda Oct 30, 2023
ea8ffec
op-batcher: remove outdated comment
protolambda Oct 30, 2023
515de0e
Merge pull request #7290 from testinprod-io/tip/span-batch-batcher
protolambda Oct 30, 2023
dbdcde3
Make MaxSpanBatchFieldSize equal to MaxRLPBytesPerChannel
pcw109550 Oct 16, 2023
177b78c
Harden Span batch field size check
pcw109550 Oct 16, 2023
c6d3901
Add tests for span batch field size check
pcw109550 Oct 16, 2023
c0d92e6
Add comments for l1Blocks field of batch queue
pcw109550 Oct 16, 2023
51866cd
Update spec for span batch field limit
pcw109550 Oct 16, 2023
f4e2450
Rename variable and explanations span batch limit
pcw109550 Oct 17, 2023
70e060c
op-node/derive: use require instead of assert in span-batch tests
pcw109550 Oct 20, 2023
4606212
Merge pull request #7925 from ethereum-optimism/ci-builder/include-so…
tynes Oct 30, 2023
5b3f8b0
Merge pull request #7751 from testinprod-io/tip/span-batch-limit
protolambda Oct 30, 2023
72cd648
op-node: Span Batch type/encoding/decoding refactor
pcw109550 Oct 10, 2023
9f9cf61
op-node: reduce batch inner type encode/decode methods to just one way
protolambda Oct 30, 2023
4cc340a
ci: disable codecov comments on zero diff
Inphi Oct 30, 2023
8ac11e3
Merge pull request #7926 from ethereum-optimism/inphi/cc
trianglesphere Oct 30, 2023
babe5e7
Merge pull request #7752 from testinprod-io/tip/span-batch-types-refa…
protolambda Oct 30, 2023
6600e97
header traversal nits
hamdiallam Oct 30, 2023
c3efa31
Merge pull request #7858 from ethereum-optimism/10-25-indexer.metric.…
hamdiallam Oct 30, 2023
0f49412
Merge pull request #7908 from ethereum-optimism/felipe/proxyd-eip1898
felipe-op Oct 30, 2023
3f3ad34
op-node: Hide rethDB option
trianglesphere Oct 30, 2023
81a04c1
Merge pull request #7918 from ethereum-optimism/cl/rustc-ci
mslipper Oct 30, 2023
006ed38
Merge pull request #7894 from ethereum-optimism/aj/e2e-groups
protolambda Oct 30, 2023
0d93adc
Merge pull request #7934 from ethereum-optimism/jg/hide_rethdb
trianglesphere Oct 30, 2023
a51fd20
op-batcher: fix test RNG data flake
protolambda Oct 30, 2023
19fc020
Merge pull request #7944 from ethereum-optimism/fix-batcher-flake
sebastianst Oct 30, 2023
8a33c02
Merge pull request #7856 from ethereum-optimism/extra-networks
trianglesphere Oct 30, 2023
53f54e4
op-node: Enable Canyon on Goerli & Sepolia via superchain registry
trianglesphere Oct 30, 2023
96a24cc
Merge pull request #7946 from ethereum-optimism/jg/enable_canyon
trianglesphere Oct 30, 2023
9d5e944
feat: reduce conflicts with optimism v1.2.0
Pangssu Nov 10, 2023
b2e2a80
Merge tag 'op-node/v1.3.0' into feat/upstream-op-v1.3.0
Pangssu Jan 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .foundryrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee5d02c3ef5f55a06b069e4a70a820661a9130c8
1 change: 1 addition & 0 deletions .gethrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.13.4
47 changes: 22 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ci
on:
push:
branches:
- dev
- dev
tags:
- '*.*.*'

Expand Down Expand Up @@ -33,39 +33,38 @@ jobs:
go-version: '1.21'
- run: go mod download

- name: Setup Node.js 16.x
uses: actions/setup-node@master
- name: Setup Node.js 20
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 20

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

- name: Yarn Cache
uses: actions/cache@v3
id: yarn-cache
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-pnpm-store-

- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Install dependencies
run: pnpm install

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly-d369d2486f85576eec4ca41d277391dfdae21ba7

- name: Build
run: yarn build

- name: Run Tests
env:
E2E_DISABLE_PARALLEL: true
run: make test
run: pnpm build

- name: Docker Image Name
id: docker-image-name
Expand Down Expand Up @@ -169,5 +168,3 @@ jobs:
target: op-batcher
push: true
tags: kromanetwork/batcher:${{ needs.prepare.outputs.docker-tag }}


48 changes: 28 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Tests
on:
pull_request:
branches:
- dev
- main
- dev
- main

jobs:
test:
Expand All @@ -24,36 +24,44 @@ jobs:
go-version: '1.21'
- run: go mod download

- name: Setup Node.js 16.x
uses: actions/setup-node@master
- name: Setup Node.js using .nvmrc
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version-file: .nvmrc

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

- name: Yarn Cache
uses: actions/cache@v3
id: yarn-cache
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-pnpm-store-

- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Install dependencies
run: pnpm install

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly-d369d2486f85576eec4ca41d277391dfdae21ba7

- name: Build
run: yarn build
run: pnpm build

- name: Generate L1 allocs
run: make devnet-allocs

- name: Run tests
env:
E2E_DISABLE_PARALLEL: true
OP_E2E_DISABLE_PARALLEL: true
OP_E2E_USE_CANYON: true
run: make test
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,20 @@ tags
### Hardhat ###
cache
artifacts
!/op-bindings/hardhat/testdata/artifacts/

### Devnet
.devnet
packages/contracts/deployments/devnetL1

### Misc ###
# Ignore all binary folders
bin/

# Ignore local fuzzing results
**/testdata/fuzz/

coverage.out

# Ignore bedrock go bindings local output files
op-bindings/bin
5 changes: 5 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# run prefoo scripts
# npm and yarn support this as a default pnpm defaults to false
enable-pre-post-scripts=true
lockfile=true
prefer-workspace-packages=true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.16.0
v20.9.0
Loading