serialization: bump

beacon_chain/networking/network_metadata.nim

@@ -209,11 +209,17 @@ proc loadCompileTimeNetworkMetadata(
 when const_preset == "gnosis":
   when incbinEnabled:
     let
-      gnosisGenesis* {.importc: "gnosis_mainnet_genesis".}: ptr UncheckedArray[byte]
-      gnosisGenesisSize* {.importc: "gnosis_mainnet_genesis_size".}: int
+      gnosisGenesisVar {.importc: "gnosis_mainnet_genesis".}: ptr UncheckedArray[byte]
+      gnosisGenesisSizeVar {.importc: "gnosis_mainnet_genesis_size".}: int
 
-      chiadoGenesis* {.importc: "gnosis_chiado_genesis".}: ptr UncheckedArray[byte]
-      chiadoGenesisSize* {.importc: "gnosis_chiado_genesis_size".}: int
+      chiadoGenesisVar {.importc: "gnosis_chiado_genesis".}: ptr UncheckedArray[byte]
+      chiadoGenesisSizeVar {.importc: "gnosis_chiado_genesis_size".}: int
+
+    template gnosisGenesis*(): ptr UncheckedArray[byte] = {.noSideEffect.}: gnosisGenesisVar
+    template gnosisGenesisSize*(): int = {.noSideEffect.}: gnosisGenesisSizeVar
+
+    template chiadoGenesis*(): ptr UncheckedArray[byte] = {.noSideEffect.}: chiadoGenesisVar
+    template chiadoGenesisSize*(): int = {.noSideEffect.}: chiadoGenesisSizeVar
 
     # let `.incbin` in assembly file find the binary file through search path
     {.passc: "-I" & escape(vendorDir).}
@@ -252,13 +258,19 @@ elif const_preset == "mainnet":
     # use this trick instead which saves significant amounts of compile time
     {.push hint[GlobalVar]:off.}
     let
-      mainnetGenesis* {.importc: "eth2_mainnet_genesis".}: ptr UncheckedArray[byte]
-      mainnetGenesisSize* {.importc: "eth2_mainnet_genesis_size".}: int
+      mainnetGenesisVar {.importc: "eth2_mainnet_genesis".}: ptr UncheckedArray[byte]
+      mainnetGenesisSizeVar {.importc: "eth2_mainnet_genesis_size".}: int
 
-      sepoliaGenesis* {.importc: "eth2_sepolia_genesis".}: ptr UncheckedArray[byte]
-      sepoliaGenesisSize* {.importc: "eth2_sepolia_genesis_size".}: int
+      sepoliaGenesisVar {.importc: "eth2_sepolia_genesis".}: ptr UncheckedArray[byte]
+      sepoliaGenesisSizeVar {.importc: "eth2_sepolia_genesis_size".}: int
     {.pop.}
 
+    template mainnetGenesis*(): ptr UncheckedArray[byte] = {.noSideEffect.}: mainnetGenesisVar
+    template mainnetGenesisSize*: int = {.noSideEffect.}: mainnetGenesisSizeVar
+
+    template sepoliaGenesis*(): ptr UncheckedArray[byte] = {.noSideEffect.}: sepoliaGenesisVar
+    template sepoliaGenesisSize*(): int = {.noSideEffect.}: sepoliaGenesisSizeVar
+
     # let `.incbin` in assembly file find the binary file through search path
     {.passc: "-I" & escape(vendorDir).}
     {.compile: "network_metadata_mainnet.S".}

beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim

@@ -1447,7 +1447,7 @@ proc readValue*(
     hexToByteArray(reader.readValue(string), distinctBase(value))
   except ValueError:
     raiseUnexpectedValue(
-      reader, "Expected a valid hex string with " & $value.len() & " bytes")
+      reader, "Expected a valid hex string with " & $distinctBase(value).len() & " bytes")
 
 template unrecognizedFieldWarning(fieldNameParam, typeNameParam: string) =
   # TODO: There should be a different notification mechanism for informing the