Skip to content

Commit a93ab7c

Browse files
tersectersec
authored
Revert "bump nim-kzg4844 for gcc-14 compatibility (#6342)" (#6360)
This reverts commit c532661.
1 parent 05d2271 commit a93ab7c

File tree

12 files changed

+30
-47
lines changed

12 files changed

+30
-47
lines changed

‎beacon_chain/el/el_manager.nim‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,9 @@ func asConsensusType*(payload: engine_api.GetPayloadV3Response):
491491
# Both are defined as `array[N, byte]` under the hood.
492492
blobsBundle: deneb.BlobsBundle(
493493
commitments: KzgCommitments.init(
494-
payload.blobsBundle.commitments.mapIt(
495-
kzg_abi.KzgCommitment(bytes: it.bytes))),
494+
payload.blobsBundle.commitments.mapIt(it.bytes)),
496495
proofs: KzgProofs.init(
497-
payload.blobsBundle.proofs.mapIt(
498-
kzg_abi.KzgProof(bytes: it.bytes))),
496+
payload.blobsBundle.proofs.mapIt(it.bytes)),
499497
blobs: Blobs.init(
500498
payload.blobsBundle.blobs.mapIt(it.bytes))))
501499

@@ -562,11 +560,9 @@ func asConsensusType*(payload: engine_api.GetPayloadV4Response):
562560
# Both are defined as `array[N, byte]` under the hood.
563561
blobsBundle: deneb.BlobsBundle(
564562
commitments: KzgCommitments.init(
565-
payload.blobsBundle.commitments.mapIt(
566-
kzg_abi.KzgCommitment(bytes: it.bytes))),
563+
payload.blobsBundle.commitments.mapIt(it.bytes)),
567564
proofs: KzgProofs.init(
568-
payload.blobsBundle.proofs.mapIt(
569-
kzg_abi.KzgProof(bytes: it.bytes))),
565+
payload.blobsBundle.proofs.mapIt(it.bytes)),
570566
blobs: Blobs.init(
571567
payload.blobsBundle.blobs.mapIt(it.bytes))))
572568

