Skip to content

Commit 2e8c41f

Browse files
jpnovaisjpnovais
committed
Merge branch 'main' into state-reconstruction-app
# Conflicts: # jvm-libs/generic/serialization/jackson/src/main/kotlin/build/linea/s11n/jackson/BytesHexSerDe.kt # jvm-libs/generic/serialization/jackson/src/test/kotlin/build/linea/s11n/jackson/BytesSerDeTest.kt # jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/JsonRpcRequest.kt # jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcClient.kt # jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcRequestRetryerV2.kt # jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/ObjectMappers.kt # jvm-libs/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt # jvm-libs/json-rpc/src/test/kotlin/net/consensys/linea/jsonrpc/client/JsonRpcV2ClientImplTest.kt # settings.gradle
2 parents 352c2de + 62438cb commit 2e8c41f

File tree

59 files changed

+1277
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1277
-963
lines changed

‎config/common/smart-contract-errors.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"b1504a5f" = "BlobSubmissionDataIsMissing"
2929
"c0e41e1d" = "EmptyBlobDataAtIndex"
3030
"fb4cd6ef" = "FinalBlockDoesNotMatchShnarfFinalBlock"
31-
"2526F108 " = "ShnarfAndFinalBlockNumberLengthsMismatched"
31+
"2526F108" = "ShnarfAndFinalBlockNumberLengthsMismatched"
3232
"d3664fb3" = "FinalShnarfWrong"
3333
"4e686675" = "L2MerkleRootDoesNotExist"
3434
"e5d14425" = "L2MerkleRootAlreadyAnchored"
@@ -46,3 +46,4 @@
4646
"d39e75f9" = "L1MessageNumberSynchronizationWrong"
4747
"7557a60a" = "L1RollingHashSynchronizationWrong"
4848
"36a4bb94" = "FinalRollingHashIsZero"
49+
"42ab979d" = "ParentBlobNotSubmitted"

‎config/coordinator/coordinator-local-dev.config.overrides.toml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@ non-canonical-raw-traces-directory = "tmp/local/traces/raw-non-canonical"
3838
[state-manager]
3939
endpoints=["http://127.0.0.1:8998/"]
4040

41-
[dynamic-gas-price-service]
42-
geth-gas-price-update-recipients=[
43-
"http://127.0.0.1:8645",
44-
"http://127.0.0.1:8845"
45-
]
46-
besu-gas-price-update-recipients=[
47-
"http://127.0.0.1:8545/"
48-
]
49-
extra-data-update-recipient="http://127.0.0.1:8545/"
41+
[l2-network-gas-pricing.extra-data-pricing-propagation]
42+
extra-data-update-recipient = "http://127.0.0.1:8545/"
43+
44+
[l2-network-gas-pricing.json-rpc-pricing-propagation]
45+
geth-gas-price-update-recipients = ["http://127.0.0.1:8845"]
46+
besu-gas-price-update-recipients = []
5047

5148
[l1]
5249
rpc-endpoint="http://127.0.0.1:8445"

‎contracts/abi/LineaRollupV6.0.abi

