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

refactor: v1 v2 split #268

Merged
merged 46 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
5b5cc4b
access control for erc20 custody new
skosito Jul 23, 2024
f1cf789
cleanup erc20 custody new events and errors
skosito Jul 23, 2024
8b9669e
access control for gateway evm
skosito Jul 23, 2024
1851b89
move connector events to interface
skosito Jul 23, 2024
ba0f25f
add tss address to connector and fix uniswap integration test
skosito Jul 23, 2024
3f4990c
tests for tss sender in connector
skosito Jul 23, 2024
a686f66
remove access control todos from zevm contracts
skosito Jul 23, 2024
58160e8
generate
skosito Jul 23, 2024
0f8ab79
missing access control
skosito Jul 23, 2024
72e1200
init v2 folder
skosito Jul 24, 2024
8fafcbd
use npm
skosito Jul 24, 2024
99aaebb
moving files
skosito Jul 24, 2024
8e5b78f
moving files
skosito Jul 24, 2024
2964b06
move upgrade test
skosito Jul 24, 2024
3eac2ca
connector tests
skosito Jul 24, 2024
c0dbd8c
wip
skosito Jul 24, 2024
394e7c5
forge fmt
skosito Jul 24, 2024
09be45c
move echidna
skosito Jul 24, 2024
6672b9e
using submodule for forge-std
skosito Jul 24, 2024
2ea0a59
forge install: openzeppelin-contracts-upgradeable
skosito Jul 24, 2024
a8ec2b1
use submodules
skosito Jul 24, 2024
3a57e9d
move existing to v1 folder
skosito Jul 26, 2024
a3bf3f2
Merge branch 'main' into v1-v2-split
skosito Jul 29, 2024
731aa1e
yarn generate for v1
skosito Jul 29, 2024
3d6a870
cleanup
skosito Jul 29, 2024
3d736e5
conflicts
skosito Jul 29, 2024
0ec2a72
try to fix build action
skosito Jul 29, 2024
b334516
fixing v1 actions
skosito Jul 29, 2024
307a455
fix test v1
skosito Jul 29, 2024
d00c832
add paths to v1 actions
skosito Jul 29, 2024
b8db384
forge fmt
skosito Jul 29, 2024
56ef158
add test v2 and cleanup v1 actions
skosito Jul 29, 2024
9a7dd16
fix
skosito Jul 29, 2024
28af3e6
fix
skosito Jul 29, 2024
dd4cbeb
remove build v1 action and rename test actions steps
skosito Jul 29, 2024
2a01ed1
feat: port localnet to v2 (#269)
skosito Jul 29, 2024
4c013a2
readme and test fixes
skosito Jul 29, 2024
f401c98
lint v2
skosito Jul 29, 2024
8af5d05
enable coverage and slither on v2
skosito Jul 29, 2024
545201b
remove broadcast folder
skosito Jul 29, 2024
5231707
fix PR comments
skosito Jul 30, 2024
f4c1c7d
merge main
skosito Jul 30, 2024
640e67d
refactor: v2 bindings (#270)
skosito Jul 30, 2024
6835971
refactor: remove new suffix from v2 contracts (#272)
skosito Jul 31, 2024
5f2ea3c
feat: add missing access control (#277)
skosito Aug 1, 2024
ab656a2
Merge branch 'main' into v1-v2-split
skosito Aug 2, 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
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Generated Files are Updated
name: Generated Files are Updated (V1)

on:
push:
branches:
- main
paths:
- 'v1/**'
pull_request:
branches:
- "*"
Expand All @@ -13,14 +15,16 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v1

jobs:
generate:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v4
Expand All @@ -40,9 +44,6 @@ jobs:
tar -zxvf geth-alltools-linux-amd64-1.11.5-a38f4108.tar.gz
sudo mv geth-alltools-linux-amd64-1.11.5-a38f4108/abigen /usr/local/bin/

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Generate Go packages and typechain-types
run: |
yarn generate
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/lint.yaml → .github/workflows/lint_v1.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Lint TS/JS
name: Lint TS/JS (V1)

on:
push:
branches:
- main
paths:
- 'v1/**'
pull_request:
branches:
- "*"
Expand All @@ -13,25 +15,24 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v1

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "18"
registry-url: "https://registry.npmjs.org"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Dependencies
run: yarn install

Expand Down
24 changes: 19 additions & 5 deletions .github/workflows/build.yaml → .github/workflows/lint_v2.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Build
name: Lint TS/JS/Sol (V2)

on:
push:
branches:
- main
paths:
- 'v2/**'
pull_request:
branches:
- "*"
Expand All @@ -13,22 +15,34 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v2

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "18"
node-version: "21.1.0"
registry-url: "https://registry.npmjs.org"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Dependencies
run: yarn install

- name: Build
run: yarn build
- name: Lint JavaScript/TypeScript
run: yarn lint

- name: Lint Solidity
run: forge fmt --check
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
name: Publish to NPM
name: Publish to NPM (V1)

on:
release:
types: [published]

defaults:
run:
working-directory: ./v1

jobs:
publish:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "18"
registry-url: "https://registry.npmjs.org"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Dependencies
run: yarn install

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Slither
name: Slither (V2)

on:
push:
branches:
- main
paths:
- 'v2/**'
pull_request:
branches:
- "*"
Expand All @@ -13,6 +15,10 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v2

jobs:
slither:
runs-on: ubuntu-latest
Expand All @@ -22,14 +28,14 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "21.1.0"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
Expand All @@ -38,15 +44,15 @@ jobs:
run: yarn install

- name: Build project
run: yarn build
run: forge build

- name: Run Slither
uses: crytic/slither-action@main
id: slither
continue-on-error: true
with:
sarif: results.sarif
node-version: "18"
node-version: "21.1.0"
fail-on: none

- name: Upload SARIF file
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/test.yaml → .github/workflows/test_v1.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Test
name: Test (V1)

on:
push:
branches:
- main
paths:
- 'v1/**'
pull_request:
branches:
- "*"
Expand All @@ -13,33 +15,29 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v1

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "18.0.0"
registry-url: "https://registry.npmjs.org"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Dependencies
run: yarn install

- name: Build project
run: yarn build

- name: Test (foundry)
run: yarn test:foundry


- name: Test (hardhat)
run: yarn test
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Coverage
name: Test (V2)

on:
push:
branches:
- main
paths:
- 'v2/**'
pull_request:
branches:
- "*"
Expand All @@ -13,27 +15,36 @@ on:
- reopened
- ready_for_review

defaults:
run:
working-directory: ./v2

jobs:
coverage:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "21.1.0"
registry-url: "https://registry.npmjs.org"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Dependencies
run: yarn install

- name: Test
run: yarn test

- name: Test with coverage
- name: Coverage
run: yarn coverage

- name: Upload coverage reports to Codecov
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ crytic-export

out
cache_forge
broadcast
13 changes: 8 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/openzeppelin-foundry-upgrades"]
path = lib/openzeppelin-foundry-upgrades
[submodule "v2/lib/openzeppelin-foundry-upgrades"]
path = v2/lib/openzeppelin-foundry-upgrades
url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
[submodule "v2/lib/forge-std"]
path = v2/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "v2/lib/openzeppelin-contracts-upgradeable"]
path = v2/lib/openzeppelin-contracts-upgradeable
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# ZetaChain Protocol Contracts

Contracts of official protocol contracts deployed by the core ZetaChain team.

## Learn more about ZetaChain

* Check our [website](https://www.zetachain.com/).
* Read our [docs](https://docs.zetachain.com/).

## Packages

- [v1 legacy contracts](v1)
- [v2 new contracts (currently in development)](v2)
15 changes: 0 additions & 15 deletions foundry.toml

This file was deleted.

1 change: 0 additions & 1 deletion lib/forge-std
Submodule forge-std deleted from 07263d
Loading
Loading