Bls v0.10.1

Makefile

@@ -18,12 +18,12 @@ TOOLS := \
 	beacon_node \
 	inspector \
 	logtrace \
-	bench_bls_sig_agggregation \
 	deposit_contract \
 	ncli_hash_tree_root \
 	ncli_pretty \
 	ncli_transition \
 	process_dashboard
+	# bench_bls_sig_agggregation TODO reenable after bls v0.10.1 changes
 TOOLS_DIRS := \
 	beacon_chain \
 	benchmarks \
@@ -153,4 +153,3 @@ libnfuzz.a: | build deps
 		rm -f build/$@ && \
 		$(ENV_SCRIPT) nim c -d:release --app:staticlib --noMain --nimcache:nimcache/libnfuzz_static -o:build/$@ $(NIM_PARAMS) nfuzz/libnfuzz.nim && \
 		[[ -e "$@" ]] && mv "$@" build/ # workaround for https://github.com/nim-lang/Nim/issues/12745
-

beacon_chain/attestation_pool.nim

@@ -31,7 +31,7 @@ proc combine*(tgt: var Attestation, src: Attestation, flags: UpdateFlags) =
     tgt.aggregation_bits.combine(src.aggregation_bits)
 
     if skipBlsValidation notin flags:
-      tgt.signature.combine(src.signature)
+      tgt.signature.aggregate(src.signature)
   else:
     trace "Ignoring overlapping attestations"
 
@@ -341,7 +341,7 @@ proc getAttestationsForBlock*(
       #      one new attestation in there
       if not attestation.aggregation_bits.overlaps(v.aggregation_bits):
         attestation.aggregation_bits.combine(v.aggregation_bits)
-        attestation.signature.combine(v.aggregate_signature)
+        attestation.signature.aggregate(v.aggregate_signature)
 
     result.add(attestation)
 

beacon_chain/conf.nim

@@ -293,4 +293,3 @@ iterator validatorKeys*(conf: BeaconNodeConf): ValidatorPrivKey =
 template writeValue*(writer: var JsonWriter,
                      value: TypedInputFile|InputFile|InputDir|OutPath|OutDir|OutFile) =
   writer.writeValue(string value)
-

beacon_chain/interop.nim

@@ -15,24 +15,19 @@ func get_eth1data_stub*(deposit_count: uint64, current_epoch: Epoch): Eth1Data =
     block_hash: hash_tree_root(hash_tree_root(voting_period).data),
   )
 
-when ValidatorPrivKey is BlsValue:
-  func makeInteropPrivKey*(i: int): ValidatorPrivKey =
-    discard
-    {.fatal: "todo/unused?".}
-else:
-  func makeInteropPrivKey*(i: int): ValidatorPrivKey =
-    var bytes: array[32, byte]
-    bytes[0..7] = uint64(i).toBytesLE()
+func makeInteropPrivKey*(i: int): ValidatorPrivKey =
+  var bytes: array[32, byte]
+  bytes[0..7] = uint64(i).toBytesLE()
 
-    let
-      # BLS381-12 curve order - same as milagro but formatted different
-      curveOrder =
-        "52435875175126190479447740508185965837690552500527637822603658699938581184513".parse(UInt256)
+  let
+    # BLS381-12 curve order - same as milagro but formatted different
+    curveOrder =
+      "52435875175126190479447740508185965837690552500527637822603658699938581184513".parse(UInt256)
 
-      privkeyBytes = eth2hash(bytes)
-      key = (UInt256.fromBytesLE(privkeyBytes.data) mod curveOrder).toBytesBE()
+    privkeyBytes = eth2hash(bytes)
+    key = (UInt256.fromBytesLE(privkeyBytes.data) mod curveOrder).toBytesBE()
 
-    ValidatorPrivKey.init(key)
+  result.initFromBytes(key)
 
 const eth1BlockHash* = block:
   var x: Eth2Digest
@@ -56,10 +51,10 @@ func makeDeposit*(
         pubkey: pubkey,
         withdrawal_credentials: makeWithdrawalCredentials(pubkey)))
 
-  if skipBlsValidation notin flags:
-    ret.data.signature =
-      bls_sign(
-        privkey, hash_tree_root(ret.getDepositMessage).data,
-        compute_domain(DOMAIN_DEPOSIT))
+  if skipBLSValidation notin flags:
+    let domain = compute_domain(DOMAIN_DEPOSIT)
+    let signing_root = compute_signing_root(ret.getDepositMessage, domain)
+
+    ret.data.signature = bls_sign(privkey, signing_root.data)
 
   ret

beacon_chain/spec/beaconstate.nim

@@ -73,9 +73,11 @@ proc process_deposit*(
 
   if index == -1:
     # Verify the deposit signature (proof of possession)
-    if skipBlsValidation notin flags and not bls_verify(
-        pubkey, hash_tree_root(deposit.getDepositMessage).data,
-        deposit.data.signature, compute_domain(DOMAIN_DEPOSIT)):
+    let domain = compute_domain(DOMAIN_DEPOSIT)
+    let signing_root = compute_signing_root(deposit.getDepositMessage, domain)
+    if skipBLSValidation notin flags and not bls_verify(
+        pubkey, signing_root.data,
+        deposit.data.signature):
       return false
 
     # Add validator and balance entries
@@ -214,7 +216,7 @@ func initialize_beacon_state_from_eth1*(
     latest_block_header:
       BeaconBlockHeader(
         body_root: hash_tree_root(BeaconBlockBody(
-          randao_reveal: BlsValue[Signature](kind: OpaqueBlob)
+          randao_reveal: ValidatorSig(kind: OpaqueBlob)
         ))
       )
   )
@@ -263,7 +265,7 @@ func get_initial_beacon_block*(state: BeaconState): SignedBeaconBlock =
       state_root: hash_tree_root(state),
       body: BeaconBlockBody(
         # TODO: This shouldn't be necessary if OpaqueBlob is the default
-        randao_reveal: BlsValue[Signature](kind: OpaqueBlob))))
+        randao_reveal: ValidatorSig(kind: OpaqueBlob))))
       # parent_root, randao_reveal, eth1_data, signature, and body automatically
       # initialized to default values.
 
@@ -381,13 +383,13 @@ proc is_valid_indexed_attestation*(
     return false
 
   # Verify aggregate signature
-  if skipBlsValidation notin flags and not bls_verify(
-    bls_aggregate_pubkeys(mapIt(indices, state.validators[it.int].pubkey)),
-    hash_tree_root(indexed_attestation.data).data,
-    indexed_attestation.signature,
-    get_domain(
-      state, DOMAIN_BEACON_ATTESTER, indexed_attestation.data.target.epoch)
-  ):
+  let pubkeys = mapIt(indices, state.validators[it.int].pubkey) # TODO: fuse loops with blsFastAggregateVerify
+  let domain = state.get_domain(DOMAIN_BEACON_ATTESTER, indexed_attestation.data.target.epoch)
+  let signing_root = compute_signing_root(indexed_attestation.data, domain)
+  if skipBLSValidation notin flags and
+       not blsFastAggregateVerify(
+             pubkeys, signing_root.data, indexed_attestation.signature
+       ):
     notice "indexed attestation: signature verification failure"
     return false