status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump nim-web3 to `c76ddefea96e7763c3cc5b28ec5cbac1adefc4e7` (#6670) 

- Fix AuthorizationObject fields name to v, r, s
This commit is contained in:
Etan Kissling 2024-10-22 18:13:36 +02:00 committed by GitHub
parent 5d940b4c1e
commit 117fecad99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_chain/libnimbus_lc/libnimbus_lc.nim
View File

@ -1562,7 +1562,7 @@ proc ETHTransactionsCreateFromJson(
if data.authorizationList.isSome: if data.authorizationList.isSome:
for authorization in data.authorizationList.get: for authorization in data.authorizationList.get:
static: doAssert sizeof(uint64) == sizeof(authorization.chainId) static: doAssert sizeof(uint64) == sizeof(authorization.chainId)
if distinctBase(authorization.yParity) > uint8.high: if distinctBase(authorization.v) > uint8.high:
return nil return nil
let let
tx = eth_types.EthTransaction( tx = eth_types.EthTransaction(
@ -1602,9 +1602,9 @@ proc ETHTransactionsCreateFromJson(
chainId: it.chainId.ChainId, chainId: it.chainId.ChainId,
address: distinctBase(it.address).to(EthAddress), address: distinctBase(it.address).to(EthAddress),
nonce: distinctBase(it.nonce), nonce: distinctBase(it.nonce),
v: distinctBase(it.yParity), v: distinctBase(it.v),
r: it.R, r: it.r,
s: it.S)) s: it.s))
else: else:
@[], @[],
V: distinctBase(data.v), V: distinctBase(data.v),

12
beacon_chain/libnimbus_lc/test_files/transactions.json
View File

@ -318,17 +318,17 @@
"chainId": "0x0", "chainId": "0x0",
"address": "0x3031323334353637383940414243444546474849", "address": "0x3031323334353637383940414243444546474849",
"nonce": "0x0", "nonce": "0x0",
"yParity": "0x1", "v": "0x1",
"R": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", "r": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454",
"S": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" "s": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6"
}, },
{ {
"chainId": "0x1", "chainId": "0x1",
"address": "0x5051525354555657585960616263646566676869", "address": "0x5051525354555657585960616263646566676869",
"nonce": "0x309", "nonce": "0x309",
"yParity": "0x1", "v": "0x1",
"R": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", "r": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454",
"S": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" "s": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6"
} }
], ],
"v": "0x1", "v": "0x1",

2
vendor/nim-web3 vendored

@ -1 +1 @@
Subproject commit a2710222060de4936ca582ef677614dc4585ff12 Subproject commit c76ddefea96e7763c3cc5b28ec5cbac1adefc4e7