Code

Sprint 1 poc#14

Code

Merged

Benjimmutable merged 138 commits intomainimmutable/zkevm-bridge-contracts:mainfrom sprint-1-pocimmutable/zkevm-bridge-contracts:sprint-1-pocCopy head branch name to clipboardOct 31, 2023

+26,312-68

Commits

Commits on Oct 3, 2023

• Initial migration commit

  Benjimmutable

  committed
  ebaaeca

• Move to apache license

  Benjimmutable

  committed
  5959b50

• Add contribution, license, and security markdowns

  Benjimmutable

  committed
  e635e67

• Update README

  Benjimmutable

  committed
  02e0006

• wip

  Benjimmutable

  committed
  69d7652

Commits on Oct 4, 2023

• Testing of deposit L1 side complete

  Benjimmutable

  committed
  1fa52c7

• Test cleanup

  Benjimmutable

  committed
  e66f48e

• Fix solc pragmas

  Benjimmutable

  committed
  dfc1188

• natspecs

  Benjimmutable

  committed
  0f16296

• small todo comment

  Benjimmutable

  committed
  f6f9890

• deposit done, not tested yet

  proletesseract

  committed
  9adb18e

• Cleanup

  Benjimmutable

  committed
  572eea1

• Merge remote-tracking branch 'origin/bridge-tokens-L1' into bridge-tokens-L2

  proletesseract

  committed
  32d48e8

• Add vscode settings to gitignore

  Benjimmutable

  committed
  062cdc8

• Merge pull request #1 from immutable/bridge-tokens-L1

  Show description for 5e4def6
  Benjimmutable

  authored
  5e4def6

• Merge branch 'sprint-1-poc' into bridge-tokens-L2

  proletesseract

  committed
  df0f544

• Initial deployment scripts

  Benjimmutable

  committed
  19ddbb2

Commits on Oct 5, 2023

• Bug fix with bytes slicing

  Benjimmutable

  committed
  e47e59e

• first few tests done

  proletesseract

  committed
  485a38a

• Integration tests

  Benjimmutable

  committed
  d826357

• Merge branch 'bridge-tokens-L2' of github.com:immutable/zkevm-bridge-contracts into bridge-tokens-L2

  Benjimmutable

  committed
  02d88b5

• Fix test

  Benjimmutable

  committed
  3ae04af

• Unit tests

  Benjimmutable

  committed
  b96d5e9

Commits on Oct 6, 2023

• Add TODO

  Benjimmutable

  committed
  99b421d

• Merge pull request #2 from immutable/bridge-tokens-L2

  Show description for 504c882
  Benjimmutable

  authored
  504c882

• Minor refactor

  Benjimmutable

  committed
  dafb33b

• Merge branch 'sprint-1-poc' of github.com:immutable/zkevm-bridge-contracts into deployment-scripts

  Benjimmutable

  committed
  f8a88c2

Commits on Oct 9, 2023

• Deployment scripts

  Benjimmutable

  committed
  4dcd758

• PR Fixes

  Benjimmutable

  committed
  a458377

• Update README

  Benjimmutable

  committed
  4e5d100

• Add WIMX

  wcgcyx

  committed
  6df13fc

• Add comments

  wcgcyx

  committed
  8367767

• Private keys should be CHILD_PRIVATE_KEY in child scripts

  Benjimmutable

  committed
  bcb7cc4

• Update readme

  Benjimmutable

  committed
  d7c845d

• jq install in readme

  Benjimmutable

  committed
  10045a5

• Fix chain IDs in readme

  Benjimmutable

  committed
  726546a

Commits on Oct 10, 2023

• README fixes

  Benjimmutable

  committed
  877b74c

• Fix typo and natspec comments format

  wcgcyx

  committed
  2e3397b

• Update test

  wcgcyx

  committed
  c398119

• forge fmt

  wcgcyx

  committed
  65d38c1

Commits on Oct 11, 2023

• first cut

  proletesseract

  committed
  9b89f61

• initialiser for child chain updated

  proletesseract

  committed
  84537fe

• more tests for the initialiser

  proletesseract

  committed
  52fa0d8

• feedback applied

  proletesseract

  committed
  79192d6

• Update ChildERC20Bridge.t.sol

  proletesseract

  committed
  77270e2

Commits on Oct 12, 2023

• ready for review

  proletesseract

  committed
  bd3251e

• Remove vscode

  wcgcyx

  committed
  2a967ac

