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.

Sign up for GitHub

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

Feature/feijoa #227

Draft
wants to merge 76 commits into
base: develop
Choose a base branch
from
Draft

Feature/feijoa #227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
866f84c
aggregation
invocamanman Feb 12, 2024
47c1501
first approach
invocamanman Feb 13, 2024
39d49df
check chainID range
invocamanman Feb 16, 2024
414ff5b
rebases changes
invocamanman Mar 4, 2024
0ece2e5
update cancun
invocamanman Mar 5, 2024
eebb890
fix test
invocamanman Mar 6, 2024
56b01f9
move and rename
invocamanman Mar 12, 2024
3d87c83
update version
invocamanman Mar 12, 2024
d971a47
update solidity 0.8.24
invocamanman Mar 12, 2024
101f3c3
rebase changes
invocamanman Mar 14, 2024
5fe5e11
rebase changes
invocamanman Mar 19, 2024
896cb41
ongoing
invocamanman Mar 21, 2024
0f6015f
rename
invocamanman Mar 24, 2024
09296e3
mini commit
invocamanman Mar 25, 2024
ba7985b
mini fix
invocamanman Mar 25, 2024
723f4ee
renaming
invocamanman Mar 27, 2024
50d59af
update
invocamanman Mar 27, 2024
edcdef9
intermediate
invocamanman Mar 28, 2024
d8ec50f
fix
invocamanman Mar 28, 2024
18cd950
fix mini problems
invocamanman Mar 28, 2024
1dd36eb
global
invocamanman Mar 29, 2024
adf1610
it compiles
invocamanman Apr 2, 2024
ede73fc
fix
invocamanman Apr 2, 2024
7978ef8
compiles again
invocamanman Apr 2, 2024
67c2610
udpate
invocamanman Apr 2, 2024
144979a
small changes
invocamanman Apr 2, 2024
0a1f46c
udpates
invocamanman Apr 3, 2024
e70665f
validium
invocamanman Apr 3, 2024
88e411c
rollup manager fees
invocamanman Apr 3, 2024
6e38bfa
fix deployment scripts
invocamanman Apr 3, 2024
97979cc
finish deployment and verify contracts
invocamanman Apr 3, 2024
53ee751
add compiled contracts
invocamanman Apr 3, 2024
ac0e2c9
docker and compiled
invocamanman Apr 4, 2024
e1c34f0
small fix
invocamanman Apr 5, 2024
7e42421
fix compilation
invocamanman Apr 5, 2024
c5e8929
fix permisions
invocamanman Apr 5, 2024
1117fb6
start testing
invocamanman Apr 5, 2024
ac6dbfe
fix bug
invocamanman Apr 7, 2024
256665e
test
invocamanman Apr 7, 2024
fc18763
validium tests
invocamanman Apr 7, 2024
83e91ed
asset input
invocamanman Apr 7, 2024
065688b
comments
invocamanman Apr 7, 2024
1a9c888
proof
invocamanman Apr 7, 2024
b8040dc
renames oz
invocamanman Apr 7, 2024
f1a930c
test upgrade
invocamanman Apr 8, 2024
1e223bb
upgrade test
invocamanman Apr 8, 2024
f1c901c
update
invocamanman Apr 8, 2024
c9b2def
moar
invocamanman Apr 8, 2024
5a4d0bf
fnish test
invocamanman Apr 8, 2024
6f6b02c
mock test blobs
invocamanman Apr 8, 2024
b185c63
work on PolygonRollupBaseFeijoa coverage
simonDos Apr 11, 2024
2ed6a94
tests: global exit root v2 after initalization
DhairyaSethi Apr 11, 2024
cd4b644
tests: global exit root v2 before initialization
DhairyaSethi Apr 11, 2024
5e86e19
test: updateExitRoot idempotentcy for coverage
DhairyaSethi Apr 11, 2024
44fbf09
test: bump coverage to 100
DhairyaSethi Apr 11, 2024
2984b63
test: depositCount exceeds capacity
DhairyaSethi Apr 11, 2024
8aeae8f
Merge pull request #235 from 0xPolygonHermez/test/GERv2
invocamanman Apr 12, 2024
dff1895
Merge pull request #234 from 0xPolygonHermez/feijoaTests
invocamanman Apr 12, 2024
7430a1d
test(feijoa): complete committee coverage
ZeroEkkusu Apr 12, 2024
784bdd3
Merge pull request #237 from ZeroEkkusu/test/coverage
invocamanman Apr 12, 2024
6d7957e
update l1 event
invocamanman Apr 12, 2024
eb2f929
Merge pull request #238 from 0xPolygonHermez/feature/updateL1Event
invocamanman Apr 12, 2024
131a930
update tx btye constnat
invocamanman Apr 12, 2024
112cf3e
Merge pull request #240 from 0xPolygonHermez/feature/updateTxByteCons…
invocamanman Apr 12, 2024
6ba4086
test(rollupmanager); coverage
DhairyaSethi Apr 12, 2024
dc2f102
test: coverage
DhairyaSethi Apr 12, 2024
0bc1388
test: use GERv2 for bridge tests
DhairyaSethi Apr 12, 2024
bb44e23
test: rebase l1event info changes
DhairyaSethi Apr 12, 2024
7687547
test: cleanup
DhairyaSethi Apr 12, 2024
9311185
Merge pull request #236 from 0xPolygonHermez/tests/bridge
invocamanman Apr 12, 2024
18eef1e
Merge pull request #241 from 0xPolygonHermez/test/rollupmanager
invocamanman Apr 12, 2024
868e790
fix test to work with custom mnemonics
invocamanman Apr 12, 2024
44d7ccf
test(validium): cover timestamp and leaf reverts
ZeroEkkusu Apr 12, 2024
fd65d86
Merge pull request #242 from 0xPolygonHermez/test/coverage-val
ZeroEkkusu Apr 12, 2024
203dc37
Update CI (#243)
DhairyaSethi Apr 16, 2024
8d9ed46
config fixes
invocamanman Apr 18, 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
Prev Previous commit
Next Next commit
update version
  • Loading branch information
@invocamanman
invocamanman committed Apr 7, 2024
commit 3d87c83c46c0964c935af49a278247e89b44a3cf
2 changes: 1 addition & 1 deletion contracts/v2/PolygonRollupManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeab
import "./lib/PolygonTransparentProxy.sol";
import "./lib/PolygonAccessControlUpgradeable.sol";
import "./lib/LegacyZKEVMStateVariables.sol";
import "./consensus/zkEVM/PolygonZkEVMExistentEtrog.sol";
import "./consensus/etrog/zkEVM/PolygonZkEVMExistentEtrog.sol";
import "./lib/PolygonConstantsBase.sol";

/**
Expand Down
14 changes: 7 additions & 7 deletions contracts/v2/consensus/etrog/PolygonRollupBaseEtrog.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
pragma solidity ^0.8.20;

import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
import "../../../interfaces/IPolygonZkEVMGlobalExitRootV2.sol";
import "../../interfaces/IPolygonZkEVMGlobalExitRootV2.sol";
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
import "../../../../interfaces/IPolygonZkEVMErrors.sol";
import "../../../interfaces/IPolygonZkEVMVEtrogErrors.sol";
import "../../../PolygonRollupManager.sol";
import "../../../interfaces/IPolygonRollupBase.sol";
import "../../../interfaces/IPolygonZkEVMBridgeV2.sol";
import "../../../interfaces/IPolygonZkEVMErrors.sol";
import "../../interfaces/IPolygonZkEVMVEtrogErrors.sol";
import "../../PolygonRollupManager.sol";
import "../../interfaces/IPolygonRollupBase.sol";
import "../../interfaces/IPolygonZkEVMBridgeV2.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
import "../../../lib/PolygonConstantsBase.sol";
import "../../lib/PolygonConstantsBase.sol";

/**
* Contract responsible for managing the states and the updates of L2 network.
Expand Down
Loading