jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove Account length from compact on AccountBeforeTx (#2622)

Browse Source
This commit is contained in:
joshieDo
2023-05-12 18:29:56 +01:00
committed by GitHub
parent 45caab8052
commit 4056b15882
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/storage/db/src/tables/models/accounts.rs
View File

@ -7,13 +7,15 @@ use crate::{
table::{Decode, Encode},
Error,
};
use reth_codecs::Compact;
use bytes::Buf;
use reth_codecs::{derive_arbitrary, Compact};
use reth_primitives::{Account, Address, BlockNumber};
use serde::{Deserialize, Serialize};
/// Account as it is saved inside [`AccountChangeSet`][crate::tables::AccountChangeSet].
///
/// [`Address`] is the subkey.
#[derive_arbitrary(compact)]
#[derive(Debug, Default, Clone, Eq, PartialEq, Serialize)]
pub struct AccountBeforeTx {
/// Address for the account. Acts as `DupSort::SubKey`.
@ -32,16 +34,29 @@ impl Compact for AccountBeforeTx {
{
// for now put full bytes and later compress it.
buf.put_slice(&self.address.to_fixed_bytes()[..]);
self.info.to_compact(buf) + 32
let mut acc_len = 0;
if let Some(account) = self.info {
acc_len = account.to_compact(buf);
}
acc_len + 20
}
fn from_compact(buf: &[u8], len: usize) -> (Self, &[u8])
fn from_compact(mut buf: &[u8], len: usize) -> (Self, &[u8])
where
Self: Sized,
{
let address = Address::from_slice(&buf[..20]);
let (info, out) = <Option<Account>>::from_compact(&buf[20..], len - 20);
(Self { address, info }, out)
buf.advance(20);
let mut info = None;
if len - 20 > 0 {
let (acc, advanced_buf) = Account::from_compact(buf, len - 20);
buf = advanced_buf;
info = Some(acc);
}
(Self { address, info }, buf)
}
}