github/scroll
1
1
Fork 0
mirror of https://github.com/scroll-tech/scroll.git synced 2026-04-23 03:00:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
377 Commits 214 Branches 683 Tags
3c7b5a400a9f963dd3ee3e10ca06e54e8be3e376
Commit Graph

377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
maskpp
3c7b5a400a Merge feat/record_transaction branch and fix comments. 2023-04-24 14:37:30 +08:00
maskpp
5ec3f3c181 Merge branch 'develop' into feat/record_transaction 2023-04-24 10:36:45 +08:00
maskpp
2690aeff63 Merge develop branch and fix comments. 2023-04-24 10:27:01 +08:00
maskpp
0776e2dbdc Merge branch 'develop' into feat/record_transaction 2023-04-24 10:12:40 +08:00
colin
10ac638a51 test(coordinator): add more unit tests (#430) 
Co-authored-by: maskpp <maskpp266@gmail.com>
 2023-04-23 22:28:03 +08:00
maskpp
2fafb64e0a test(integration): add predeployed erc20 & greeter contract tests (#428) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-04-23 19:55:22 +08:00
maskpp
ab1cda6568 test(coordinator): simplify coordinator tests (#434) 2023-04-23 17:15:28 +08:00
maskpp
02d53fb74d Merge branch 'develop' into feat/record_transaction 2023-04-22 09:36:28 +08:00
colin
905961d0ad fix(Jenkinsfile): specify -coverpkg in unit tests (#431) 2023-04-21 20:50:36 +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
maskpp
0f26e0d67b test(integration): pre-deploy test contracts into genesis (#420) 
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-04-21 16:23:16 +08:00
maskpp
cd653d1997 fix bug after merged feat/record_transaction branch. 2023-04-19 11:16:07 +08:00
maskpp
bf6b17d1da Merge feat/record_transaction branch and fix conflicts. 2023-04-19 10:27:30 +08:00
maskpp
82e51fd7e3 fix comments 2023-04-19 10:10:06 +08:00
maskpp
52e0078bcb Merge branch 'develop' into feat/record_transaction 2023-04-19 09:54:26 +08:00
maskpp
c774462d1d test(integration-test): refactor integration-test (#425) 2023-04-18 21:33:12 +08:00
HAOYUatHZ
01f5b71de4 Merge branch 'develop' into feat/record_transaction 2023-04-18 13:17:25 +08:00
colin
7eb6d9696a chore(bridge & coordinator): clear some unused code (#423) 2023-04-17 22:09:52 +08:00
maskpp
6f29d24d92 Merge branch 'develop' into feat/record_transaction 2023-04-16 21:36:15 +08:00
Lawliet-Chan
401ea68332 feat(libzkp): recover rust zkp panic instead of crashing (#421) 2023-04-14 20:51:50 +08:00
maskpp
416cd85fee trigger ci 2023-04-13 10:29:19 +08:00
maskpp
b1b0305ec3 trigger ci 2023-04-13 10:08:40 +08:00
maskpp
7ec31ac642 trigger ci 2023-04-13 10:00:28 +08:00
maskpp
db51839624 fix bug when merge develop branch 2023-04-13 09:53:02 +08:00
maskpp
3d323fc2c3 Merge branch 'develop' into feat/record_transaction 2023-04-13 09:17:54 +08:00
maskpp
c13e8aafc4 feat(tests): update docker app (#402) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
Co-authored-by: ChuhanJin <60994121+ChuhanJin@users.noreply.github.com>
Co-authored-by: vincent <419436363@qq.com>
Co-authored-by: colinlyguo <651734127@qq.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
 2023-04-13 08:40:51 +08:00
colin
2b2cc62efe fix(coordinator): add metric roller_proofs_generated_failed_time (#419) v3.0.10 2023-04-12 18:27:55 +08:00
maskpp
0e76e4406f fix bug in sender module 2023-04-12 14:56:44 +08:00
maskpp
b894b63078 beautify comments and log messages. 2023-04-12 14:14:19 +08:00
maskpp
5249acc0ee Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-12 13:42:33 +08:00
maskpp
5f46a5fbdb format sql 2023-04-12 13:42:19 +08:00
maskpp
9dfab5f511 fix json and db mismatch. 2023-04-12 13:37:27 +08:00
maskpp
e59e4e3542 Add join index 2023-04-12 13:33:25 +08:00
maskpp
49a839b030 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-12 13:26:59 +08:00
maskpp
537193e237 Add join index 2023-04-12 13:05:55 +08:00
maskpp
2744735035 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-11 17:05:13 +08:00
maskpp
84ae9ad430 Merge branch 'develop' into feat/record_transaction 2023-04-11 17:04:16 +08:00
maskpp
a8da89d7b9 fix bug in test cases 2023-04-11 16:57:34 +08:00
colin
807b7c7f33 refactor(coordinator): adjust logs for Loki query (#417) 
Co-authored-by: Lawliet-Chan <1576710154@qq.com>
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-04-11 16:38:52 +08:00
maskpp
ebe78e86ef add test cases 2023-04-11 16:13:47 +08:00
maskpp
0ea67d6882 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-11 16:01:05 +08:00
maskpp
4cb711dc36 add test cases 2023-04-11 15:52:15 +08:00
maskpp
75e3bd4b86 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-11 12:38:43 +08:00
maskpp
4b29a2ac7a Merge branch 'develop' into feat/record_transaction 2023-04-11 11:12:09 +08:00
maskpp
f5caf35785 Clean extra_data after tx is confirmed. 2023-04-11 11:11:54 +08:00
maskpp
bf1d007acf merge feat/record_transaction branch 2023-04-11 11:10:04 +08:00
maskpp
7b6556922c Add test case for extra_data field. 2023-04-11 11:05:55 +08:00
HAOYUatHZ
454f032c9f doc(test): add testing doc (#412) 2023-04-11 11:05:33 +08:00
maskpp
481b05e487 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-11 10:53:32 +08:00
maskpp
37cf73348f Add extra data field in scroll_transaction table order to record rollupCommitting batch_hashes. 2023-04-11 10:52:59 +08:00