Support u8 slice digester in frozen abi struct. (#23726)
* support u8 slice in frozen abi digester * use slice in account struct * add bpf cargo lock file * no need to pass account.data to serializer * fix comments
This commit is contained in:
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -4882,6 +4882,7 @@ dependencies = [
|
|||||||
"memmap2 0.5.3",
|
"memmap2 0.5.3",
|
||||||
"rustc_version 0.4.0",
|
"rustc_version 0.4.0",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_bytes",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"sha2 0.10.2",
|
"sha2 0.10.2",
|
||||||
"solana-frozen-abi-macro 1.10.4",
|
"solana-frozen-abi-macro 1.10.4",
|
||||||
|
@ -16,6 +16,7 @@ lazy_static = "1.4.0"
|
|||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
serde = "1.0.136"
|
serde = "1.0.136"
|
||||||
serde_derive = "1.0.103"
|
serde_derive = "1.0.103"
|
||||||
|
serde_bytes = "0.11"
|
||||||
sha2 = "0.10.2"
|
sha2 = "0.10.2"
|
||||||
solana-frozen-abi-macro = { path = "macro", version = "=1.10.4" }
|
solana-frozen-abi-macro = { path = "macro", version = "=1.10.4" }
|
||||||
thiserror = "1.0"
|
thiserror = "1.0"
|
||||||
|
@ -562,6 +562,17 @@ mod tests {
|
|||||||
#[derive(Serialize, AbiExample)]
|
#[derive(Serialize, AbiExample)]
|
||||||
struct TestNewtypeStruct(i8);
|
struct TestNewtypeStruct(i8);
|
||||||
|
|
||||||
|
#[frozen_abi(digest = "Hbs1X2X7TF2gFEfsspwfZ1JKr8ZGbLY3uidQBebqcMYt")]
|
||||||
|
#[derive(Serialize, AbiExample)]
|
||||||
|
struct Foo<'a> {
|
||||||
|
#[serde(with = "serde_bytes")]
|
||||||
|
data1: Vec<u8>,
|
||||||
|
#[serde(with = "serde_bytes")]
|
||||||
|
data2: &'a [u8],
|
||||||
|
#[serde(with = "serde_bytes")]
|
||||||
|
data3: &'a Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
#[frozen_abi(digest = "5qio5qYurHDv6fq5kcwP2ue2RBEazSZF8CPk2kUuwC2j")]
|
#[frozen_abi(digest = "5qio5qYurHDv6fq5kcwP2ue2RBEazSZF8CPk2kUuwC2j")]
|
||||||
#[derive(Serialize, AbiExample)]
|
#[derive(Serialize, AbiExample)]
|
||||||
struct TestStructReversed {
|
struct TestStructReversed {
|
||||||
|
@ -415,6 +415,13 @@ impl AbiExample for &Vec<u8> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl AbiExample for &[u8] {
|
||||||
|
fn example() -> Self {
|
||||||
|
info!("AbiExample for (&[u8]): {}", type_name::<Self>());
|
||||||
|
&VEC_U8[..]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<T: AbiExample> AbiExample for VecDeque<T> {
|
impl<T: AbiExample> AbiExample for VecDeque<T> {
|
||||||
fn example() -> Self {
|
fn example() -> Self {
|
||||||
info!("AbiExample for (Vec<T>): {}", type_name::<Self>());
|
info!("AbiExample for (Vec<T>): {}", type_name::<Self>());
|
||||||
|
1
programs/bpf/Cargo.lock
generated
1
programs/bpf/Cargo.lock
generated
@ -3370,6 +3370,7 @@ dependencies = [
|
|||||||
"memmap2 0.5.3",
|
"memmap2 0.5.3",
|
||||||
"rustc_version 0.4.0",
|
"rustc_version 0.4.0",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_bytes",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"sha2 0.10.2",
|
"sha2 0.10.2",
|
||||||
"solana-frozen-abi-macro 1.10.4",
|
"solana-frozen-abi-macro 1.10.4",
|
||||||
|
@ -46,8 +46,8 @@ mod account_serialize {
|
|||||||
struct Account<'a> {
|
struct Account<'a> {
|
||||||
lamports: u64,
|
lamports: u64,
|
||||||
#[serde(with = "serde_bytes")]
|
#[serde(with = "serde_bytes")]
|
||||||
// a ref so we don't have to make a copy just to serialize this
|
// a slice so we don't have to make a copy just to serialize this
|
||||||
data: &'a Vec<u8>,
|
data: &'a [u8],
|
||||||
// can't be &pubkey because abi example doesn't support it
|
// can't be &pubkey because abi example doesn't support it
|
||||||
owner: Pubkey,
|
owner: Pubkey,
|
||||||
executable: bool,
|
executable: bool,
|
||||||
@ -57,7 +57,6 @@ mod account_serialize {
|
|||||||
/// allows us to implement serialize on AccountSharedData that is equivalent to Account::serialize without making a copy of the Vec<u8>
|
/// allows us to implement serialize on AccountSharedData that is equivalent to Account::serialize without making a copy of the Vec<u8>
|
||||||
pub fn serialize_account<S>(
|
pub fn serialize_account<S>(
|
||||||
account: &(impl ReadableAccount + Serialize),
|
account: &(impl ReadableAccount + Serialize),
|
||||||
data: &Vec<u8>,
|
|
||||||
serializer: S,
|
serializer: S,
|
||||||
) -> Result<S::Ok, S::Error>
|
) -> Result<S::Ok, S::Error>
|
||||||
where
|
where
|
||||||
@ -65,8 +64,7 @@ mod account_serialize {
|
|||||||
{
|
{
|
||||||
let temp = Account {
|
let temp = Account {
|
||||||
lamports: account.lamports(),
|
lamports: account.lamports(),
|
||||||
// note this is a ref, which is the whole point of 'account_serialize'
|
data: account.data(),
|
||||||
data,
|
|
||||||
owner: *account.owner(),
|
owner: *account.owner(),
|
||||||
executable: account.executable(),
|
executable: account.executable(),
|
||||||
rent_epoch: account.rent_epoch(),
|
rent_epoch: account.rent_epoch(),
|
||||||
@ -80,7 +78,7 @@ impl Serialize for Account {
|
|||||||
where
|
where
|
||||||
S: Serializer,
|
S: Serializer,
|
||||||
{
|
{
|
||||||
crate::account::account_serialize::serialize_account(self, &self.data, serializer)
|
crate::account::account_serialize::serialize_account(self, serializer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +87,7 @@ impl Serialize for AccountSharedData {
|
|||||||
where
|
where
|
||||||
S: Serializer,
|
S: Serializer,
|
||||||
{
|
{
|
||||||
crate::account::account_serialize::serialize_account(self, &self.data, serializer)
|
crate::account::account_serialize::serialize_account(self, serializer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user