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

fix/rlp #177

Merged
merged 51 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3ebfc38
chore: forge init
ethyla Aug 24, 2024
12c0169
chore: settings
ethyla Aug 24, 2024
722542c
feat: deploy script
ethyla Aug 24, 2024
f5924b9
fix: fix
ethyla Aug 24, 2024
6eca100
init mintableerc20predicate implementation
ethyla May 22, 2024
dfd91a9
init mintableerc721predicate implementation
ethyla May 22, 2024
6c908b1
feat: simplify disable init
ethyla Jun 4, 2024
62c8076
feat: disable init on more token contracts
ethyla Jun 4, 2024
0758779
feat: disable init on ChildChainManager
ethyla Jun 4, 2024
ba6eb30
feat: disable init on RootChainManager
ethyla Jun 4, 2024
16f3080
fix: allow tests to run
ethyla Aug 25, 2024
88ff566
Merge pull request #1 from ethyla/fix/disableInit
ethyla Aug 25, 2024
94bdf89
fix: readd 3rd parameter exitToken
ethyla Aug 26, 2024
a4e9c7b
fix: tests
ethyla Aug 26, 2024
822b217
feat: improve foundry.toml
ethyla Sep 13, 2024
8cc5149
Merge branch 'fix/exitTokenAbi'
ethyla Sep 13, 2024
d10294a
upd: gitignore
ethyla Sep 13, 2024
e25c406
chore: remove unneeded files
ethyla Sep 13, 2024
af875f2
Revert "chore: forge init"
ethyla Sep 13, 2024
66215d1
chore: forge init
ethyla Sep 13, 2024
c0c7a31
fix: restore readme
ethyla Sep 13, 2024
e1e8bd6
fix: rm files
ethyla Sep 13, 2024
c3c722d
fix: rm file
ethyla Sep 13, 2024
36eb9ca
forge install: forge-std
ethyla Sep 16, 2024
17e1361
ci: disable formatting
ethyla Sep 16, 2024
bca0991
fix: remove ds-test dep
ethyla Sep 16, 2024
9402ebc
fix: node version
ethyla Sep 18, 2024
9f22451
fix: pin some package vers
ethyla Sep 18, 2024
04d4156
fix: remove custom test
ethyla Sep 18, 2024
d706376
fix: ts types
ethyla Sep 18, 2024
ec4ce1f
fix: add fs perms
ethyla Sep 18, 2024
2d1b890
upd: forge
ethyla Sep 18, 2024
07a60c2
fix: compiler issue
ethyla Sep 18, 2024
945936f
fix: more fs perms
ethyla Sep 18, 2024
67e94d6
fix: move forge tests
ethyla Sep 18, 2024
433caa5
ci: only run once
ethyla Sep 18, 2024
a5b2f23
upd: remappings
ethyla Sep 18, 2024
57bdc33
ci: npm i forge
ethyla Sep 18, 2024
bd98a25
ci: pin node
ethyla Sep 18, 2024
bc15afd
upd: new package-lock
ethyla Sep 19, 2024
1e106b6
feat: fix mpt
ethyla Oct 6, 2024
d6ee23b
feat: add forktest with test tx
ethyla Oct 7, 2024
a323af3
feat: deploy script MPT
ethyla Oct 10, 2024
f4d3acf
standard prefix approach for extension nodes
web3security Oct 23, 2024
070d532
fix: ci
simonDos Oct 28, 2024
75cf834
fix: clean comments
ethyla Nov 6, 2024
d57c9ee
fix: test
ethyla Nov 6, 2024
4869fe2
ci: disable truffle tests
ethyla Nov 14, 2024
eb1596e
feat: add interface generation
ethyla Nov 14, 2024
10f99d2
ci: don't run fork tests
ethyla Nov 14, 2024
b48a3b4
Merge pull request #179 from maticnetwork/fix/mpt
ethyla Dec 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CI

on:
pull_request:
workflow_dispatch:

env:
FOUNDRY_PROFILE: ci

jobs:
check:
strategy:
fail-fast: true

name: Foundry project
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive

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

- name: Show Forge version
run: |
forge --version

- name: Setup Node.js environment
uses: actions/setup-node@v1
with:
node-version: "10.24.1"
- name: Cache npm dependencies
uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.OS }}-npm-cache-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-npm-cache-
- name: Install npm dependencies
run: npm install

# - name: Run Forge fmt
# run: |
# forge fmt --check
# id: fmt

- name: Run Forge build
run: |
forge build --sizes
id: build

- name: Run Forge tests
run: |
forge test -vvv
id: test
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@ tenderly.yaml
contracts/ChainConstants.sol

contracts/dump.json

.env
cache
forge-cache
artifacts
out
scripts/helpers/interfaces
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ npm i @maticnetwork/pos-portal
Make sure you've NodeJS & NPM installed

```bash
user:pos-portal anjan$ node --version
v12.18.1
node --version
v10.24.1

user:pos-portal anjan$ npm --version
6.14.5
npm --version
6.14.12
```

Clone repository & install all dependencies
Expand Down Expand Up @@ -271,5 +271,4 @@ npm run truffle exec scripts/update-implementation.js -- --network <network-name
Set list of contract addresses and new owner address in `6_change_owners.js` migration script
Set `MNEMONIC` and `API_KEY` as env variables
```bash
npm run change-owners -- --network <network-name>
```
npm run change-owners -- --network <network-name>
1 change: 0 additions & 1 deletion artifacts/BaseChildTunnel.json

This file was deleted.

1 change: 0 additions & 1 deletion artifacts/BaseRootTunnel.json

This file was deleted.

1 change: 0 additions & 1 deletion artifacts/ChainExitERC1155Predicate.json

This file was deleted.

1 change: 0 additions & 1 deletion artifacts/ChainExitERC1155PredicateProxy.json

This file was deleted.

Loading
Loading