From 117fecad9907ad0b3724b087361545909be58721 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Tue, 22 Oct 2024 18:13:36 +0200 Subject: [PATCH] Bump nim-web3 to `c76ddefea96e7763c3cc5b28ec5cbac1adefc4e7` (#6670) - Fix AuthorizationObject fields name to v, r, s --- beacon_chain/libnimbus_lc/libnimbus_lc.nim | 8 ++++---- .../libnimbus_lc/test_files/transactions.json | 12 ++++++------ vendor/nim-web3 | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/beacon_chain/libnimbus_lc/libnimbus_lc.nim b/beacon_chain/libnimbus_lc/libnimbus_lc.nim index fa37b4e7b..7a63ccbd3 100644 --- a/beacon_chain/libnimbus_lc/libnimbus_lc.nim +++ b/beacon_chain/libnimbus_lc/libnimbus_lc.nim @@ -1562,7 +1562,7 @@ proc ETHTransactionsCreateFromJson( if data.authorizationList.isSome: for authorization in data.authorizationList.get: static: doAssert sizeof(uint64) == sizeof(authorization.chainId) - if distinctBase(authorization.yParity) > uint8.high: + if distinctBase(authorization.v) > uint8.high: return nil let tx = eth_types.EthTransaction( @@ -1602,9 +1602,9 @@ proc ETHTransactionsCreateFromJson( chainId: it.chainId.ChainId, address: distinctBase(it.address).to(EthAddress), nonce: distinctBase(it.nonce), - v: distinctBase(it.yParity), - r: it.R, - s: it.S)) + v: distinctBase(it.v), + r: it.r, + s: it.s)) else: @[], V: distinctBase(data.v), diff --git a/beacon_chain/libnimbus_lc/test_files/transactions.json b/beacon_chain/libnimbus_lc/test_files/transactions.json index 9049b9c30..6fbc74b7b 100644 --- a/beacon_chain/libnimbus_lc/test_files/transactions.json +++ b/beacon_chain/libnimbus_lc/test_files/transactions.json @@ -318,17 +318,17 @@ "chainId": "0x0", "address": "0x3031323334353637383940414243444546474849", "nonce": "0x0", - "yParity": "0x1", - "R": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", - "S": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" + "v": "0x1", + "r": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", + "s": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" }, { "chainId": "0x1", "address": "0x5051525354555657585960616263646566676869", "nonce": "0x309", - "yParity": "0x1", - "R": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", - "S": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" + "v": "0x1", + "r": "0xa4be86c16c6d3a2b907660b24187d0b30b69f6db3e6e8e7a7bb1183a4706d454", + "s": "0x28aba84cdee6059dde41620422959d01da4f6cfff21a9b97036db018f1d815f6" } ], "v": "0x1", diff --git a/vendor/nim-web3 b/vendor/nim-web3 index a27102220..c76ddefea 160000 --- a/vendor/nim-web3 +++ b/vendor/nim-web3 @@ -1 +1 @@ -Subproject commit a2710222060de4936ca582ef677614dc4585ff12 +Subproject commit c76ddefea96e7763c3cc5b28ec5cbac1adefc4e7