From 7eaff5e22730145548e84f04027238382e63d7a8 Mon Sep 17 00:00:00 2001 From: tersec Date: Sat, 20 Sep 2025 06:30:06 +0000 Subject: [PATCH] add Fulu signing node test --- AllTests-mainnet.md | 1 + beacon_chain/spec/datatypes/base.nim | 1 - tests/test_signing_node.nim | 97 +++++++++++++++++++++++++++- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md index 7c549e2f9a..885c4d5b51 100644 --- a/AllTests-mainnet.md +++ b/AllTests-mainnet.md @@ -789,6 +789,7 @@ AllTests-mainnet + Public keys enumeration (/api/v1/eth2/publicKeys) test OK + Public keys reload (/reload) test OK + Signing BeaconBlock (getBlockSignature(electra)) OK ++ Signing BeaconBlock (getBlockSignature(fulu)) OK + Signing SC contribution and proof (getContributionAndProofSignature()) OK + Signing SC message (getSyncCommitteeMessage()) OK + Signing SC selection proof (getSyncCommitteeSelectionProof()) OK diff --git a/beacon_chain/spec/datatypes/base.nim b/beacon_chain/spec/datatypes/base.nim index 4716a3b95b..711f9d5947 100644 --- a/beacon_chain/spec/datatypes/base.nim +++ b/beacon_chain/spec/datatypes/base.nim @@ -980,5 +980,4 @@ func ofLen*[T, N](ListType: type List[T, N], n: int): ListType = else: raise newException(SszSizeMismatchError) -template debugFuluComment*(s: string) = discard template debugGloasComment*(s: string) = discard diff --git a/tests/test_signing_node.nim b/tests/test_signing_node.nim index 08eb2e55c9..b00df0d10c 100644 --- a/tests/test_signing_node.nim +++ b/tests/test_signing_node.nim @@ -65,6 +65,8 @@ const ElectraBlockContents = "{\"signed_block\":{\"message\":{\"slot\":\"5297696\",\"proposer_index\":\"153094\",\"parent_root\":\"0xe6106533af9be918120ead7440a8006c7f123cc3cb7daf1f11d951864abea014\",\"state_root\":\"0xf86196d34500ca25d1f4e7431d4d52f6f85540bcaf97dd0d2ad9ecdb3eebcdf0\",\"body\":{\"randao_reveal\":\"0xa7efee3d5ddceb60810b23e3b5d39734696418f41dfd13a0851c7be7a72acbdceaa61e1db27513801917d72519d1c1040ccfed829faf06abe06d9964949554bf4369134b66de715ea49eb4fecf3e2b7e646f1764a1993e31e53dbc6557929c12\",\"eth1_data\":{\"deposit_root\":\"0x8ec87d7219a3c873fff3bfe206b4f923d1b471ce4ff9d6d6ecc162ef07825e14\",\"deposit_count\":\"259476\",\"block_hash\":\"0x877b6f8332c7397251ff3f0c5cecec105ff7d4cb78251b47f91fd15a86a565ab\"},\"graffiti\":\"\",\"proposer_slashings\":[],\"attester_slashings\":[],\"attestations\":[],\"deposits\":[],\"voluntary_exits\":[],\"sync_aggregate\":{\"sync_committee_bits\":\"0x733dfda7f5ffde5ade73367fcbf7fffeef7fe43777ffdffab9dbad6f7eed5fff9bfec4affdefbfaddf35bf5efbff9ffff9dfd7dbf97fbfcdfaddfeffbf95f75f\",\"sync_committee_signature\":\"0x81fdf76e797f81b0116a1c1ae5200b613c8041115223cd89e8bd5477aab13de6097a9ebf42b130c59527bbb4c96811b809353a17c717549f82d4bd336068ef0b99b1feebd4d2432a69fa77fac12b78f1fcc9d7b59edbeb381adf10b15bc4a520\"},\"execution_payload\":{\"parent_hash\":\"0x14c2242a8cfbce559e84c391f5f16d10d7719751b8558873012dc88ae5a193e8\",\"fee_recipient\":\"$1\",\"state_root\":\"0xdf8d96b2c292736d39e72e25802c2744d34d3d3c616de5b362425cab01f72fa5\",\"receipts_root\":\"0x4938a2bf640846d213b156a1a853548b369cd02917fa63d8766ab665d7930bac\",\"logs_bloom\":\"0x298610600038408c201080013832408850a00bc8f801920121840030a015310010e2a0e0108628110552062811441c84802f43825c4fc82140b036c58025a28800054c80a44025c052090a0f2c209a0400058040019ea0008e589084078048050880930113a2894082e0112408b088382402a851621042212aa40018a408d07e178c68691486411aa9a2809043b000a04c040000065a030028018540b04b1820271d00821b00c29059095022322c10a530060223240416140190056608200063c82248274ba8f0098e402041cd9f451031481a1010b8220824833520490221071898802d206348449116812280014a10a2d1c210100a30010802490f0a221849\",\"prev_randao\":\"0xc061711e135cd40531ec3ee29d17d3824c0e5f80d07f721e792ab83240aa0ab5\",\"block_number\":\"8737497\",\"gas_limit\":\"30000000\",\"gas_used\":\"16367052\",\"timestamp\":\"1680080352\",\"extra_data\":\"0xd883010b05846765746888676f312e32302e32856c696e7578\",\"base_fee_per_gas\":\"231613172261\",\"block_hash\":\"0x5aa9fd22a9238925adb2b038fd6eafc77adabf554051db5bc16ae5168a52eff6\",\"transactions\":[],\"withdrawals\":[],\"blob_gas_used\":\"2316131761\",\"excess_blob_gas\":\"231613172261\"},\"bls_to_execution_changes\":[],\"blob_kzg_commitments\":[],\"execution_requests\":{\"deposits\":[],\"withdrawals\":[],\"consolidations\":[]}}},\"signature\":\"$2\"},\"kzg_proofs\":[],\"blobs\":[]}" + FuluBlockContents = "{\"signed_block\":{\"message\":{\"slot\":\"5297696\",\"proposer_index\":\"153094\",\"parent_root\":\"0xe6106533af9be918120ead7440a8006c7f123cc3cb7daf1f11d951864abea014\",\"state_root\":\"0xf86196d34500ca25d1f4e7431d4d52f6f85540bcaf97dd0d2ad9ecdb3eebcdf0\",\"body\":{\"randao_reveal\":\"0xa7efee3d5ddceb60810b23e3b5d39734696418f41dfd13a0851c7be7a72acbdceaa61e1db27513801917d72519d1c1040ccfed829faf06abe06d9964949554bf4369134b66de715ea49eb4fecf3e2b7e646f1764a1993e31e53dbc6557929c12\",\"eth1_data\":{\"deposit_root\":\"0x8ec87d7219a3c873fff3bfe206b4f923d1b471ce4ff9d6d6ecc162ef07825e14\",\"deposit_count\":\"259476\",\"block_hash\":\"0x877b6f8332c7397251ff3f0c5cecec105ff7d4cb78251b47f91fd15a86a565ab\"},\"graffiti\":\"\",\"proposer_slashings\":[],\"attester_slashings\":[],\"attestations\":[],\"deposits\":[],\"voluntary_exits\":[],\"sync_aggregate\":{\"sync_committee_bits\":\"0x733dfda7f5ffde5ade73367fcbf7fffeef7fe43777ffdffab9dbad6f7eed5fff9bfec4affdefbfaddf35bf5efbff9ffff9dfd7dbf97fbfcdfaddfeffbf95f75f\",\"sync_committee_signature\":\"0x81fdf76e797f81b0116a1c1ae5200b613c8041115223cd89e8bd5477aab13de6097a9ebf42b130c59527bbb4c96811b809353a17c717549f82d4bd336068ef0b99b1feebd4d2432a69fa77fac12b78f1fcc9d7b59edbeb381adf10b15bc4a520\"},\"execution_payload\":{\"parent_hash\":\"0x14c2242a8cfbce559e84c391f5f16d10d7719751b8558873012dc88ae5a193e8\",\"fee_recipient\":\"$1\",\"state_root\":\"0xdf8d96b2c292736d39e72e25802c2744d34d3d3c616de5b362425cab01f72fa5\",\"receipts_root\":\"0x4938a2bf640846d213b156a1a853548b369cd02917fa63d8766ab665d7930bac\",\"logs_bloom\":\"0x298610600038408c201080013832408850a00bc8f801920121840030a015310010e2a0e0108628110552062811441c84802f43825c4fc82140b036c58025a28800054c80a44025c052090a0f2c209a0400058040019ea0008e589084078048050880930113a2894082e0112408b088382402a851621042212aa40018a408d07e178c68691486411aa9a2809043b000a04c040000065a030028018540b04b1820271d00821b00c29059095022322c10a530060223240416140190056608200063c82248274ba8f0098e402041cd9f451031481a1010b8220824833520490221071898802d206348449116812280014a10a2d1c210100a30010802490f0a221849\",\"prev_randao\":\"0xc061711e135cd40531ec3ee29d17d3824c0e5f80d07f721e792ab83240aa0ab5\",\"block_number\":\"8737497\",\"gas_limit\":\"30000000\",\"gas_used\":\"16367052\",\"timestamp\":\"1680080352\",\"extra_data\":\"0xd883010b05846765746888676f312e32302e32856c696e7578\",\"base_fee_per_gas\":\"231613172261\",\"block_hash\":\"0x5aa9fd22a9238925adb2b038fd6eafc77adabf554051db5bc16ae5168a52eff6\",\"transactions\":[],\"withdrawals\":[],\"blob_gas_used\":\"2316131761\",\"excess_blob_gas\":\"231613172261\"},\"bls_to_execution_changes\":[],\"blob_kzg_commitments\":[],\"execution_requests\":{\"deposits\":[],\"withdrawals\":[],\"consolidations\":[]}}},\"signature\":\"$2\"},\"kzg_proofs\":[],\"blobs\":[]}" + SigningNodeAddress = "127.0.0.1" defaultSigningNodePort = 35333 @@ -98,10 +100,11 @@ proc getBlock( ElectraBlockContents % [feeRecipient, SomeSignature], ElectraSignedBlockContents).signed_block.message) of ConsensusFork.Fulu: - debugFuluComment "fulu test signing node getblock" - raiseAssert "fulu unsupported" + ForkedBeaconBlock.init(RestJson.decode( + FuluBlockContents % [feeRecipient, SomeSignature], + FuluSignedBlockContents).signed_block.message) of ConsensusFork.Gloas: - debugFuluComment "gloas test signing node getblock" + debugGloasComment "gloas test signing node getblock" raiseAssert "gloas unsupported" except ValueError: # https://github.com/nim-lang/Nim/pull/23356 @@ -923,6 +926,94 @@ block: finally: await client.closeWait() + asyncTest "Signing BeaconBlock (getBlockSignature(fulu))": + let + forked = getBlock(ConsensusFork.Fulu) + blockRoot = withBlck(forked): hash_tree_root(forkyBlck) + + sres1 = + await validator1.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + sres2 = + await validator2.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + sres3 = + await validator3.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + rres1 = + await validator4.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + rres2 = + await validator5.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + rres3 = + await validator6.getBlockSignature(SigningFork, GenesisValidatorsRoot, + blockRoot, forked) + + check: + sres1.isOk() + sres2.isOk() + sres3.isOk() + rres1.isOk() + rres2.isOk() + rres3.isOk() + sres1.get() == rres1.get() + sres2.get() == rres2.get() + sres3.get() == rres3.get() + + asyncTest "Connection timeout test": + let + request = Web3SignerRequest.init(SigningFork, GenesisValidatorsRoot, + Epoch(10)) + deadline = newFuture[void]() + (client, info) = validator4.clients[0] + + deadline.complete() + let res = await client.signData(info.pubkey, deadline, 1, request) + check: + res.isErr() + res.error.kind == Web3SignerErrorKind.TimeoutError + + asyncTest "Public keys reload (/reload) test": + let + res = createAdditionalKeystore(RemoteSignerType.Web3Signer) + remoteUrl = "http://" & SigningNodeAddress & ":" & + $getNodePort(basePort, RemoteSignerType.Web3Signer) + prestoFlags = {RestClientFlag.CommaSeparatedArray} + rclient = RestClientRef.new(remoteUrl, prestoFlags, {}) + + check: + res.isOk() + rclient.isOk() + + let client = rclient.get() + check res.isOk() + try: + block: + let response = await client.reload() + check response.status == 200 + block: + let response = await client.getKeys() + check: + response.status == 200 + len(response.data) == 4 + let + received = sorted([ + "0x" & response.data[0].toHex(), + "0x" & response.data[1].toHex(), + "0x" & response.data[2].toHex(), + "0x" & response.data[3].toHex() + ]) + expected = sorted([ + ValidatorPubKey1, + ValidatorPubKey2, + ValidatorPubKey3, + ValidatorPubKey4 + ]) + check received == expected + finally: + await client.closeWait() + waitFor(shutdownSigningNodeProcess(process)) removeTestDir(RemoteSignerType.Web3Signer)