eth_getProof balance and nonce to U256 (#572)

after some real-world testing, we figured balance as well as nonce fields might reach the upper limit of U64. Moving these fields to U256
tomusdrw · Nov 30, 2021 · 1f807bb · 1f807bb
1 parent 5f8b29e
commit 1f807bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/api/eth.rs b/src/api/eth.rs
@@ -534,9 +534,9 @@ mod tests {
       "0xf90211a0e1557a91967828ea9eaf9b4c25bb0f079857340c54fa01acf24977f5d4d12ad4a0805a5d2f0d1b8c33c6415d2df4f4d812f4abe6b2d0f9f12196d31bbe5d76e47da0882d8a3a3493a0d76c907b0c2a4c6e3f26ca67a6a37aba6105c428d98ec2f67ea0b8bb9bd971ca68a49135390b03c11e2f7c352c146be2e3f8fff2a311dda5ddf1a01ae7bbab4493b34935640f40c74d7d72079742157ad5040a23f70c64f5153ca7a0574403fc7faa3a262eae412a707a74785a1159027e5b8de9990e1e82278e9691a01edc831a2e842b4d55b009c9831774fd6f17acfdee99f097c4fb20be583911f6a044569f910709fedb1ef83ef29b508e24def8eb9cc876dac0f6fa4f5f791cd719a0ebfdbfe9538bd72dbbeb56024982502950c69d9beb5d0d6d985917120e77e0d5a02c6fdf33ef98ca85a94ac9ed1319832ca5e2b344c1b8d921e77eda35480ba9d0a0c6b20bfc93fa2167bd43fe14cb648eb53c66fd56a3c95d0bd4c0442e86f7e686a01bed6e7e4a83c9aed9b39c49bb29782d63064d5ac425734dbfe4f0367eb29d07a0dede0f30aa107e1383be0a3ac31e0083213c27e1b11912e45e974257fa1d9915a089673bee5c46e4ee86b7e68115bc34b6eb9387e7c0d7300af1c502a8ef14fdf8a07e8e4d1729077f052c82cbd6de80966666514c53072945b53afd55c40b4f3a47a024caac94dd8acbf9c88a149b728115651faebd379f92e0ecc126fb136d5289df80",
       "0xf89180a057d3fa3f15f8c0e639b1c3ac64e623348f39c5663587003279dcd5cf261489a58080a0b65511b496c46cca3eff9484a1a1961bcf7ae59237da1ead3675eea9b3f8469fa05114cfcd51e3a3735c556d68ac28f83dd28aa1a833425090521f0b9217c2114e8080a0adaeaae85d671adf3b559aaee605156f0c4511f9aa474cbcf6a594b219d216a88080808080808080"
     ],
-    "balance": "0x0",
+    "balance": "0x2166f8062324c623840",
     "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "nonce": "0x0",
+    "nonce": "0x6c",
     "storageHash": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
     "storageProof": [
       {

diff --git a/src/types/proof.rs b/src/types/proof.rs
@@ -1,5 +1,5 @@
 use crate::types::Bytes;
-use ethereum_types::{H256, U256, U64};
+use ethereum_types::{H256, U256};
 use serde::{Deserialize, Serialize};
 
 ///Proof struct returned by eth_getProof method
@@ -8,12 +8,12 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Default, Clone, PartialEq, Deserialize, Serialize)]
 pub struct Proof {
     /// the balance of the account. See eth_getBalance
-    pub balance: U64,
+    pub balance: U256,
     ///  hash of the code of the account
     #[serde(rename = "codeHash")]
     pub code_hash: H256,
     /// nonce of the account. See eth_getTransactionCount
-    pub nonce: U64,
+    pub nonce: U256,
     /// SHA3 of the StorageRoot.
     #[serde(rename = "storageHash")]
     pub storage_hash: H256,