• Update .gitignore

  wcgcyx

  committed
  f7cf520

• Merge remote-tracking branch 'origin/sprint-1-poc' into SMR-1754-WIMX

  wcgcyx

  committed
  d973df4

• Remove test warning

  wcgcyx

  committed
  f98e719

• Merge pull request #3 from immutable/deployment-scripts

  Show description for ace1a6c
  Benjimmutable

  authored
  ace1a6c

• Update src/interfaces/child/IChildERC20Bridge.sol

  Show description for b763951
  

  proletesseract

  and

  Benjimmutable

  authored
  b763951

• Update src/interfaces/root/IRootERC20Bridge.sol

  Show description for c3c7a7d
  

  proletesseract

  and

  Benjimmutable

  authored
  c3c7a7d

• change wontmap to cantmapimx

  proletesseract

  committed
  ad839cd

• Merge branch 'sprint-1-poc' into SMR-1766-IMX-Bridging

  proletesseract

  committed
  9c1cd96

• resolve conflicts, update scripts

  proletesseract

  committed
  0f254e1

• Update src/root/RootERC20Bridge.sol

  Show description for 5c0198f
  

  proletesseract

  and

  Benjimmutable

  authored
  5c0198f

• Merge pull request #5 from immutable/SMR-1766-IMX-Bridging

  Show description for 2197264
  proletesseract

  authored
  2197264

Commits on Oct 13, 2023

• Use interface

  wcgcyx

  committed
  e54adaf

• Add CI and slither

  wcgcyx

  committed
  743f3a9

Commits on Oct 15, 2023

• Merge pull request #4 from immutable/SMR-1754-WIMX

  Show description for 1686d1b
  wcgcyx

  authored
  1686d1b

Commits on Oct 16, 2023

• Exclude lib and test folder

  wcgcyx

  committed
  beca9ea

• Update static-analysis.yml

  wcgcyx

  committed
  e6fc736

• WIP

  proletesseract

  committed
  9c3de00

• Update DeployChildContracts.s.sol

  wcgcyx

  committed
  015e32b

• WIP

  proletesseract

  committed
  cf8ca98

• WIP

  proletesseract

  committed
  917b829

• WIP

  proletesseract

  committed
  0702a77

Commits on Oct 17, 2023

• Update .gitignore

  proletesseract

  committed
  a76bff1

• eth deposit working

  proletesseract

  committed
  ea14d4b

• more tests

  proletesseract

  committed
  0a7ffb1

• Update RootERC20Bridge.sol

  proletesseract

  committed
  04414ca

• Merge pull request #7 from immutable/NOJIRA-add-wimx-deployment

  Show description for c8a8f47
  wcgcyx

  authored
  c8a8f47

• Merge pull request #6 from immutable/SMR-1745-static-analysis

  Show description for 15015dd
  wcgcyx

  authored
  15015dd

Commits on Oct 18, 2023

• WIP

  proletesseract

  committed
  02d35c3

• depositToETH tests added

  proletesseract

  committed
  a2fb994

• typo fix

  proletesseract

  committed
  1e55235

Commits on Oct 19, 2023

• added copying of template local json and some logging

  proletesseract

  committed
  7bc507d

• initialising with child eth token implemented and tested

  proletesseract

  committed
  82d032c

• Merge pull request #8 from immutable/SMR-1782-eth-bridging

  Show description for e5b5428
  proletesseract

  authored
  e5b5428

• Update RootERC20Bridge.t.sol

  proletesseract

  committed
  ee559c7

• Merge branch 'sprint-1-poc' into SMR-1782-eth-bridging-child

  proletesseract

  committed
  877195d

Commits on Oct 20, 2023

• first draft

  proletesseract

  committed
  c4c59a4

• Update InitializeChildContracts.s.sol

  proletesseract

  committed
  22a0f27

• Update ChildERC20Bridge.sol

  proletesseract

  committed
  932ad87

• Update ChildERC20Bridge.sol

  proletesseract

  committed
  6a06077

Commits on Oct 23, 2023

• Checksum address fix

  Benjimmutable

  committed
  bb828a8

• Merge branch 'SMR-1773-axelar-local' of github.com:immutable/zkevm-bridge-contracts into SMR-1773-axelar-local

  Benjimmutable

  committed
  748b5c4

• Add node_modules to git ignore

  Benjimmutable

  committed
  8cdcfb2

• Remove node_modules

  Benjimmutable

  committed
  73bf8b8

