github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-13 16:08:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
365 Commits 208 Branches 673 Tags
tweak-contract
Commit Graph

55 Commits

Author SHA1 Message Date
colinlyguo
20232336ca tweak 2023-05-31 01:10:06 +08:00
colinlyguo
332b2557b6 tweak 2023-05-31 00:50:36 +08:00
Xi Lin
d743f2ce96 feat(contracts): add fallback contract to deployed in L2 (#522) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-30 08:31:12 +08:00
Xi Lin
aa24cdd1db feat(contracts): add chain id in public input hash (#517) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-28 09:41:38 +08:00
Orest Tarasiuk
02429a9ad3 (docs) Update README.md for contracts 2023-05-22 17:48:55 +02:00
HAOYUatHZ
412ec4eeb7 docs: reorganize docs (#490) 
Co-authored-by: Orest Tarasiuk <830847+OrestTa@users.noreply.github.com>
 2023-05-22 17:44:25 +02:00
Xi Lin
3bc8a3f5c6 feat(contracts): revert subsequent batches (#509) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-22 09:41:40 +02:00
Ahmed Castro
0e09160a08 build(contracts): add package.json for npm library (#485) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-22 15:07:51 +08:00
Haichen Shen
348b58ceb4 fix(contracts): disallow committing a batch twice (#505) 2023-05-21 15:00:05 -07:00
Xi Lin
f705ae7c0f feat(contracts): implement new rollup design (#464) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: maskpp <maskpp266@gmail.com>
Co-authored-by: Lawliet-Chan <1576710154@qq.com>
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: Orest Tarasiuk <830847+OrestTa@users.noreply.github.com>
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-05-21 11:29:16 -07:00
Xi Lin
29f358e838 feat(contracts): add a non-upgradeable version of IScrollStandardERC20 (#501) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-21 15:16:52 +08:00
Haichen Shen
aa03ad953d fix(contracts): update the l1 data fee calculation (#498) 2023-05-20 00:32:05 -07:00
Haichen Shen
dfc443a257 feat(contracts): Remove whitelist from ScrollMessengerBase (#499) 2023-05-20 00:15:41 -07:00
Xi Lin
2e0039ab25 feat(contracts): remove relay fee in L2ScrollMessenger (#493) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-05-19 23:12:42 -07:00
Xi Lin
09378804b7 bugfix(contracts): fix wrong _oldFeeVault (#497) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-19 10:32:40 -07:00
Haichen Shen
f6f11be0cf feat(contracts): remove unnecessary todos (#483) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-17 13:56:10 +08:00
Max Wolff
1e07c7c032 Feat/withdraw trie test (#479) 
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
 2023-05-16 15:42:37 -07:00
Xi Lin
aea91291b2 feat(contracts): gateway to add enforced transaction (#400) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-16 15:13:09 -07:00
Lawliet-Chan
929c8bf609 feat(libzkp): upgrade zkevm to v0.3 (#458) 
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
 2023-05-15 15:18:22 +08:00
Max Wolff
646ecb0124 feat(contracts): Intrinsic Gas Check (#465) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-12 10:57:58 -07:00
Xi Lin
26b65473cf feat(contracts): fixes according to Zellic contract audits (#441) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-12 09:10:53 -07:00
Xi Lin
57737ec2ca feat(contracts): add replay message support (#437) 
Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-11 17:10:40 -07:00
Xi Lin
ff800bee9d feat(contract): use rlp encoding instead of abi.encode for L1 message (#395) 
Co-authored-by: Max Wolff <maxcwolff@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-10 12:01:44 -07:00
Xi Lin
58a10d93c6 feat(contracts): address alias check in L2 (#438) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
 2023-05-09 12:25:49 -07:00
Xi Lin
8bf6592f61 feat(contracts): enable relay with proof in L1 (#457) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-09 12:14:50 -07:00
Max Wolff
4dfa81d890 feat(contracts): remove L1 Fee in Oracle (#454) 2023-05-09 15:09:42 +08:00
Xi Lin
cf9f0b921f feat(contracts): forward data to receiver after deposit/withdraw (#429) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-04-21 19:27:49 +08:00
Ahmed Castro
76b5a6c751 Small typo fix on documentation comments (#411) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-04-09 15:34:27 +08:00
Xi Lin
19f74075a1 fix(contracts): add missing payable in L2 ERC721/1155 gateway (#382) 2023-03-22 12:20:12 +08:00
Haichen Shen
cb6a609366 fix(contract): mutated function -> mutation function (#377) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-20 21:20:19 +08:00
Xi Lin
77f1fa7ca7 style(contracts): reformat contract codes with prettier (#376) 2023-03-20 13:43:55 +08:00
Xi Lin
3a1cb6a34b feat(contracts): add refund address in sendMessage (#371) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-18 16:03:38 +08:00
Xi Lin
e1cabce03d bugfix(contracts): avoid malicious call from l2 (#358) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-16 10:28:38 +08:00
Xi Lin
ebe557acf2 feat(contracts): add ScrollChainCommitmentVerifier (#344) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-14 15:49:55 +08:00
Péter Garamvölgyi
8f807c8ee0 Add weth deploy script (#355) 2023-03-10 10:13:12 +01:00
Xi Lin
a62ff312a6 feat(contracts): refund unused fee to tx.origin (#353) 
Co-authored-by: maskpp <maskpp266@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-10 14:41:52 +08:00
Xi Lin
e1ec4d1f05 fix(contract): forbid to call message queue and l2 messenger from l1 (#341) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-03-06 14:31:33 +08:00
Haichen Shen
fb7002bd6d feat(bridge): update the watcher and relayer based on the new contract (#305) 
Co-authored-by: colinlyguo <651734127@qq.com>
Co-authored-by: zimpha <zimpha@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
 2023-02-22 18:15:44 +08:00
Xi Lin
7e99c5148d feat(contracts): new bridge contracts (#288) 
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: Thegaram <th307q@gmail.com>
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
 2023-02-20 13:44:49 -08:00
Lawliet-Chan
f33bfffd85 feat(roller&coordinator): upgrade lizkp to zkevm-0215 version (#281) 
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-9-248.us-west-2.compute.internal>
 2023-02-18 18:53:57 +08:00
Péter Garamvölgyi
eb3f187926 feat(contracts): Add fee vault (#223) 2023-02-11 21:24:45 +01:00
Péter Garamvölgyi
d5f0218f5f feat: allow to override L2 deployment when address is provided (#293) 2023-02-10 14:28:38 +01:00
Xi Lin
0e88b9aa94 feat(contract): enable whitelist relayer (#272) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-02-07 14:20:34 +08:00
Xi Lin
a1cb3d3b87 fix(contracts&libzkp): fix mpt circuits panic (#232) 
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: Lawliet-Chan <1576710154@qq.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-01-14 14:58:37 +08:00
Xi Lin
73432127cd feat(contract): only use blockHeight to verify relay message in layer1 (#209) 2023-01-09 15:03:30 +08:00
Xi Lin
20b8e2bf6c feat(contract): add finalization status api in contract (#197) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-01-04 23:26:47 +08:00
Péter Garamvölgyi
612e82ce09 fix: Fix import genesis script (#79) 2022-11-10 07:38:38 +01:00
Xi Lin
14e0231eb9 hotfix(contracts): fuzzing tests for testFinalizeBatchDepositERC721 (#65) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2022-11-03 17:20:11 +08:00
Péter Garamvölgyi
9fb40a8b14 build(contracts): use Foundry for deployment scripts (#52) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2022-11-03 15:52:49 +08:00
Xi Lin
a648073962 feat(contracts): commit DA for multiple blocks (#40) 
Co-authored-by: Scroll Dev <dev@scroll.io>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2022-11-02 18:46:11 +08:00