‎beacon_chain/gossip_processing/block_processor.nim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ proc storeBackfillBlock(
186186
let blobs = blobsOpt.get()
187187
let kzgCommits = signedBlock.message.body.blob_kzg_commitments.asSeq
188188
if blobs.len > 0 or kzgCommits.len > 0:
189-
let r = validate_blobs(kzgCommits, blobs.mapIt(KzgBlob(bytes: it.blob)),
189+
let r = validate_blobs(kzgCommits, blobs.mapIt(it.blob),
190190
blobs.mapIt(it.kzg_proof))
191191
if r.isErr():
192192
debug "backfill blob validation failed",
@@ -575,7 +575,7 @@ proc storeBlock(
575575
let blobs = blobsOpt.get()
576576
let kzgCommits = signedBlock.message.body.blob_kzg_commitments.asSeq
577577
if blobs.len > 0 or kzgCommits.len > 0:
578-
let r = validate_blobs(kzgCommits, blobs.mapIt(KzgBlob(bytes: it.blob)),
578+
let r = validate_blobs(kzgCommits, blobs.mapIt(it.blob),
579579
blobs.mapIt(it.kzg_proof))
580580
if r.isErr():
581581
debug "blob validation failed",

‎beacon_chain/gossip_processing/gossip_validation.nim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ proc validateBlobSidecar*(
458458
# blob_sidecar.blob, blob_sidecar.kzg_commitment, blob_sidecar.kzg_proof)`.
459459
block:
460460
let ok = verifyProof(
461-
KzgBlob(bytes: blob_sidecar.blob),
461+
blob_sidecar.blob,
462462
blob_sidecar.kzg_commitment,
463463
blob_sidecar.kzg_proof).valueOr:
464464
return dag.checkedReject("BlobSidecar: blob verify failed")

‎beacon_chain/spec/datatypes/deneb.nim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ func initHashedBeaconState*(s: BeaconState): HashedBeaconState =
528528
HashedBeaconState(data: s)
529529

530530
func shortLog*(v: KzgCommitment | KzgProof): auto =
531-
to0xHex(v.bytes)
531+
to0xHex(v)
532532

533533
func shortLog*(v: Blob): auto =
534534
to0xHex(v.toOpenArray(0, 31))

‎beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,15 +1358,15 @@ proc readValue*(reader: var JsonReader[RestJson],
13581358
value: var (KzgCommitment|KzgProof)) {.
13591359
raises: [IOError, SerializationError].} =
13601360
try:
1361-
hexToByteArray(reader.readValue(string), distinctBase(value.bytes))
1361+
hexToByteArray(reader.readValue(string), distinctBase(value))
13621362
except ValueError:
13631363
raiseUnexpectedValue(reader,
13641364
"KzgCommitment value should be a valid hex string")
13651365

13661366
proc writeValue*(
13671367
writer: var JsonWriter[RestJson], value: KzgCommitment | KzgProof
13681368
) {.raises: [IOError].} =
1369-
writeValue(writer, hexOriginal(distinctBase(value.bytes)))
1369+
writeValue(writer, hexOriginal(distinctBase(value)))
13701370

13711371
## GraffitiBytes
13721372
proc writeValue*(

‎beacon_chain/spec/state_transition_block.nim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ func kzg_commitment_to_versioned_hash*(
10761076

10771077
var res: VersionedHash
10781078
res[0] = VERSIONED_HASH_VERSION_KZG
1079-
res[1 .. 31] = eth2digest(kzg_commitment.bytes).data.toOpenArray(1, 31)
1079+
res[1 .. 31] = eth2digest(kzg_commitment).data.toOpenArray(1, 31)
10801080
res
10811081

10821082
proc validate_blobs*(

‎beacon_chain/validators/message_router.nim‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ proc routeSignedBeaconBlock*(
117117
let blobs = blobsOpt.get()
118118
let kzgCommits = blck.message.body.blob_kzg_commitments.asSeq
119119
if blobs.len > 0 or kzgCommits.len > 0:
120-
let res = validate_blobs(
121-
kzgCommits,
122-
blobs.mapIt(KzgBlob(bytes: it.blob)),
123-
blobs.mapIt(it.kzg_proof))
120+
let res = validate_blobs(kzgCommits, blobs.mapIt(it.blob),
121+
blobs.mapIt(it.kzg_proof))
124122
if res.isErr():
125123
warn "blobs failed validation",
126124
blockRoot = shortLog(blck.root),

‎beacon_chain/validators/message_router_mev.nim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ proc unblindAndRouteBlockMEV*(
128128
bundle.data.blobs_bundle.commitments:
129129
return err("unblinded blobs bundle has unexpected commitments")
130130
let ok = verifyProofs(
131-
blobs_bundle.blobs.mapIt(KzgBlob(bytes: it)),
131+
asSeq blobs_bundle.blobs,
132132
asSeq blobs_bundle.commitments,
133133
asSeq blobs_bundle.proofs).valueOr:
134134
return err("unblinded blobs bundle fails verification")

‎tests/consensus_spec/test_fixture_fork_choice.nim‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ proc loadOps(
136136
blobs: distinctBase(parseTest(
137137
path/(step["blobs"].getStr()) & ".ssz_snappy",
138138
SSZ, List[KzgBlob, Limit MAX_BLOBS_PER_BLOCK])),
139-
proofs: step["proofs"].mapIt(
140-
KzgProof(bytes: fromHex(array[48, byte], it.getStr()))))
139+
proofs: step["proofs"].mapIt(KzgProof.fromHex(it.getStr())))
141140
else:
142141
Opt.none(BlobData)
143142
else:
@@ -408,4 +407,4 @@ from ../../beacon_chain/conf import loadKzgTrustedSetup
408407
discard loadKzgTrustedSetup() # Required for Deneb tests
409408

410409
fcSuite("ForkChoice", "fork_choice")
411-
fcSuite("Sync", "sync")
410+
fcSuite("Sync", "sync")

‎tests/consensus_spec/test_fixture_kzg.nim‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ proc runBlobToKzgCommitmentTest(suiteName, suitePath, path: string) =
5050
if blob.isNone:
5151
check output.kind == JNull
5252
else:
53-
let commitment = blobToKzgCommitment(KzgBlob(bytes: blob.get))
53+
let commitment = blobToKzgCommitment(blob.get)
5454
check:
5555
if commitment.isErr:
5656
output.kind == JNull
5757
else:
58-
commitment.get().bytes == fromHex[48](output.getStr).get
58+
commitment.get == fromHex[48](output.getStr).get
5959

6060
proc runVerifyKzgProofTest(suiteName, suitePath, path: string) =
6161
let relativePathComponent = path.relativeTestPathComponent(suitePath)
@@ -75,10 +75,7 @@ proc runVerifyKzgProofTest(suiteName, suitePath, path: string) =
7575
if commitment.isNone or z.isNone or y.isNone or proof.isNone:
7676
check output.kind == JNull
7777
else:
78-
let v = verifyProof(
79-
KzgCommitment(bytes: commitment.get),
80-
KzgBytes32(bytes: z.get), KzgBytes32(bytes: y.get),
81-
KzgBytes48(bytes: proof.get))
78+
let v = verifyProof(commitment.get, z.get, y.get, proof.get)
8279
check:
8380
if v.isErr:
8481
output.kind == JNull
@@ -103,10 +100,7 @@ proc runVerifyBlobKzgProofTest(suiteName, suitePath, path: string) =
103100
if blob.isNone or commitment.isNone or proof.isNone:
104101
check output.kind == JNull
105102
else:
106-
let v = verifyBlobKzgProof(
107-
KzgBlob(bytes: blob.get),
108-
KzgBytes48(bytes: commitment.get),
109-
KzgBytes48(bytes: proof.get))
103+
let v = verifyBlobKzgProof(blob.get, commitment.get, proof.get)
110104
check:
111105
if v.isErr:
112106
output.kind == JNull
@@ -133,9 +127,7 @@ proc runVerifyBlobKzgProofBatchTest(suiteName, suitePath, path: string) =
133127
check output.kind == JNull
134128
else:
135129
let v = verifyBlobKzgProofBatch(
136-
blobs.mapIt(KzgBlob(bytes: it.get)),
137-
commitments.mapIt(KzgCommitment(bytes: it.get)),
138-
proofs.mapIt(KzgProof(bytes: it.get)))
130+
blobs.mapIt(it.get), commitments.mapIt(it.get), proofs.mapIt(it.get))
139131
check:
140132
if v.isErr:
141133
output.kind == JNull
@@ -158,17 +150,16 @@ proc runComputeKzgProofTest(suiteName, suitePath, path: string) =
158150
if blob.isNone or z.isNone:
159151
check output.kind == JNull
160152
else:
161-
let p = computeKzgProof(
162-
KzgBlob(bytes: blob.get), KzgBytes32(bytes: z.get))
153+
let p = computeKzgProof(blob.get, z.get)
163154
if p.isErr:
164155
check output.kind == JNull
165156
else:
166157
let
167158
proof = fromHex[48](output[0].getStr)
168159
y = fromHex[32](output[1].getStr)
169160
check:
170-
p.get.proof.bytes == proof.get
171-
p.get.y.bytes == y.get
161+
p.get.proof == proof.get
162+
p.get.y == y.get
172163

173164
proc runComputeBlobKzgProofTest(suiteName, suitePath, path: string) =
174165
let relativePathComponent = path.relativeTestPathComponent(suitePath)
@@ -186,12 +177,11 @@ proc runComputeBlobKzgProofTest(suiteName, suitePath, path: string) =
186177
if blob.isNone or commitment.isNone:
187178
check output.kind == JNull
188179
else:
189-
let p = computeBlobKzgProof(
190-
KzgBlob(bytes: blob.get), KzgBytes48(bytes: commitment.get))
180+
let p = computeBlobKzgProof(blob.get, commitment.get)
191181
if p.isErr:
192182
check output.kind == JNull
193183
else:
194-
check p.get.bytes == fromHex[48](output.getStr).get
184+
check p.get == fromHex[48](output.getStr).get
195185

196186
from std/algorithm import sorted
197187

@@ -237,4 +227,4 @@ suite suiteName:
237227
for kind, path in walkDir(testsDir, relative = true, checkDir = true):
238228
runComputeBlobKzgProofTest(suiteName, testsDir, testsDir / path)
239229

240-
doAssert Kzg.freeTrustedSetup().isOk
230+
doAssert Kzg.freeTrustedSetup().isOk

0 commit comments

Comments
 (0)