Skip to content

Commit c1eba6c

Browse files
committed
Make metadata hash be just bytes
1 parent 42cfec3 commit c1eba6c

File tree

6 files changed

+12
-16
lines changed

6 files changed

+12
-16
lines changed

eras/allegra/impl/cddl-files/allegra.cddl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,10 @@ dns_name = text .size (0 .. 64)
208208
; dns_name: An SRV DNS record
209209
multi_host_name = (2, dns_name)
210210

211-
pool_metadata = [url, metadata_hash]
211+
pool_metadata = [url, bytes]
212212

213213
url = text .size (0 .. 64)
214214

215-
metadata_hash = hash32
216-
217215
pool_retirement = (4, pool_keyhash, epoch)
218216

219217
epoch = uint
@@ -272,6 +270,8 @@ maxWord64 = 18446744073709551615
272270

273271
nonce = [0// 1, bytes .size 32]
274272

273+
metadata_hash = hash32
274+
275275
transaction_witness_set =
276276
{? 0 : [* vkeywitness], ? 1 : [* native_script], ? 2 : [* bootstrap_witness]}
277277

eras/alonzo/impl/cddl-files/alonzo.cddl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,10 @@ dns_name = text .size (0 .. 64)
240240
; dns_name: An SRV DNS record
241241
multi_host_name = (2, dns_name)
242242

243-
pool_metadata = [url, metadata_hash]
243+
pool_metadata = [url, bytes]
244244

245245
url = text .size (0 .. 64)
246246

247-
metadata_hash = hash32
248-
249247
pool_retirement = (4, pool_keyhash, epoch)
250248

251249
epoch = uint

eras/babbage/impl/cddl-files/babbage.cddl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,10 @@ dns_name = text .size (0 .. 64)
329329
; dns_name: An SRV DNS record
330330
multi_host_name = (2, dns_name)
331331

332-
pool_metadata = [url, metadata_hash]
332+
pool_metadata = [url, bytes]
333333

334334
url = text .size (0 .. 64)
335335

336-
metadata_hash = hash32
337-
338336
pool_retirement = (4, pool_keyhash, epoch)
339337

340338
epoch = uint

eras/mary/impl/cddl-files/mary.cddl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,10 @@ dns_name = text .size (0 .. 64)
216216
; dns_name: An SRV DNS record
217217
multi_host_name = (2, dns_name)
218218

219-
pool_metadata = [url, metadata_hash]
219+
pool_metadata = [url, bytes]
220220

221221
url = text .size (0 .. 64)
222222

223-
metadata_hash = hash32
224-
225223
pool_retirement = (4, pool_keyhash, epoch)
226224

227225
epoch = uint
@@ -280,6 +278,8 @@ maxWord64 = 18446744073709551615
280278

281279
nonce = [0// 1, bytes .size 32]
282280

281+
metadata_hash = hash32
282+
283283
mint = multiasset<int64>
284284

285285
int64 = -9223372036854775808 .. 9223372036854775807

eras/shelley/impl/cddl-files/shelley.cddl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,10 @@ dns_name = text .size (0 .. 64)
206206
; dns_name: An SRV DNS record
207207
multi_host_name = (2, dns_name)
208208

209-
pool_metadata = [url, metadata_hash]
209+
pool_metadata = [url, bytes]
210210

211211
url = text .size (0 .. 64)
212212

213-
metadata_hash = hash32
214-
215213
pool_retirement = (4, pool_keyhash, epoch)
216214

217215
epoch = uint
@@ -270,6 +268,8 @@ maxWord64 = 18446744073709551615
270268

271269
nonce = [0// 1, bytes .size 32]
272270

271+
metadata_hash = hash32
272+
273273
transaction_witness_set =
274274
{ ? 0 : [* vkeywitness]
275275
, ? 1 : [* multisig_script]

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/CDDL.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ relay =
237237
/ arr [a multi_host_name]
238238

239239
pool_metadata :: Rule
240-
pool_metadata = "pool_metadata" =:= arr [a url, a metadata_hash]
240+
pool_metadata = "pool_metadata" =:= arr [a url, a VBytes]
241241

242242
url :: Rule
243243
url = "url" =:= VText `sized` (0 :: Word64, 64 :: Word64)

0 commit comments

Comments
 (0)