Code

fix: crosschain merge conflicts#88

Code

Merged

agusduha merged 55 commits intosc-feat/crosschain-erc20defi-wonderland/optimism:sc-feat/crosschain-erc20from fix/crosschain-merge-conflictsdefi-wonderland/optimism:fix/crosschain-merge-conflictsCopy head branch name to clipboardOct 8, 2024

+2,511-2,536

Commits

Commits on Oct 2, 2024

• dependabot(docker): bump ethereum/client-go in /ops-bedrock (ethereum-optimism#12229)

  Show description for 00f965d
  dependabot[bot]

  authored
  00f965d

  Copy full SHA for 00f965d

• fix(ct): error in deploy script (ethereum-optimism#12264)

  Show description for c54044f
  smartcontracts

  authored
  c54044f

  Copy full SHA for c54044f

• op-program: Increase timeout for the verify job. (ethereum-optimism#12267)

  Show description for 91f67eb
  ajsutton

  authored
  91f67eb

  Copy full SHA for 91f67eb

• Move serialize from cannon to op-service (ethereum-optimism#12265)

  mininny

  authored
  b117186

  Copy full SHA for b117186

• feat: Add ChainAssertions for deploySuperchain contracts (ethereum-optimism#12271)

  Show description for c8a9533
  

  maurelian

  and

  mds1

  authored
  c8a9533

  Copy full SHA for c8a9533

• feat(ct): add SOLIDITY_UPGRADES document (ethereum-optimism#12272)

  Show description for 83b91d9
  smartcontracts

  authored
  83b91d9

  Copy full SHA for 83b91d9

• maint(ci): add kontrol build to CI (ethereum-optimism#12266)

  Show description for daff281
  smartcontracts

  authored
  daff281

  Copy full SHA for daff281

• Update op-geth depdency to 1.14.11 base (ethereum-optimism#12262)

  Show description for 82cb8ff
  0x00101010

  authored
  82cb8ff

  Copy full SHA for 82cb8ff

Commits on Oct 3, 2024

• op-deployer: Test for existing OPCM (ethereum-optimism#12257)

  Show description for a83c375
  mslipper

  authored
  a83c375

  Copy full SHA for a83c375

• op-deployer: Update artifacts url (ethereum-optimism#12278)

  Show description for f538497
  mslipper

  authored
  f538497

  Copy full SHA for f538497

• maint(ct): move EAS contracts into vendor folder (ethereum-optimism#12277)

  Show description for 35426c1
  smartcontracts

  authored
  35426c1

  Copy full SHA for 35426c1

• Add error codes to ChainAssertions (ethereum-optimism#12279)

  Show description for 8eada51
  maurelian

  authored
  8eada51

  Copy full SHA for 8eada51

• dependabot(gomod): bump github.com/multiformats/go-multiaddr-dns (ethereum-optimism#12263)

  Show description for ce13164
  dependabot[bot]

  authored
  ce13164

  Copy full SHA for ce13164

• feat: deletes unused FPACOPS scripts (ethereum-optimism#12283)

  Show description for ae47d36
  maurelian

  authored
  ae47d36

  Copy full SHA for ae47d36

• Fix typos in dastate.go (ethereum-optimism#12223)

  karlb

  authored
  6cf6cd1

  Copy full SHA for 6cf6cd1

• feat: allow block time override (ethereum-optimism#12276)

  mds1

  authored
  c4119f1

  Copy full SHA for c4119f1

• doc: remove deleted .yml path (ethereum-optimism#12285)

  Show description for 1ab9775
  r4525532

  authored
  1ab9775

  Copy full SHA for 1ab9775

• feat: Delete scripts/fpac dir (ethereum-optimism#12286)

  maurelian

  authored
  13d116a

  Copy full SHA for 13d116a

• Update README.md (ethereum-optimism#12288)

  Show description for 9e7d1ef
  raffaelemazzitelli

  authored
  9e7d1ef

  Copy full SHA for 9e7d1ef

• Update SECURITY.md (ethereum-optimism#12290)

  Show description for a9f8330
  raffaelemazzitelli

  authored
  a9f8330

  Copy full SHA for a9f8330

• feat(ci): add local semgrep scanning (ethereum-optimism#12281)

  Show description for 9c91fff
  smartcontracts

  authored
  9c91fff

  Copy full SHA for 9c91fff

• Update SECURITY.md (ethereum-optimism#12293)

  Show description for 6014026
  raffaelemazzitelli

  authored
  6014026

  Copy full SHA for 6014026

• cannon: Fix 64-bit memory access (ethereum-optimism#12259)

  Show description for 711bc7c
  Inphi

  authored
  711bc7c

  Copy full SHA for 711bc7c

Commits on Oct 4, 2024

• Add binary deserialization to asterisc's state converter trace function (ethereum-optimism#12238)

  Show description for b02dba0
  mininny

  authored
  b02dba0

  Copy full SHA for b02dba0

• feat: better e2e deploy check (ethereum-optimism#12309)

  Show description for 289f074
  tynes

  authored
  289f074

  Copy full SHA for 289f074

• feat: Replace deployImplementations with call to DeployImplementations.run()

  Show description for 0a40d05
  maurelian

  authored
  0a40d05

  Copy full SHA for 0a40d05

• feat: Add OPCM to deployImplementations (ethereum-optimism#12287)

  Show description for 7789e6a
  maurelian

  authored
  7789e6a

  Copy full SHA for 7789e6a

• dependabot(gomod): bump golang.org/x/time from 0.6.0 to 0.7.0 (ethereum-optimism#12327)

  Show description for f2096a6
  dependabot[bot]

  authored
  f2096a6

  Copy full SHA for f2096a6

• feat: Move DEFAULT_STARTING_ANCHOR_ROOTS to Constants library (ethereum-optimism#12332)

  Show description for 035129d
  maurelian

  authored
  035129d

  Copy full SHA for 035129d

• contracts: update chain assertions (ethereum-optimism#12323)

  Show description for ca604d5
  tynes

  authored
  ca604d5

  Copy full SHA for ca604d5

Commits on Oct 5, 2024

• Update SECURITY.md (ethereum-optimism#12294)

  Show description for f9a3052
  raffaele-oplabs

  authored
  f9a3052

  Copy full SHA for f9a3052

• feat: add sol-style-doc-comment locally (ethereum-optimism#12343)

  Show description for 8636b6e
  smartcontracts

  authored
  8636b6e

  Copy full SHA for 8636b6e

• feat(ci): allow solc warnings on tests (ethereum-optimism#12292)

  Show description for df25b1f
  maurelian

  authored
  df25b1f

  Copy full SHA for df25b1f

• dependabot(gomod): bump golang.org/x/crypto from 0.27.0 to 0.28.0 (ethereum-optimism#12329)

  Show description for 1f62270
  

  dependabot[bot]

  and

  tynes

  authored
  1f62270

  Copy full SHA for 1f62270

• feat: add sol-expectrevert-no-args locally (ethereum-optimism#12342)

  Show description for e9b5eeb
  smartcontracts

  authored
  e9b5eeb

  Copy full SHA for e9b5eeb

• contracts: clean up deploy script abstractions (ethereum-optimism#12336)

  Show description for e165a7e
  tynes

  authored
  e165a7e

  Copy full SHA for e165a7e

Commits on Oct 6, 2024

• maint(ci): clean up semgrep rules and ignores (ethereum-optimism#12347)

  Show description for 5a155ee
  smartcontracts

  authored
  5a155ee

  Copy full SHA for 5a155ee

• feat(ci): use foundry profiles to set fuzz parameters (ethereum-optimism#12346)

  Show description for 8917511
  smartcontracts

  authored
  8917511

  Copy full SHA for 8917511

Commits on Oct 7, 2024

• Remove AddSingularBatch from ChannelOut interface (prefer AddBlock) (ethereum-optimism#12079)

  mdehoog

  authored
  d062c1c

  Copy full SHA for d062c1c

• increase metric properly when blocks are requeued (ethereum-optimism#12326)

  geoknee

  authored
  f33a0a9

  Copy full SHA for f33a0a9

• feat: add sol-style-malformed-require locally (ethereum-optimism#12340)

  Show description for 981ee6a
  smartcontracts

  authored
  981ee6a

  Copy full SHA for 981ee6a

• contracts-bedrock: cleanup FeeVault (ethereum-optimism#12338)

  Show description for b460aa2
  tynes

  authored
  b460aa2

  Copy full SHA for b460aa2

• contracts-bedrock: fixes OptimismMintableERC721Factory test (ethereum-optimism#12306)

  Show description for 35bbd80
  tynes

  authored
  35bbd80

  Copy full SHA for 35bbd80

• feat: add sol-style-malformed-revert locally (ethereum-optimism#12341)

  Show description for 6d874d5
  smartcontracts

  authored
  6d874d5

  Copy full SHA for 6d874d5

• feat(ct): add checks for unused imports (ethereum-optimism#12348)

  Show description for fb8ac6b
  smartcontracts

  authored
  fb8ac6b

  Copy full SHA for fb8ac6b

• ci: Fix proofs team CI notification group name (ethereum-optimism#12362)

  pauldowman

  authored
  a85ff0a

  Copy full SHA for a85ff0a

• fix(ci): add unused imports check to ci (ethereum-optimism#12360)

  Show description for 77c91d0
  smartcontracts

  authored
  77c91d0

  Copy full SHA for 77c91d0

• fix(ci): add MIPSInstructions as exception (ethereum-optimism#12361)

  Show description for b4171c3
  smartcontracts

  authored
  b4171c3

  Copy full SHA for b4171c3

• OPCM: DepolyOPChain additional testing checks. (ethereum-optimism#12355)

  Show description for 078e016
  blmalone

  authored
  078e016

  Copy full SHA for 078e016

• devnet: fix build issue (ethereum-optimism#12364)

  Show description for c938fdf
  tynes

  authored
  c938fdf

  Copy full SHA for c938fdf

Commits on Oct 8, 2024

• fix(ct): deploy MIPS2 properly (ethereum-optimism#12365)

  Show description for 2412379
  smartcontracts

  authored
  2412379

  Copy full SHA for 2412379

• feat: add semgrep-scan-local to justfile (ethereum-optimism#12366)

  Show description for 8cb56d9
  smartcontracts

  authored
  8cb56d9

  Copy full SHA for 8cb56d9

• op-program: Avoid parsing op-sepolia and op-mainnet rollup and chain configs in init() methods (ethereum-optimism#12307)

  Show description for fb7f306
  ajsutton

  authored
  fb7f306

  Copy full SHA for fb7f306

• Merge branch 'develop' into fix/crosschain-merge-conflicts

  agusduha

  committed
  9f49b43

  Copy full SHA for 9f49b43

• fix: remove unused imports

  agusduha

  committed
  ab1e074

  Copy full SHA for ab1e074