Skip to content

Commit c75a074

Browse files
colinlyguocolinlyguo
authored
feat: add scroll-node new commits (#26)
Co-authored-by: colinlyguo <[email protected]>
1 parent 72ec430 commit c75a074

34 files changed

+1162
-1035
lines changed

‎assets/evm_proof‎

-147 KB
Binary file not shown.

‎assets/state_proof‎

-19.9 KB
Binary file not shown.

‎bridge/Jenkinsfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ pipeline {
2121
stage('Test') {
2222
steps {
2323
sh 'ls $PWD/build/bin'
24-
// prepare test DB. TODO: remove this dependency
25-
sh '''#!/bin/bash
26-
./build/bin/bridge reset --config ./test_config.json
27-
./build/bin/bridge migrate --config ./test_config.json
28-
'''
2924
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
3025
//sh '''cat $PWD/logs/geth.log'''
3126
sh '''

‎bridge/cmd/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/urfave/cli/v2"
1111

1212
"scroll-tech/store"
13+
1314
"scroll-tech/utils"
1415

1516
"scroll-tech/bridge/config"

‎bridge/coverage.txt‎

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
mode: atomic
2+
scroll-tech/coordinator/api.go:36.56,40.49 4 0
3+
scroll-tech/coordinator/api.go:55.2,55.17 1 0
4+
scroll-tech/coordinator/api.go:40.49,46.36 3 0
5+
scroll-tech/coordinator/api.go:53.3,53.26 1 0
6+
scroll-tech/coordinator/api.go:46.36,47.24 1 0
7+
scroll-tech/coordinator/api.go:47.24,50.10 3 0
8+
scroll-tech/coordinator/api.go:58.100,61.33 3 0
9+
scroll-tech/coordinator/api.go:64.2,71.14 2 0
10+
scroll-tech/coordinator/api.go:74.2,74.14 1 0
11+
scroll-tech/coordinator/api.go:61.33,63.3 1 0
12+
scroll-tech/coordinator/api.go:71.14,73.3 1 0
13+
scroll-tech/coordinator/api.go:78.74,81.53 3 0
14+
scroll-tech/coordinator/api.go:84.2,84.46 1 0
15+
scroll-tech/coordinator/api.go:87.2,87.69 1 0
16+
scroll-tech/coordinator/api.go:81.53,83.3 1 0
17+
scroll-tech/coordinator/api.go:84.46,86.3 1 0
18+
scroll-tech/coordinator/conns.go:13.24,17.2 1 5
19+
scroll-tech/coordinator/conns.go:19.35,22.2 2 7
20+
scroll-tech/coordinator/conns.go:24.84,26.12 1 7
21+
scroll-tech/coordinator/conns.go:30.2,30.17 1 7
22+
scroll-tech/coordinator/conns.go:26.12,28.3 1 0
23+
scroll-tech/coordinator/conns.go:33.40,35.8 2 7
24+
scroll-tech/coordinator/conns.go:39.2,39.12 1 7
25+
scroll-tech/coordinator/conns.go:35.8,37.3 1 0
26+
scroll-tech/coordinator/conns.go:42.38,43.37 1 11
27+
scroll-tech/coordinator/conns.go:46.2,47.36 2 11
28+
scroll-tech/coordinator/conns.go:43.37,45.3 1 0
29+
scroll-tech/coordinator/conns.go:50.60,51.12 1 11
30+
scroll-tech/coordinator/conns.go:55.2,55.13 1 11
31+
scroll-tech/coordinator/conns.go:51.12,53.3 1 7
32+
scroll-tech/coordinator/conns.go:58.25,59.41 1 5
33+
scroll-tech/coordinator/conns.go:59.41,61.3 1 4
34+
scroll-tech/coordinator/conns.go:64.47,65.41 1 21
35+
scroll-tech/coordinator/conns.go:68.2,68.17 1 21
36+
scroll-tech/coordinator/conns.go:65.41,67.3 1 22
37+
scroll-tech/coordinator/manager.go:80.104,82.32 2 5
38+
scroll-tech/coordinator/manager.go:90.2,100.8 2 5
39+
scroll-tech/coordinator/manager.go:82.32,85.17 3 5
40+
scroll-tech/coordinator/manager.go:85.17,87.4 1 0
41+
scroll-tech/coordinator/manager.go:104.33,105.19 1 5
42+
scroll-tech/coordinator/manager.go:110.2,110.18 1 5
43+
scroll-tech/coordinator/manager.go:124.2,124.41 1 5
44+
scroll-tech/coordinator/manager.go:127.2,130.12 3 5
45+
scroll-tech/coordinator/manager.go:105.19,107.3 1 0
46+
scroll-tech/coordinator/manager.go:110.18,113.17 2 2
47+
scroll-tech/coordinator/manager.go:113.17,114.33 1 2
48+
scroll-tech/coordinator/manager.go:114.33,115.114 1 0
49+
scroll-tech/coordinator/manager.go:115.114,117.6 1 0
50+
scroll-tech/coordinator/manager.go:119.9,121.4 1 0
51+
scroll-tech/coordinator/manager.go:124.41,126.3 1 0
52+
scroll-tech/coordinator/manager.go:134.26,135.20 1 5
53+
scroll-tech/coordinator/manager.go:140.2,140.40 1 5
54+
scroll-tech/coordinator/manager.go:145.2,145.34 1 5
55+
scroll-tech/coordinator/manager.go:135.20,137.3 1 0
56+
scroll-tech/coordinator/manager.go:140.40,143.3 2 0
57+
scroll-tech/coordinator/manager.go:149.36,151.2 1 10
58+
scroll-tech/coordinator/manager.go:154.26,161.6 3 5
59+
scroll-tech/coordinator/manager.go:161.6,162.10 1 73
60+
scroll-tech/coordinator/manager.go:163.17,164.40 1 68
61+
scroll-tech/coordinator/manager.go:181.4,181.68 1 62
62+
scroll-tech/coordinator/manager.go:184.34,185.63 1 0
63+
scroll-tech/coordinator/manager.go:191.23,192.26 1 0
64+
scroll-tech/coordinator/manager.go:198.4,198.10 1 0
65+
scroll-tech/coordinator/manager.go:164.40,175.19 3 14
66+
scroll-tech/coordinator/manager.go:175.19,177.14 2 6
67+
scroll-tech/coordinator/manager.go:181.68,183.5 1 4
68+
scroll-tech/coordinator/manager.go:185.63,190.5 1 0
69+
scroll-tech/coordinator/manager.go:192.26,197.5 1 0
70+
scroll-tech/coordinator/manager.go:204.66,207.53 2 0
71+
scroll-tech/coordinator/manager.go:211.2,211.18 1 0
72+
scroll-tech/coordinator/manager.go:207.53,209.3 1 0
73+
scroll-tech/coordinator/manager.go:212.21,216.13 2 0
74+
scroll-tech/coordinator/manager.go:217.24,220.61 1 0
75+
scroll-tech/coordinator/manager.go:221.26,223.48 1 0
76+
scroll-tech/coordinator/manager.go:224.21,225.42 1 0
77+
scroll-tech/coordinator/manager.go:226.10,227.62 1 0
78+
scroll-tech/coordinator/manager.go:234.66,238.53 3 0
79+
scroll-tech/coordinator/manager.go:245.2,248.9 4 0
80+
scroll-tech/coordinator/manager.go:251.2,254.32 2 0
81+
scroll-tech/coordinator/manager.go:257.2,259.15 2 0
82+
scroll-tech/coordinator/manager.go:271.2,271.36 1 0
83+
scroll-tech/coordinator/manager.go:282.2,282.120 1 0
84+
scroll-tech/coordinator/manager.go:286.2,286.76 1 0
85+
scroll-tech/coordinator/manager.go:291.2,292.23 2 0
86+
scroll-tech/coordinator/manager.go:318.2,319.13 2 0
87+
scroll-tech/coordinator/manager.go:328.2,328.67 1 0
88+
scroll-tech/coordinator/manager.go:332.2,332.14 1 0
89+
scroll-tech/coordinator/manager.go:238.53,240.3 1 0
90+
scroll-tech/coordinator/manager.go:248.9,250.3 1 0
91+
scroll-tech/coordinator/manager.go:254.32,256.3 1 0
92+
scroll-tech/coordinator/manager.go:259.15,264.19 2 0
93+
scroll-tech/coordinator/manager.go:264.19,265.79 1 0
94+
scroll-tech/coordinator/manager.go:265.79,267.5 1 0
95+
scroll-tech/coordinator/manager.go:271.36,273.77 2 0
96+
scroll-tech/coordinator/manager.go:277.3,278.13 2 0
97+
scroll-tech/coordinator/manager.go:273.77,275.4 1 0
98+
scroll-tech/coordinator/manager.go:282.120,285.3 2 0
99+
scroll-tech/coordinator/manager.go:286.76,289.3 2 0
100+
scroll-tech/coordinator/manager.go:292.23,294.29 2 0
101+
scroll-tech/coordinator/manager.go:301.3,302.17 2 0
102+
scroll-tech/coordinator/manager.go:294.29,295.18 1 0
103+
scroll-tech/coordinator/manager.go:298.4,298.14 1 0
104+
scroll-tech/coordinator/manager.go:295.18,297.5 1 0
105+
scroll-tech/coordinator/manager.go:302.17,309.4 3 0
106+
scroll-tech/coordinator/manager.go:309.9,311.4 1 0
107+
scroll-tech/coordinator/manager.go:312.8,316.3 3 0
108+
scroll-tech/coordinator/manager.go:319.13,321.3 1 0
109+
scroll-tech/coordinator/manager.go:321.8,327.3 1 0
110+
scroll-tech/coordinator/manager.go:328.67,330.3 1 0
111+
scroll-tech/coordinator/manager.go:336.55,339.6 2 4
112+
scroll-tech/coordinator/manager.go:339.6,340.10 1 4
113+
scroll-tech/coordinator/manager.go:341.18,345.17 2 0
114+
scroll-tech/coordinator/manager.go:352.4,353.40 2 0
115+
scroll-tech/coordinator/manager.go:359.4,359.38 1 0
116+
scroll-tech/coordinator/manager.go:375.4,376.18 2 0
117+
scroll-tech/coordinator/manager.go:383.4,385.10 2 0
118+
scroll-tech/coordinator/manager.go:386.29,389.17 3 0
119+
scroll-tech/coordinator/manager.go:345.17,348.5 2 0
120+
scroll-tech/coordinator/manager.go:353.40,354.17 1 0
121+
scroll-tech/coordinator/manager.go:354.17,356.6 1 0
122+
scroll-tech/coordinator/manager.go:359.38,368.72 4 0
123+
scroll-tech/coordinator/manager.go:371.5,371.11 1 0
124+
scroll-tech/coordinator/manager.go:368.72,370.6 1 0
125+
scroll-tech/coordinator/manager.go:376.18,382.5 1 0
126+
scroll-tech/coordinator/manager.go:395.48,397.2 1 4
127+
scroll-tech/coordinator/manager.go:400.36,408.2 1 0
128+
scroll-tech/coordinator/manager.go:411.78,413.40 2 4
129+
scroll-tech/coordinator/manager.go:417.2,421.15 4 4
130+
scroll-tech/coordinator/manager.go:429.2,433.16 4 4
131+
scroll-tech/coordinator/manager.go:440.2,440.48 1 4
132+
scroll-tech/coordinator/manager.go:448.2,468.13 7 4
133+
scroll-tech/coordinator/manager.go:413.40,415.3 1 0
134+
scroll-tech/coordinator/manager.go:421.15,422.19 1 4
135+
scroll-tech/coordinator/manager.go:422.19,423.75 1 0
136+
scroll-tech/coordinator/manager.go:423.75,425.5 1 0
137+
scroll-tech/coordinator/manager.go:433.16,439.3 2 0
138+
scroll-tech/coordinator/manager.go:440.48,446.3 2 0
139+
scroll-tech/coordinator/manager.go:472.42,474.26 2 4
140+
scroll-tech/coordinator/manager.go:495.2,495.12 1 0
141+
scroll-tech/coordinator/manager.go:474.26,478.22 4 4
142+
scroll-tech/coordinator/manager.go:487.3,487.26 1 4
143+
scroll-tech/coordinator/manager.go:493.3,493.14 1 4
144+
scroll-tech/coordinator/manager.go:478.22,484.12 4 0
145+
scroll-tech/coordinator/manager.go:487.26,491.12 3 0
146+
scroll-tech/coordinator/manager.go:499.51,504.34 3 18
147+
scroll-tech/coordinator/manager.go:512.2,512.13 1 13
148+
scroll-tech/coordinator/manager.go:504.34,505.42 1 11
149+
scroll-tech/coordinator/manager.go:505.42,506.32 1 11
150+
scroll-tech/coordinator/manager.go:506.32,508.5 1 5
151+
scroll-tech/coordinator/manager.go:516.48,519.49 2 17
152+
scroll-tech/coordinator/manager.go:524.2,524.12 1 17
153+
scroll-tech/coordinator/manager.go:519.49,520.56 1 14
154+
scroll-tech/coordinator/manager.go:520.56,522.4 1 9
155+
scroll-tech/coordinator/manager.go:527.75,534.16 3 4
156+
scroll-tech/coordinator/manager.go:538.2,541.8 1 4
157+
scroll-tech/coordinator/manager.go:534.16,536.3 1 0
158+
scroll-tech/coordinator/manager.go:544.63,546.2 1 0
159+
scroll-tech/coordinator/server.go:48.32,49.18 1 11
160+
scroll-tech/coordinator/server.go:52.2,54.37 3 7
161+
scroll-tech/coordinator/server.go:58.2,58.12 1 7
162+
scroll-tech/coordinator/server.go:49.18,51.3 1 4
163+
scroll-tech/coordinator/server.go:54.37,57.3 2 0
164+
scroll-tech/coordinator/server.go:61.34,63.2 1 19
165+
scroll-tech/coordinator/server.go:84.37,99.2 8 5
166+
scroll-tech/coordinator/server.go:101.32,106.12 4 5
167+
scroll-tech/coordinator/server.go:110.2,111.12 2 5
168+
scroll-tech/coordinator/server.go:106.12,108.3 1 5
169+
scroll-tech/coordinator/server.go:114.31,117.2 2 5
170+
scroll-tech/coordinator/server.go:119.68,121.16 2 8
171+
scroll-tech/coordinator/server.go:125.2,130.16 3 8
172+
scroll-tech/coordinator/server.go:135.2,144.59 2 7
173+
scroll-tech/coordinator/server.go:153.2,154.22 1 7
174+
scroll-tech/coordinator/server.go:159.2,160.22 1 7
175+
scroll-tech/coordinator/server.go:163.2,168.25 4 7
176+
scroll-tech/coordinator/server.go:121.16,124.3 2 0
177+
scroll-tech/coordinator/server.go:130.16,133.3 2 1
178+
scroll-tech/coordinator/server.go:144.59,148.3 1 0
179+
scroll-tech/coordinator/server.go:154.22,158.4 3 0
180+
scroll-tech/coordinator/server.go:160.22,162.4 1 0
181+
scroll-tech/coordinator/server.go:168.25,169.10 1 7
182+
scroll-tech/coordinator/server.go:170.31,170.31 0 7
183+
scroll-tech/coordinator/server.go:171.11,172.10 1 0
184+
scroll-tech/coordinator/server.go:177.77,179.47 1 8
185+
scroll-tech/coordinator/server.go:185.2,185.58 1 8
186+
scroll-tech/coordinator/server.go:197.2,197.16 1 8
187+
scroll-tech/coordinator/server.go:202.2,205.52 3 7
188+
scroll-tech/coordinator/server.go:210.2,210.34 1 7
189+
scroll-tech/coordinator/server.go:214.2,215.60 2 7
190+
scroll-tech/coordinator/server.go:220.2,221.16 2 7
191+
scroll-tech/coordinator/server.go:225.2,225.119 1 7
192+
scroll-tech/coordinator/server.go:228.2,230.21 2 7
193+
scroll-tech/coordinator/server.go:179.47,181.3 1 1
194+
scroll-tech/coordinator/server.go:185.58,186.7 1 8
195+
scroll-tech/coordinator/server.go:186.7,188.18 2 8
196+
scroll-tech/coordinator/server.go:192.4,192.37 1 7
197+
scroll-tech/coordinator/server.go:188.18,190.5 1 1
198+
scroll-tech/coordinator/server.go:192.37,194.5 1 7
199+
scroll-tech/coordinator/server.go:197.16,199.3 1 1
200+
scroll-tech/coordinator/server.go:205.52,207.3 1 0
201+
scroll-tech/coordinator/server.go:210.34,212.3 1 0
202+
scroll-tech/coordinator/server.go:215.60,217.3 1 0
203+
scroll-tech/coordinator/server.go:221.16,223.3 1 0
204+
scroll-tech/coordinator/server.go:225.119,227.3 1 0
205+
scroll-tech/coordinator/server.go:233.38,236.6 2 7
206+
scroll-tech/coordinator/server.go:236.6,237.10 1 7
207+
scroll-tech/coordinator/server.go:238.20,239.10 1 0
208+
scroll-tech/coordinator/server.go:240.11,241.73 1 7
209+
scroll-tech/coordinator/server.go:246.4,247.18 2 7
210+
scroll-tech/coordinator/server.go:253.4,253.37 1 0
211+
scroll-tech/coordinator/server.go:241.73,244.5 2 0
212+
scroll-tech/coordinator/server.go:247.18,250.5 2 7
213+
scroll-tech/coordinator/server.go:253.37,260.5 2 0
214+
scroll-tech/coordinator/server.go:266.38,270.6 3 7
215+
scroll-tech/coordinator/server.go:270.6,271.10 1 7
216+
scroll-tech/coordinator/server.go:272.20,273.10 1 7
217+
scroll-tech/coordinator/server.go:274.23,277.75 2 0
218+
scroll-tech/coordinator/server.go:283.4,283.72 1 0
219+
scroll-tech/coordinator/server.go:289.4,289.18 1 0
220+
scroll-tech/coordinator/server.go:277.75,281.5 3 0
221+
scroll-tech/coordinator/server.go:283.72,287.5 3 0
222+
scroll-tech/coordinator/server.go:294.53,296.16 2 4
223+
scroll-tech/coordinator/server.go:300.2,303.73 3 4
224+
scroll-tech/coordinator/server.go:307.2,307.54 1 4
225+
scroll-tech/coordinator/server.go:296.16,298.3 1 0
226+
scroll-tech/coordinator/server.go:303.73,306.3 2 0

‎bridge/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module scroll-tech/bridge
33
go 1.17
44

55
require (
6+
github.com/orcaman/concurrent-map v1.0.0
67
github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
78
github.com/stretchr/testify v1.7.2
89
github.com/urfave/cli/v2 v2.3.0
@@ -64,7 +65,6 @@ require (
6465
github.com/opencontainers/go-digest v1.0.0 // indirect
6566
github.com/opencontainers/image-spec v1.0.2 // indirect
6667
github.com/opentracing/opentracing-go v1.1.0 // indirect
67-
github.com/orcaman/concurrent-map v1.0.0 // indirect
6868
github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect
6969
github.com/pkg/errors v0.9.1 // indirect
7070
github.com/pmezard/go-difflib v1.0.0 // indirect

‎bridge/l1/backend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func New(ctx context.Context, cfg *config.L1Config, orm store.OrmFactory) (*Back
3434
return nil, err
3535
}
3636

37-
relayer, err := NewLayer1Relayer(ctx, client, orm, cfg.RelayerConfig)
37+
relayer, err := NewLayer1Relayer(ctx, client, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
3838
if err != nil {
3939
return nil, err
4040
}

0 commit comments

Comments
 (0)