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

Cautious w bridge #15003

Closed
wants to merge 89 commits into from
Closed

Cautious w bridge #15003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
74783f3
feat(protocol): Contestable zkRollup [DRAFT] (#14703)
dantaik Sep 18, 2023
3e7e6c3
Merge branch 'main' into contestable-zkrollup
dantaik Sep 18, 2023
fb5ca45
Update LibProposing.sol
dong77 Sep 18, 2023
022745f
more
dong77 Sep 18, 2023
5fc177d
Update LibProposing.sol
dong77 Sep 18, 2023
42e57bb
Update TaikoData.sol
dong77 Sep 18, 2023
1f55b21
rename
dong77 Sep 18, 2023
c6ee6e3
Merge branch 'main' into contestable-zkrollup
davidtaikocha Sep 19, 2023
8a64422
Merge branch 'main' into contestable-zkrollup
adaki2004 Sep 19, 2023
795d6f1
Merge branch 'main' into contestable-zkrollup
adaki2004 Sep 19, 2023
72b2de6
Fix tran.timestamp for first proveBlock() txn
adaki2004 Sep 19, 2023
3948721
Merge branch 'main' into contestable-zkrollup
dantaik Sep 19, 2023
917d26d
refactor(protocol): further improve EIP1559 on L2 (#14724)
dantaik Sep 19, 2023
cfe5966
feat(protocol): Contestable zkRollup v2 (observations) [DRAFT] (#14721)
adaki2004 Sep 19, 2023
ea51ba3
Emit an event (#14731)
dantaik Sep 19, 2023
f3c6a36
Merge branch 'main' into contestable-zkrollup
dantaik Sep 20, 2023
0e7258f
Update LibProving.sol
dong77 Sep 20, 2023
25043b6
fix(protocol): fixed a minor issue with getting EIP1559 base fee func…
dantaik Sep 20, 2023
830334f
Merge branch 'main' into contestable-zkrollup
adaki2004 Sep 21, 2023
381abaa
fix(protocol): Hybrid rollup tests and small fixes (#14766)
adaki2004 Sep 21, 2023
0be3527
fix(protocol): allow prover assignment with different proving fees (#…
dantaik Sep 22, 2023
e86320f
feat(protocol): extract tier configs into a provider contract for dec…
dantaik Sep 22, 2023
edc9ccb
refactor(protocol): cleanup solidity imports (#14772)
dantaik Sep 22, 2023
a7edd7b
Update TaikoL2.sol
dong77 Sep 23, 2023
7f8a1bc
fix(protocol): Fix tests (#14783)
adaki2004 Sep 23, 2023
a7133cf
Merge branch 'main' into contestable-zkrollup
dantaik Sep 23, 2023
6c17b0a
more
dong77 Sep 24, 2023
a58c2a0
Merge branch 'main' into contestable-zkrollup
davidtaikocha Sep 25, 2023
248b5da
address build warning
adaki2004 Sep 25, 2023
a353265
remove debug prints
adaki2004 Sep 25, 2023
f47cc85
Optimize gas (#14803)
dantaik Sep 25, 2023
1a6744f
Merge branch 'main' into contestable-zkrollup
dantaik Sep 25, 2023
00f0be1
Merge branch 'main' into contestable-zkrollup
dantaik Sep 26, 2023
4528e7b
fix test command
adaki2004 Sep 26, 2023
77d26e3
fix unit test command
adaki2004 Sep 26, 2023
6de9c60
Fuzz seed workaround
adaki2004 Sep 26, 2023
36b1ece
remove unused eip1559config
adaki2004 Sep 26, 2023
0e340a0
Merge branch 'main' into contestable-zkrollup
davidtaikocha Sep 26, 2023
d07eea1
update comment
adaki2004 Sep 26, 2023
0b4ba34
feat(protocol): emit events in LibTaikoToken (#14821)
dantaik Sep 26, 2023
535ca31
refactor(protocol): rename variables (#14820)
dantaik Sep 26, 2023
7274072
Update packages/protocol/contracts/L1/libs/LibProposing.sol
dantaik Sep 26, 2023
90612d2
feat(protocol): rename config providers and add ZKRollupConfigProvide…
dantaik Sep 27, 2023
bf7262c
fix(protocol): fixes based on David's review (#14828)
dantaik Sep 27, 2023
8770d6c
feat(protocol): Guardian can return unprovable bonds (#14830)
adaki2004 Sep 27, 2023
67f4edf
Update GuardianVerifier.sol
dong77 Sep 27, 2023
7f34319
Merge branch 'main' into contestable-zkrollup
dantaik Sep 27, 2023
5a2aa13
feat(protocol): update `DeployOnL1` script based on Contestable zkRol…
davidtaikocha Sep 27, 2023
29bfd96
feat(protocol): add extraData to proposed block (#14846)
dantaik Sep 28, 2023
be0fe1c
feat(protocol): add `minTier` to `BlockProposed` event (#14859)
davidtaikocha Sep 30, 2023
ea737d3
feat(protocol): add a missing slot value in pre-deployed `TaikoL2` ge…
davidtaikocha Oct 1, 2023
61268f5
Merge branch 'main' into contestable-zkrollup
davidtaikocha Oct 1, 2023
781464f
refactor(protocol): reimplement curve(amm)-based 1559 for L2a (#14885)
dantaik Oct 3, 2023
6a6cc8b
chore(protocol): Contestable rollup additions (design docs, documenta…
adaki2004 Oct 3, 2023
d072fc5
feat(eventindexer): Contestable zkrollup eventindexer (#14892)
cyberhorsey Oct 4, 2023
14d5ffd
fix genesis test
adaki2004 Oct 4, 2023
324be43
remove parentTimestamp from taikoL2.ts
adaki2004 Oct 4, 2023
a74f44f
Merge branch 'alpha-6' into contestable-zkrollup
dantaik Oct 4, 2023
4c78ddb
feat(protocol): implemented partial and more fair block proposal rew…
adaki2004 Oct 6, 2023
49efd75
feat(protocol): lower top tier proof cost (#14922)
dantaik Oct 9, 2023
2bcf2bf
feat(protocol): allow checking config after initialization (#14924)
dantaik Oct 10, 2023
b3a77cc
feat(protocol): reward proposer using gas used on L2 (#14929)
dantaik Oct 13, 2023
6f88830
Update TaikoErrors.sol
dong77 Oct 13, 2023
3d3e1ab
Merge branch 'alpha-6' into contestable-zkrollup
dantaik Oct 13, 2023
cd76f60
refactor(protocol): update TaikoL2.sol (#14947)
mvidovic-tuple Oct 14, 2023
2511b58
Update TaikoL2.sol
dong77 Oct 14, 2023
1f3fd0f
Update TaikoL2.sol
dong77 Oct 14, 2023
d9e3617
pnpm update --latest
dong77 Oct 15, 2023
7d947b2
pnpm update --latest
dong77 Oct 15, 2023
6772f94
refactor(protocol): address manager cannot be changed, only upgradabl…
dantaik Oct 16, 2023
22c4a5a
fix(protocol): Revert long imports (hardhat seems issues parsing rema…
adaki2004 Oct 16, 2023
6945598
feat(protocol): support multi-hop bridging & add SGX prover (#14954)
dantaik Oct 17, 2023
56efc69
merge
dong77 Oct 17, 2023
7a58e95
Add refund in onMessageRecalled
adaki2004 Oct 18, 2023
b8e699c
fix typo
adaki2004 Oct 18, 2023
372b8e5
Added sgxAndZk verifier to deployment
adaki2004 Oct 18, 2023
ee4f93e
Test for proof and hop proof
adaki2004 Oct 18, 2023
362ee57
getInstance -> calcInstance
dong77 Oct 19, 2023
ee6f34d
remove errors
dong77 Oct 19, 2023
cb21e4e
Update SgxVerifier.sol
dong77 Oct 19, 2023
00e20be
fix(protocol): Fix LibAddress (#14989)
adaki2004 Oct 19, 2023
4d740b5
add warning acc. to Brecht
adaki2004 Oct 19, 2023
74d2649
function order change
adaki2004 Oct 19, 2023
d63982e
function order change2
adaki2004 Oct 19, 2023
56c0198
chore(protocol): deploy `ProxiedGuardianProver` in `DeployOnL1` scrip…
davidtaikocha Oct 20, 2023
409f368
feat(protocol): remove block reward (#14992)
dantaik Oct 20, 2023
5b7fc25
feat(protocol): Simulate and plot l2 basefee (#14997)
adaki2004 Oct 21, 2023
394ff17
refactor(protocol): improve TaikoToken and allow pausing Bridge/Vault…
dantaik Oct 21, 2023
2cc9863
Merge branch 'contestable-zkrollup-consolidated' into contestable-zkr…
dantaik Oct 21, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
* **pos-dashboard:** Changed font color of error message ([#14543](https://github.com/taikoxyz/taiko-mono/issues/14543)) ([279d4e9](https://github.com/taikoxyz/taiko-mono/commit/279d4e96bf378eb651b91976d7729b0675ea1368))
* **protocol:** block reward must be minted ([#14595](https://github.com/taikoxyz/taiko-mono/issues/14595)) ([e92b1da](https://github.com/taikoxyz/taiko-mono/commit/e92b1da2ced73c2b28a825fce916acededab0a39))
* **protocol:** change transition ID from uint16 to uint32 ([#14620](https://github.com/taikoxyz/taiko-mono/issues/14620)) ([c8969b6](https://github.com/taikoxyz/taiko-mono/commit/c8969b64bbaacf9ec6d239608509424fdc02ee97))
* **protocol:** remove proof from getInstance calculation ([#14623](https://github.com/taikoxyz/taiko-mono/issues/14623)) ([2eedc33](https://github.com/taikoxyz/taiko-mono/commit/2eedc33c213cb5d0abf9daa8bc9bd21b730ae6af))
* **protocol:** remove proof from calcInstance calculation ([#14623](https://github.com/taikoxyz/taiko-mono/issues/14623)) ([2eedc33](https://github.com/taikoxyz/taiko-mono/commit/2eedc33c213cb5d0abf9daa8bc9bd21b730ae6af))
* **protocol:** revert impl deployment V2 ([#14621](https://github.com/taikoxyz/taiko-mono/issues/14621)) ([7e59e0b](https://github.com/taikoxyz/taiko-mono/commit/7e59e0b0077e4d81bcd5333bc6f0900e0761d6ea))
* **relayer:** Eth bridge ([#14609](https://github.com/taikoxyz/taiko-mono/issues/14609)) ([f5207ae](https://github.com/taikoxyz/taiko-mono/commit/f5207ae19c48d9aaa83dab2739cd05d9c2985112))

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.23.0",
"private": true,
"devDependencies": {
"lefthook": "^1.4.7",
"prettier": "^2.8.8"
"lefthook": "^1.5.2",
"prettier": "^3.0.3"
}
}
Loading