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
366 Commits 214 Branches 683 Tags
cd653d1997bf38d9496966bb8e2e7fc37f8bfc13
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
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
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
ebe78e86ef add test cases 2023-04-11 16:13:47 +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
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
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
maskpp
9be3ce1d90 Update l1 relayer test case. 2023-04-11 10:16:58 +08:00
maskpp
4fc06301d2 Add test cases. 2023-04-10 13:35:22 +08:00
maskpp
d789c62042 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-10 10:50:58 +08:00
maskpp
d3fe77716d Add tx confirm field, when received confirm message from sender update it. 2023-04-10 10:49:06 +08:00
maskpp
22b51207c5 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-07 09:41:33 +08:00
maskpp
0b9cfe9f34 fix mistakes 2023-04-06 16:19:04 +08:00
maskpp
9a3a28f6e8 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-06 15:57:37 +08:00
maskpp
d423841ed8 revert mistake change 2023-04-06 15:57:10 +08:00
maskpp
9fd74d581e merge feat/record_transaction branch 2023-04-06 15:55:08 +08:00
maskpp
809d0c71af fix comments 2023-04-06 11:30:36 +08:00
maskpp
92ba5c1878 Merge branch 'feat/record_transaction' into feat/resend_unconfirmed_txs 2023-04-04 21:25:05 +08:00
maskpp
4d9e8ed47d fix comments 2023-04-04 21:23:33 +08:00
maskpp
89ac6e2d1e merge feat/record_transaction branch 2023-04-04 16:49:20 +08:00
maskpp
b1ef3c5053 add type in transaction table 2023-04-04 16:35:50 +08:00
maskpp
340dc45108 add resend unconfirm txs logic 2023-04-04 15:47:48 +08:00
maskpp
068e35705a fix ci 2023-04-03 21:21:12 +08:00
maskpp
05a3dccc53 revert mistake change 2023-04-03 21:19:40 +08:00
maskpp
f07dc25cd4 fix comments 2023-04-03 20:42:08 +08:00
maskpp
7ed5464de7 fix comments 2023-04-03 20:10:13 +08:00
maskpp
032ab6649e add comment 2023-04-03 17:51:26 +08:00
maskpp
26b799f713 update migration version 2023-04-03 16:43:54 +08:00
maskpp
21cf0ad2da revert mistake change 2023-04-03 16:37:34 +08:00
maskpp
d4eca74c03 revert mistake change 2023-04-03 16:28:28 +08:00
maskpp
41a9e7fb60 fix ci 2023-04-03 16:20:22 +08:00
maskpp
3eff1e49aa fix ci 2023-04-03 16:02:25 +08:00
maskpp
2cb4232365 merge develop branch and fix conflict 2023-04-03 15:38:18 +08:00
maskpp
28b7b5b83c Merge branch 'develop' into feat/record_transaction 2023-04-03 15:21:21 +08:00
maskpp
793804cb2e record tx 2023-03-31 10:17:27 +08:00
Max Wolff
179c6ee978 add failed relay status to db (#384) 
Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
 2023-03-27 11:52:07 +02:00