Lines changed: 45 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,6 @@
5252
"name": "DataAlreadySubmitted",
5353
"type": "error"
5454
},
55-
{
56-
"inputs": [
57-
{
58-
"internalType": "uint256",
59-
"name": "expected",
60-
"type": "uint256"
61-
},
62-
{
63-
"internalType": "uint256",
64-
"name": "actual",
65-
"type": "uint256"
66-
}
67-
],
68-
"name": "DataStartingBlockDoesNotMatch",
69-
"type": "error"
70-
},
71-
{
72-
"inputs": [],
73-
"name": "EmptyBlobData",
74-
"type": "error"
75-
},
7655
{
7756
"inputs": [
7857
{
@@ -174,38 +153,6 @@
174153
"name": "FinalizationStateIncorrect",
175154
"type": "error"
176155
},
177-
{
178-
"inputs": [
179-
{
180-
"internalType": "uint256",
181-
"name": "firstBlockNumber",
182-
"type": "uint256"
183-
},
184-
{
185-
"internalType": "uint256",
186-
"name": "finalBlockNumber",
187-
"type": "uint256"
188-
}
189-
],
190-
"name": "FirstBlockGreaterThanFinalBlock",
191-
"type": "error"
192-
},
193-
{
194-
"inputs": [
195-
{
196-
"internalType": "uint256",
197-
"name": "firstBlockNumber",
198-
"type": "uint256"
199-
},
200-
{
201-
"internalType": "uint256",
202-
"name": "lastFinalizedBlock",
203-
"type": "uint256"
204-
}
205-
],
206-
"name": "FirstBlockLessThanOrEqualToLastFinalizedBlock",
207-
"type": "error"
208-
},
209156
{
210157
"inputs": [],
211158
"name": "FirstByteIsNotZero",
@@ -296,22 +243,6 @@
296243
"name": "LastFinalizationTimeNotLapsed",
297244
"type": "error"
298245
},
299-
{
300-
"inputs": [
301-
{
302-
"internalType": "bytes32",
303-
"name": "expected",
304-
"type": "bytes32"
305-
},
306-
{
307-
"internalType": "bytes32",
308-
"name": "actual",
309-
"type": "bytes32"
310-
}
311-
],
312-
"name": "LastFinalizedShnarfWrong",
313-
"type": "error"
314-
},
315246
{
316247
"inputs": [
317248
{
@@ -388,6 +319,17 @@
388319
"name": "MissingRollingHashForMessageNumber",
389320
"type": "error"
390321
},
322+
{
323+
"inputs": [
324+
{
325+
"internalType": "bytes32",
326+
"name": "shnarf",
327+
"type": "bytes32"
328+
}
329+
],
330+
"name": "ParentBlobNotSubmitted",
331+
"type": "error"
332+
},
391333
{
392334
"inputs": [],
393335
"name": "PeriodIsZero",
@@ -461,27 +403,6 @@
461403
"name": "ReentrantCall",
462404
"type": "error"
463405
},
464-
{
465-
"inputs": [
466-
{
467-
"internalType": "uint256",
468-
"name": "shnarfsLength",
469-
"type": "uint256"
470-
},
471-
{
472-
"internalType": "uint256",
473-
"name": "finalBlockNumbers",
474-
"type": "uint256"
475-
}
476-
],
477-
"name": "ShnarfAndFinalBlockNumberLengthsMismatched",
478-
"type": "error"
479-
},
480-
{
481-
"inputs": [],
482-
"name": "SnarkHashIsZeroHash",
483-
"type": "error"
484-
},
485406
{
486407
"inputs": [],
487408
"name": "StartingRootHashDoesNotMatch",
@@ -555,18 +476,6 @@
555476
{
556477
"anonymous": false,
557478
"inputs": [
558-
{
559-
"indexed": true,
560-
"internalType": "uint256",
561-
"name": "startBlock",
562-
"type": "uint256"
563-
},
564-
{
565-
"indexed": true,
566-
"internalType": "uint256",
567-
"name": "endBlock",
568-
"type": "uint256"
569-
},
570479
{
571480
"indexed": false,
572481
"internalType": "bytes32",
@@ -1315,6 +1224,25 @@
13151224
"stateMutability": "view",
13161225
"type": "function"
13171226
},
1227+
{
1228+
"inputs": [
1229+
{
1230+
"internalType": "bytes32",
1231+
"name": "shnarf",
1232+
"type": "bytes32"
1233+
}
1234+
],
1235+
"name": "blobShnarfExists",
1236+
"outputs": [
1237+
{
1238+
"internalType": "uint256",
1239+
"name": "exists",
1240+
"type": "uint256"
1241+
}
1242+
],
1243+
"stateMutability": "view",
1244+
"type": "function"
1245+
},
13181246
{
13191247
"inputs": [
13201248
{
@@ -1656,7 +1584,7 @@
16561584
},
16571585
{
16581586
"internalType": "uint256",
1659-
"name": "finalBlockInData",
1587+
"name": "endBlockNumber",
16601588
"type": "uint256"
16611589
},
16621590
{
@@ -2296,25 +2224,6 @@
22962224
"stateMutability": "nonpayable",
22972225
"type": "function"
22982226
},
2299-
{
2300-
"inputs": [
2301-
{
2302-
"internalType": "bytes32",
2303-
"name": "shnarf",
2304-
"type": "bytes32"
2305-
}
2306-
],
2307-
"name": "shnarfFinalBlockNumbers",
2308-
"outputs": [
2309-
{
2310-
"internalType": "uint256",
2311-
"name": "finalBlockNumber",
2312-
"type": "uint256"
2313-
}
2314-
],
2315-
"stateMutability": "view",
2316-
"type": "function"
2317-
},
23182227
{
23192228
"inputs": [
23202229
{
@@ -2338,33 +2247,6 @@
23382247
"inputs": [
23392248
{
23402249
"components": [
2341-
{
2342-
"components": [
2343-
{
2344-
"internalType": "bytes32",
2345-
"name": "finalStateRootHash",
2346-
"type": "bytes32"
2347-
},
2348-
{
2349-
"internalType": "uint256",
2350-
"name": "firstBlockInData",
2351-
"type": "uint256"
2352-
},
2353-
{
2354-
"internalType": "uint256",
2355-
"name": "finalBlockInData",
2356-
"type": "uint256"
2357-
},
2358-
{
2359-
"internalType": "bytes32",
2360-
"name": "snarkHash",
2361-
"type": "bytes32"
2362-
}
2363-
],
2364-
"internalType": "struct ILineaRollup.SupportingSubmissionDataV2",
2365-
"name": "submissionData",
2366-
"type": "tuple"
2367-
},
23682250
{
23692251
"internalType": "uint256",
23702252
"name": "dataEvaluationClaim",
@@ -2379,10 +2261,20 @@
23792261
"internalType": "bytes",
23802262
"name": "kzgProof",
23812263
"type": "bytes"
2264+
},
2265+
{
2266+
"internalType": "bytes32",
2267+
"name": "finalStateRootHash",
2268+
"type": "bytes32"
2269+
},
2270+
{
2271+
"internalType": "bytes32",
2272+
"name": "snarkHash",
2273+
"type": "bytes32"
23822274
}
23832275
],
2384-
"internalType": "struct ILineaRollup.BlobSubmissionData[]",
2385-
"name": "_blobSubmissionData",
2276+
"internalType": "struct ILineaRollup.BlobSubmission[]",
2277+
"name": "_blobSubmissions",
23862278
"type": "tuple[]"
23872279
},
23882280
{
@@ -2410,16 +2302,6 @@
24102302
"name": "finalStateRootHash",
24112303
"type": "bytes32"
24122304
},
2413-
{
2414-
"internalType": "uint256",
2415-
"name": "firstBlockInData",
2416-
"type": "uint256"
2417-
},
2418-
{
2419-
"internalType": "uint256",
2420-
"name": "finalBlockInData",
2421-
"type": "uint256"
2422-
},
24232305
{
24242306
"internalType": "bytes32",
24252307
"name": "snarkHash",
@@ -2431,8 +2313,8 @@
24312313
"type": "bytes"
24322314
}
24332315
],
2434-
"internalType": "struct ILineaRollup.SubmissionDataV2",
2435-
"name": "_submissionData",
2316+
"internalType": "struct ILineaRollup.CompressedCalldataSubmission",
2317+
"name": "_submission",
24362318
"type": "tuple"
24372319
},
24382320
{

0 commit comments

Comments
 (0)