From a848874f49f11ceb4d00d0313d820b1c5fc85496 Mon Sep 17 00:00:00 2001 From: pmantica11 <151664502+pmantica11@users.noreply.github.com> Date: Tue, 7 May 2024 16:12:27 -0600 Subject: [PATCH] Adjust to latest contracts (#94) * Use latest version of Photon * Fix warnings --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/common/typedefs/token_data.rs | 2 - src/ingester/parser/mod.rs | 19 ++- src/main.rs | 2 - ...H1m7gRUXaEVh9NJjBkpugU6QPHweQHkdiq6NP2eu2f | 1 + ...5YJZtLQgACG9ANsvzfZN1s9d6UPZMabAYYsMoZ6GsG | 1 + ...WuiEYf3DgyS2DxytSm7RkDN6f24n1XCZJudZKQT6MC | 1 + ...KzofFt7HdQX8zzyDqymxuggeK31DQRCDLxffc2fHwr | 1 + ...79mMYHppom3p3wwcnEqWciDrhVDVRAU1hcqmsPfDk7 | 1 + ...cDrJWVVVZbi2ZZJAE2m8YXUkmhb6sN4vaHdqxWhiyk | 1 + ...sQES4Qn2MRykjXrf1SKU9sg9cyUzsCYPcd9GdjqND2 | 1 + ...zPF6K67Z298LiPeech4kBb677HFnYpxqSX3y8PmqtU | 1 + ...uoDHpdV4iLjvo9VjDp2kWBBxFnugLAdioyeHRcz5JA | 1 + tests/integration_tests/e2e_tests.rs | 25 ++-- ...s__e2e_mint_and_transfer-bob-accounts.snap | 32 +++--- ...sts__e2e_mint_and_transfer-bob-proofs.snap | 24 ++-- ..._mint_and_transfer-bob-token-balances.snap | 2 +- ...int_and_transfer-bob-token-signatures.snap | 8 +- ...2e_mint_and_transfer-charles-accounts.snap | 32 +++--- ..._e2e_mint_and_transfer-charles-proofs.snap | 24 ++-- ...t_and_transfer-charles-token-balances.snap | 2 +- ...and_transfer-charles-token-signatures.snap | 6 +- ...2e_mint_and_transfer-mint-transaction.snap | 78 +++++-------- ...int_and_transfer-transfer-transaction.snap | 108 +++++++----------- ...sts__lamport_transfers-payer-accounts.snap | 4 +- ...tests__lamport_transfers-payer-proofs.snap | 10 +- ...__lamport_transfers-receiver-accounts.snap | 16 +-- ...ts__lamport_transfers-receiver-proofs.snap | 24 ++-- ...s__payer-lamport_transfers-signatures.snap | 6 +- ...receiver-lamport_transfers-signatures.snap | 4 +- 31 files changed, 202 insertions(+), 239 deletions(-) create mode 100644 tests/data/transactions/e2e_mint_and_transfer/2FrvajC55EwHptaGyuBTjBUm4XkE2c5KHo6AVez2qy8jXbH1m7gRUXaEVh9NJjBkpugU6QPHweQHkdiq6NP2eu2f create mode 100644 tests/data/transactions/e2e_mint_and_transfer/3H2R6UT3Pw9ejNmYTphb27jNoRdXmuLXjjxDaSs87uyuq25YJZtLQgACG9ANsvzfZN1s9d6UPZMabAYYsMoZ6GsG create mode 100644 tests/data/transactions/e2e_mint_and_transfer/62LLe2o1pSdcmos5NH2A1L7LAXU6FnRRHRJ224ZcN1kT5bWuiEYf3DgyS2DxytSm7RkDN6f24n1XCZJudZKQT6MC create mode 100644 tests/data/transactions/e2e_mint_and_transfer/67P7sjss5EV1eTzeRSFEejwohTGYvtxgrReAURrEnQJ1JiKzofFt7HdQX8zzyDqymxuggeK31DQRCDLxffc2fHwr create mode 100644 tests/data/transactions/indexing_bug/53gmfc1VU1VHXURRyj6zwv8kvhggkwcMofTKXGJ1UFEris79mMYHppom3p3wwcnEqWciDrhVDVRAU1hcqmsPfDk7 create mode 100644 tests/data/transactions/indexing_bug/65c2R7qGU1HqRm3n6n5WWPT4jKojRv4jkVb5zjKGUPCFyMcDrJWVVVZbi2ZZJAE2m8YXUkmhb6sN4vaHdqxWhiyk create mode 100644 tests/data/transactions/lamport_transfers/2jLuZajWysScmEeuW7egrnDLK5m15dxECAvFGVqy9B8LNxsQES4Qn2MRykjXrf1SKU9sg9cyUzsCYPcd9GdjqND2 create mode 100644 tests/data/transactions/lamport_transfers/3DGUfF1qnMcXE8er6U6Yaqh83punr2FBK2oW2v6MVpdPRVzPF6K67Z298LiPeech4kBb677HFnYpxqSX3y8PmqtU create mode 100644 tests/data/transactions/lamport_transfers/5Mi1rJzJskdDqnyXS1k8rw91Gm9qsnFuAEmF5G2f21PFXGuoDHpdV4iLjvo9VjDp2kWBBxFnugLAdioyeHRcz5JA diff --git a/Cargo.lock b/Cargo.lock index 4ad50a39..915810ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3488,7 +3488,7 @@ dependencies = [ [[package]] name = "photon-indexer" -version = "0.17.0" +version = "0.18.0" dependencies = [ "anchor-lang", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 4956a766..b7b1e11c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ name = "photon-indexer" publish = true readme = "README.md" repository = "https://github.com/helius-labs/photon" -version = "0.17.0" +version = "0.18.0" [[bin]] name = "photon" diff --git a/src/common/typedefs/token_data.rs b/src/common/typedefs/token_data.rs index 77ffd4ae..64e6f25e 100644 --- a/src/common/typedefs/token_data.rs +++ b/src/common/typedefs/token_data.rs @@ -20,8 +20,6 @@ use super::{serializable_pubkey::SerializablePubkey, unsigned_integer::UnsignedI #[repr(u8)] #[derive(Default)] pub enum AccountState { - #[allow(non_camel_case_types)] - uninitialized, #[allow(non_camel_case_types)] #[default] initialized, diff --git a/src/ingester/parser/mod.rs b/src/ingester/parser/mod.rs index 7affa94e..2a907a02 100644 --- a/src/ingester/parser/mod.rs +++ b/src/ingester/parser/mod.rs @@ -50,8 +50,8 @@ pub fn parse_transaction(tx: &TransactionInfo, slot: u64) -> Result Result