Update nim-eth types #6583
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1282,25 +1282,25 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| if data.nonce.isNone: | ||
| return nil | ||
| let blockHeader = ExecutionBlockHeader( | ||
| parentHash: data.parentHash.asEth2Digest.to(Hash32), | ||
| ommersHash: data.sha3Uncles.asEth2Digest.to(Hash32), | ||
| coinbase: distinctBase(data.miner).to(EthAddress), | ||
| stateRoot: data.stateRoot.asEth2Digest.to(Hash32), | ||
| transactionsRoot: data.transactionsRoot.asEth2Digest.to(Hash32), | ||
| receiptsRoot: data.receiptsRoot.asEth2Digest.to(Hash32), | ||
| logsBloom: distinctBase(data.logsBloom).to(Bloom), | ||
| difficulty: data.difficulty, | ||
| number: distinctBase(data.number), | ||
| gasLimit: distinctBase(data.gasLimit), | ||
| gasUsed: distinctBase(data.gasUsed), | ||
| timestamp: EthTime(distinctBase(data.timestamp)), | ||
| extraData: distinctBase(data.extraData), | ||
| mixHash: data.mixHash.asEth2Digest.to(Hash32), | ||
| nonce: distinctBase(data.nonce.get).to(Bytes8), | ||
|
Contributor
There was a problem hiding this comment. shouldn't nonce be a number type? is it still getting serialized properly with this change? as in, as Quantity and not as a byte array, on engine?
Member
Author
There was a problem hiding this comment.
Contributor
There was a problem hiding this comment. is that compatible with engine API?
Contributor
There was a problem hiding this comment. (or, json-rpc, probably the better one, as nonce is not used in engine itself)
Contributor
There was a problem hiding this comment. https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_getblockbyhash says it's bytes8, but the reality seems to encode it as quantity: curl https://docs-demo.quiknode.pro/ \
-X POST \
-H "Content-Type: application/json" \
--data '{"method":"eth_getBlockByNumber","params":["0xc5043f",true],"id":1,"jsonrpc":"2.0"}' | jq '.'e.g. here nonce is "0x1d" not a bytes8 {
"blockHash": "0xa917fcc721a5465a484e9be17cda0cc5493933dd3bc70c9adbee192cb419c9d7",
"blockNumber": "0xc5043f",
"from": "0xb0cba44805f096094e8759ee9824a05590c10f27",
"gas": "0x5208",
"gasPrice": "0x7f084b500",
"hash": "0x3dc2776aa483c0eee09c2ccc654bf81dccebead40e9bb664289637bfb5e7e954",
"input": "0x",
"nonce": "0x1d",
"to": "0xb0cba44805f096094e8759ee9824a05590c10f27",
"transactionIndex": "0xcb",
"value": "0x3f3b45b9331",
"type": "0x0",
"chainId": "0x1",
"v": "0x26",
"r": "0x19610db3a46538e10c4db8597510902374ff66ef339a2251c82faebb3c00f8b9",
"s": "0x7af4c008f4bc1edbe081c8e32f49893f035a9eeacb615dd67808f6a9f5e13b52"
}the specs don't seem authoritative. https://github.com/ethereum/devp2p/blob/master/caps/eth.md here the blocks don't even have excess blob fees or parent beacn blob roots, as per spec, in reality they have. or also, there's ethereum/execution-apis#573 which is implemented in practice but is not specced out like that.
Member
Author
There was a problem hiding this comment.
Contributor
There was a problem hiding this comment. ExecutionPayload of web3 is not using nonce from eth block header. And the example posted by @etan-status is not a block header, but a transaction. And a transaction's nonce is a uint64. There will be no conversion friction or serialization issue in the case of this block header nonce. And there is no problem also with the json encoding nonce of block header so far in our json-rpc. |
||
| baseFeePerGas: data.baseFeePerGas, | ||
| withdrawalsRoot: | ||
| if data.withdrawalsRoot.isSome: | ||
| Opt.some(data.withdrawalsRoot.get.asEth2Digest.to(Hash32)) | ||
| else: | ||
| Opt.none(ExecutionHash256), | ||
| blobGasUsed: | ||
|
|
@@ -1315,12 +1315,12 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| Opt.none(uint64), | ||
| parentBeaconBlockRoot: | ||
| if data.parentBeaconBlockRoot.isSome: | ||
| Opt.some data.parentBeaconBlockRoot.get.asEth2Digest.to(Hash32) | ||
| else: | ||
| Opt.none(ExecutionHash256), | ||
| requestsRoot: | ||
| if data.requestsRoot.isSome: | ||
| Opt.some(data.requestsRoot.get.asEth2Digest.to(Hash32)) | ||
| else: | ||
| Opt.none(ExecutionHash256)) | ||
| if rlpHash(blockHeader) != executionHash[]: | ||
|
|
@@ -1342,7 +1342,7 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| wd = ExecutionWithdrawal( | ||
| index: distinctBase(data.index), | ||
| validatorIndex: distinctBase(data.validatorIndex), | ||
| address: distinctBase(data.address).to(EthAddress), | ||
| amount: distinctBase(data.amount)) | ||
| rlpBytes = | ||
| try: | ||
|
|
@@ -1353,7 +1353,7 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| wds.add ETHWithdrawal( | ||
| index: wd.index, | ||
| validatorIndex: wd.validatorIndex, | ||
| address: ExecutionAddress(data: wd.address.data), | ||
| amount: wd.amount, | ||
| bytes: rlpBytes) | ||
|
|
||
|
|
@@ -1379,10 +1379,10 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| # Construct deposit request | ||
| let | ||
| req = ExecutionDepositRequest( | ||
| pubkey: distinctBase(data.pubkey).to(Bytes48), | ||
| withdrawalCredentials: distinctBase(data.withdrawalCredentials).to(Bytes32), | ||
| amount: distinctBase(data.amount), | ||
| signature: distinctBase(data.signature).to(Bytes96), | ||
| index: distinctBase(data.index)) | ||
| rlpBytes = | ||
| try: | ||
|
|
@@ -1391,10 +1391,10 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| raiseAssert "Unreachable" | ||
|
|
||
| depositRequests.add ETHDepositRequest( | ||
| pubkey: ValidatorPubKey(blob: req.pubkey.data), | ||
| withdrawalCredentials: req.withdrawalCredentials.data, | ||
| amount: req.amount, | ||
| signature: ValidatorSig(blob: req.signature.data), | ||
| index: req.index, | ||
| bytes: rlpBytes) | ||
|
|
||
|
|
@@ -1411,8 +1411,8 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| # Construct withdrawal request | ||
| let | ||
| req = ExecutionWithdrawalRequest( | ||
| sourceAddress: distinctBase(data.sourceAddress).to(EthAddress), | ||
| validatorPubkey: distinctBase(data.validatorPubkey).to(Bytes48), | ||
| amount: distinctBase(data.amount)) | ||
| rlpBytes = | ||
| try: | ||
|
|
@@ -1421,8 +1421,8 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| raiseAssert "Unreachable" | ||
|
|
||
| withdrawalRequests.add ETHWithdrawalRequest( | ||
| sourceAddress: ExecutionAddress(data: req.sourceAddress.data), | ||
| validatorPubkey: ValidatorPubKey(blob: req.validatorPubkey.data), | ||
| amount: req.amount, | ||
| bytes: rlpBytes) | ||
|
|
||
|
|
@@ -1439,19 +1439,19 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| # Construct consolidation request | ||
| let | ||
| req = ExecutionConsolidationRequest( | ||
| sourceAddress: distinctBase(data.sourceAddress).to(EthAddress), | ||
| sourcePubkey: distinctBase(data.sourcePubkey).to(Bytes48), | ||
| targetPubkey: distinctBase(data.targetPubkey).to(Bytes48)) | ||
| rlpBytes = | ||
| try: | ||
| rlp.encode(req) | ||
| except RlpError: | ||
| raiseAssert "Unreachable" | ||
|
|
||
| consolidationRequests.add ETHConsolidationRequest( | ||
| sourceAddress: ExecutionAddress(data: req.sourceAddress.data), | ||
| sourcePubkey: ValidatorPubKey(blob: req.sourcePubkey.data), | ||
| targetPubkey: ValidatorPubKey(blob: req.targetPubkey.data), | ||
| bytes: rlpBytes) | ||
|
|
||
| # Verify requests root | ||
|
|
@@ -1487,9 +1487,9 @@ proc ETHExecutionBlockHeaderCreateFromJson( | |
| let executionBlockHeader = ETHExecutionBlockHeader.new() | ||
| executionBlockHeader[] = ETHExecutionBlockHeader( | ||
| transactionsRoot: blockHeader.txRoot, | ||
| withdrawalsRoot: blockHeader.withdrawalsRoot.get(zeroHash32), | ||
| withdrawals: wds, | ||
| requestsRoot: blockHeader.requestsRoot.get(zeroHash32), | ||
| depositRequests: depositRequests, | ||
| withdrawalRequests: withdrawalRequests, | ||
| consolidationRequests: consolidationRequests) | ||
|
|
@@ -1776,31 +1776,31 @@ proc ETHTransactionsCreateFromJson( | |
| gasLimit: distinctBase(data.gas).GasInt, | ||
| to: | ||
| if data.to.isSome: | ||
| Opt.some(distinctBase(data.to.get).to(EthAddress)) | ||
| else: | ||
| Opt.none(EthAddress), | ||
| value: data.value, | ||
| payload: data.input, | ||
| accessList: | ||
| if data.accessList.isSome: | ||
| data.accessList.get.mapIt(AccessPair( | ||
| address: distinctBase(it.address).to(EthAddress), | ||
| storageKeys: it.storageKeys.mapIt(distinctBase(it).to(Bytes32)))) | ||
| else: | ||
| @[], | ||
| maxFeePerBlobGas: | ||
| data.maxFeePerBlobGas.get(0.u256), | ||
| versionedHashes: | ||
| if data.blobVersionedHashes.isSome: | ||
| data.blobVersionedHashes.get.mapIt( | ||
| Bytes32(distinctBase(it))) | ||
| else: | ||
| @[], | ||
| authorizationList: | ||
| if data.authorizationList.isSome: | ||
| data.authorizationList.get.mapIt(Authorization( | ||
| chainId: it.chainId.ChainId, | ||
| address: distinctBase(it.address).to(EthAddress), | ||
| nonce: distinctBase(it.nonce), | ||
| yParity: distinctBase(it.yParity), | ||
| R: it.R, | ||
|
|
@@ -1834,7 +1834,7 @@ proc ETHTransactionsCreateFromJson( | |
| return Opt.none(array[20, byte]) | ||
| pubkey = sig.recover(sigHash).valueOr: | ||
| return Opt.none(array[20, byte]) | ||
| Opt.some keys.PublicKey(pubkey).toCanonicalAddress().data | ||
|
|
||
| # Compute from execution address | ||
| let | ||
|
|
@@ -1861,10 +1861,8 @@ proc ETHTransactionsCreateFromJson( | |
| of DestinationType.Regular: | ||
| tx.to.get | ||
| of DestinationType.Create: | ||
| let hash = keccakHash(rlp.encodeList(fromAddress, tx.nonce)) | ||
| hash.to(EthAddress) | ||
|
Comment on lines
-1864
to
+1865
Contributor
There was a problem hiding this comment. This one's a bit tricky, keccak returns 32 bytes and
Member
Author
There was a problem hiding this comment. It "kind of" fits with the idea of a canonical conversion from
Member
Author
There was a problem hiding this comment. I guess it could be named something else, if you happen to have a good name handy :) |
||
|
|
||
| # Compute authorizations | ||
| var authorizationList = newSeqOfCap[ETHAuthorizationTuple]( | ||
|
|
@@ -1876,7 +1874,7 @@ proc ETHTransactionsCreateFromJson( | |
| return nil | ||
| authorizationList.add ETHAuthorizationTuple( | ||
| chainId: distinctBase(auth.chainId).u256, | ||
| address: ExecutionAddress(data: auth.address.data), | ||
| nonce: auth.nonce, | ||
| authority: ExecutionAddress(data: authority), | ||
| signature: @signature) | ||
|
|
@@ -1890,14 +1888,14 @@ proc ETHTransactionsCreateFromJson( | |
| maxFeePerGas: tx.maxFeePerGas.uint64, | ||
| gas: tx.gasLimit.uint64, | ||
| destinationType: destinationType, | ||
| to: ExecutionAddress(data: toAddress.data), | ||
| value: tx.value, | ||
| input: tx.payload, | ||
| accessList: tx.accessList.mapIt(ETHAccessTuple( | ||
| address: ExecutionAddress(data: it.address.data), | ||
| storageKeys: it.storageKeys.mapIt(Eth2Digest(data: it.data)))), | ||
| maxFeePerBlobGas: tx.maxFeePerBlobGas, | ||
| blobVersionedHashes: tx.versionedHashes.mapIt(Eth2Digest(data: it.data)), | ||
|
Contributor
There was a problem hiding this comment. isn't this
Member
Author
There was a problem hiding this comment. most of this will go away in the next set of pr:s which will reuse the new nim-eth types in nim-web3, getting rid of most of the conversion friction - this is just a "make it work" step. |
||
| authorizationList: authorizationList, | ||
| signature: @rawSig, | ||
| bytes: rlpBytes.TypedTransaction) | ||
|
|
@@ -2581,14 +2579,14 @@ proc ETHReceiptsCreateFromJson( | |
| status: distinctBase(data.status.get(1.Quantity)) != 0'u64, | ||
| hash: | ||
| if data.root.isSome: | ||
| ExecutionHash256(distinctBase(data.root.get)) | ||
| else: | ||
| default(ExecutionHash256), | ||
| cumulativeGasUsed: distinctBase(data.cumulativeGasUsed).GasInt, | ||
| logsBloom: distinctBase(data.logsBloom).to(Bloom), | ||
| logs: data.logs.mapIt(Log( | ||
| address: distinctBase(it.address).to(EthAddress), | ||
| topics: it.topics.mapIt(distinctBase(it).to(Bytes32)), | ||
| data: it.data))) | ||
| rlpBytes = | ||
| try: | ||
|
|
@@ -2605,10 +2603,10 @@ proc ETHReceiptsCreateFromJson( | |
| root: rec.hash, | ||
| status: rec.status, | ||
| gasUsed: distinctBase(data.gasUsed), # Validated during sanity checks. | ||
| logsBloom: BloomLogs(data: rec.logsBloom.data), | ||
| logs: rec.logs.mapIt(ETHLog( | ||
| address: ExecutionAddress(data: it.address.data), | ||
| topics: it.topics.mapIt(Eth2Digest(data: it.data)), | ||
| data: it.data)), | ||
| bytes: rlpBytes) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -462,6 +462,12 @@ func toExecutionWithdrawal*( | |
| address: EthAddress withdrawal.address.data, | ||
| amount: distinctBase(withdrawal.amount)) | ||
|
|
||
| proc append(w: var RlpWriter, val: EthAddress) = | ||
| # TODO for some reason, the same implementation from addresses_rlp isn't | ||
| # picked up, so we need to repeat it here - odd. | ||
| mixin append | ||
| w.append(val.data()) | ||
|
|
||
arnetheduck marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| # https://eips.ethereum.org/EIPS/eip-4895 | ||
| proc computeWithdrawalsTrieRoot*( | ||
| payload: capella.ExecutionPayload | deneb.ExecutionPayload | | ||
|
|
@@ -480,25 +486,25 @@ proc computeWithdrawalsTrieRoot*( | |
| func toExecutionDepositRequest*( | ||
| request: electra.DepositRequest): ExecutionDepositRequest = | ||
| ExecutionDepositRequest( | ||
| pubkey: Bytes48 request.pubkey.blob, | ||
| withdrawalCredentials: Bytes32 request.withdrawal_credentials.data, | ||
| amount: distinctBase(request.amount), | ||
| signature: Bytes96 request.signature.blob, | ||
| index: request.index) | ||
|
|
||
| func toExecutionWithdrawalRequest*( | ||
| request: electra.WithdrawalRequest): ExecutionWithdrawalRequest = | ||
| ExecutionWithdrawalRequest( | ||
| sourceAddress: Address request.source_address.data, | ||
| validatorPubkey: Bytes48 request.validator_pubkey.blob, | ||
| amount: distinctBase(request.amount)) | ||
|
|
||
| func toExecutionConsolidationRequest*( | ||
| request: electra.ConsolidationRequest): ExecutionConsolidationRequest = | ||
| ExecutionConsolidationRequest( | ||
| sourceAddress: Address request.source_address.data, | ||
| sourcePubkey: Bytes48 request.source_pubkey.blob, | ||
| targetPubkey: Bytes48 request.target_pubkey.blob) | ||
|
|
||
| # https://eips.ethereum.org/EIPS/eip-7685 | ||
| proc computeRequestsTrieRoot( | ||
|
|
@@ -571,7 +577,7 @@ proc blockToBlockHeader*(blck: ForkyBeaconBlock): ExecutionBlockHeader = | |
| Opt.none(uint64) | ||
| parentBeaconBlockRoot = | ||
| when typeof(payload).kind >= ConsensusFork.Deneb: | ||
| Opt.some ExecutionHash256(blck.parent_root.data) | ||
| else: | ||
| Opt.none(ExecutionHash256) | ||
| requestsRoot = | ||
|
|
@@ -581,20 +587,20 @@ proc blockToBlockHeader*(blck: ForkyBeaconBlock): ExecutionBlockHeader = | |
| Opt.none(ExecutionHash256) | ||
|
|
||
| ExecutionBlockHeader( | ||
| parentHash : payload.parent_hash.to(Hash32), | ||
| ommersHash : EMPTY_UNCLE_HASH, | ||
| coinbase : EthAddress payload.fee_recipient.data, | ||
| stateRoot : payload.state_root.to(Root), | ||
| transactionsRoot : txRoot, | ||
| receiptsRoot : payload.receipts_root.to(Root), | ||
| logsBloom : BloomFilter payload.logs_bloom.data.to(Bloom), | ||
| difficulty : default(DifficultyInt), | ||
| number : payload.block_number, | ||
| gasLimit : payload.gas_limit, | ||
| gasUsed : payload.gas_used, | ||
| timestamp : EthTime(payload.timestamp), | ||
| extraData : payload.extra_data.asSeq, | ||
| mixHash : payload.prev_randao.to(Hash32), # EIP-4399 `mixHash` -> `prevRandao` | ||
| nonce : default(BlockNonce), | ||
| baseFeePerGas : Opt.some payload.base_fee_per_gas, | ||
| withdrawalsRoot : withdrawalsRoot, | ||
|
|
@@ -604,7 +610,7 @@ proc blockToBlockHeader*(blck: ForkyBeaconBlock): ExecutionBlockHeader = | |
| requestsRoot : requestsRoot) # EIP-7685 | ||
|
|
||
| proc compute_execution_block_hash*(blck: ForkyBeaconBlock): Eth2Digest = | ||
| rlpHash(blockToBlockHeader(blck)).to(Eth2Digest) | ||
|
Contributor
There was a problem hiding this comment. what's the difference between
Member
Author
There was a problem hiding this comment. https://github.com/ethereum/execution-specs/blob/master/src/ethereum/paris/fork_types.py#L29
it's a rather pointless alias in the spec |
||
|
|
||
| from std/math import exp, ln | ||
| from std/sequtils import foldl | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one is not exported, and it worked before without it, is it necessary?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nim-ethadds anAddresssymbol - this local type has precedence over everything imported so it sets a preference between primitives and nim-eth for the rest of the file