github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-01-15 00:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
395 Commits 207 Branches 673 Tags
2f459d9995448df2f706cf75ef2fa07d1632e799
Commit Graph

395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maskpp
2f459d9995 Update bytecode makefile 2023-05-23 09:57:23 +08:00
maskpp
23d2c98735 add git ignore file in scroll 2023-05-23 09:56:26 +08:00
maskpp
baf2aebecb chore: forge init 2023-05-23 07:53:33 +08:00
maskpp
f327b4abbe Merge branch 'develop' into feat/integration-test_scroll_contracts_test 2023-05-22 15:44:25 +08: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
Lawliet-Chan
bd9d2e784c feat(version&Roller): add Halo2 version into Roller (#494) 
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
 2023-05-22 14:57:10 +08:00
maskpp
b25c593a88 Use abigen with new flag --contract 2023-05-22 14:35:25 +08:00
maskpp
b77905b6bf Merge branch 'develop' into feat/integration-test_scroll_contracts_test 2023-05-22 14:03:45 +08:00
maskpp
bd2303a4d2 Use abigen with new flag --contract 2023-05-22 14:02:16 +08:00
Haichen Shen
af94da625c fix(ci): Disable github actions on draft prs (#508) 
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
 2023-05-22 08:50:38 +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
maskpp
0bab8f95c1 trigger ci 2023-05-19 17:05:57 +08:00
maskpp
6b38531a09 Merge branch 'develop' into feat/integration-test_scroll_contracts_test 2023-05-19 16:51:05 +08:00
maskpp
88bcf13515 fix ci 2023-05-19 16:46:38 +08:00
HAOYUatHZ
80c946dabe build: rearrange docker build orders (#495) 2023-05-19 11:34:54 +08:00
HAOYUatHZ
58b70639b2 refactor(bridge-history-api): rename CreatedTime to CreatedAt (#492) v3.0.21 2023-05-19 11:22:09 +08:00
Lawliet-Chan
5788dd6207 fix(libzkp): fix makefile script (#491) 
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
 2023-05-18 17:56:11 +08:00
maskpp
d8d1669a67 just use sol file 2023-05-18 17:31:25 +08:00
maskpp
109632ca48 just use sol file 2023-05-18 17:20:46 +08:00
maskpp
6470092742 just use sol file 2023-05-18 17:20:35 +08:00
maskpp
3e9ac08533 just use sol file 2023-05-18 17:13:09 +08:00
maskpp
44925be3f3 Update bytecode git ignore file. 2023-05-18 16:53:09 +08:00
maskpp
891b8e14f1 Revert unnecessary change. 2023-05-18 16:03:08 +08:00
maskpp
b02c16730c Revert unnecessary change. 2023-05-18 15:27:43 +08:00
maskpp
f75b18395e Merge branch 'develop' into feat/integration-test_scroll_contracts_test 2023-05-18 14:51:58 +08:00
maskpp
e08d94990b Finish deposit and withdraw contract test. 2023-05-18 14:50:10 +08:00
maskpp
61dbb27159 Finish deposit and withdraw contract test. 2023-05-18 14:47:35 +08:00
maskpp
f855f4db9c deploy contracts 2023-05-18 14:13:10 +08:00
maskpp
4dcaf468cb deploy contracts 2023-05-18 11:39:25 +08:00
maskpp
8754645f6a deploy contracts 2023-05-18 11:37:59 +08:00
maskpp
6af6e12522 deploy contracts 2023-05-18 11:32:32 +08:00
Orest Tarasiuk
50479d430c Update README.md: Fix contract docs relative paths 2023-05-17 18:33:18 +02:00
colin
b2b19dd2d3 feat(tests): add Docker-based local testing solution for M1/M2 silicon (#469) 
Co-authored-by: maskpp <maskpp266@gmail.com>
Co-authored-by: Orest Tarasiuk <830847+OrestTa@users.noreply.github.com>
Co-authored-by: Xi Lin <zimpha@gmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-05-17 18:29:51 +02:00
ChuhanJin
0a7a7ad98b refactor(bridge-history-api): update bridge-history api (#478) 
Co-authored-by: vincent <419436363@qq.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-17 22:37:16 +08: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
Lawliet-Chan
f2c8b733c3 fix(libzkp):fix libzkp.so path (#486) 
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-05-17 13:27:42 +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
Nazarii Denha
02d0ff2219 Fix race condition in TestWorkerPool (#482) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-05-16 13:19:06 +02:00
maskpp
baf678bbe4 temporary code for test 2023-05-16 10:35:35 +08:00
maskpp
a70c317b92 refactor(API): refactor SubmitProof (#318) 
Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
Co-authored-by: Lawliet-Chan <1576710154@qq.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: Haichen Shen <shenhaichen@gmail.com>
v3.0.18 		2023-05-16 09:22:45 +08:00
Orest Tarasiuk
046463e4e8 chore(github): make PR template copy explicit (#476) 2023-05-15 12:03:27 +02:00
maskpp
5a9a82993c revert genesis file 2023-05-15 17:37:54 +08:00