diff --git a/Cargo.lock b/Cargo.lock index 0690083..d2cb9e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3674,7 +3674,7 @@ dependencies = [ [[package]] name = "photon-indexer" -version = "0.25.0" +version = "0.26.0" dependencies = [ "anchor-lang", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index e0a5531..1bdfb0f 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.25.0" +version = "0.26.0" [[bin]] name = "photon" diff --git a/src/api/method/utils.rs b/src/api/method/utils.rs index 974b6dc..4d32325 100644 --- a/src/api/method/utils.rs +++ b/src/api/method/utils.rs @@ -299,9 +299,6 @@ pub async fn fetch_token_accounts( .delegate .map(SerializablePubkey::try_from) .transpose()?, - delegated_amount: UnsignedInteger(parse_decimal( - token_account.delegated_amount, - )?), is_native: token_account .is_native .map(|x| { diff --git a/src/common/typedefs/token_data.rs b/src/common/typedefs/token_data.rs index 64e6f25..78586b7 100644 --- a/src/common/typedefs/token_data.rs +++ b/src/common/typedefs/token_data.rs @@ -48,9 +48,4 @@ pub struct TokenData { /// used by the Processor to ensure that wrapped SOL accounts do not /// drop below this threshold. pub is_native: Option, - /// The amount delegated - pub delegated_amount: UnsignedInteger, // TODO: make instruction data optional - // TODO: validate that we don't need close authority - // /// Optional authority to close the account. - // pub close_authority: Option, } diff --git a/src/dao/generated/token_accounts.rs b/src/dao/generated/token_accounts.rs index a3605b5..9bd0183 100644 --- a/src/dao/generated/token_accounts.rs +++ b/src/dao/generated/token_accounts.rs @@ -17,8 +17,6 @@ pub struct Model { pub amount: Decimal, #[sea_orm(column_type = "Decimal(Some((20, 0)))", nullable)] pub is_native: Option, - #[sea_orm(column_type = "Decimal(Some((20, 0)))")] - pub delegated_amount: Decimal, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/src/ingester/persist/mod.rs b/src/ingester/persist/mod.rs index ad7e509..bbb2cfc 100644 --- a/src/ingester/persist/mod.rs +++ b/src/ingester/persist/mod.rs @@ -380,7 +380,6 @@ pub async fn persist_token_accounts( amount: Set(Decimal::from(token_data.amount.0)), delegate: Set(token_data.delegate.map(|d| d.to_bytes_vec())), state: Set(token_data.state as i32), - delegated_amount: Set(Decimal::from(token_data.delegated_amount.0)), is_native: Set(token_data.is_native.map(|x| Decimal::from(x.0))), spent: Set(false), prev_spent: Set(None), diff --git a/src/migration/m20220101_000001_init.rs b/src/migration/m20220101_000001_init.rs index d2e7b3c..93f6597 100644 --- a/src/migration/m20220101_000001_init.rs +++ b/src/migration/m20220101_000001_init.rs @@ -264,12 +264,6 @@ impl MigrationTrait for Migration { ) .await?; - execute_sql( - manager, - "ALTER TABLE token_accounts ADD COLUMN delegated_amount bigint2 NOT NULL;", - ) - .await?; - execute_sql( manager, "ALTER TABLE owner_balances ADD COLUMN lamports bigint2 NOT NULL;", @@ -302,11 +296,6 @@ impl MigrationTrait for Migration { "ALTER TABLE token_accounts ADD COLUMN is_native REAL;", ) .await?; - execute_sql( - manager, - "ALTER TABLE token_accounts ADD COLUMN delegated_amount REAL;", - ) - .await?; execute_sql( manager, diff --git a/tests/data/transactions/e2e_mint_and_transfer/3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx b/tests/data/transactions/e2e_mint_and_transfer/3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx new file mode 100644 index 0000000..71ffe97 --- /dev/null +++ b/tests/data/transactions/e2e_mint_and_transfer/3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx @@ -0,0 +1 @@ +{"slot":52,"transaction":["AnNAVVGEexlBcQePiYd8J1SI0e8QmPGb+vdHchRTCQqM9Ml+bli1FLI903QzC6dqodJi4+ZvUL0PHRHADhWl3AuOcRL/BfC6KquO63HnWaQ7KwktwZ3tuHIKyc5Fr6hCESGHHUv4nNwVI7mBtRNg6v2amOqvj+g3BB/jsBFmv/cFgAIBCg/WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dmb20fJ/aarWCwdtMON5y2ApOLzHzeZm4Nb+4MGjJllcmPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSDwYCc5JmqNblS/S+tYeGfqm9F3krnNH4cUp/LieFLLTURNfSBMgD20Ac9FLHl2mRGzt3Mio39m1gFXr7FfMUFFAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAD1itLHAR4o1KBGtaL93zMnlB5NHD6SDRSqmfZ7YrJBH7SlQOyDt9WW7rhI2hN7rYf3O2M6x7u3IJANtD1uTGCcBt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnu+iPYo1pSSKfRxOPSrVn/jhTHlpDXPaQiL7Xk4pnQEZHO1F4ue36ePjvKhQ/1+bWXRuK+jAPhOiyhsi1YEji5C7wPwLtHyi90xBEulKsTz6PGNOXcF+rLA80aI81+eHyUJa+9/ABJJWec/z1Ytd+0tY2uuyhzxF6W5bZkVSls+KxW1RflaYZhtplDZTn2OqAPHuUse8KSTOHPrHkF2nKGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC+7xDL3HyAcVSsf6tM2/KAwoApoNApZsD0a27dHzkLLAIFAAUCQEIPAAYOAAEHAgMICQoLDA0EBg448SIwuiWze8ABAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3MBAAAA6AMAAAAAAAAA","base64"],"meta":{"err":null,"status":{"Ok":null},"fee":10000,"preBalances":[996489120,0,1461600,2039280,9496056960,1,1141440,0,929020800,1141440,1392000,1141440,0,1141440,1],"postBalances":[996478935,0,1461600,2039280,9496057145,1,1141440,0,929020800,1141440,1392000,1141440,0,1141440,1],"innerInstructions":[{"index":1,"instructions":[{"programIdIndex":8,"accounts":[2,3,1],"data":"6qYT3cRnoTxb","stackHeight":2},{"programIdIndex":9,"accounts":[0,7,10,11,12,13,6,9,9,14,9,4],"data":"oMTGA8J44vo3pCVmAjiCzPxz4nKYu5pf4rExqGMKqP54CBrn4JhRS8L9JaAC9QkxSi3ozrsj1CoNuh8S34VVg5GWWZcmhEFpUwbeP6sBXxs2j8cFssN1dEkmxXxpj1gKK3FMoad7n8bVvL3WDiCZRyjrKVuh2k6wWbG23aiczUn9kw2kvcGqd9FmqDYbDKKndyjJRvHsYfsyZmcjtNG93VHzhV26e2htiYh6yBfbYiqVH7aAW7y7MYTNsZvkRibRJ7NJrViHN2Lru1vvCFq9NPNNHrsGdunMbq199BkT","stackHeight":2},{"programIdIndex":13,"accounts":[0,12,10,14,4],"data":"5wPdbtbk7M4b3JSHrvyzJCo2PzcvwajjZsYDjR2mPH6QWuyRdrEYdziaJzxFv5","stackHeight":3},{"programIdIndex":14,"accounts":[0,4],"data":"3Bxs4XoPh3u5UtLF","stackHeight":4},{"programIdIndex":11,"accounts":[],"data":"11112kX1UKQEwNzET6jxMwVB3UM47oQJftYqqkzqrS3iK5RrmgwJLa8UZ2fF14EScsDePRvwSLp515ph5pdnDKy3FQpSMpixfmHeCjVveQy5YMgfEkCNJiTNLco6dxtufFhNd6jA7bfGwPjN4porWjq38SHDGAGiHo4kqPodVqPX2FK3hFjGFCxQv7NDHgnbSTFwhP2pNRkwSGXHeJxMY2gF8XBmbF2H255iQGs6cLLH7VrNVCDZYGkbgeRDviKczTR1JUcvsumrBk31DeMM5xzq576TxWgLzVnzKSgD4ebF5c6EcqBhfpyrjAwC6dM6gFBim1C8R5RTeTU3mxWMTM5C1ggmBAkdA7gTNiBDmYLPrUc8FpsddakHgkFRodJfUCUX36JcVEU8tBfgLYqwV","stackHeight":3}]}],"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN invoke [1]","Program log: Instruction: MintTo","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]","Program log: Instruction: MintTo","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 4492 of 985597 compute units","Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN invoke [2]","Program log: Instruction: InvokeCpi","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: AppendLeavesToMerkleTrees","Program 11111111111111111111111111111111 invoke [4]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 40972 of 930379 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 886758 compute units","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 79579 of 965736 compute units","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 114530 of 999850 compute units","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success"],"preTokenBalances":[{"accountIndex":3,"mint":"BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj","uiTokenAmount":{"uiAmount":null,"decimals":2,"amount":"0","uiAmountString":"0"},"owner":"DAAY8YnCFASfeLyXFXff8bTitePXdGcXYr6DkkYJ3aJX","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"postTokenBalances":[{"accountIndex":3,"mint":"BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj","uiTokenAmount":{"uiAmount":10.0,"decimals":2,"amount":"1000","uiAmountString":"10"},"owner":"DAAY8YnCFASfeLyXFXff8bTitePXdGcXYr6DkkYJ3aJX","programId":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"}],"rewards":[],"loadedAddresses":{"writable":[],"readonly":[]},"computeUnitsConsumed":114680},"version":0,"blockTime":1718897718} \ No newline at end of file diff --git a/tests/data/transactions/e2e_mint_and_transfer/4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A b/tests/data/transactions/e2e_mint_and_transfer/4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A new file mode 100644 index 0000000..4f7518d --- /dev/null +++ b/tests/data/transactions/e2e_mint_and_transfer/4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A @@ -0,0 +1 @@ +{"slot":53,"transaction":["ArakEiR67ArSSPYWR1cOkuGrnDdQFDiAPtostbVYr7upnl8dA1gXEJPXCccQfLTB2djKd0kDF3lihwikAgEypw+Rx4C+PkMi8ki4tjUilXXnU8YEeamvKHtPSpU0e0f+5zjh2exvuMl/Be9hlv2Tb/djvjBq9ny7sOmKrV36vzQOgAIBCQ3WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dilhUzJbtt8gZNnLENKnY5p/OqPmaiNkPNpY/9XYII9zRE19IEyAPbQBz0UseXaZEbO3cyKjf2bWAVevsV8xQUUtaxlkRkeJL9L43N8LzM1Z+DDTqAsZ255jL3/4jmvEbgMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA9YrSxwEeKNSgRrWi/d8zJ5QeTRw+kg0Uqpn2e2KyQR+0pUDsg7fVlu64SNoTe62H9ztjOse7tyCQDbQ9bkxgnO76I9ijWlJIp9HE49KtWf+OFMeWkNc9pCIvteTimdARkc7UXi57fp4+O8qFD/X5tZdG4r6MA+E6LKGyLVgSOLkLvA/Au0fKL3TEES6UqxPPo8Y05dwX6ssDzRojzX54fJQlr738AEklZ5z/PVi137S1ja67KHPEXpbltmRVKWz4rFbVF+VphmG2mUNlOfY6oA8e5Sx7wpJM4c+seQXacoYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAID7EWQv+uUwPK3hUnhyYIsj975dHepPQpmlvApvxPAgQABQJAQg8ABQ8AAQYHCAkKCwUFBQUMAgOfAqM0yOeMA0W6EwEAAAGEHvGCcNZM7hM4Ib/B3VyaFzAR/QBRq5MmbVBxhQMyrgWbXWqIAmYxtYa5tyf4XRizOBcTB1D59qCMj6Lq3sIUBBBnBkEQIXvQd0tJsTVYZpDsgsfyAW9sTGkUACiUzHOEEoJPT4yL3YpS4e/B2pdEnnGVSqvBgELO5COkmA2RoJj3xWiHbrzoq2N0TLV3l0FllXPPGffxdVwtMAanrFkgAAEAAADoAwAAAAAAAAAAAAEAAAAAAQACAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3MsAQAAAAAAAAAAHIgjmSN63/jGE/Ml5WcCn4oIJA9cK/JeIVXPdyXC1yS8AgAAAAAAAAAAAAAAAA==","base64"],"meta":{"err":null,"status":{"Ok":null},"fee":10000,"preBalances":[996478935,1000000000,9496057145,2293180800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"postBalances":[996463565,1000000000,9496057515,2293185800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"innerInstructions":[{"index":1,"instructions":[{"programIdIndex":7,"accounts":[0,6,8,9,10,11,5,7,7,12,7,2,3],"data":"QvhQPyjav2YY64y1QNZ1CYwFnkbVmWppHHAmieR9tRtYPM4PXfbSMRZZbUHGXrEP2CKsfojmFrj6GTbZmkZfoNrJzbNcYUVsrP5fu32oFKfVCmegtJFLeJG7SVppLdBL58dqiXmEEhCtQa4N2LpPjuuDhazsR1ApR3ZXNth7HeshYnP42ZseJGENUxtDanXfw4nJTuF33Miy5pm15vRJJsqqZhwTZ98evVkn4GKTdfTpbtvmuT6sXGmbqCGQQggSMqUrFQ7yJ4AA1o1STdk4fBzpgydn6DACUpXbJP3jtL3BF3QqtGe45fbnr1nzTY6smpUXYb8HGcVBDDbjXqBmS8dN1WQX2sFC2bCWP5312u6Sz8dSJ828TrpVNQWT1ha9PeGr8PKMeBFxSAsWYRBze8BerM3SpyhkndroW44zmh8Rb9QFLcfxTwqMehvFqfyuhjeuNVxN2DfVEhu6Yp21fJf6EXFATSQD7xqRNz35tJutPvXh87M77xscmZpQMb5qivSSDXbswkvB4NdHRwVhmYnAGjGbMPisktut8YKYChU2ni2Q9CZdxADw7TuPJgxrj2d8yTiB8NqZXZP86Bj87gi5ToALmvqJ93A4CVW6FedAoU7XQYiKdk4zyiC8NRmmTw7GWLPJKawLbXSHYME5QvZLdqe7yXFDncx2ajmfXdoHJ1zyDJfQAtPqkpwhQ23cqRnwRE3vkKB2fydWNVaEuNKvrjQDvf2P9uiVuxArhgXjniWbdWTpeJ4jpEL5CZRdx7yrY6ZYJk5H6V7Z59dwdxbTPTR1f9gHmUjCqpGTPhtukxzeHpccYj4RLpUh1A3qpJtEUhVehGmpKe8MiA6rYkiiuUrhZLiDcx8ULeUHr2v2k5kVMvCs8fGHeVcozaUS8beFDMjfKbK2voCTtRhh8R2ZcQF","stackHeight":2},{"programIdIndex":11,"accounts":[0,10,8,12,3,2],"data":"WiZw2hSp2LSxinAV4o8EjdnrY44bkw3kzFqkwbijHNhNo8qmMcWkyYrP8qNm","stackHeight":3},{"programIdIndex":12,"accounts":[0,3],"data":"3Bxs4PckVVt51W8w","stackHeight":3},{"programIdIndex":11,"accounts":[0,10,8,12,2],"data":"7UWNMdwFJEWBQPSoUMH68DcTaa1PYe2XvCzsJTrbiEmQdoKpbhMkV8P3U2KnegEAE69eJ6RHrVfUH4KnYbesVaMu59r8tmc8TsQXup81K5N","stackHeight":3},{"programIdIndex":12,"accounts":[0,2],"data":"3Bxs4Kve8YTRHdVR","stackHeight":4},{"programIdIndex":9,"accounts":[],"data":"68rmtBiHmUYX8J113nQ3T1m3ynfYXsQWasNvFwscZcB3aUmaf6EXEVdhPEDTD1JWkii7XAJaTT9Yzbg5hJNKCfuP6N8tphe1RWMpWyNpTND7jSWfEBUdgBe8prqx2PSv28yqMi3yw28PbUdS4MyHH4vuho3M5SQuyEC5c4h7Ce7G72VnBk6QQAbYMaYD6wTY4z6LwDa6XtHabgt9VfmyVSXVjTD4QsFFz3DUABvFmxtWfMWY2AJNLYNQtuqXqz34jMxKZC96qusNscHktrSdd1bzgzKSeEZGHkN8TxopqhmhySCwPx6HggDTVwfDk2CvR2ytianDmJUyD8gHCkgPf4BgQzvaTTcayWLsZGshE7sNGEnAJ2LGcMs2p6JhqePv55oga1R6HbypPwKhijh3FbipnoZrGVoF7hB8qw7L4prJTiSXB6dVxszz7qd8WUojEPudmkEvVdJ7VeAFicc8nBrU1fuFZREVMniiJFf77GdXKdwPLSbJYdLBmC8QnSLZGLmAyU2cTaeQjUy2cJKjnM6eWscvQfQv26psrykhyShS9LP4zp7HdHkSk4oc998YAwa1fjMm8kDcrBnhQR1dJhuFkpa9sBuzu2vNSq5Zsp2b5bPdnfx7MwyrEnhRegFncirQh5TQsKaQBTkKj7ULKhvVf7y1vXL5wm3rtphyEKVUX1rF73cqUsnKQ4cxSKANyfKzt9uQEEexZEqkWnywaW3f5dd5TtvxjLbmiak6MWyPX7f1KseqgnxrGB1H","stackHeight":3}]}],"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN invoke [1]","Program log: Instruction: Transfer","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN invoke [2]","Program log: Instruction: InvokeCpi","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: InsertIntoNullifierQueues","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 9634 of 814325 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program 11111111111111111111111111111111 invoke [3]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: AppendLeavesToMerkleTrees","Program 11111111111111111111111111111111 invoke [4]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 45238 of 787080 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 738324 compute units","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 221466 of 959117 compute units","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 263207 of 999850 compute units","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success"],"preTokenBalances":[],"postTokenBalances":[],"rewards":[],"loadedAddresses":{"writable":[],"readonly":[]},"computeUnitsConsumed":263357},"version":0,"blockTime":1718897718} \ No newline at end of file diff --git a/tests/data/transactions/e2e_mint_and_transfer/Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8 b/tests/data/transactions/e2e_mint_and_transfer/Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8 new file mode 100644 index 0000000..f39f145 --- /dev/null +++ b/tests/data/transactions/e2e_mint_and_transfer/Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8 @@ -0,0 +1 @@ +{"slot":55,"transaction":["AhIFvg0NfZFAcZ8JsUO9WFNm8pIlRfs3/L03JyB3aZC0bRkhk3CycyuTAuholZqljEErZ/pwD4IZ/Q/A/S6UeQ3iitYe/buT/qgvejHtnBeOr+LgVQ2N+Gk733fG5QoFZfbRZ+1ywaxbu5a2Mjw4v28hFZJHYz8gy36UKBdMBCkAgAIBCQ3WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dhyII5kjet/4xhPzJeVnAp+KCCQPXCvyXiFVz3clwtckRE19IEyAPbQBz0UseXaZEbO3cyKjf2bWAVevsV8xQUUtaxlkRkeJL9L43N8LzM1Z+DDTqAsZ255jL3/4jmvEbgMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA9YrSxwEeKNSgRrWi/d8zJ5QeTRw+kg0Uqpn2e2KyQR+0pUDsg7fVlu64SNoTe62H9ztjOse7tyCQDbQ9bkxgnO76I9ijWlJIp9HE49KtWf+OFMeWkNc9pCIvteTimdARkc7UXi57fp4+O8qFD/X5tZdG4r6MA+E6LKGyLVgSOLkLvA/Au0fKL3TEES6UqxPPo8Y05dwX6ssDzRojzX54fJQlr738AEklZ5z/PVi137S1ja67KHPEXpbltmRVKWz4rFbVF+VphmG2mUNlOfY6oA8e5Sx7wpJM4c+seQXacoYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGaaLDjUbc3Rz/Njue9CXvWQkfN8z8p/zpzNVE9shSv8AgQABQJAQg8ABQ8AAQYHCAkKCwUFBQUMAgOfAqM0yOeMA0W6EwEAAAGBwnTDe9OW4lTI/cQy4LRSmu1xYa8sHEgyi01YbODPMgJtMN5821WsBSpgju7aF6bVGkGbpih8AjNNbedvO5/zDjrbAwDX/gGaS96c6GkAx25SLmtIkah9U/T6HC1rYW8jq6St7fmxGNaQTy9E7de91FqYWLRRVkiM6Zi/KI39jJj3xWiHbrzoq2N0TLV3l0FllXPPGffxdVwtMAanrFkgAAEAAAC8AgAAAAAAAAAAAAECAAAABQACAAAAHIgjmSN63/jGE/Ml5WcCn4oIJA9cK/JeIVXPdyXC1yS3AgAAAAAAAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3MFAAAAAAAAAAAAAAAAAA==","base64"],"meta":{"err":null,"status":{"Ok":null},"fee":10000,"preBalances":[996448195,1000000000,9496057885,2293190800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"postBalances":[996432825,1000000000,9496058255,2293195800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"innerInstructions":[{"index":1,"instructions":[{"programIdIndex":7,"accounts":[0,6,8,9,10,11,5,7,7,12,7,2,3],"data":"QvhQPyjav2YY64y1QNVvLN7wexm8xPz1K7ZDA7ZVEpGMfXpzuKGQtfVPbRG98pUi99sRUnCLmNx3BTvokdfBe3rRdBfU7yv2n9xT8gRo1erczwmCKsiGty814KHdWyoGrsWwMjqDMZLzvpitt53SwyYMmBQytRLL2vHKmwxoQdj4np2Vgvg3smq6eDDzBEYmSjZHyiYHp3TpNpKTaSySd3CAXrFVPY6LVJevyXQumFBE81CwiTg6hyZPerUNMC2bvoaRpYXjsyVg1DBn9R1MLAUPYstDM9JbKsKdPc6NfYtuidUXBZtaJBdZGLNjs8ypPH9xUU5UZnitFeiCZtt2xj2GsUbASWjbNphQo3uRjvfZ2iRaH8Zf7B1vDoQjjFs9ctjDpUuGz4mqdHxZ7e1mLJ6RCd4pePSSRvdXKrbLvbZBEzzeLavkpw8w7mjtMuUwS51spVmPBnt12QpBizngUJSWMDKjivqkgRBMtHUXh5q9eVP7WaZq9Qxa7aJaetyDehmMxy11xtPdUDzEGmZJCxF69trg1kWETKCynrWbSxWsYbHrgXkqaTL3tnXFGrz8qceS7zSg9t2Qam3U22K4X4Wn6fh4EEMB9nMNiEoFsDvEorbZSbPZW1UySM93NCJhaCfSPHsBit6a3EipeJJ2L8VViNxLftxUZzs7zhWmCmCYL54AGF7pJSsRbT72bzseGyu3kZHPUXgK8UdXKFb6Tspn3yHsbYQRjaLNeHYVbr5iTtP3XWRe8BtQPQBzKDQXkybYqYyHCt2Nk1Sk1Hq3yDcRJ2G9cyiBQEoqanwPo8hTjAMsRVtSxpMHVFKm1Hpg65FbDwXkPFY8MjdiSfBxQKWhMNHrhj2akPwPvXvEyHSekTVp9gDUUChYMst8PhKiUcR6Hjb1L4C1C5avKvx4pUfHgLw","stackHeight":2},{"programIdIndex":11,"accounts":[0,10,8,12,3,2],"data":"WiZw2hSp2LSxinAV4c3wxVUmJUvhGT4SDX9rocrV8sBhuYrMEHfX8cNujHuW","stackHeight":3},{"programIdIndex":12,"accounts":[0,3],"data":"3Bxs4PckVVt51W8w","stackHeight":3},{"programIdIndex":11,"accounts":[0,10,8,12,2],"data":"7UWNMdwFJEWBQPSoUMJU28B8JGnYcqCYNwMNfpLakAtXEsLBZDNB3CWVw3SEzhipHjF8xPziezs5Qk2BscHjc9qMCoeSDhk7jpCWcLWZoER","stackHeight":3},{"programIdIndex":12,"accounts":[0,2],"data":"3Bxs4Kve8YTRHdVR","stackHeight":4},{"programIdIndex":9,"accounts":[],"data":"68rmt9VACCWdnGk2AXdVcfYABAttUkprQ4MnvXTjfuMdzwUG3o3YpyCJTj5FK2hnGuZusi6X1yuYLFtGUr3uhKBUPV6TG2RprQxr4PPTZ5qh38xbeWgH7rnYGF3W7y9JFYhRy3zW7TXYihVLt89T7ceLa63F9hZaAYNSfpJ3rCSC7dYEvKuT8fjaJsE9gASBYTX3xsCEervSsTbnVqSKuLWq3kqLT7EA6EXTsZFCHAQYUXbr3nta14ZBT3tQCkE5WgdYAb88HdfcwXm1qwcMSDs5s2BCsB1zGu3iuESANn2eG1DYa4iwAqoPk15y79chyXroXbby246t4XRbAB5wHQ4TtegxZA3sNyzmUp4BUtBMKaYnSf5KoVKTi6Sxa6QAAsVhoviyF6yCZgNfrgh6uEiCpWY2iimHEB1jT1A3pyyCfHm9ceZqFt642d4ZGHJL5Q65zQ2yuBDgLoELoyKZh9xUL5rdQY9t43V3CjH2jfYjFnNfBgM7myeEUeSPxYXrkmniXgYyMhmT6FQZKo5nA2am61Lk5g5RY4KaU4bnm9Di871NgxsdoR1FMNxiJEWfAm7Di91vuX7f5PpEezuoJsifZDGJnpvZjTSj8bAq4nESG2hDc5Bxe3UqmejRTdWKGpnK5UKzc1YeC4tpbEGFU2zh7kxW91RvRaijh59x8EzUex4b6KcNUCE7iHbCFJQgvuW5FByDttGGfaik58bdMrbxE1E8UnMzEhYTAe1CY94sqQibhsv76APiPiHV","stackHeight":3}]}],"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN invoke [1]","Program log: Instruction: Transfer","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN invoke [2]","Program log: Instruction: InvokeCpi","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: InsertIntoNullifierQueues","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 9634 of 814325 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program 11111111111111111111111111111111 invoke [3]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: AppendLeavesToMerkleTrees","Program 11111111111111111111111111111111 invoke [4]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 45219 of 787080 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 738343 compute units","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 221447 of 959117 compute units","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 263188 of 999850 compute units","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success"],"preTokenBalances":[],"postTokenBalances":[],"rewards":[],"loadedAddresses":{"writable":[],"readonly":[]},"computeUnitsConsumed":263338},"version":0,"blockTime":1718897719} \ No newline at end of file diff --git a/tests/data/transactions/e2e_mint_and_transfer/SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5 b/tests/data/transactions/e2e_mint_and_transfer/SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5 new file mode 100644 index 0000000..863ce36 --- /dev/null +++ b/tests/data/transactions/e2e_mint_and_transfer/SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5 @@ -0,0 +1 @@ +{"slot":54,"transaction":["AhZo2IZrYO5tqh8l6n50e60vUXVtAI2he2cz1MZ83JaJmQywLiWvv0RS/1VzN65nNtIkHk8LiCNVUnfJ2yDLUA4r09E7sxzYexFQJgGYhz/gVOTVnvxay/veQo0x6ypgVIe8RmLt07psb6maXWN4JYOliLbAysVwLVt1j+yrvIEMgAIBCQ3WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dilhUzJbtt8gZNnLENKnY5p/OqPmaiNkPNpY/9XYII9zRE19IEyAPbQBz0UseXaZEbO3cyKjf2bWAVevsV8xQUUtaxlkRkeJL9L43N8LzM1Z+DDTqAsZ255jL3/4jmvEbgMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA9YrSxwEeKNSgRrWi/d8zJ5QeTRw+kg0Uqpn2e2KyQR+0pUDsg7fVlu64SNoTe62H9ztjOse7tyCQDbQ9bkxgnO76I9ijWlJIp9HE49KtWf+OFMeWkNc9pCIvteTimdARkc7UXi57fp4+O8qFD/X5tZdG4r6MA+E6LKGyLVgSOLkLvA/Au0fKL3TEES6UqxPPo8Y05dwX6ssDzRojzX54fJQlr738AEklZ5z/PVi137S1ja67KHPEXpbltmRVKWz4rFbVF+VphmG2mUNlOfY6oA8e5Sx7wpJM4c+seQXacoYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABacOqesUhZUJdR3i0raWw3MrOcpcsw2VLsPl3Qt4fTjAgQABQJAQg8ABQ8AAQYHCAkKCwUFBQUMAgOfAqM0yOeMA0W6EwEAAAEKWKiPlkHnC8xg5b/2LkZVb9rH/ixKTLBVJoLr7I8Jlx1h76XqHUEBKnKDM+t4mnGFbwQ/9r4cz8Ej4KikAvVGAm8Rl3Vv/IFyJoBbAiyp3soEuqruJhUNG80V/P/aNHiluYAueAM9sOhBZtiMB91qBIZbWVnw6W//pqEcusWqGJj3xWiHbrzoq2N0TLV3l0FllXPPGffxdVwtMAanrFkgAAEAAAAsAQAAAAAAAAAAAAEBAAAAAwACAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3NkAAAAAAAAAAAAHIgjmSN63/jGE/Ml5WcCn4oIJA9cK/JeIVXPdyXC1yTIAAAAAAAAAAAAAAAAAA==","base64"],"meta":{"err":null,"status":{"Ok":null},"fee":10000,"preBalances":[996463565,1000000000,9496057515,2293185800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"postBalances":[996448195,1000000000,9496057885,2293190800,1,1141440,0,1141440,1392000,1141440,0,1141440,1],"innerInstructions":[{"index":1,"instructions":[{"programIdIndex":7,"accounts":[0,6,8,9,10,11,5,7,7,12,7,2,3],"data":"QvhQPyjav2YY64y1QKoxrjHejyevq8q5YBV2wBzvDrRZmYj5eTyESdaW7548GrhUx5UEURA2cbAEagJqx9KPDhL2x1qz9DemUDX9smguGMhKLqESkZWhXFSMnFGXTsva842WEsPfswSuStgcKCCAGBsaFPGCwdQv1MheXKUhxRQhfj3St77DgpTnvxKpDUzqJRF5e1Mjnsge77nTk1KvzT12zoXbaCPp8ZtDy74ZtASWWn6oNZFb66gvwN6S6p5Byt5gbdRnxoLn2giThZezytLHHyQ7JwzXdy4U8oGeLQZsjd4dWbxY1EnXHXj3cfEmNNKYaEjxXunewqHssKEZELedpaSjeedN2n1XkSafbPs7xVGKsqkXdPX7Uzqit8f3MY1cQN1F761p1fUtYKzaiEqrpLvVfyyZ7NLteRbYXt23ZS46ECcj8i2GE4yeRpQBbNzL6VTo5DHgxK2ekNFB4J4hN3o3ScxSwHdkKvmC8Xrq4iYTNSYX6S46Z7CVpMpQzpb5DBEaadTjavsLs6igsdULeo6BApUjjmSA24BUgidJzp7ZBTbqk9rTkTw6sA7eaEXPfRLYfnnUR2umCKg7auPh6AK3P3HcETy8DKHikB49dF9sb85DwGXsJ8TiRTDU4eLFh1sDKTzsFAPZzqZ1BPQTCeFtR7sXwNUhrBpTPRa7WD9nk2LPVtj2P5sGoJxDkJgsABwJS3djdRXdkcJUQjr3MnZ3EpQ9JuY31Gkj71jNSwTfujDXuYNKqFDX3xAYTdD99kUk5PKSgmK3hZzpp19UNeTg2Udp39m6uFy2jpJyEbksHNDSAzSnDtgtMGCDkVrPGtJAYKzbnBTpdossX9RAa7HDRPZQWkr8Vz8fGQfWDwnvTTG87mtUEue4wt8mFAK4cHj8pMLoR9XJ6safAKcXmLb","stackHeight":2},{"programIdIndex":11,"accounts":[0,10,8,12,3,2],"data":"WiZw2hSp2LSxinAV3aEs6RKbQ8oFBH8fycAWAxpU4n5sF8pabcHuZJPo8ejy","stackHeight":3},{"programIdIndex":12,"accounts":[0,3],"data":"3Bxs4PckVVt51W8w","stackHeight":3},{"programIdIndex":11,"accounts":[0,10,8,12,2],"data":"7UWNMdwFJEWBQPSoUMLzBdqxNWbEb6fuZBGTiN8bXQSVQuyYR5TVix1FcuuHGcLixyfJJjc31xun3iX5JBBGDweFFyxMJSYeqAaWUhY2TrY","stackHeight":3},{"programIdIndex":12,"accounts":[0,2],"data":"3Bxs4Kve8YTRHdVR","stackHeight":4},{"programIdIndex":9,"accounts":[],"data":"68rmswTi5aq7yd5bnkYs9V3ZLqJGsdgsYA8WsuhpbRbZUpLZRVRCidQkmFdN2t82Nm4V2Y2XcKoP9tUyQ4G8aGqzvHwT4aqjEY9tAgZXy6G8gme3b3XRMAe5R3dr3DxekLmdzXechWJfRiHAmSV8nyVD8v8YNTU3DfzHYtkgHjtN4JQQjLhCzueKkGQm4QvMN3hyksvJNDPAwBMafZRAW4kv29mpoMBpxyE7Mt8kFyQQVz618G9ocR6g3sSZ8fD7tnRCb8RV9hjzxPnm94SWhEdpwVkBPt1144ZHPLH19Hj9kz56VfEwkUkST3mbhjS7rvjsovmSfpkHsXCUyYZb1ConJYn6FaoAvLDFpBJdXQLLSHi6QPEcUwwt6FmbAWS73ueyJGHM4GgAoYvXdpEPYedetpTWysNLxcHuFBVFeRuWBtup45YkWv8AfPCZdm2anESCyqM2Z9ifhiFYTFfsN1s2gXrx6EVWr37BJHTWZ3WQ6gAmiYwgz7Qiai13wwgvWpCkzQRsuBw7NgBeoqEaHxGaS4oJvD1jZ1xYzkvvPYyU7hzxPVWSfMhwyFugopjTHSLEnZRSmynRLEMWUnz6R95P1NPpWJ5ueToM8zhevm4B4qBHFH2t34wiSLEkmXpVuV6muHf2J2iwfu6EK4vxsKrZmNa3PfidXNrByCxQrscVkksMwfbvy5CM6YJ9SySUCEcuQZFBEBkrz8BVwKrUMr5ULR9LD1p468Jjny8GZBdZJvkDX4LifmVXJKo5","stackHeight":3}]}],"logMessages":["Program ComputeBudget111111111111111111111111111111 invoke [1]","Program ComputeBudget111111111111111111111111111111 success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN invoke [1]","Program log: Instruction: Transfer","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN invoke [2]","Program log: Instruction: InvokeCpi","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: InsertIntoNullifierQueues","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 9634 of 814325 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program 11111111111111111111111111111111 invoke [3]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]","Program log: Instruction: AppendLeavesToMerkleTrees","Program 11111111111111111111111111111111 invoke [4]","Program 11111111111111111111111111111111 success","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 46242 of 787080 compute units","Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 737320 compute units","Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 222470 of 959117 compute units","Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 264211 of 999850 compute units","Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success"],"preTokenBalances":[],"postTokenBalances":[],"rewards":[],"loadedAddresses":{"writable":[],"readonly":[]},"computeUnitsConsumed":264361},"version":0,"blockTime":1718897719} \ No newline at end of file diff --git a/tests/integration_tests/e2e_tests.rs b/tests/integration_tests/e2e_tests.rs index 54b5ba1..31012f8 100644 --- a/tests/integration_tests/e2e_tests.rs +++ b/tests/integration_tests/e2e_tests.rs @@ -52,18 +52,18 @@ async fn test_e2e_mint_and_transfer( .await; let bob_pubkey = - SerializablePubkey::try_from("7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7").unwrap(); + SerializablePubkey::try_from("3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk").unwrap(); let charles_pubkey = - SerializablePubkey::try_from("AByXwz518ntDjhTaMr6Z65pgde3gy7t4tZ6htdPGkjhh").unwrap(); + SerializablePubkey::try_from("2vNpRS9qaZuYdFmdeyogid5pDXJDbucZLzJeFwaHymAB").unwrap(); let mint_tx = - "5jGUVMbUx2qxRF5u94f5KNmds8if3mHraKg36Xx9NqBQ6azCST3EwzXmj5xXcN2xiTMRg7oNXqUD4ygXybsDfRAn"; + "3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx"; let transfer_tx = - "27pxT3ndnCXhbUXdT2k6riDw7Y22xnRjVRmUHseXpFi7mTziNiEegxFAmgNBoYPKtQrx7N66tCCcGwFKt4RniqXA"; + "4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A"; let transfer_txn2: &str = - "G6ZcxS2HkHh521JjHXvxkpuYC2qu2fa3cdGZvKF9NVAM3oPEBZ8tNa4ghVXVo9uc4UzWPwXGAFrGqg8TdeYoTPW"; + "SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5"; let transfer_txn3 = - "61nLwpJcf143PhYz9AVqeUv9ePNWNW9TAWkrDoMynhSAh3TPsmprMW2cDhjJakrZa8APmNPFLYsrx5CEgZdVgYpm"; + "Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8"; let txs = [mint_tx, transfer_tx, transfer_txn2, transfer_txn3]; diff --git a/tests/integration_tests/mock_tests.rs b/tests/integration_tests/mock_tests.rs index f66c7da..708a9cb 100644 --- a/tests/integration_tests/mock_tests.rs +++ b/tests/integration_tests/mock_tests.rs @@ -356,7 +356,6 @@ async fn test_persist_token_data( delegate: Some(delegate1), state: AccountState::frozen, is_native: Some(UnsignedInteger(1)), - delegated_amount: UnsignedInteger(1), }; let token_data2 = TokenData { @@ -366,7 +365,6 @@ async fn test_persist_token_data( delegate: Some(delegate2), state: AccountState::initialized, is_native: None, - delegated_amount: UnsignedInteger(2), }; let token_data3 = TokenData { @@ -376,7 +374,6 @@ async fn test_persist_token_data( delegate: Some(delegate1), state: AccountState::frozen, is_native: Some(UnsignedInteger(1000)), - delegated_amount: UnsignedInteger(3), }; let all_token_data = vec![token_data1, token_data2, token_data3]; diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-accounts.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-accounts.snap index 6fd9b04..b8ec02e 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-accounts.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-accounts.snap @@ -10,54 +10,52 @@ expression: accounts "items": [ { "account": { - "hash": "6vKDqPoxbJXGVUJgp3N2L6Qeg3cUHrnZ7S3yoTgPBzL", + "hash": "26FEoLQ2nW736yXrKhPgTccnnEMogKA7XpaARLwK4a8Z", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9hWbIyIYiP5OCX/NxTMqOBLMwkvr6zLEYoWupiYDCCnmQAAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "2KffhaoXAjNcLFs6Ma4PGLj9wuh8ytJqpTgQcxvcjyuC" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSApYVMyW7bfIGTZyxDSp2Oafzqj5mojZDzaWP/V2CCPcwUAAAAAAAAAAAAA", + "dataHash": "2SpuyyEYZjcqMrEQ7SYRicMXRfyMBLDbmAGVZvSMPFBE" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, "tree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", - "leafIndex": 3, - "seq": 4, + "leafIndex": 6, + "seq": 7, "slotCreated": 0 }, "tokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7", - "amount": 100, + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk", + "amount": 5, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } }, { "account": { - "hash": "XwKNKiUyu9rbYsnjDcKA2Pf9NJ1RvHxwJyi5tzTTuvK", + "hash": "44Qv4BgzziuHPN3PWaY1RjG6r3Js3ewXuTkWF6DxCpQz", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9hWbIyIYiP5OCX/NxTMqOBLMwkvr6zLEYoWupiYDCCngUAAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "3Q5qvJMq1uGbEuwRT4dcFcieHLD5r6gcN3to1dB6iLkD" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSApYVMyW7bfIGTZyxDSp2Oafzqj5mojZDzaWP/V2CCPc2QAAAAAAAAAAAAA", + "dataHash": "2pBbg1nDKCCG7GE1JUgASMYVp6y7AgZPmNoFKfCzoL5H" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, "tree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", - "leafIndex": 6, - "seq": 7, + "leafIndex": 3, + "seq": 4, "slotCreated": 0 }, "tokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7", - "amount": 5, + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk", + "amount": 100, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } } ], diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-proofs.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-proofs.snap index 0e9251f..46ff1f7 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-proofs.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-proofs.snap @@ -9,9 +9,9 @@ expression: proofs "value": [ { "proof": [ - "2wN5qe6d9ptX8VkSN7QYS8qAnRMMmVhmFQET29BNe5PP", - "3jEChu7dLao4xEu2Ca5yy8EXZDCczH8JXQitdq3jsTXJ", - "2kLMz8ZDFzWF3WQJxweD6eL9kTtBVvCeqfjZCovCoZXr", + "11111111111111111111111111111111", + "VrG5s122v5morVi37e3JQ5LHNpUPeQij1JEg1JGuDdA", + "3b1LdoJPiFH9KDJbjFTA1ogBP9DxG8Pe62QCH3SKHckH", "2gQksfK543Jw196amPxXWceFzNTfRHiqb7x2edvupftT", "Y8pRoGMGXJPGZyb7m4sqkPsTSJvzZ7oSVnaybCcYbgd", "3w895nemtSxb1fEjFT3cXkVpW3y6f9uHQn43jEwu1RWc", @@ -36,17 +36,17 @@ expression: proofs "3dbMMyehykAriNZ8FMJgPc1N6YSzm9ZfV2HcW9sbaXzP", "4EE5KQnQ6Tvo78gGhTu8serpJV4srbRhYZ3rdvCiRa5e" ], - "root": "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "leafIndex": 3, - "hash": "6vKDqPoxbJXGVUJgp3N2L6Qeg3cUHrnZ7S3yoTgPBzL", + "root": "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "leafIndex": 6, + "hash": "26FEoLQ2nW736yXrKhPgTccnnEMogKA7XpaARLwK4a8Z", "merkleTree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", "rootSeq": 7 }, { "proof": [ - "11111111111111111111111111111111", - "3QkA7hhvEHZ9Sk9x8sGYFFvcL6BjN3m8jgGh17sCx1RR", - "JrXNXauNVWThqanqR7q7cTFDTZCe6w4fLyk4Xbi8e3R", + "27pDbCQ19o5wRwnLvGi77tepXmFBzemNHGqCuwS6LdkY", + "JcsvURVEUL5xZnqWaZogo8b5S85dAynCtpcgSRoRbLy", + "4EhNVsv1rFUVCVpFJqjK6fPd527syUF6LotQ8kXmskbq", "2gQksfK543Jw196amPxXWceFzNTfRHiqb7x2edvupftT", "Y8pRoGMGXJPGZyb7m4sqkPsTSJvzZ7oSVnaybCcYbgd", "3w895nemtSxb1fEjFT3cXkVpW3y6f9uHQn43jEwu1RWc", @@ -71,9 +71,9 @@ expression: proofs "3dbMMyehykAriNZ8FMJgPc1N6YSzm9ZfV2HcW9sbaXzP", "4EE5KQnQ6Tvo78gGhTu8serpJV4srbRhYZ3rdvCiRa5e" ], - "root": "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "leafIndex": 6, - "hash": "XwKNKiUyu9rbYsnjDcKA2Pf9NJ1RvHxwJyi5tzTTuvK", + "root": "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "leafIndex": 3, + "hash": "44Qv4BgzziuHPN3PWaY1RjG6r3Js3ewXuTkWF6DxCpQz", "merkleTree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", "rootSeq": 7 } diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-balances.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-balances.snap index 602bea1..103ab9a 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-balances.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-balances.snap @@ -9,7 +9,7 @@ expression: token_balances "value": { "token_balances": [ { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", "balance": 105 } ], diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-signatures.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-signatures.snap index 4860c62..f981a43 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-signatures.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-token-signatures.snap @@ -4,22 +4,22 @@ expression: signatures --- [ { - "signature": "61nLwpJcf143PhYz9AVqeUv9ePNWNW9TAWkrDoMynhSAh3TPsmprMW2cDhjJakrZa8APmNPFLYsrx5CEgZdVgYpm", + "signature": "4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A", "slot": 0, "blockTime": 0 }, { - "signature": "5jGUVMbUx2qxRF5u94f5KNmds8if3mHraKg36Xx9NqBQ6azCST3EwzXmj5xXcN2xiTMRg7oNXqUD4ygXybsDfRAn", + "signature": "3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx", "slot": 0, "blockTime": 0 }, { - "signature": "27pxT3ndnCXhbUXdT2k6riDw7Y22xnRjVRmUHseXpFi7mTziNiEegxFAmgNBoYPKtQrx7N66tCCcGwFKt4RniqXA", + "signature": "SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5", "slot": 0, "blockTime": 0 }, { - "signature": "G6ZcxS2HkHh521JjHXvxkpuYC2qu2fa3cdGZvKF9NVAM3oPEBZ8tNa4ghVXVo9uc4UzWPwXGAFrGqg8TdeYoTPW", + "signature": "Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8", "slot": 0, "blockTime": 0 } diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-validity-proof.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-validity-proof.snap index 23bc9c9..9c2149d 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-validity-proof.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-bob-validity-proof.snap @@ -9,20 +9,20 @@ expression: validity_proof "c": [] }, "roots": [ - "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j" + "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2" ], "rootIndices": [ 7, 7 ], "leafIndices": [ - 3, - 6 + 6, + 3 ], "leaves": [ - "6vKDqPoxbJXGVUJgp3N2L6Qeg3cUHrnZ7S3yoTgPBzL", - "XwKNKiUyu9rbYsnjDcKA2Pf9NJ1RvHxwJyi5tzTTuvK" + "26FEoLQ2nW736yXrKhPgTccnnEMogKA7XpaARLwK4a8Z", + "44Qv4BgzziuHPN3PWaY1RjG6r3Js3ewXuTkWF6DxCpQz" ], "merkleTrees": [ "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-accounts.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-accounts.snap index 528474d..ba1ea36 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-accounts.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-accounts.snap @@ -10,54 +10,52 @@ expression: accounts "items": [ { "account": { - "hash": "kpa4KjVWgSViv7fnvgBCVkxwbRSqmA7hCaTDpULuaFr", + "hash": "28wJuAbi54EHkLi7km2yWR5m5bDjYAd4mZpvM7Q6ce8s", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj+IiOnEspeTeOdZNFzuckQ51O3YZOQbeGYJ+HXZr+PgCMgAAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "3QbRkSSyKaVhRr95qVaRTQLZjLJyGWE9NL3Jfe5stBXb" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSAciCOZI3rf+MYT8yXlZwKfiggkD1wr8l4hVc93JcLXJLcCAAAAAAAAAAAA", + "dataHash": "32koXnTc1x1rAGh9hPZ3DSbFogxBQaeDB1utTfApK3PF" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, "tree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", - "leafIndex": 4, - "seq": 5, + "leafIndex": 5, + "seq": 6, "slotCreated": 0 }, "tokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "AByXwz518ntDjhTaMr6Z65pgde3gy7t4tZ6htdPGkjhh", - "amount": 200, + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "2vNpRS9qaZuYdFmdeyogid5pDXJDbucZLzJeFwaHymAB", + "amount": 695, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } }, { "account": { - "hash": "2gNZn5NQKLkLsBMriRTuhAix8pe3FWhg3AX8AXfHzyfY", + "hash": "3kyJbEwFnwwHtiEZYeP8hLZnjGC1M1ndHkCaGvpSMwkL", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj+IiOnEspeTeOdZNFzuckQ51O3YZOQbeGYJ+HXZr+PgCLcCAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "2uKwkUwBYhhWRm4z3j3sUBigPvJd4AagSTFdjddCXYGU" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSAciCOZI3rf+MYT8yXlZwKfiggkD1wr8l4hVc93JcLXJMgAAAAAAAAAAAAA", + "dataHash": "6ATyB11C9drF8Ld9SHjypyP34b3X3H9k4eQRUH6ydAe" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, "tree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", - "leafIndex": 5, - "seq": 6, + "leafIndex": 4, + "seq": 5, "slotCreated": 0 }, "tokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "AByXwz518ntDjhTaMr6Z65pgde3gy7t4tZ6htdPGkjhh", - "amount": 695, + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "2vNpRS9qaZuYdFmdeyogid5pDXJDbucZLzJeFwaHymAB", + "amount": 200, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } } ], diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-proofs.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-proofs.snap index 3b1e70e..eb366df 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-proofs.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-proofs.snap @@ -9,9 +9,9 @@ expression: proofs "value": [ { "proof": [ - "2gNZn5NQKLkLsBMriRTuhAix8pe3FWhg3AX8AXfHzyfY", - "45xv9FTFyvD7BZJ9HEbiRvHbPKZ9GbuoavESj9L2SXeX", - "JrXNXauNVWThqanqR7q7cTFDTZCe6w4fLyk4Xbi8e3R", + "3kyJbEwFnwwHtiEZYeP8hLZnjGC1M1ndHkCaGvpSMwkL", + "31f8iN6iUahR1fPFHzWbEqubZYXrYsUXxHXSAcsf6Wr6", + "3b1LdoJPiFH9KDJbjFTA1ogBP9DxG8Pe62QCH3SKHckH", "2gQksfK543Jw196amPxXWceFzNTfRHiqb7x2edvupftT", "Y8pRoGMGXJPGZyb7m4sqkPsTSJvzZ7oSVnaybCcYbgd", "3w895nemtSxb1fEjFT3cXkVpW3y6f9uHQn43jEwu1RWc", @@ -36,17 +36,17 @@ expression: proofs "3dbMMyehykAriNZ8FMJgPc1N6YSzm9ZfV2HcW9sbaXzP", "4EE5KQnQ6Tvo78gGhTu8serpJV4srbRhYZ3rdvCiRa5e" ], - "root": "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "leafIndex": 4, - "hash": "kpa4KjVWgSViv7fnvgBCVkxwbRSqmA7hCaTDpULuaFr", + "root": "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "leafIndex": 5, + "hash": "28wJuAbi54EHkLi7km2yWR5m5bDjYAd4mZpvM7Q6ce8s", "merkleTree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", "rootSeq": 7 }, { "proof": [ - "kpa4KjVWgSViv7fnvgBCVkxwbRSqmA7hCaTDpULuaFr", - "45xv9FTFyvD7BZJ9HEbiRvHbPKZ9GbuoavESj9L2SXeX", - "JrXNXauNVWThqanqR7q7cTFDTZCe6w4fLyk4Xbi8e3R", + "28wJuAbi54EHkLi7km2yWR5m5bDjYAd4mZpvM7Q6ce8s", + "31f8iN6iUahR1fPFHzWbEqubZYXrYsUXxHXSAcsf6Wr6", + "3b1LdoJPiFH9KDJbjFTA1ogBP9DxG8Pe62QCH3SKHckH", "2gQksfK543Jw196amPxXWceFzNTfRHiqb7x2edvupftT", "Y8pRoGMGXJPGZyb7m4sqkPsTSJvzZ7oSVnaybCcYbgd", "3w895nemtSxb1fEjFT3cXkVpW3y6f9uHQn43jEwu1RWc", @@ -71,9 +71,9 @@ expression: proofs "3dbMMyehykAriNZ8FMJgPc1N6YSzm9ZfV2HcW9sbaXzP", "4EE5KQnQ6Tvo78gGhTu8serpJV4srbRhYZ3rdvCiRa5e" ], - "root": "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "leafIndex": 5, - "hash": "2gNZn5NQKLkLsBMriRTuhAix8pe3FWhg3AX8AXfHzyfY", + "root": "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "leafIndex": 4, + "hash": "3kyJbEwFnwwHtiEZYeP8hLZnjGC1M1ndHkCaGvpSMwkL", "merkleTree": "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", "rootSeq": 7 } diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-balances.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-balances.snap index cf0c9ba..a56c89a 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-balances.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-balances.snap @@ -9,7 +9,7 @@ expression: token_balances "value": { "token_balances": [ { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", "balance": 895 } ], diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-signatures.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-signatures.snap index cc9ec97..fb52129 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-signatures.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-token-signatures.snap @@ -4,17 +4,17 @@ expression: signatures --- [ { - "signature": "61nLwpJcf143PhYz9AVqeUv9ePNWNW9TAWkrDoMynhSAh3TPsmprMW2cDhjJakrZa8APmNPFLYsrx5CEgZdVgYpm", + "signature": "4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A", "slot": 0, "blockTime": 0 }, { - "signature": "27pxT3ndnCXhbUXdT2k6riDw7Y22xnRjVRmUHseXpFi7mTziNiEegxFAmgNBoYPKtQrx7N66tCCcGwFKt4RniqXA", + "signature": "SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5", "slot": 0, "blockTime": 0 }, { - "signature": "G6ZcxS2HkHh521JjHXvxkpuYC2qu2fa3cdGZvKF9NVAM3oPEBZ8tNa4ghVXVo9uc4UzWPwXGAFrGqg8TdeYoTPW", + "signature": "Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8", "slot": 0, "blockTime": 0 } diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-validity-proof.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-validity-proof.snap index 6bc2734..d6cd8ab 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-validity-proof.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-charles-validity-proof.snap @@ -9,20 +9,20 @@ expression: validity_proof "c": [] }, "roots": [ - "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j", - "2z8QTsjDzaEFmSnDoVnLSJFTXm6gui7QLVM9ZNFavc9j" + "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2", + "2cvmJ3SpPyBHp1HApVescUg8VfKVbjip52frvpdAX7B2" ], "rootIndices": [ 7, 7 ], "leafIndices": [ - 4, - 5 + 5, + 4 ], "leaves": [ - "kpa4KjVWgSViv7fnvgBCVkxwbRSqmA7hCaTDpULuaFr", - "2gNZn5NQKLkLsBMriRTuhAix8pe3FWhg3AX8AXfHzyfY" + "28wJuAbi54EHkLi7km2yWR5m5bDjYAd4mZpvM7Q6ce8s", + "3kyJbEwFnwwHtiEZYeP8hLZnjGC1M1ndHkCaGvpSMwkL" ], "merkleTrees": [ "5bdFnXU47QjzGpzHfXnxcEi5WXyxzEAZzd1vrE39bf1W", diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-latest-signatures.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-latest-signatures.snap index 4860c62..f981a43 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-latest-signatures.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-latest-signatures.snap @@ -4,22 +4,22 @@ expression: signatures --- [ { - "signature": "61nLwpJcf143PhYz9AVqeUv9ePNWNW9TAWkrDoMynhSAh3TPsmprMW2cDhjJakrZa8APmNPFLYsrx5CEgZdVgYpm", + "signature": "4enuRCWyq1aXXGxBDYFN4ad5PzHpp6XE8mfJkBipT8SSRgMQyEWhfiJWtwcLYnqxjdesFQL15GkMMjDN3pbH5t2A", "slot": 0, "blockTime": 0 }, { - "signature": "5jGUVMbUx2qxRF5u94f5KNmds8if3mHraKg36Xx9NqBQ6azCST3EwzXmj5xXcN2xiTMRg7oNXqUD4ygXybsDfRAn", + "signature": "3JeUPwyeXzf8FQ59C2j2uHkWunykPncoDj9AvkjmESkbWbkHWbCc4tfD4SpCVL4vCNcpEjvdkHSFNYfBrqdDxiDx", "slot": 0, "blockTime": 0 }, { - "signature": "27pxT3ndnCXhbUXdT2k6riDw7Y22xnRjVRmUHseXpFi7mTziNiEegxFAmgNBoYPKtQrx7N66tCCcGwFKt4RniqXA", + "signature": "SzCjq8kMxAnvBW9pL74mJWDZFAv9jEvJeYZkWBGZyMVr3ow4NgfRZtk9J5a7VXbk1VxFWdBJj8saptpX4LZuHA5", "slot": 0, "blockTime": 0 }, { - "signature": "G6ZcxS2HkHh521JjHXvxkpuYC2qu2fa3cdGZvKF9NVAM3oPEBZ8tNa4ghVXVo9uc4UzWPwXGAFrGqg8TdeYoTPW", + "signature": "Mu8x9eh2ByH3ui6wq5UNCNnm9rgxygoD57WvhRYshubLBkT5eJCu2uVB4rMHU9zZxFhC2qL1d791ZTeejq87Ae8", "slot": 0, "blockTime": 0 } diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-mint-transaction.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-mint-transaction.snap index ae22ac1..ae4e7a5 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-mint-transaction.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-mint-transaction.snap @@ -6,7 +6,7 @@ expression: parsed_transaction "transaction": { "slot": 52, "transaction": [ - "AuyEa9pfgd8PIBCwOp/aeaFovMyOPwLOiSzuLMW2mLB3UtKEsJifJ1g4xsQ5O7J5ZymK+Wh8Hqzps7ETdO3AwgeDsy06YjwDnmZV7rRE7DKOkUYqquAsH6ctfqjr6S5re9pY23kK9WJj9xpKJPQiwj9oh5X3XBx36uEqHy+LztcBgAIBCg929wO8WIKG6eY3uWLE8oiLV+uv4g4bZ8FJk67jITSz9C65sXVWZydDKXuRt3BQeU1xshoCIVHrBFXBBN9FsFrv3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9yxuiFW5NaMQbkpr1lCJaYDyzxhfgbp+ZPMWi/qK11GERNfSBMgD20Ac9FLHl2mRGzt3Mio39m1gFXr7FfMUFFAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAD1itLHAR4o1KBGtaL93zMnlB5NHD6SDRSqmfZ7YrJBH7SlQOyDt9WW7rhI2hN7rYf3O2M6x7u3IJANtD1uTGCcBt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnu+iPYo1pSSKfRxOPSrVn/jhTHlpDXPaQiL7Xk4pnQEZHO1F4ue36ePjvKhQ/1+bWXRuK+jAPhOiyhsi1YEji5C7wPwLtHyi90xBEulKsTz6PGNOXcF+rLA80aI81+eHyUJa+9/ABJJWec/z1Ytd+0tY2uuyhzxF6W5bZkVSls+KxW1RflaYZhtplDZTn2OqAPHuUse8KSTOHPrHkF2nKGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACYzGyuMEKsUA4m+CcYBTKGtwZyqNchjKBC4T9ZYQpvgAIFAAUCQEIPAAYOAAEHAgMICQoLDA0EBg448SIwuiWze8ABAAAAYVmyMiGIj+Tgl/zcUzKjgSzMJL6+syxGKFrqYmAwgp4BAAAA6AMAAAAAAAAA", + "AnNAVVGEexlBcQePiYd8J1SI0e8QmPGb+vdHchRTCQqM9Ml+bli1FLI903QzC6dqodJi4+ZvUL0PHRHADhWl3AuOcRL/BfC6KquO63HnWaQ7KwktwZ3tuHIKyc5Fr6hCESGHHUv4nNwVI7mBtRNg6v2amOqvj+g3BB/jsBFmv/cFgAIBCg/WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dmb20fJ/aarWCwdtMON5y2ApOLzHzeZm4Nb+4MGjJllcmPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSDwYCc5JmqNblS/S+tYeGfqm9F3krnNH4cUp/LieFLLTURNfSBMgD20Ac9FLHl2mRGzt3Mio39m1gFXr7FfMUFFAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAD1itLHAR4o1KBGtaL93zMnlB5NHD6SDRSqmfZ7YrJBH7SlQOyDt9WW7rhI2hN7rYf3O2M6x7u3IJANtD1uTGCcBt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnu+iPYo1pSSKfRxOPSrVn/jhTHlpDXPaQiL7Xk4pnQEZHO1F4ue36ePjvKhQ/1+bWXRuK+jAPhOiyhsi1YEji5C7wPwLtHyi90xBEulKsTz6PGNOXcF+rLA80aI81+eHyUJa+9/ABJJWec/z1Ytd+0tY2uuyhzxF6W5bZkVSls+KxW1RflaYZhtplDZTn2OqAPHuUse8KSTOHPrHkF2nKGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC+7xDL3HyAcVSsf6tM2/KAwoApoNApZsD0a27dHzkLLAIFAAUCQEIPAAYOAAEHAgMICQoLDA0EBg448SIwuiWze8ABAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3MBAAAA6AMAAAAAAAAA", "base64" ], "meta": { @@ -20,7 +20,7 @@ expression: parsed_transaction 0, 1461600, 2039280, - 9496836480, + 9496056960, 1, 1141440, 0, @@ -33,11 +33,11 @@ expression: parsed_transaction 1 ], "postBalances": [ - 996478932, + 996478935, 0, 1461600, 2039280, - 9496836668, + 9496057145, 1, 1141440, 0, @@ -79,7 +79,7 @@ expression: parsed_transaction 9, 4 ], - "data": "bDnj5SrNsb7atr9XPjJDZcibdPZdgyWxs8TTVb6XbUHPSjj84KdvMwUy5wQt2T4THgXcFBEFxmG9sGwo9zptXBQo9LwXSjrrYqHLJt7A5qG9GHhp1qDnGLZ3zn81nWEc4yoEsZvmUywUqTLpg5bQHTYoXUHFK6FQpqVrGPGCZqa7ZN3CMp5p88Xrh4krv6NqgDPuGTbg1eK1CXcsoHPGhmoor51VvgRWQgQZLHsQehrE9jCBnvFSbKBSAXmvub7iBDpbBdaNNGHbueqvLsqyhrfn2akhrxMsMhtvuRkL8yEMdLPMU95", + "data": "oMTGA8J44vo3pCVmAjiCzPxz4nKYu5pf4rExqGMKqP54CBrn4JhRS8L9JaAC9QkxSi3ozrsj1CoNuh8S34VVg5GWWZcmhEFpUwbeP6sBXxs2j8cFssN1dEkmxXxpj1gKK3FMoad7n8bVvL3WDiCZRyjrKVuh2k6wWbG23aiczUn9kw2kvcGqd9FmqDYbDKKndyjJRvHsYfsyZmcjtNG93VHzhV26e2htiYh6yBfbYiqVH7aAW7y7MYTNsZvkRibRJ7NJrViHN2Lru1vvCFq9NPNNHrsGdunMbq199BkT", "stackHeight": 2 }, { @@ -91,7 +91,7 @@ expression: parsed_transaction 14, 4 ], - "data": "5wPdbtbk7M4b3JSHrvyYjDuxK7vAXRBm55enM4HAUSV2sQCaUhdQVjAnjYFEfT", + "data": "5wPdbtbk7M4b3JSHrvyzJCo2PzcvwajjZsYDjR2mPH6QWuyRdrEYdziaJzxFv5", "stackHeight": 3 }, { @@ -100,13 +100,13 @@ expression: parsed_transaction 0, 4 ], - "data": "3Bxs4YJVi6KXxi8o", + "data": "3Bxs4XoPh3u5UtLF", "stackHeight": 4 }, { "programIdIndex": 11, "accounts": [], - "data": "11112HwuWuFMMaNJn71TmYWRZcauNW86vQRVPUtqVt7EH7Byo9TKV3V8iwJXWR4ZQYuPE9gFArk8QpqVEpqji6vfNWHM5NFLUgCbm8tRieMWpdBv8S4Um5E3EUxVudLwJinmNyfyJZG7Hf1CpsKETCnHS5yBLRngGkiUH7PUffc8N2MryG7Bg8BRm2GpiVXx5PDkiNBj3uZwCWm8YZg7CJXBK1ykFdxw1wNpqSk34YFht6DMTF6oSru9tm4EhRn58eRue2c8d7bwYkVtbnAgek5sEJvCaQ78ZejXegniAiU2AAAqnm3qEgcxYLvpKrBZXWLm9GCbeUubFDvHHubUHCA6ffhhpLGHJYoX4mKqCPGVUoucRfnE1Tog2SgoonsWijugt4qZNFeWcGn756WwGDvEgZ8Tgioy", + "data": "11112kX1UKQEwNzET6jxMwVB3UM47oQJftYqqkzqrS3iK5RrmgwJLa8UZ2fF14EScsDePRvwSLp515ph5pdnDKy3FQpSMpixfmHeCjVveQy5YMgfEkCNJiTNLco6dxtufFhNd6jA7bfGwPjN4porWjq38SHDGAGiHo4kqPodVqPX2FK3hFjGFCxQv7NDHgnbSTFwhP2pNRkwSGXHeJxMY2gF8XBmbF2H255iQGs6cLLH7VrNVCDZYGkbgeRDviKczTR1JUcvsumrBk31DeMM5xzq576TxWgLzVnzKSgD4ebF5c6EcqBhfpyrjAwC6dM6gFBim1C8R5RTeTU3mxWMTM5C1ggmBAkdA7gTNiBDmYLPrUc8FpsddakHgkFRodJfUCUX36JcVEU8tBfgLYqwV", "stackHeight": 3 } ] @@ -127,20 +127,20 @@ expression: parsed_transaction "Program log: Instruction: AppendLeavesToMerkleTrees", "Program 11111111111111111111111111111111 invoke [4]", "Program 11111111111111111111111111111111 success", - "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 46215 of 930587 compute units", + "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 40972 of 930379 compute units", "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success", "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]", - "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 881772 compute units", + "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 886758 compute units", "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success", - "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 84520 of 965699 compute units", + "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 79579 of 965736 compute units", "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success", - "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 119508 of 999850 compute units", + "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 114530 of 999850 compute units", "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success" ], "preTokenBalances": [ { "accountIndex": 3, - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", "uiTokenAmount": { "uiAmount": null, "decimals": 2, @@ -154,7 +154,7 @@ expression: parsed_transaction "postTokenBalances": [ { "accountIndex": 3, - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", "uiTokenAmount": { "uiAmount": 10.0, "decimals": 2, @@ -170,22 +170,22 @@ expression: parsed_transaction "writable": [], "readonly": [] }, - "computeUnitsConsumed": 119658 + "computeUnitsConsumed": 114680 }, "version": 0, - "blockTime": 1717594775 + "blockTime": 1718897718 }, "compressionInfo": { "closedAccounts": [], "openedAccounts": [ { "account": { - "hash": "sKXVGdDgbogNTGsoa1eWGcE4u7M7PbdoTYBD6L739yB", + "hash": "2JtWNLi6PNDqvRmfh1Q1FsX4gGkrtEknQbgSksuZkBDo", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9hWbIyIYiP5OCX/NxTMqOBLMwkvr6zLEYoWupiYDCCnugDAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "Ta3F7qfK5vNRy1zPB1ifmxeHM1ZfBaqxqUmBRWVCX8Y" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSApYVMyW7bfIGTZyxDSp2Oafzqj5mojZDzaWP/V2CCPc+gDAAAAAAAAAAAA", + "dataHash": "3DZpg2KCUDZ3mpD7FRT4zbpcmE1pti3KTRkKUpwPG7nn" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, @@ -195,13 +195,12 @@ expression: parsed_transaction "slotCreated": 52 }, "optionalTokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk", "amount": 1000, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } } ] diff --git a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-transfer-transaction.snap b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-transfer-transaction.snap index c0a1f9f..37baf71 100644 --- a/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-transfer-transaction.snap +++ b/tests/integration_tests/snapshots/integration_tests__e2e_tests__e2e_mint_and_transfer-transfer-transaction.snap @@ -6,7 +6,7 @@ expression: parsed_transaction "transaction": { "slot": 53, "transaction": [ - "AjfneV2HbG23LQexYuLHAoF9wMZsj0IOpeXvDxNGbqdFXUFjTJk/kSNb1bGUTR68GLddy/GdsASqEcWcYBSiqQ27gMDUdcZjuKumQ60bMqQsJaWyihPVqHeZKaCFzXeiLUlIyILzjknpoQjvI5yuVLJ9X55lJIU4BsX9HVJl1FoEgAIBCQ129wO8WIKG6eY3uWLE8oiLV+uv4g4bZ8FJk67jITSz9GFZsjIhiI/k4Jf83FMyo4EszCS+vrMsRiha6mJgMIKeRE19IEyAPbQBz0UseXaZEbO3cyKjf2bWAVevsV8xQUUtaxlkRkeJL9L43N8LzM1Z+DDTqAsZ255jL3/4jmvEbgMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA9YrSxwEeKNSgRrWi/d8zJ5QeTRw+kg0Uqpn2e2KyQR+0pUDsg7fVlu64SNoTe62H9ztjOse7tyCQDbQ9bkxgnO76I9ijWlJIp9HE49KtWf+OFMeWkNc9pCIvteTimdARkc7UXi57fp4+O8qFD/X5tZdG4r6MA+E6LKGyLVgSOLkLvA/Au0fKL3TEES6UqxPPo8Y05dwX6ssDzRojzX54fJQlr738AEklZ5z/PVi137S1ja67KHPEXpbltmRVKWz4rFbVF+VphmG2mUNlOfY6oA8e5Sx7wpJM4c+seQXacoYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALruaUcu7+H8CMsmyTtJGWXL9h4FbXnCPweCUcdCDZBMAgQABQJAQg8ABQ8AAQYHCAkKCwUFBQUMAgOgAqM0yOeMA0W6FAEAAAGLZI542l/AiGL98WqbD7cn8gKT/fTrAAaqr+iWPzYnxCORzyU0mBJGa//k3L+m8rNQcs8+gRPW9NG1vvUFmcFNDCeNlVXlK0n/c3Z7OEpg7GWTdn2aS8DxxnqWzCeVmz8P8yU9A/2KsEvBmfHFDBul/YMCb8k4rqiyBDllDYuxrtzpL6rbPGdKqE1hHsDJDmlITXcq5npf614uZg2kjr4/AAEAAADoAwAAAAAAAAAAAAABAAAAAAEAAgAAAGFZsjIhiI/k4Jf83FMyo4EszCS+vrMsRiha6mJgMIKeLAEAAAAAAAAAAIiI6cSyl5N451k0XO5yRDnU7dhk5Bt4Zgn4ddmv4+AIvAIAAAAAAAAAAAAAAAA=", + "ArakEiR67ArSSPYWR1cOkuGrnDdQFDiAPtostbVYr7upnl8dA1gXEJPXCccQfLTB2djKd0kDF3lihwikAgEypw+Rx4C+PkMi8ki4tjUilXXnU8YEeamvKHtPSpU0e0f+5zjh2exvuMl/Be9hlv2Tb/djvjBq9ny7sOmKrV36vzQOgAIBCQ3WO+k7ZzQAEG3W2TAv+NJZgju4PJcG/ijgISl9wbv5dilhUzJbtt8gZNnLENKnY5p/OqPmaiNkPNpY/9XYII9zRE19IEyAPbQBz0UseXaZEbO3cyKjf2bWAVevsV8xQUUtaxlkRkeJL9L43N8LzM1Z+DDTqAsZ255jL3/4jmvEbgMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAA9YrSxwEeKNSgRrWi/d8zJ5QeTRw+kg0Uqpn2e2KyQR+0pUDsg7fVlu64SNoTe62H9ztjOse7tyCQDbQ9bkxgnO76I9ijWlJIp9HE49KtWf+OFMeWkNc9pCIvteTimdARkc7UXi57fp4+O8qFD/X5tZdG4r6MA+E6LKGyLVgSOLkLvA/Au0fKL3TEES6UqxPPo8Y05dwX6ssDzRojzX54fJQlr738AEklZ5z/PVi137S1ja67KHPEXpbltmRVKWz4rFbVF+VphmG2mUNlOfY6oA8e5Sx7wpJM4c+seQXacoYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAID7EWQv+uUwPK3hUnhyYIsj975dHepPQpmlvApvxPAgQABQJAQg8ABQ8AAQYHCAkKCwUFBQUMAgOfAqM0yOeMA0W6EwEAAAGEHvGCcNZM7hM4Ib/B3VyaFzAR/QBRq5MmbVBxhQMyrgWbXWqIAmYxtYa5tyf4XRizOBcTB1D59qCMj6Lq3sIUBBBnBkEQIXvQd0tJsTVYZpDsgsfyAW9sTGkUACiUzHOEEoJPT4yL3YpS4e/B2pdEnnGVSqvBgELO5COkmA2RoJj3xWiHbrzoq2N0TLV3l0FllXPPGffxdVwtMAanrFkgAAEAAADoAwAAAAAAAAAAAAEAAAAAAQACAAAAKWFTMlu23yBk2csQ0qdjmn86o+ZqI2Q82lj/1dggj3MsAQAAAAAAAAAAHIgjmSN63/jGE/Ml5WcCn4oIJA9cK/JeIVXPdyXC1yS8AgAAAAAAAAAAAAAAAA==", "base64" ], "meta": { @@ -16,9 +16,9 @@ expression: parsed_transaction }, "fee": 10000, "preBalances": [ - 996478932, + 996478935, 1000000000, - 9496836668, + 9496057145, 2293180800, 1, 1141440, @@ -31,9 +31,9 @@ expression: parsed_transaction 1 ], "postBalances": [ - 996463556, + 996463565, 1000000000, - 9496837044, + 9496057515, 2293185800, 1, 1141440, @@ -66,7 +66,7 @@ expression: parsed_transaction 2, 3 ], - "data": "AdP3Yq8kJWgSqv2pJsUz3UKGRejVMHRMBy5wAxV1gWKVRCGLw36zd5MGXGLt9HF9TXy3J6wcYq8x2x3CbF3C3kfvmzVeeA4ZK2mJufjHeFUwo6G7Sexhxm18FXAC5ZnuxPNHaFWfdL4ustZADebC1ECWJCjndiZdcZTLzeSkcyv4xApWiEYxqaRXPBBgawgzAft8WAVZjR7cSHioebmxx3MMn6YdAdfXHqDCRr8jKLnJQ5dKNFbMoGsMRneq6tPGykjtcK1ZBcB5d29sbgFNdFvxzK95Rh2brQcTcPXtwA389bgHRL5MAtRvuoNsqyVWwVzDjF14tu8PRPrt99pW33SaCAGBjHTtnJ1qheX3NP3w3gs4gBtdVxbSsQs5X6tcdV8T3UZiqtvrELixFwYj8Zo4oUHXrn63ovsftFfdmpfSzSebANLw34Jb7tdCD2nFnT5PVrPw9d8dBduutho6mJAeyJbL2bjHU1xj2LThpMDKC2PEK8XSCVqrhYpouMe2EFkuF3w6KxcKw1kJ1ZZdoQdqaknN6EsmwFqHgDgggLRePwPFh3jNYkfyw7xwQEccPsHRmfk5w8qY2DbAgksUhLzmG8L6kiN1d3zSGvogvRf6BpeiayvPRKvDApREosAgqAXhg8nfPhgNifwc7p3oLZwtwLTACcZk1TVYXCv8KfTnMBT1Sa9V1NGBZoxYsQzhFg86XWcPjjk6hxd5zU8D4p5koMdgDgC2ChMntqSxYyt6NyeueTyub7dtHWLESXZopQsXfD1ALcgfsfqFYQcnnTVnnxWv8QN7xDzkRGRkeJo2GT2p2kAMqkVtcFBRjT796ePdHseA4rwhkpb7fjFmGfUM7YG7UsP41uh949366nbukz79QefSdceEhE93xnxi62yv7xYbAYEF3n5fqAJXyB4HPXVjQz1UKUFYAoKtbgVFFX3W43MUijcAPZaf", + "data": "QvhQPyjav2YY64y1QNZ1CYwFnkbVmWppHHAmieR9tRtYPM4PXfbSMRZZbUHGXrEP2CKsfojmFrj6GTbZmkZfoNrJzbNcYUVsrP5fu32oFKfVCmegtJFLeJG7SVppLdBL58dqiXmEEhCtQa4N2LpPjuuDhazsR1ApR3ZXNth7HeshYnP42ZseJGENUxtDanXfw4nJTuF33Miy5pm15vRJJsqqZhwTZ98evVkn4GKTdfTpbtvmuT6sXGmbqCGQQggSMqUrFQ7yJ4AA1o1STdk4fBzpgydn6DACUpXbJP3jtL3BF3QqtGe45fbnr1nzTY6smpUXYb8HGcVBDDbjXqBmS8dN1WQX2sFC2bCWP5312u6Sz8dSJ828TrpVNQWT1ha9PeGr8PKMeBFxSAsWYRBze8BerM3SpyhkndroW44zmh8Rb9QFLcfxTwqMehvFqfyuhjeuNVxN2DfVEhu6Yp21fJf6EXFATSQD7xqRNz35tJutPvXh87M77xscmZpQMb5qivSSDXbswkvB4NdHRwVhmYnAGjGbMPisktut8YKYChU2ni2Q9CZdxADw7TuPJgxrj2d8yTiB8NqZXZP86Bj87gi5ToALmvqJ93A4CVW6FedAoU7XQYiKdk4zyiC8NRmmTw7GWLPJKawLbXSHYME5QvZLdqe7yXFDncx2ajmfXdoHJ1zyDJfQAtPqkpwhQ23cqRnwRE3vkKB2fydWNVaEuNKvrjQDvf2P9uiVuxArhgXjniWbdWTpeJ4jpEL5CZRdx7yrY6ZYJk5H6V7Z59dwdxbTPTR1f9gHmUjCqpGTPhtukxzeHpccYj4RLpUh1A3qpJtEUhVehGmpKe8MiA6rYkiiuUrhZLiDcx8ULeUHr2v2k5kVMvCs8fGHeVcozaUS8beFDMjfKbK2voCTtRhh8R2ZcQF", "stackHeight": 2 }, { @@ -79,7 +79,7 @@ expression: parsed_transaction 3, 2 ], - "data": "WiZw2hSp2LSxinAV4MZFrZhyqHeSCxYy6pTQBzotg13s2HgckUNVRmGvRp89", + "data": "WiZw2hSp2LSxinAV4o8EjdnrY44bkw3kzFqkwbijHNhNo8qmMcWkyYrP8qNm", "stackHeight": 3 }, { @@ -100,7 +100,7 @@ expression: parsed_transaction 12, 2 ], - "data": "7UWNMdwFJEWBQPSoUMKtr3bukccHKfYDfeQQkEJTkRR52MqsyybbmeLhdW4rUSQzfgw6LDbMb3emjEZMC6T8y8yf2kPoXgNW4jarNgTDhrZ", + "data": "7UWNMdwFJEWBQPSoUMH68DcTaa1PYe2XvCzsJTrbiEmQdoKpbhMkV8P3U2KnegEAE69eJ6RHrVfUH4KnYbesVaMu59r8tmc8TsQXup81K5N", "stackHeight": 3 }, { @@ -109,13 +109,13 @@ expression: parsed_transaction 0, 2 ], - "data": "3Bxs4LvrAdJLFH6X", + "data": "3Bxs4Kve8YTRHdVR", "stackHeight": 4 }, { "programIdIndex": 9, "accounts": [], - "data": "3oLtGWPG6EsRhRwBpFEBZbQCbrDkBnwUPsiSYzoBL5hCPaTBxFQKqexZftuBgWrEtmTPnxZcv3dB5FcuDcv2rNEWXeBwXAx6QDV2Zbo7DPk2XVmQ3ZsbAoPsk9pxZSHhNK14phsibkkT1Vr9XU1U7pLr86wTDSMpRXscMnWqmb5YpaG9XF1VMHrWW8QJdd5BTyc9FQCYFYQC8ctqhcfkWWn6iFh6bQsYScz7cARKVqRD6PstzkbVWiuq9zm4V3Bht6hsC4aBWfXGGjwCvvs4bN41fAbCQaoZtGGpRnU7dNRnSh3vayYyZBnwPyzpuL6QYn1bjHDb2rDqToVbog9Jsq3MV5D7Xod9AB4ua4Wke7mBZKy2nEwwEKgm36ffxbx4XLUZuQ4MTSQHiSPyy2JC3RsSHqR1yCUneDBWzmHdUCx66KNgQGcBpnc7qoPqhcfRGSCgPkcoLsx6AzovJduWg85r4ijbWmrscvNdqj1W2SbyBRPWsiB7jPaGogV1xdHBGoU4bj8Tkd1mtsLDX7oa7uz1KSXABgRrdtyZaRsL66cCiv8L4bd2hjo6St1e86SPGsdADi4SFHUmfRTqVZHXcPWPDC7QTUuNsTHSTjKKGuG4VUz4sanxm8Woq8wa2EaUtoDckp6ERaNznMKTxTh9LZ4ga4Qji67BvXQsbe62Z6bF1CkkbSCiEHT7AibYnGnzuiyiyiQ3LsLYQ3QKKouhioayWNEtwFZaX1BykDjGR3uytiWWBYUzhyXqqJhpdPH3B84PFfHPUQgiWgyNm5", + "data": "68rmtBiHmUYX8J113nQ3T1m3ynfYXsQWasNvFwscZcB3aUmaf6EXEVdhPEDTD1JWkii7XAJaTT9Yzbg5hJNKCfuP6N8tphe1RWMpWyNpTND7jSWfEBUdgBe8prqx2PSv28yqMi3yw28PbUdS4MyHH4vuho3M5SQuyEC5c4h7Ce7G72VnBk6QQAbYMaYD6wTY4z6LwDa6XtHabgt9VfmyVSXVjTD4QsFFz3DUABvFmxtWfMWY2AJNLYNQtuqXqz34jMxKZC96qusNscHktrSdd1bzgzKSeEZGHkN8TxopqhmhySCwPx6HggDTVwfDk2CvR2ytianDmJUyD8gHCkgPf4BgQzvaTTcayWLsZGshE7sNGEnAJ2LGcMs2p6JhqePv55oga1R6HbypPwKhijh3FbipnoZrGVoF7hB8qw7L4prJTiSXB6dVxszz7qd8WUojEPudmkEvVdJ7VeAFicc8nBrU1fuFZREVMniiJFf77GdXKdwPLSbJYdLBmC8QnSLZGLmAyU2cTaeQjUy2cJKjnM6eWscvQfQv26psrykhyShS9LP4zp7HdHkSk4oc998YAwa1fjMm8kDcrBnhQR1dJhuFkpa9sBuzu2vNSq5Zsp2b5bPdnfx7MwyrEnhRegFncirQh5TQsKaQBTkKj7ULKhvVf7y1vXL5wm3rtphyEKVUX1rF73cqUsnKQ4cxSKANyfKzt9uQEEexZEqkWnywaW3f5dd5TtvxjLbmiak6MWyPX7f1KseqgnxrGB1H", "stackHeight": 3 } ] @@ -130,7 +130,7 @@ expression: parsed_transaction "Program log: Instruction: InvokeCpi", "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK invoke [3]", "Program log: Instruction: InsertIntoNullifierQueues", - "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 9341 of 816825 compute units", + "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 9634 of 814325 compute units", "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success", "Program 11111111111111111111111111111111 invoke [3]", "Program 11111111111111111111111111111111 success", @@ -138,14 +138,14 @@ expression: parsed_transaction "Program log: Instruction: AppendLeavesToMerkleTrees", "Program 11111111111111111111111111111111 invoke [4]", "Program 11111111111111111111111111111111 success", - "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 51939 of 790356 compute units", + "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK consumed 45238 of 787080 compute units", "Program CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK success", "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV invoke [3]", - "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 734927 compute units", + "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV consumed 38 of 738324 compute units", "Program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV success", - "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 226867 of 961128 compute units", + "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN consumed 221466 of 959117 compute units", "Program H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN success", - "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 266570 of 999850 compute units", + "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN consumed 263207 of 999850 compute units", "Program HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN success" ], "preTokenBalances": [], @@ -155,21 +155,21 @@ expression: parsed_transaction "writable": [], "readonly": [] }, - "computeUnitsConsumed": 266720 + "computeUnitsConsumed": 263357 }, "version": 0, - "blockTime": 1717594775 + "blockTime": 1718897718 }, "compressionInfo": { "closedAccounts": [ { "account": { - "hash": "sKXVGdDgbogNTGsoa1eWGcE4u7M7PbdoTYBD6L739yB", + "hash": "2JtWNLi6PNDqvRmfh1Q1FsX4gGkrtEknQbgSksuZkBDo", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9hWbIyIYiP5OCX/NxTMqOBLMwkvr6zLEYoWupiYDCCnugDAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "Ta3F7qfK5vNRy1zPB1ifmxeHM1ZfBaqxqUmBRWVCX8Y" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSApYVMyW7bfIGTZyxDSp2Oafzqj5mojZDzaWP/V2CCPc+gDAAAAAAAAAAAA", + "dataHash": "3DZpg2KCUDZ3mpD7FRT4zbpcmE1pti3KTRkKUpwPG7nn" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, @@ -179,25 +179,24 @@ expression: parsed_transaction "slotCreated": 0 }, "optionalTokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk", "amount": 1000, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } } ], "openedAccounts": [ { "account": { - "hash": "3E79jMkJGfK5dvJ5uFCVZUUYQt62N23UUQjtLqL6Xup8", + "hash": "618j8EqFSxVLmragMikVEcoTg9MLEjbebTbLdSyjzb1", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj9hWbIyIYiP5OCX/NxTMqOBLMwkvr6zLEYoWupiYDCCniwBAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "ipgQY2rAKLuR54ZgkkLtivtr1qQhd5CGado3R3WQxhB" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSApYVMyW7bfIGTZyxDSp2Oafzqj5mojZDzaWP/V2CCPcywBAAAAAAAAAAAA", + "dataHash": "33tKo3Xrqqc6GUCkxnym8JTcmY86mfFKnpLh2BAz5WY2" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, @@ -207,23 +206,22 @@ expression: parsed_transaction "slotCreated": 53 }, "optionalTokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "7Z1siJsXDpSgwyXsErgdrhbLNHGuqoivfjbycnUyxWX7", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "3nXnqdxiQQBBuFfCZMcpHuUcaYqSiSVWr33mmJ3dyCwk", "amount": 300, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } }, { "account": { - "hash": "2wN5qe6d9ptX8VkSN7QYS8qAnRMMmVhmFQET29BNe5PP", + "hash": "27pDbCQ19o5wRwnLvGi77tepXmFBzemNHGqCuwS6LdkY", "address": null, "data": { "discriminator": 2, - "data": "3Okvqts8Z0qoTWEewMkOaUhNdyrmel/rXi5mDaSOvj+IiOnEspeTeOdZNFzuckQ51O3YZOQbeGYJ+HXZr+PgCLwCAAAAAAAAAAAAAAAAAAAAAAA=", - "dataHash": "3kc71bVFqhxuPprfvg2ZeVi7oTzLdoSZrCgRKhBXJ7RH" + "data": "mPfFaIduvOirY3RMtXeXQWWVc88Z9/F1XC0wBqesWSAciCOZI3rf+MYT8yXlZwKfiggkD1wr8l4hVc93JcLXJLwCAAAAAAAAAAAA", + "dataHash": "3GoDgv8JBA8Np9qJm5nefNBjzKw9XkV8tKW7uJpLtH6A" }, "owner": "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN", "lamports": 0, @@ -233,13 +231,12 @@ expression: parsed_transaction "slotCreated": 53 }, "optionalTokenData": { - "mint": "FsLvdEqi6xTaxSDZ6mzCRhWGRN6W7c7n8E4SmPix6YM4", - "owner": "AByXwz518ntDjhTaMr6Z65pgde3gy7t4tZ6htdPGkjhh", + "mint": "BJ86ojfyha7r9EhDBxs43uSdxjdePz3dWfU1sU2oYeSj", + "owner": "2vNpRS9qaZuYdFmdeyogid5pDXJDbucZLzJeFwaHymAB", "amount": 700, "delegate": null, "state": "initialized", - "isNative": null, - "delegatedAmount": 0 + "isNative": null } } ]