• Remove spammy broadcasts

  Benjimmutable

  committed
  02ffdaf

• Merge branch 'sprint-1-poc' of github.com:immutable/zkevm-bridge-contracts into SMR-1773-axelar-local

  Benjimmutable

  committed
  04eb50f

• Clean up

  Benjimmutable

  committed
  8a16796

• Update readme

  Benjimmutable

  committed
  bda3547

• cleanup

  Benjimmutable

  committed
  b566caa

• Fix workflow file

  Benjimmutable

  committed
  54bfe8a

Commits on Oct 24, 2023

• Add lint CI workflow

  Benjimmutable

  committed
  c88ad56

• fix

  Benjimmutable

  committed
  558df25

• Merge pull request #11 from immutable/nojira-lint-in-ci

  Show description for 52a7243
  Benjimmutable

  authored
  52a7243

• Update .gitignore

  proletesseract

  committed
  fc2eaae

• remove ETH_TOKEN address from child initialise

  proletesseract

  committed
  e4de38e

• Merge branch 'sprint-1-poc' into SMR-1782-eth-bridging-child

  proletesseract

  committed
  1d5fcac

• formatting

  proletesseract

  committed
  c597a9f

• integration tests for IMX and Native events

  proletesseract

  committed
  eb4134e

• removed childETH from root and added integration tests

  proletesseract

  committed
  108abc4

• formatting

  proletesseract

  committed
  abc5c4f

• Remove need for child eth token env var in deployment scripts

  Benjimmutable

  committed
  59e4a8c

Commits on Oct 25, 2023

• Merge branch 'SMR-1782-eth-bridging-child' of github.com:immutable/zkevm-bridge-contracts into SMR-1773-axelar-local

  Benjimmutable

  committed
  2eaf469

• Predict the child ETH address properly

  Benjimmutable

  committed
  56737b4

• Lint

  Benjimmutable

  committed
  23df4cb

• WIP

  proletesseract

  committed
  8b8df0f

• Merge pull request #9 from immutable/SMR-1782-eth-bridging-child

  Show description for 8ee323f
  Benjimmutable

  authored
  8ee323f

• Merge branch 'sprint-1-poc' into SMR-1834-WETH-Bridging

  proletesseract

  committed
  a3dcb0d

• Fix failing test

  ermyas

  committed
  ea4dcdc

• last patches and tests added

  proletesseract

  committed
  853c365

• formatting

  proletesseract

  committed
  1335e14

• Delete IERC20.sol

  proletesseract

  committed
  05a4e93

• Update RootERC20Bridge.sol

  proletesseract

  committed
  29487d8

• README fix and other fixes

  Benjimmutable

  committed
  75b164d

• Merge branch 'sprint-1-poc' of github.com:immutable/zkevm-bridge-contracts into SMR-1773-axelar-local

  Benjimmutable

  committed
  db8e1ff

• updated comment, reordered functions

  proletesseract

  committed
  11aa4ba

• Update RootERC20Bridge.sol

  proletesseract

  committed
  364d73f

Commits on Oct 26, 2023

• private keys in readme

  Benjimmutable

  committed
  db674d5

• More readme fixes

  Benjimmutable

  committed
  1b9ea93

• Merge pull request #10 from immutable/SMR-1773-axelar-local

  Show description for 275d3b6
  Benjimmutable

  authored
  275d3b6

• cleanup for the Demo

  Benjimmutable

  committed
  39f5d40

• More cleanup

  Benjimmutable

  committed
  4eb7dda

• feedback applied

  proletesseract

  committed
  f2beb02

• formatting

  proletesseract

  committed
  0a6034a

• Merge branch 'sprint-1-poc' into SMR-1834-WETH-Bridging

  proletesseract

  committed
  5e0b1c5

• formatting

  proletesseract

  committed
  d07713c

• deploy scripts WIP

  proletesseract

  committed
  c806901

• readme updates

  proletesseract

  committed
  140b51b

• final patches

  proletesseract

  committed
  cd63d62

• formatting

  proletesseract

  committed
  d4bc8cb

• Merge pull request #12 from immutable/SMR-1834-WETH-Bridging

  Show description for ff42ce1
  proletesseract

  authored
  ff42ce1

Commits on Oct 30, 2023

• Cleanup for demo

  Benjimmutable

  committed
  ad21f38

• Merge pull request #13 from immutable/SMR-1773-axelar-local

  Show description for 4a4f7fc
  Benjimmutable

  authored
  4a4f7fc