From aa631b3225563afaa0873365e91e9bbf11046674 Mon Sep 17 00:00:00 2001 From: Yuun Lim <38443641+yuunlimm@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:42:30 -0700 Subject: [PATCH 1/4] Add Sdk tests (#554) From 33bfa81ab866d9182cce6bbcb19bb3580e3c6a9b Mon Sep 17 00:00:00 2001 From: yuunlimm Date: Sun, 20 Oct 2024 21:07:52 -0700 Subject: [PATCH 2/4] update manipulated version --- rust/Cargo.lock | 16 +- rust/Cargo.toml | 6 +- .../events_processor/21/events.json | 19 - .../events_processor/41/events.json | 19 - .../events_processor/63/events.json | 19 - .../events_processor/83/events.json | 19 - .../21/current_fungible_asset_balances.json | 13 - .../21/fungible_asset_activities.json | 20 - .../21/fungible_asset_balances.json | 14 - .../41/coin_supply.json | 10 - .../41/current_fungible_asset_balances.json | 13 - .../41/fungible_asset_activities.json | 20 - .../41/fungible_asset_balances.json | 14 - .../63/coin_supply.json | 10 - .../63/fungible_asset_activities.json | 20 - .../63/fungible_asset_balances.json | 14 - .../83/coin_supply.json | 10 - .../83/current_fungible_asset_balances.json | 13 - .../83/fungible_asset_activities.json | 20 - .../83/fungible_asset_balances.json | 14 - .../events_processor/1/events.json} | 0 .../events_processor/2/events.json | 22 ++ .../events_processor/3/events.json} | 0 .../events_processor/4/events.json | 32 ++ .../events_processor/5/events.json | 77 ++++ .../events_processor/6/events.json | 281 +++++++++++++++ .../events_processor/7/events.json | 62 ++++ .../events_processor/8/events.json | 47 +++ .../multi_txns_handling_test.json | 341 ++++++++++++++++++ .../1/coin_supply.json | 10 + .../1/current_fungible_asset_balances.json | 24 ++ .../1/fungible_asset_activities.json | 56 +++ .../1/fungible_asset_balances.json | 26 ++ .../1}/fungible_asset_metadata.json | 0 .../2/coin_supply.json | 10 + .../2/current_fungible_asset_balances.json | 46 +++ .../2/fungible_asset_activities.json | 74 ++++ .../2/fungible_asset_balances.json | 50 +++ .../2/fungible_asset_metadata.json | 19 + .../3/coin_supply.json | 10 + .../3/current_fungible_asset_balances.json | 35 ++ .../3/fungible_asset_activities.json | 56 +++ .../3/fungible_asset_balances.json | 38 ++ .../3}/fungible_asset_metadata.json | 0 .../4/coin_supply.json} | 0 .../4/current_fungible_asset_balances.json} | 0 .../4/fungible_asset_activities.json} | 0 .../4/fungible_asset_balances.json} | 0 .../4/fungible_asset_metadata.json} | 0 .../5/coin_supply.json | 10 + .../5/current_fungible_asset_balances.json | 24 ++ .../5/fungible_asset_activities.json | 38 ++ .../5/fungible_asset_balances.json | 26 ++ .../5/fungible_asset_metadata.json | 19 + .../6/coin_supply.json | 10 + .../6/current_fungible_asset_balances.json} | 0 .../6/fungible_asset_activities.json | 1 + .../6/fungible_asset_balances.json | 1 + .../6/fungible_asset_metadata.json | 1 + .../7/coin_supply.json | 1 + .../7/current_fungible_asset_balances.json | 1 + .../7/fungible_asset_activities.json | 1 + .../7/fungible_asset_balances.json | 1 + .../7/fungible_asset_metadata.json | 1 + .../8}/coin_supply.json | 8 +- .../8/current_fungible_asset_balances.json | 1 + .../8/fungible_asset_activities.json | 1 + .../8/fungible_asset_balances.json | 1 + .../8/fungible_asset_metadata.json | 1 + .../src/sdk_tests/events_processor_tests.rs | 71 +++- .../fungible_asset_processor_tests.rs | 7 +- rust/integration-tests/src/sdk_tests/mod.rs | 35 +- 72 files changed, 1553 insertions(+), 326 deletions(-) delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/21/events.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/41/events.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/63/events.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/83/events.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_activities.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/coin_supply.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_activities.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/coin_supply.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_activities.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/coin_supply.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_activities.json delete mode 100644 rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_balances.json rename rust/integration-tests/{sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test.json => sdk_expected_db_output_files2/imported_testnet_txns/events_processor/1/events.json} (100%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_metadata.json => sdk_expected_db_output_files2/imported_testnet_txns/events_processor/3/events.json} (100%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/41 => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1}/fungible_asset_metadata.json (100%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/63 => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3}/fungible_asset_metadata.json (100%) rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/63/current_fungible_asset_balances.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json} (100%) rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_metadata.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/current_fungible_asset_balances.json} (100%) rename rust/integration-tests/{expected_db_output_files/scripted_txns/token_v2_processor/21/token_activities_v2.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_activities.json} (100%) rename rust/integration-tests/{expected_db_output_files/scripted_txns/token_v2_processor/41/token_activities_v2.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_balances.json} (100%) rename rust/integration-tests/{expected_db_output_files/scripted_txns/token_v2_processor/63/token_activities_v2.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_metadata.json} (100%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json rename rust/integration-tests/{expected_db_output_files/scripted_txns/token_v2_processor/83/token_activities_v2.json => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json} (100%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json rename rust/integration-tests/{expected_db_output_files/scripted_txns/fungible_asset_processor/21 => sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8}/coin_supply.json (50%) create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b02bc00d8..74d731a0a 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -141,7 +141,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aptos-indexer-processor-sdk" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "ahash", "anyhow", @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "aptos-indexer-processor-sdk-server-framework" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "aptos-indexer-testing-framework" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -234,10 +234,10 @@ dependencies = [ [[package]] name = "aptos-indexer-transaction-stream" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894)", + "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38)", "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb)", "chrono", "futures-util", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "aptos-moving-average" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "chrono", ] @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "instrumented-channel" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "delegate", "derive_builder", @@ -4129,7 +4129,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sample" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=1f989c65abbd5cf00a0631a30755ef05818e1894#1f989c65abbd5cf00a0631a30755ef05818e1894" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" dependencies = [ "tracing", ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 7335b4d5d..30d3845ec 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -30,12 +30,12 @@ testing-transactions = { path = "testing-transactions" } ahash = { version = "0.8.7", features = ["serde"] } anyhow = "1.0.86" -aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" } -aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" } +aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } +aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" } aptos-system-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "202bdccff2b2d333a385ae86a4fcf23e89da9f62" } aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "3099bbe1e100be815ca0cb262cd7eceef9c75dad" } -aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" } +aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } async-trait = "0.1.53" backtrace = "0.3.58" diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/21/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/21/events.json deleted file mode 100644 index 50ec7f28d..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/21/events.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 21, - "transaction_block_height": 10, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "1", - "storage_fee_octas": "0", - "execution_gas_units": "3", - "total_charge_gas_units": "3", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 0 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/41/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/41/events.json deleted file mode 100644 index bb36bb801..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/41/events.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 41, - "transaction_block_height": 19, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "1", - "storage_fee_octas": "0", - "execution_gas_units": "3", - "total_charge_gas_units": "3", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 0 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/63/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/63/events.json deleted file mode 100644 index 5ce982ab2..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/63/events.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 63, - "transaction_block_height": 29, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "1", - "storage_fee_octas": "0", - "execution_gas_units": "3", - "total_charge_gas_units": "3", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 0 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/83/events.json b/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/83/events.json deleted file mode 100644 index 7840e99b9..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/events_processor/83/events.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 83, - "transaction_block_height": 38, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "1", - "storage_fee_octas": "0", - "execution_gas_units": "3", - "total_charge_gas_units": "3", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 0 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/current_fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/current_fungible_asset_balances.json deleted file mode 100644 index ea60034bd..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/current_fungible_asset_balances.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "storage_id": "0x9cfa839238cb942fbc487ff341fcdccabacd01e29864f594587900aa3a9d88b2", - "owner_address": "0x765d8c8d4d5859f43a56e2756fbf5f3d2483dbaa14f3fb62872df820d6e64eff", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "99999700", - "last_transaction_timestamp": "2024-10-16T05:36:37", - "last_transaction_version": 21, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_activities.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_activities.json deleted file mode 100644 index 23ea8b1bf..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_activities.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "transaction_version": 21, - "event_index": -1, - "owner_address": "0x765d8c8d4d5859f43a56e2756fbf5f3d2483dbaa14f3fb62872df820d6e64eff", - "storage_id": "0x9cfa839238cb942fbc487ff341fcdccabacd01e29864f594587900aa3a9d88b2", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": null, - "block_height": 10, - "token_standard": "v1", - "transaction_timestamp": "2024-10-16T05:36:37", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_balances.json deleted file mode 100644 index 8b5b1e374..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_balances.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "transaction_version": 21, - "write_set_change_index": 0, - "storage_id": "0x9cfa839238cb942fbc487ff341fcdccabacd01e29864f594587900aa3a9d88b2", - "owner_address": "0x765d8c8d4d5859f43a56e2756fbf5f3d2483dbaa14f3fb62872df820d6e64eff", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "99999700", - "transaction_timestamp": "2024-10-16T05:36:37", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/coin_supply.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/coin_supply.json deleted file mode 100644 index 5c2514ef6..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 41, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18446744073709351225", - "transaction_timestamp": "2024-10-16T05:36:43", - "transaction_epoch": 2 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/current_fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/current_fungible_asset_balances.json deleted file mode 100644 index 2e8510b1b..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/current_fungible_asset_balances.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "storage_id": "0xee7ccdc3a833754267c71df9534640b532352f734e07509cbe48561d23d05831", - "owner_address": "0x8f0de18409d6fca18c72fac4062fc0f9baa6404296fed93a3ad0250fb671f8b3", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "99999700", - "last_transaction_timestamp": "2024-10-16T05:36:43", - "last_transaction_version": 41, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_activities.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_activities.json deleted file mode 100644 index e96f6b15f..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_activities.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "transaction_version": 41, - "event_index": -1, - "owner_address": "0x8f0de18409d6fca18c72fac4062fc0f9baa6404296fed93a3ad0250fb671f8b3", - "storage_id": "0xee7ccdc3a833754267c71df9534640b532352f734e07509cbe48561d23d05831", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": null, - "block_height": 19, - "token_standard": "v1", - "transaction_timestamp": "2024-10-16T05:36:43", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_balances.json deleted file mode 100644 index ee097a2c1..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_balances.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "transaction_version": 41, - "write_set_change_index": 0, - "storage_id": "0xee7ccdc3a833754267c71df9534640b532352f734e07509cbe48561d23d05831", - "owner_address": "0x8f0de18409d6fca18c72fac4062fc0f9baa6404296fed93a3ad0250fb671f8b3", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "99999700", - "transaction_timestamp": "2024-10-16T05:36:43", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/coin_supply.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/coin_supply.json deleted file mode 100644 index 1087a8803..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 63, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18446744073809350825", - "transaction_timestamp": "2024-10-16T05:36:50", - "transaction_epoch": 2 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_activities.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_activities.json deleted file mode 100644 index e11e3c1bc..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_activities.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "transaction_version": 63, - "event_index": -1, - "owner_address": "0xa531b7fdd7917f73ca216d89a8d9ce0cf7e7cfb9086ca6f6cbf9521532748d16", - "storage_id": "0xba2fa98d311f0adb1d6608dfbc6d66b6e583c0b8f6bbadea7d241f7e1b0b1080", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": null, - "block_height": 29, - "token_standard": "v1", - "transaction_timestamp": "2024-10-16T05:36:50", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_balances.json deleted file mode 100644 index 5bbcafed2..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_balances.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "transaction_version": 63, - "write_set_change_index": 0, - "storage_id": "0xba2fa98d311f0adb1d6608dfbc6d66b6e583c0b8f6bbadea7d241f7e1b0b1080", - "owner_address": "0xa531b7fdd7917f73ca216d89a8d9ce0cf7e7cfb9086ca6f6cbf9521532748d16", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "99999700", - "transaction_timestamp": "2024-10-16T05:36:50", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/coin_supply.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/coin_supply.json deleted file mode 100644 index f9d30ef1a..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 83, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18446744073909449225", - "transaction_timestamp": "2024-10-16T05:36:56", - "transaction_epoch": 2 - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/current_fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/current_fungible_asset_balances.json deleted file mode 100644 index e6c79af53..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/current_fungible_asset_balances.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "storage_id": "0xba2fa98d311f0adb1d6608dfbc6d66b6e583c0b8f6bbadea7d241f7e1b0b1080", - "owner_address": "0xa531b7fdd7917f73ca216d89a8d9ce0cf7e7cfb9086ca6f6cbf9521532748d16", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "199999400", - "last_transaction_timestamp": "2024-10-16T05:36:56", - "last_transaction_version": 83, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_activities.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_activities.json deleted file mode 100644 index c958d2ba2..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_activities.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "transaction_version": 83, - "event_index": -1, - "owner_address": "0xa531b7fdd7917f73ca216d89a8d9ce0cf7e7cfb9086ca6f6cbf9521532748d16", - "storage_id": "0xba2fa98d311f0adb1d6608dfbc6d66b6e583c0b8f6bbadea7d241f7e1b0b1080", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": null, - "block_height": 38, - "token_standard": "v1", - "transaction_timestamp": "2024-10-16T05:36:56", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_balances.json b/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_balances.json deleted file mode 100644 index affa613df..000000000 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_balances.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "transaction_version": 83, - "write_set_change_index": 0, - "storage_id": "0xba2fa98d311f0adb1d6608dfbc6d66b6e583c0b8f6bbadea7d241f7e1b0b1080", - "owner_address": "0xa531b7fdd7917f73ca216d89a8d9ce0cf7e7cfb9086ca6f6cbf9521532748d16", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "199999400", - "transaction_timestamp": "2024-10-16T05:36:56", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/1/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/1/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json new file mode 100644 index 000000000..1c54ddcd9 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json @@ -0,0 +1,22 @@ +[ + { + "sequence_number": 2, + "creation_number": 3, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", + "transaction_version": 2, + "transaction_block_height": 2, + "type_": "0x1::block::NewBlockEvent", + "data": { + "hash": "0x7155ede2ab87b66e7beba3210b43367eb90daff8891d44ed05eed20a71b9b55a", + "epoch": "2", + "round": "1", + "height": "2", + "proposer": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f", + "time_microseconds": "1662686657332551", + "failed_proposer_indices": [], + "previous_block_votes_bitvec": "0x00" + }, + "indexed_type": "0x1::block::NewBlockEvent", + "event_index": 0 + } +] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/3/events.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/3/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json new file mode 100644 index 000000000..ac0f9f033 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json @@ -0,0 +1,32 @@ +[ + { + "sequence_number": 2, + "creation_number": 0, + "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "transaction_version": 4, + "transaction_block_height": 20040326, + "type_": "0x1::account::CoinRegisterEvent", + "data": { + "type_info": { + "module_name": "0x70726f746f6e5f63626479", + "struct_name": "0x5052545f4b4642434343", + "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862" + } + }, + "indexed_type": "0x1::account::CoinRegisterEvent", + "event_index": 0 + }, + { + "sequence_number": 0, + "creation_number": 10, + "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "transaction_version": 4, + "transaction_block_height": 20040326, + "type_": "0x1::coin::DepositEvent", + "data": { + "amount": "1000000000000000000" + }, + "indexed_type": "0x1::coin::DepositEvent", + "event_index": 1 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json new file mode 100644 index 000000000..2ca61fa25 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json @@ -0,0 +1,77 @@ +[ + { + "sequence_number": 0, + "creation_number": 3, + "account_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "transaction_version": 5, + "transaction_block_height": 295534162, + "type_": "0x1::coin::WithdrawEvent", + "data": { + "amount": "300000" + }, + "indexed_type": "0x1::coin::WithdrawEvent", + "event_index": 0 + }, + { + "sequence_number": 707, + "creation_number": 4, + "account_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", + "transaction_version": 5, + "transaction_block_height": 295534162, + "type_": "0x1::coin::DepositEvent", + "data": { + "amount": "300000" + }, + "indexed_type": "0x1::coin::DepositEvent", + "event_index": 1 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 5, + "transaction_block_height": 295534162, + "type_": "0x1::fungible_asset::Deposit", + "data": { + "store": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", + "amount": "300000" + }, + "indexed_type": "0x1::fungible_asset::Deposit", + "event_index": 2 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 5, + "transaction_block_height": 295534162, + "type_": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit", + "data": { + "pool": { + "inner": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8" + }, + "user": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "token": "0x1::aptos_coin::AptosCoin", + "amount": "300000" + }, + "indexed_type": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit", + "event_index": 3 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 5, + "transaction_block_height": 295534162, + "type_": "0x1::transaction_fee::FeeStatement", + "data": { + "io_gas_units": "16", + "storage_fee_octas": "45720", + "execution_gas_units": "32", + "total_charge_gas_units": "505", + "storage_fee_refund_octas": "0" + }, + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 4 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json new file mode 100644 index 000000000..18325925d --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json @@ -0,0 +1,281 @@ +[ + { + "sequence_number": 9814, + "creation_number": 12, + "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", + "rewards_amount": "789371656" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 0 + }, + { + "sequence_number": 4252, + "creation_number": 12, + "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", + "rewards_amount": "19174256316" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 1 + }, + { + "sequence_number": 9823, + "creation_number": 12, + "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", + "rewards_amount": "19178730843" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 2 + }, + { + "sequence_number": 3697, + "creation_number": 12, + "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", + "rewards_amount": "818123890" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 3 + }, + { + "sequence_number": 9813, + "creation_number": 12, + "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", + "rewards_amount": "19178287161" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 4 + }, + { + "sequence_number": 14143, + "creation_number": 12, + "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", + "rewards_amount": "963055869" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 5 + }, + { + "sequence_number": 9812, + "creation_number": 12, + "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", + "rewards_amount": "19177688699" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 6 + }, + { + "sequence_number": 7807, + "creation_number": 12, + "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", + "rewards_amount": "841058926" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 7 + }, + { + "sequence_number": 9823, + "creation_number": 12, + "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", + "rewards_amount": "19178518163" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 8 + }, + { + "sequence_number": 9829, + "creation_number": 12, + "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x3c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", + "rewards_amount": "19185171265" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 9 + }, + { + "sequence_number": 4252, + "creation_number": 12, + "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", + "rewards_amount": "19174925092" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 10 + }, + { + "sequence_number": 8256, + "creation_number": 12, + "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", + "rewards_amount": "18813123628" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 11 + }, + { + "sequence_number": 8641, + "creation_number": 10, + "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", + "rewards_amount": "828031401" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 12 + }, + { + "sequence_number": 1882, + "creation_number": 12, + "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", + "rewards_amount": "798768182" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 13 + }, + { + "sequence_number": 2197, + "creation_number": 12, + "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", + "rewards_amount": "18896078163" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 14 + }, + { + "sequence_number": 2199, + "creation_number": 12, + "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", + "rewards_amount": "18894077814" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 15 + }, + { + "sequence_number": 225, + "creation_number": 12, + "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", + "rewards_amount": "787639333" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 16 + }, + { + "sequence_number": 405, + "creation_number": 12, + "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", + "rewards_amount": "789473752" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 17 + }, + { + "sequence_number": 330, + "creation_number": 10, + "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", + "rewards_amount": "787913628" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 18 + }, + { + "sequence_number": 16643, + "creation_number": 2, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", + "transaction_version": 6, + "transaction_block_height": 322305240, + "type_": "0x1::reconfiguration::NewEpochEvent", + "data": { + "epoch": "16644" + }, + "indexed_type": "0x1::reconfiguration::NewEpochEvent", + "event_index": 19 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json new file mode 100644 index 000000000..2bb918040 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json @@ -0,0 +1,62 @@ +[ + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "transaction_version": 7, + "transaction_block_height": 354619634, + "type_": "0x1::account::CoinRegisterEvent", + "data": { + "type_info": { + "module_name": "0x6170746f735f636f696e", + "struct_name": "0x4170746f73436f696e", + "account_address": "0x1" + } + }, + "indexed_type": "0x1::account::CoinRegisterEvent", + "event_index": 0 + }, + { + "sequence_number": 21684, + "creation_number": 3, + "account_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "transaction_version": 7, + "transaction_block_height": 354619634, + "type_": "0x1::coin::WithdrawEvent", + "data": { + "amount": "10" + }, + "indexed_type": "0x1::coin::WithdrawEvent", + "event_index": 1 + }, + { + "sequence_number": 0, + "creation_number": 2, + "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "transaction_version": 7, + "transaction_block_height": 354619634, + "type_": "0x1::coin::DepositEvent", + "data": { + "amount": "10" + }, + "indexed_type": "0x1::coin::DepositEvent", + "event_index": 2 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 7, + "transaction_block_height": 354619634, + "type_": "0x1::transaction_fee::FeeStatement", + "data": { + "io_gas_units": "5", + "storage_fee_octas": "98800", + "execution_gas_units": "6", + "total_charge_gas_units": "999", + "storage_fee_refund_octas": "0" + }, + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 3 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json new file mode 100644 index 000000000..629f45b83 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json @@ -0,0 +1,47 @@ +[ + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 8, + "transaction_block_height": 356437526, + "type_": "0x1::fungible_asset::Withdraw", + "data": { + "store": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", + "amount": "100000000" + }, + "indexed_type": "0x1::fungible_asset::Withdraw", + "event_index": 0 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 8, + "transaction_block_height": 356437526, + "type_": "0x1::fungible_asset::Deposit", + "data": { + "store": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", + "amount": "100000000" + }, + "indexed_type": "0x1::fungible_asset::Deposit", + "event_index": 1 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 8, + "transaction_block_height": 356437526, + "type_": "0x1::transaction_fee::FeeStatement", + "data": { + "io_gas_units": "7", + "storage_fee_octas": "0", + "execution_gas_units": "5", + "total_charge_gas_units": "12", + "storage_fee_refund_octas": "0" + }, + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 2 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json new file mode 100644 index 000000000..f8a5e1a18 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json @@ -0,0 +1,341 @@ +[ + { + "sequence_number": 9814, + "creation_number": 12, + "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", + "rewards_amount": "789371656" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 0 + }, + { + "sequence_number": 4252, + "creation_number": 12, + "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", + "rewards_amount": "19174256316" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 1 + }, + { + "sequence_number": 9823, + "creation_number": 12, + "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", + "rewards_amount": "19178730843" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 2 + }, + { + "sequence_number": 3697, + "creation_number": 12, + "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", + "rewards_amount": "818123890" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 3 + }, + { + "sequence_number": 9813, + "creation_number": 12, + "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", + "rewards_amount": "19178287161" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 4 + }, + { + "sequence_number": 14143, + "creation_number": 12, + "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", + "rewards_amount": "963055869" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 5 + }, + { + "sequence_number": 9812, + "creation_number": 12, + "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", + "rewards_amount": "19177688699" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 6 + }, + { + "sequence_number": 7807, + "creation_number": 12, + "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", + "rewards_amount": "841058926" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 7 + }, + { + "sequence_number": 9823, + "creation_number": 12, + "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", + "rewards_amount": "19178518163" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 8 + }, + { + "sequence_number": 9829, + "creation_number": 12, + "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x3c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", + "rewards_amount": "19185171265" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 9 + }, + { + "sequence_number": 4252, + "creation_number": 12, + "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", + "rewards_amount": "19174925092" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 10 + }, + { + "sequence_number": 8256, + "creation_number": 12, + "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", + "rewards_amount": "18813123628" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 11 + }, + { + "sequence_number": 8641, + "creation_number": 10, + "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", + "rewards_amount": "828031401" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 12 + }, + { + "sequence_number": 1882, + "creation_number": 12, + "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", + "rewards_amount": "798768182" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 13 + }, + { + "sequence_number": 2197, + "creation_number": 12, + "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", + "rewards_amount": "18896078163" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 14 + }, + { + "sequence_number": 2199, + "creation_number": 12, + "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", + "rewards_amount": "18894077814" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 15 + }, + { + "sequence_number": 225, + "creation_number": 12, + "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", + "rewards_amount": "787639333" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 16 + }, + { + "sequence_number": 405, + "creation_number": 12, + "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", + "rewards_amount": "789473752" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 17 + }, + { + "sequence_number": 330, + "creation_number": 10, + "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::stake::DistributeRewardsEvent", + "data": { + "pool_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", + "rewards_amount": "787913628" + }, + "indexed_type": "0x1::stake::DistributeRewardsEvent", + "event_index": 18 + }, + { + "sequence_number": 16643, + "creation_number": 2, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", + "transaction_version": 1, + "transaction_block_height": 322305240, + "type_": "0x1::reconfiguration::NewEpochEvent", + "data": { + "epoch": "16644" + }, + "indexed_type": "0x1::reconfiguration::NewEpochEvent", + "event_index": 19 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "transaction_version": 2, + "transaction_block_height": 354619634, + "type_": "0x1::account::CoinRegisterEvent", + "data": { + "type_info": { + "module_name": "0x6170746f735f636f696e", + "struct_name": "0x4170746f73436f696e", + "account_address": "0x1" + } + }, + "indexed_type": "0x1::account::CoinRegisterEvent", + "event_index": 0 + }, + { + "sequence_number": 21684, + "creation_number": 3, + "account_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "transaction_version": 2, + "transaction_block_height": 354619634, + "type_": "0x1::coin::WithdrawEvent", + "data": { + "amount": "10" + }, + "indexed_type": "0x1::coin::WithdrawEvent", + "event_index": 1 + }, + { + "sequence_number": 0, + "creation_number": 2, + "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "transaction_version": 2, + "transaction_block_height": 354619634, + "type_": "0x1::coin::DepositEvent", + "data": { + "amount": "10" + }, + "indexed_type": "0x1::coin::DepositEvent", + "event_index": 2 + }, + { + "sequence_number": 0, + "creation_number": 0, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", + "transaction_version": 2, + "transaction_block_height": 354619634, + "type_": "0x1::transaction_fee::FeeStatement", + "data": { + "io_gas_units": "5", + "storage_fee_octas": "98800", + "execution_gas_units": "6", + "total_charge_gas_units": "999", + "storage_fee_refund_octas": "0" + }, + "indexed_type": "0x1::transaction_fee::FeeStatement", + "event_index": 3 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json new file mode 100644 index 000000000..44f79c5df --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json @@ -0,0 +1,10 @@ +[ + { + "transaction_version": 1, + "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", + "coin_type": "0x1::aptos_coin::AptosCoin", + "supply": "29164832318786122251", + "transaction_timestamp": "2024-09-13T16:48:29", + "transaction_epoch": 17778 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json new file mode 100644 index 000000000..dd9d3bab7 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json @@ -0,0 +1,24 @@ +[ + { + "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", + "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "10", + "last_transaction_timestamp": "2024-09-13T16:48:29", + "last_transaction_version": 1, + "token_standard": "v1" + }, + { + "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", + "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "16673484350", + "last_transaction_timestamp": "2024-09-13T16:48:29", + "last_transaction_version": 1, + "token_standard": "v1" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json new file mode 100644 index 000000000..fcf6db58b --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json @@ -0,0 +1,56 @@ +[ + { + "transaction_version": 1, + "event_index": -1, + "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "99900", + "type_": "0x1::aptos_coin::GasFeeEvent", + "is_gas_fee": true, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x1::aptos_account::transfer", + "block_height": 354619634, + "token_standard": "v1", + "transaction_timestamp": "2024-09-13T16:48:29", + "storage_refund_amount": "0" + }, + { + "transaction_version": 1, + "event_index": 1, + "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "10", + "type_": "0x1::coin::WithdrawEvent", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x1::aptos_account::transfer", + "block_height": 354619634, + "token_standard": "v1", + "transaction_timestamp": "2024-09-13T16:48:29", + "storage_refund_amount": "0" + }, + { + "transaction_version": 1, + "event_index": 2, + "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "10", + "type_": "0x1::coin::DepositEvent", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x1::aptos_account::transfer", + "block_height": 354619634, + "token_standard": "v1", + "transaction_timestamp": "2024-09-13T16:48:29", + "storage_refund_amount": "0" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json new file mode 100644 index 000000000..d7d127038 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json @@ -0,0 +1,26 @@ +[ + { + "transaction_version": 1, + "write_set_change_index": 0, + "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", + "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "16673484350", + "transaction_timestamp": "2024-09-13T16:48:29", + "token_standard": "v1" + }, + { + "transaction_version": 1, + "write_set_change_index": 2, + "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", + "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "10", + "transaction_timestamp": "2024-09-13T16:48:29", + "token_standard": "v1" + } +] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/41/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json new file mode 100644 index 000000000..188e61ab5 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json @@ -0,0 +1,10 @@ +[ + { + "transaction_version": 2, + "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", + "coin_type": "0x1::aptos_coin::AptosCoin", + "supply": "29152644549222814344", + "transaction_timestamp": "2024-06-18T05:07:55", + "transaction_epoch": 15650 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json new file mode 100644 index 000000000..bb185ba28 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json @@ -0,0 +1,46 @@ +[ + { + "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", + "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "29450400", + "last_transaction_timestamp": "2024-06-18T05:07:55", + "last_transaction_version": 2, + "token_standard": "v1" + }, + { + "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", + "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "17374075418", + "last_transaction_timestamp": "2024-06-18T05:07:55", + "last_transaction_version": 2, + "token_standard": "v1" + }, + { + "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", + "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "is_primary": false, + "is_frozen": false, + "amount": "93054699", + "last_transaction_timestamp": "2024-06-18T05:07:55", + "last_transaction_version": 2, + "token_standard": "v2" + }, + { + "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", + "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "is_primary": false, + "is_frozen": false, + "amount": "17272186129", + "last_transaction_timestamp": "2024-06-18T05:07:55", + "last_transaction_version": 2, + "token_standard": "v2" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json new file mode 100644 index 000000000..7b29e7e8c --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json @@ -0,0 +1,74 @@ +[ + { + "transaction_version": 2, + "event_index": -1, + "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "50500", + "type_": "0x1::aptos_coin::GasFeeEvent", + "is_gas_fee": true, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", + "block_height": 295534162, + "token_standard": "v1", + "transaction_timestamp": "2024-06-18T05:07:55", + "storage_refund_amount": "0" + }, + { + "transaction_version": 2, + "event_index": 0, + "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "300000", + "type_": "0x1::coin::WithdrawEvent", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", + "block_height": 295534162, + "token_standard": "v1", + "transaction_timestamp": "2024-06-18T05:07:55", + "storage_refund_amount": "0" + }, + { + "transaction_version": 2, + "event_index": 1, + "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", + "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "300000", + "type_": "0x1::coin::DepositEvent", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", + "block_height": 295534162, + "token_standard": "v1", + "transaction_timestamp": "2024-06-18T05:07:55", + "storage_refund_amount": "0" + }, + { + "transaction_version": 2, + "event_index": 2, + "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", + "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "is_frozen": null, + "amount": "300000", + "type_": "0x1::fungible_asset::Deposit", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", + "block_height": 295534162, + "token_standard": "v2", + "transaction_timestamp": "2024-06-18T05:07:55", + "storage_refund_amount": "0" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json new file mode 100644 index 000000000..10071cf21 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json @@ -0,0 +1,50 @@ +[ + { + "transaction_version": 2, + "write_set_change_index": 4, + "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", + "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "17374075418", + "transaction_timestamp": "2024-06-18T05:07:55", + "token_standard": "v1" + }, + { + "transaction_version": 2, + "write_set_change_index": 5, + "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", + "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "is_primary": false, + "is_frozen": false, + "amount": "93054699", + "transaction_timestamp": "2024-06-18T05:07:55", + "token_standard": "v2" + }, + { + "transaction_version": 2, + "write_set_change_index": 8, + "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", + "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "is_primary": false, + "is_frozen": false, + "amount": "17272186129", + "transaction_timestamp": "2024-06-18T05:07:55", + "token_standard": "v2" + }, + { + "transaction_version": 2, + "write_set_change_index": 16, + "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", + "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "29450400", + "transaction_timestamp": "2024-06-18T05:07:55", + "token_standard": "v1" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json new file mode 100644 index 000000000..a6425725b --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json @@ -0,0 +1,19 @@ +[ + { + "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", + "creator_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", + "name": "Aptos Coin", + "symbol": "APT", + "decimals": 8, + "icon_uri": "", + "project_uri": "", + "last_transaction_version": 2, + "last_transaction_timestamp": "2024-06-18T05:07:55", + "supply_aggregator_table_handle_v1": null, + "supply_aggregator_table_key_v1": null, + "token_standard": "v2", + "is_token_v2": null, + "maximum_v2": "340282366920938463463374607431768211455", + "supply_v2": "17374075418" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json new file mode 100644 index 000000000..b2a199e83 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json @@ -0,0 +1,10 @@ +[ + { + "transaction_version": 3, + "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", + "coin_type": "0x1::aptos_coin::AptosCoin", + "supply": "29165678689185321503", + "transaction_timestamp": "2024-09-16T06:58:10", + "transaction_epoch": 17841 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json new file mode 100644 index 000000000..0935341a5 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json @@ -0,0 +1,35 @@ +[ + { + "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", + "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "18901942640", + "last_transaction_timestamp": "2024-09-16T06:58:10", + "last_transaction_version": 3, + "token_standard": "v1" + }, + { + "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", + "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_primary": true, + "is_frozen": false, + "amount": "0", + "last_transaction_timestamp": "2024-09-16T06:58:10", + "last_transaction_version": 3, + "token_standard": "v2" + }, + { + "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", + "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_primary": true, + "is_frozen": false, + "amount": "9996985969300000000", + "last_transaction_timestamp": "2024-09-16T06:58:10", + "last_transaction_version": 3, + "token_standard": "v2" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json new file mode 100644 index 000000000..8686b8992 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json @@ -0,0 +1,56 @@ +[ + { + "transaction_version": 3, + "event_index": -1, + "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", + "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "1200", + "type_": "0x1::aptos_coin::GasFeeEvent", + "is_gas_fee": true, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", + "block_height": 356437526, + "token_standard": "v1", + "transaction_timestamp": "2024-09-16T06:58:10", + "storage_refund_amount": "0" + }, + { + "transaction_version": 3, + "event_index": 0, + "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", + "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_frozen": null, + "amount": "100000000", + "type_": "0x1::fungible_asset::Withdraw", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", + "block_height": 356437526, + "token_standard": "v2", + "transaction_timestamp": "2024-09-16T06:58:10", + "storage_refund_amount": "0" + }, + { + "transaction_version": 3, + "event_index": 1, + "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", + "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_frozen": null, + "amount": "100000000", + "type_": "0x1::fungible_asset::Deposit", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", + "block_height": 356437526, + "token_standard": "v2", + "transaction_timestamp": "2024-09-16T06:58:10", + "storage_refund_amount": "0" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json new file mode 100644 index 000000000..3c2e34a41 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json @@ -0,0 +1,38 @@ +[ + { + "transaction_version": 3, + "write_set_change_index": 0, + "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", + "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_primary": true, + "is_frozen": false, + "amount": "0", + "transaction_timestamp": "2024-09-16T06:58:10", + "token_standard": "v2" + }, + { + "transaction_version": 3, + "write_set_change_index": 2, + "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", + "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "18901942640", + "transaction_timestamp": "2024-09-16T06:58:10", + "token_standard": "v1" + }, + { + "transaction_version": 3, + "write_set_change_index": 4, + "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", + "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", + "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", + "is_primary": true, + "is_frozen": false, + "amount": "9996985969300000000", + "transaction_timestamp": "2024-09-16T06:58:10", + "token_standard": "v2" + } +] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/63/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/83/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/current_fungible_asset_balances.json diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/21/token_activities_v2.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/21/token_activities_v2.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_activities.json diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/41/token_activities_v2.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/41/token_activities_v2.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_balances.json diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/63/token_activities_v2.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/63/token_activities_v2.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json new file mode 100644 index 000000000..88ef4b4f7 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json @@ -0,0 +1,10 @@ +[ + { + "transaction_version": 5, + "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", + "coin_type": "0x1::aptos_coin::AptosCoin", + "supply": "18544645433533405815", + "transaction_timestamp": "2022-10-13T01:46:57", + "transaction_epoch": 746 + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json new file mode 100644 index 000000000..55a9dfc97 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json @@ -0,0 +1,24 @@ +[ + { + "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "10041540182", + "last_transaction_timestamp": "2022-10-13T01:46:57", + "last_transaction_version": 5, + "token_standard": "v1" + }, + { + "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", + "is_primary": true, + "is_frozen": false, + "amount": "1000000000000000000", + "last_transaction_timestamp": "2022-10-13T01:46:57", + "last_transaction_version": 5, + "token_standard": "v1" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json new file mode 100644 index 000000000..315ea46bd --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json @@ -0,0 +1,38 @@ +[ + { + "transaction_version": 5, + "event_index": -1, + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_frozen": null, + "amount": "2787000", + "type_": "0x1::aptos_coin::GasFeeEvent", + "is_gas_fee": true, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x1::code::publish_package_txn", + "block_height": 20040326, + "token_standard": "v1", + "transaction_timestamp": "2022-10-13T01:46:57", + "storage_refund_amount": "0" + }, + { + "transaction_version": 5, + "event_index": 1, + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", + "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", + "is_frozen": null, + "amount": "1000000000000000000", + "type_": "0x1::coin::DepositEvent", + "is_gas_fee": false, + "gas_fee_payer_address": null, + "is_transaction_success": true, + "entry_function_id_str": "0x1::code::publish_package_txn", + "block_height": 20040326, + "token_standard": "v1", + "transaction_timestamp": "2022-10-13T01:46:57", + "storage_refund_amount": "0" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json new file mode 100644 index 000000000..94938f666 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json @@ -0,0 +1,26 @@ +[ + { + "transaction_version": 5, + "write_set_change_index": 3, + "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "asset_type": "0x1::aptos_coin::AptosCoin", + "is_primary": true, + "is_frozen": false, + "amount": "10041540182", + "transaction_timestamp": "2022-10-13T01:46:57", + "token_standard": "v1" + }, + { + "transaction_version": 5, + "write_set_change_index": 4, + "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", + "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", + "is_primary": true, + "is_frozen": false, + "amount": "1000000000000000000", + "transaction_timestamp": "2022-10-13T01:46:57", + "token_standard": "v1" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json new file mode 100644 index 000000000..0e17a4f13 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json @@ -0,0 +1,19 @@ +[ + { + "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", + "creator_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", + "name": "Aptos", + "symbol": "APT", + "decimals": 10, + "icon_uri": null, + "project_uri": null, + "last_transaction_version": 5, + "last_transaction_timestamp": "2022-10-13T01:46:57", + "supply_aggregator_table_handle_v1": null, + "supply_aggregator_table_key_v1": null, + "token_standard": "v1", + "is_token_v2": null, + "maximum_v2": null, + "supply_v2": null + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json new file mode 100644 index 000000000..fc6210a18 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json @@ -0,0 +1,10 @@ +[ + { + "transaction_version": 6, + "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", + "coin_type": "0x1::aptos_coin::AptosCoin", + "supply": "29159026553346716168", + "transaction_timestamp": "2024-07-29T00:02:18", + "transaction_epoch": 16643 + } +] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/83/token_activities_v2.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/expected_db_output_files/scripted_txns/token_v2_processor/83/token_activities_v2.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json similarity index 50% rename from rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json index f91249423..e7288c441 100644 --- a/rust/integration-tests/expected_db_output_files/scripted_txns/fungible_asset_processor/21/coin_supply.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json @@ -1,10 +1,10 @@ [ { - "transaction_version": 21, + "transaction_version": 8, "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18446744073709451425", - "transaction_timestamp": "2024-10-16T05:36:37", - "transaction_epoch": 2 + "supply": "18448344078275751615", + "transaction_timestamp": "2022-09-09T01:24:17", + "transaction_epoch": 1 } ] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs index 1ac79d334..febbfc725 100644 --- a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs @@ -14,7 +14,7 @@ pub fn setup_events_processor_config( db_url: &str, ) -> (IndexerProcessorConfig, &'static str) { let transaction_stream_config = - test_context.create_transaction_stream_config(txn_version, txn_count as u64); + test_context.create_transaction_stream_config(txn_version, txn_count as u64); // since this will be always 1, we can remove from the arg list let postgres_config = PostgresConfig { connection_string: db_url.to_string(), db_pool_size: 100, @@ -49,23 +49,41 @@ mod tests { setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; + use aptos_indexer_processor_sdk::traits::processor_trait::ProcessorTrait; use aptos_indexer_test_transactions::{ - ALL_IMPORTED_TESTNET_TXNS, IMPORTED_TESTNET_TXNS_1_GENESIS, + IMPORTED_TESTNET_TXNS_1255836496_V2_FA_METADATA_, IMPORTED_TESTNET_TXNS_1_GENESIS, + IMPORTED_TESTNET_TXNS_278556781_V1_COIN_REGISTER_FA_METADATA, IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; use aptos_protos::transaction::v1::Transaction; use sdk_processor::processors::events_processor::EventsProcessor; + use testing_transactions::{ + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, + }; // TODO - Add more intentional tests to validate the processor with different scenarios - // This test cases runs the events processor and validates the output of all available transactions proto jsons + // Example test1: This test cases runs the events processor and validates the output of all available transactions proto jsons #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_db_output_diff_test() { let (diff_flag, custom_output_path) = get_test_config(); let output_path = custom_output_path - .unwrap_or_else(|| DEFAULT_OUTPUT_FOLDER.to_string() + "imported_testnet_txns"); + .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); // Step 1: set up an input transaction that will be used + pub const ALL_IMPORTED_TESTNET_TXNS: &[&[u8]] = &[ + IMPORTED_TESTNET_TXNS_1_GENESIS, + IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, + IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + IMPORTED_TESTNET_TXNS_278556781_V1_COIN_REGISTER_FA_METADATA, + IMPORTED_TESTNET_TXNS_1255836496_V2_FA_METADATA_, + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, + IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, + ]; + let transaction_batches = ALL_IMPORTED_TESTNET_TXNS .iter() .map(|txn| serde_json::from_slice(txn).unwrap()) @@ -74,8 +92,8 @@ mod tests { let (db, mut test_context) = setup_test_environment(ALL_IMPORTED_TESTNET_TXNS).await; // Step 2: Loop over each transaction and run the test for each - for txn in transaction_batches.iter() { - let txn_version = txn.version; + for (ind, _txn) in transaction_batches.iter().enumerate() { + let txn_version = (ind + 1) as u64; // Step 3: Run the processor let db_url = db.get_db_url(); @@ -105,6 +123,7 @@ mod tests { txn_version, processor_name, output_path.clone(), + None, ); }, Err(e) => { @@ -118,6 +137,7 @@ mod tests { } } + // Example 2: Test for multiple transactions handling #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_db_output_scenario_testing() { let (diff_flag, custom_output_path) = get_test_config(); @@ -125,9 +145,8 @@ mod tests { .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); let imported = [ - IMPORTED_TESTNET_TXNS_1_GENESIS, - IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, - IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, ]; let (db, mut test_context) = setup_test_environment(&imported).await; @@ -137,10 +156,7 @@ mod tests { .map(|txn| serde_json::from_slice(txn).expect("Failed to deserialize transaction")) .collect(); - let starting_version = transaction_batches - .first() - .expect("No transactions found") - .version; + let starting_version = 1; let db_url = db.get_db_url(); let (indexer_processor_config, _processor_name) = setup_events_processor_config( @@ -153,18 +169,35 @@ mod tests { let events_processor = EventsProcessor::new(indexer_processor_config) .await .expect("Failed to create EventsProcessor"); - - // TODO: we can a validation here later. - let _ = run_processor_test( + let processor_name = events_processor.name(); + match run_processor_test( &mut test_context, events_processor, load_data, db_url, - vec![starting_version as i64], + vec![(starting_version as i64), ((starting_version + 1) as i64)], // we can pass multiple versions, diff_flag, - output_path, + output_path.clone(), Some("multi_txns_handling_test".to_string()), ) - .await; + .await + { + Ok(mut db_value) => { + let _ = validate_json( + &mut db_value, + starting_version, + processor_name, + output_path.clone(), + Some("multi_txns_handling_test".to_string()), + ); + }, + Err(e) => { + eprintln!( + "[ERROR] Failed to run processor for txn version {}: {}", + starting_version, e + ); + panic!("Test failed due to processor error"); + }, + } } } diff --git a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs index b44ebbcd9..99f5314a9 100644 --- a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs @@ -60,7 +60,7 @@ mod tests { async fn fa_processor_db_output_diff_test() { let (diff_flag, custom_output_path) = get_test_config(); let output_path = custom_output_path - .unwrap_or_else(|| DEFAULT_OUTPUT_FOLDER.to_string() + "imported_testnet_txns"); + .unwrap_or_else(|| DEFAULT_OUTPUT_FOLDER.to_string() + "/imported_testnet_txns"); let transaction_batches = ALL_IMPORTED_TESTNET_TXNS .iter() @@ -70,8 +70,8 @@ mod tests { let (db, mut test_context) = setup_test_environment(ALL_IMPORTED_TESTNET_TXNS).await; // Step 2: Loop over each transaction and run the test for each - for txn in transaction_batches.iter() { - let txn_version = txn.version; + for (ind, _txn) in transaction_batches.iter().enumerate() { + let txn_version = (ind + 1) as u64; // Step 3: Run the processor let db_url = db.get_db_url(); @@ -101,6 +101,7 @@ mod tests { txn_version, processor_name, output_path.clone(), + None, ); }, Err(e) => { diff --git a/rust/integration-tests/src/sdk_tests/mod.rs b/rust/integration-tests/src/sdk_tests/mod.rs index a282052ae..f743fce30 100644 --- a/rust/integration-tests/src/sdk_tests/mod.rs +++ b/rust/integration-tests/src/sdk_tests/mod.rs @@ -7,7 +7,11 @@ use aptos_indexer_testing_framework::{ use assert_json_diff::assert_json_eq; use diesel::{Connection, PgConnection}; use serde_json::Value; -use std::{collections::HashMap, fs, path::Path}; +use std::{ + collections::HashMap, + fs, + path::{Path, PathBuf}, +}; #[cfg(test)] pub mod events_processor_tests; @@ -15,7 +19,7 @@ pub mod events_processor_tests; pub mod fungible_asset_processor_tests; #[allow(dead_code)] -pub const DEFAULT_OUTPUT_FOLDER: &str = "sdk_expected_db_output_files/"; +pub const DEFAULT_OUTPUT_FOLDER: &str = "sdk_expected_db_output_files2"; #[allow(dead_code)] pub fn read_and_parse_json(path: &str) -> anyhow::Result { @@ -53,13 +57,23 @@ pub fn validate_json( txn_version: u64, processor_name: &str, output_path: String, + file_name: Option, ) -> anyhow::Result<()> { for (table_name, db_value) in db_values.iter_mut() { - // Generate the expected JSON file path for each table - let expected_file_path = Path::new(&output_path) - .join(processor_name) - .join(txn_version.to_string()) - .join(format!("{}.json", table_name)); // File name format: processor_table_txnVersion.json + let expected_file_path = match file_name.clone() { + Some(custom_name) => { + PathBuf::from(&output_path).join(processor_name).join( + format!("{}.json", custom_name.clone()), // Including table_name in the format + ) + }, + None => { + // Default case: use table_name and txn_version to construct file name + Path::new(&output_path) + .join(processor_name) + .join(txn_version.to_string()) + .join(format!("{}.json", table_name)) // File name format: processor_table_txnVersion.json + }, + }; let mut expected_json = match read_and_parse_json(expected_file_path.to_str().unwrap()) { Ok(json) => json, @@ -77,8 +91,13 @@ pub fn validate_json( remove_transaction_timestamp(db_value); remove_inserted_at(&mut expected_json); remove_transaction_timestamp(&mut expected_json); - + println!( + "Diffing table: {}, diffing version: {}", + table_name, txn_version + ); assert_json_eq!(db_value, expected_json); + println!("db value: {:#?}", db_value); + println!("expected json: {:#?}", expected_json); } Ok(()) } From 53a8b090fa91f7153eba30e2199ec0c6eb3c1c75 Mon Sep 17 00:00:00 2001 From: yuunlimm Date: Mon, 21 Oct 2024 12:59:40 -0700 Subject: [PATCH 3/4] split tests --- rust/Cargo.lock | 16 +- rust/Cargo.toml | 6 +- .../events_processor/6/events.json | 281 ------------------ .../events_processor/7/events.json | 62 ---- .../events.json | 4 +- .../{3 => empty_txn_test}/events.json | 0 .../{8 => fa_activities_test}/events.json | 6 +- .../{5 => fa_metadata_test}/events.json | 10 +- .../{1 => genesis_txn_test}/events.json | 0 .../events.json} | 0 .../{2 => new_block_event_test}/events.json | 2 +- .../2/coin_supply.json | 10 - .../2/current_fungible_asset_balances.json | 46 --- .../2/fungible_asset_activities.json | 74 ----- .../2/fungible_asset_balances.json | 50 ---- .../2/fungible_asset_metadata.json | 19 -- .../4/coin_supply.json | 1 - .../5/coin_supply.json | 10 - .../5/current_fungible_asset_balances.json | 24 -- .../5/fungible_asset_activities.json | 38 --- .../5/fungible_asset_balances.json | 26 -- .../5/fungible_asset_metadata.json | 19 -- .../6/current_fungible_asset_balances.json | 1 - .../6/fungible_asset_activities.json | 1 - .../6/fungible_asset_balances.json | 1 - .../6/fungible_asset_metadata.json | 1 - .../7/coin_supply.json | 1 - .../7/current_fungible_asset_balances.json | 1 - .../7/fungible_asset_activities.json | 1 - .../7/fungible_asset_balances.json | 1 - .../7/fungible_asset_metadata.json | 1 - .../8/coin_supply.json | 10 - .../8/current_fungible_asset_balances.json | 1 - .../8/fungible_asset_activities.json | 1 - .../8/fungible_asset_balances.json | 1 - .../8/fungible_asset_metadata.json | 1 - .../coin_supply.json | 0 .../current_fungible_asset_balances.json | 0 .../fungible_asset_activities.json | 0 .../fungible_asset_balances.json | 0 .../fungible_asset_metadata.json | 0 .../coin_supply.json | 2 +- .../current_fungible_asset_balances.json | 6 +- .../fungible_asset_activities.json | 6 +- .../fungible_asset_balances.json | 6 +- .../fungible_asset_metadata.json | 0 .../coin_supply.json | 2 +- .../current_fungible_asset_balances.json | 0 .../fungible_asset_activities.json | 0 .../fungible_asset_balances.json | 0 .../fungible_asset_metadata.json | 0 .../src/sdk_tests/events_processor_tests.rs | 166 ++++++----- .../fungible_asset_processor_tests.rs | 127 ++++---- rust/integration-tests/src/sdk_tests/mod.rs | 20 +- 54 files changed, 206 insertions(+), 856 deletions(-) delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{4 => coin_register_fa_metadata_test}/events.json (93%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{3 => empty_txn_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{8 => fa_activities_test}/events.json (94%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{5 => fa_metadata_test}/events.json (94%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{1 => genesis_txn_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{multi_txns_handling_test.json => multi_txns_handling_test/events.json} (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/{2 => new_block_event_test}/events.json (95%) delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/coin_supply.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/current_fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/fungible_asset_activities.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/fungible_asset_metadata.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{3 => fa_activities_txn_test}/coin_supply.json (89%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{3 => fa_activities_txn_test}/current_fungible_asset_balances.json (92%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{3 => fa_activities_txn_test}/fungible_asset_activities.json (96%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{3 => fa_activities_txn_test}/fungible_asset_balances.json (93%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{3 => fa_activities_txn_test}/fungible_asset_metadata.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{6 => validator_txn_test}/coin_supply.json (89%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{4 => validator_txn_test}/current_fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{4 => validator_txn_test}/fungible_asset_activities.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{4 => validator_txn_test}/fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/{4 => validator_txn_test}/fungible_asset_metadata.json (100%) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 74d731a0a..aa6cb5df2 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -141,7 +141,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aptos-indexer-processor-sdk" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "ahash", "anyhow", @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "aptos-indexer-processor-sdk-server-framework" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "aptos-indexer-testing-framework" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -234,10 +234,10 @@ dependencies = [ [[package]] name = "aptos-indexer-transaction-stream" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38)", + "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8)", "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb)", "chrono", "futures-util", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "aptos-moving-average" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "chrono", ] @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "instrumented-channel" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "delegate", "derive_builder", @@ -4129,7 +4129,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sample" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=4f55f2a3b65f375874858f61898e2896bc06af38#4f55f2a3b65f375874858f61898e2896bc06af38" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" dependencies = [ "tracing", ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 30d3845ec..a9d8b375a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -30,12 +30,12 @@ testing-transactions = { path = "testing-transactions" } ahash = { version = "0.8.7", features = ["serde"] } anyhow = "1.0.86" -aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } -aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } +aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } +aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" } aptos-system-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "202bdccff2b2d333a385ae86a4fcf23e89da9f62" } aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "3099bbe1e100be815ca0cb262cd7eceef9c75dad" } -aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "4f55f2a3b65f375874858f61898e2896bc06af38" } +aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } async-trait = "0.1.53" backtrace = "0.3.58" diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json deleted file mode 100644 index 18325925d..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/6/events.json +++ /dev/null @@ -1,281 +0,0 @@ -[ - { - "sequence_number": 9814, - "creation_number": 12, - "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", - "rewards_amount": "789371656" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 0 - }, - { - "sequence_number": 4252, - "creation_number": 12, - "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", - "rewards_amount": "19174256316" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 1 - }, - { - "sequence_number": 9823, - "creation_number": 12, - "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", - "rewards_amount": "19178730843" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 2 - }, - { - "sequence_number": 3697, - "creation_number": 12, - "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", - "rewards_amount": "818123890" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 3 - }, - { - "sequence_number": 9813, - "creation_number": 12, - "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", - "rewards_amount": "19178287161" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 4 - }, - { - "sequence_number": 14143, - "creation_number": 12, - "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", - "rewards_amount": "963055869" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 5 - }, - { - "sequence_number": 9812, - "creation_number": 12, - "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", - "rewards_amount": "19177688699" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 6 - }, - { - "sequence_number": 7807, - "creation_number": 12, - "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", - "rewards_amount": "841058926" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 7 - }, - { - "sequence_number": 9823, - "creation_number": 12, - "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", - "rewards_amount": "19178518163" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 8 - }, - { - "sequence_number": 9829, - "creation_number": 12, - "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x3c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", - "rewards_amount": "19185171265" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 9 - }, - { - "sequence_number": 4252, - "creation_number": 12, - "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", - "rewards_amount": "19174925092" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 10 - }, - { - "sequence_number": 8256, - "creation_number": 12, - "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", - "rewards_amount": "18813123628" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 11 - }, - { - "sequence_number": 8641, - "creation_number": 10, - "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", - "rewards_amount": "828031401" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 12 - }, - { - "sequence_number": 1882, - "creation_number": 12, - "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", - "rewards_amount": "798768182" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 13 - }, - { - "sequence_number": 2197, - "creation_number": 12, - "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", - "rewards_amount": "18896078163" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 14 - }, - { - "sequence_number": 2199, - "creation_number": 12, - "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", - "rewards_amount": "18894077814" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 15 - }, - { - "sequence_number": 225, - "creation_number": 12, - "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", - "rewards_amount": "787639333" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 16 - }, - { - "sequence_number": 405, - "creation_number": 12, - "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", - "rewards_amount": "789473752" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 17 - }, - { - "sequence_number": 330, - "creation_number": 10, - "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", - "rewards_amount": "787913628" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 18 - }, - { - "sequence_number": 16643, - "creation_number": 2, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 6, - "transaction_block_height": 322305240, - "type_": "0x1::reconfiguration::NewEpochEvent", - "data": { - "epoch": "16644" - }, - "indexed_type": "0x1::reconfiguration::NewEpochEvent", - "event_index": 19 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json deleted file mode 100644 index 2bb918040..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/7/events.json +++ /dev/null @@ -1,62 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "transaction_version": 7, - "transaction_block_height": 354619634, - "type_": "0x1::account::CoinRegisterEvent", - "data": { - "type_info": { - "module_name": "0x6170746f735f636f696e", - "struct_name": "0x4170746f73436f696e", - "account_address": "0x1" - } - }, - "indexed_type": "0x1::account::CoinRegisterEvent", - "event_index": 0 - }, - { - "sequence_number": 21684, - "creation_number": 3, - "account_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "transaction_version": 7, - "transaction_block_height": 354619634, - "type_": "0x1::coin::WithdrawEvent", - "data": { - "amount": "10" - }, - "indexed_type": "0x1::coin::WithdrawEvent", - "event_index": 1 - }, - { - "sequence_number": 0, - "creation_number": 2, - "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "transaction_version": 7, - "transaction_block_height": 354619634, - "type_": "0x1::coin::DepositEvent", - "data": { - "amount": "10" - }, - "indexed_type": "0x1::coin::DepositEvent", - "event_index": 2 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 7, - "transaction_block_height": 354619634, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "5", - "storage_fee_octas": "98800", - "execution_gas_units": "6", - "total_charge_gas_units": "999", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 3 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json similarity index 93% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json index ac0f9f033..72cf689b7 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/4/events.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json @@ -3,7 +3,7 @@ "sequence_number": 2, "creation_number": 0, "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "transaction_version": 4, + "transaction_version": 1, "transaction_block_height": 20040326, "type_": "0x1::account::CoinRegisterEvent", "data": { @@ -20,7 +20,7 @@ "sequence_number": 0, "creation_number": 10, "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "transaction_version": 4, + "transaction_version": 1, "transaction_block_height": 20040326, "type_": "0x1::coin::DepositEvent", "data": { diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/3/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/3/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json similarity index 94% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json index 629f45b83..6bb24838e 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/8/events.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json @@ -3,7 +3,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 8, + "transaction_version": 1, "transaction_block_height": 356437526, "type_": "0x1::fungible_asset::Withdraw", "data": { @@ -17,7 +17,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 8, + "transaction_version": 1, "transaction_block_height": 356437526, "type_": "0x1::fungible_asset::Deposit", "data": { @@ -31,7 +31,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 8, + "transaction_version": 1, "transaction_block_height": 356437526, "type_": "0x1::transaction_fee::FeeStatement", "data": { diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json similarity index 94% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json index 2ca61fa25..742ce4713 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/5/events.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json @@ -3,7 +3,7 @@ "sequence_number": 0, "creation_number": 3, "account_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "transaction_version": 5, + "transaction_version": 1, "transaction_block_height": 295534162, "type_": "0x1::coin::WithdrawEvent", "data": { @@ -16,7 +16,7 @@ "sequence_number": 707, "creation_number": 4, "account_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "transaction_version": 5, + "transaction_version": 1, "transaction_block_height": 295534162, "type_": "0x1::coin::DepositEvent", "data": { @@ -29,7 +29,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 5, + "transaction_version": 1, "transaction_block_height": 295534162, "type_": "0x1::fungible_asset::Deposit", "data": { @@ -43,7 +43,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 5, + "transaction_version": 1, "transaction_block_height": 295534162, "type_": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit", "data": { @@ -61,7 +61,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 5, + "transaction_version": 1, "transaction_block_height": 295534162, "type_": "0x1::transaction_fee::FeeStatement", "data": { diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/1/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/1/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json similarity index 95% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json index 1c54ddcd9..368204084 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/2/events.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json @@ -3,7 +3,7 @@ "sequence_number": 2, "creation_number": 3, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 2, + "transaction_version": 1, "transaction_block_height": 2, "type_": "0x1::block::NewBlockEvent", "data": { diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json deleted file mode 100644 index 188e61ab5..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 2, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "29152644549222814344", - "transaction_timestamp": "2024-06-18T05:07:55", - "transaction_epoch": 15650 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json deleted file mode 100644 index bb185ba28..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "29450400", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 2, - "token_standard": "v1" - }, - { - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "17374075418", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 2, - "token_standard": "v1" - }, - { - "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "93054699", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 2, - "token_standard": "v2" - }, - { - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "17272186129", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 2, - "token_standard": "v2" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json deleted file mode 100644 index 7b29e7e8c..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "transaction_version": 2, - "event_index": -1, - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "50500", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 2, - "event_index": 0, - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::coin::WithdrawEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 2, - "event_index": 1, - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::coin::DepositEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 2, - "event_index": 2, - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::fungible_asset::Deposit", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v2", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json deleted file mode 100644 index 10071cf21..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "transaction_version": 2, - "write_set_change_index": 4, - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "17374075418", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v1" - }, - { - "transaction_version": 2, - "write_set_change_index": 5, - "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "93054699", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v2" - }, - { - "transaction_version": 2, - "write_set_change_index": 8, - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "17272186129", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v2" - }, - { - "transaction_version": 2, - "write_set_change_index": 16, - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "29450400", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json deleted file mode 100644 index a6425725b..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "creator_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "name": "Aptos Coin", - "symbol": "APT", - "decimals": 8, - "icon_uri": "", - "project_uri": "", - "last_transaction_version": 2, - "last_transaction_timestamp": "2024-06-18T05:07:55", - "supply_aggregator_table_handle_v1": null, - "supply_aggregator_table_key_v1": null, - "token_standard": "v2", - "is_token_v2": null, - "maximum_v2": "340282366920938463463374607431768211455", - "supply_v2": "17374075418" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/coin_supply.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json deleted file mode 100644 index 88ef4b4f7..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 5, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18544645433533405815", - "transaction_timestamp": "2022-10-13T01:46:57", - "transaction_epoch": 746 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json deleted file mode 100644 index 55a9dfc97..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/current_fungible_asset_balances.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10041540182", - "last_transaction_timestamp": "2022-10-13T01:46:57", - "last_transaction_version": 5, - "token_standard": "v1" - }, - { - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_primary": true, - "is_frozen": false, - "amount": "1000000000000000000", - "last_transaction_timestamp": "2022-10-13T01:46:57", - "last_transaction_version": 5, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json deleted file mode 100644 index 315ea46bd..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_activities.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "transaction_version": 5, - "event_index": -1, - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "2787000", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::code::publish_package_txn", - "block_height": 20040326, - "token_standard": "v1", - "transaction_timestamp": "2022-10-13T01:46:57", - "storage_refund_amount": "0" - }, - { - "transaction_version": 5, - "event_index": 1, - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_frozen": null, - "amount": "1000000000000000000", - "type_": "0x1::coin::DepositEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::code::publish_package_txn", - "block_height": 20040326, - "token_standard": "v1", - "transaction_timestamp": "2022-10-13T01:46:57", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json deleted file mode 100644 index 94938f666..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_balances.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "transaction_version": 5, - "write_set_change_index": 3, - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10041540182", - "transaction_timestamp": "2022-10-13T01:46:57", - "token_standard": "v1" - }, - { - "transaction_version": 5, - "write_set_change_index": 4, - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_primary": true, - "is_frozen": false, - "amount": "1000000000000000000", - "transaction_timestamp": "2022-10-13T01:46:57", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json deleted file mode 100644 index 0e17a4f13..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/5/fungible_asset_metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "creator_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "name": "Aptos", - "symbol": "APT", - "decimals": 10, - "icon_uri": null, - "project_uri": null, - "last_transaction_version": 5, - "last_transaction_timestamp": "2022-10-13T01:46:57", - "supply_aggregator_table_handle_v1": null, - "supply_aggregator_table_key_v1": null, - "token_standard": "v1", - "is_token_v2": null, - "maximum_v2": null, - "supply_v2": null - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/coin_supply.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/7/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json deleted file mode 100644 index e7288c441..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 8, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18448344078275751615", - "transaction_timestamp": "2022-09-09T01:24:17", - "transaction_epoch": 1 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/8/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json similarity index 89% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json index b2a199e83..eb87b6941 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json @@ -1,6 +1,6 @@ [ { - "transaction_version": 3, + "transaction_version": 1, "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", "coin_type": "0x1::aptos_coin::AptosCoin", "supply": "29165678689185321503", diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json similarity index 92% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json index 0935341a5..c2a114df9 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json @@ -7,7 +7,7 @@ "is_frozen": false, "amount": "18901942640", "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 3, + "last_transaction_version": 1, "token_standard": "v1" }, { @@ -18,7 +18,7 @@ "is_frozen": false, "amount": "0", "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 3, + "last_transaction_version": 1, "token_standard": "v2" }, { @@ -29,7 +29,7 @@ "is_frozen": false, "amount": "9996985969300000000", "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 3, + "last_transaction_version": 1, "token_standard": "v2" } ] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json similarity index 96% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json index 8686b8992..0cc5897f3 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json @@ -1,6 +1,6 @@ [ { - "transaction_version": 3, + "transaction_version": 1, "event_index": -1, "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", @@ -18,7 +18,7 @@ "storage_refund_amount": "0" }, { - "transaction_version": 3, + "transaction_version": 1, "event_index": 0, "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", @@ -36,7 +36,7 @@ "storage_refund_amount": "0" }, { - "transaction_version": 3, + "transaction_version": 1, "event_index": 1, "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json similarity index 93% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json index 3c2e34a41..f0bfe6ff3 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json @@ -1,6 +1,6 @@ [ { - "transaction_version": 3, + "transaction_version": 1, "write_set_change_index": 0, "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", @@ -12,7 +12,7 @@ "token_standard": "v2" }, { - "transaction_version": 3, + "transaction_version": 1, "write_set_change_index": 2, "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", @@ -24,7 +24,7 @@ "token_standard": "v1" }, { - "transaction_version": 3, + "transaction_version": 1, "write_set_change_index": 4, "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json similarity index 89% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json index fc6210a18..809c8549f 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/6/coin_supply.json +++ b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json @@ -1,6 +1,6 @@ [ { - "transaction_version": 6, + "transaction_version": 1, "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", "coin_type": "0x1::aptos_coin::AptosCoin", "supply": "29159026553346716168", diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/4/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs index febbfc725..5bb2b98d2 100644 --- a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs @@ -7,14 +7,12 @@ use sdk_processor::config::{ }; use std::collections::HashSet; -pub fn setup_events_processor_config( +pub async fn setup_events_processor_config( test_context: &SdkTestContext, - txn_version: u64, txn_count: usize, db_url: &str, ) -> (IndexerProcessorConfig, &'static str) { - let transaction_stream_config = - test_context.create_transaction_stream_config(txn_version, txn_count as u64); // since this will be always 1, we can remove from the arg list + let transaction_stream_config = test_context.create_transaction_stream_config(txn_count as u64); // since this will be always 1, we can remove from the arg list let postgres_config = PostgresConfig { connection_string: db_url.to_string(), db_pool_size: 100, @@ -64,77 +62,50 @@ mod tests { IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, }; - // TODO - Add more intentional tests to validate the processor with different scenarios - // Example test1: This test cases runs the events processor and validates the output of all available transactions proto jsons #[tokio::test(flavor = "multi_thread", worker_threads = 2)] - async fn testnet_events_processor_db_output_diff_test() { - let (diff_flag, custom_output_path) = get_test_config(); - let output_path = custom_output_path - .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); + async fn testnet_events_processor_genesis_txn() { + process_single_testnet_event_txn(IMPORTED_TESTNET_TXNS_1_GENESIS, "genesis_txn_test").await; + } - // Step 1: set up an input transaction that will be used - pub const ALL_IMPORTED_TESTNET_TXNS: &[&[u8]] = &[ - IMPORTED_TESTNET_TXNS_1_GENESIS, + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_new_block_event() { + process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, - IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + "new_block_event_test", + ) + .await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_empty_txn() { + process_single_testnet_event_txn(IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, "empty_txn_test").await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_coin_register_fa_metadata() { + process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_278556781_V1_COIN_REGISTER_FA_METADATA, + "coin_register_fa_metadata_test", + ) + .await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_fa_metadata() { + process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_1255836496_V2_FA_METADATA_, - IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, - IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, - IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, - ]; + "fa_metadata_test", + ) + .await; + } - let transaction_batches = ALL_IMPORTED_TESTNET_TXNS - .iter() - .map(|txn| serde_json::from_slice(txn).unwrap()) - .collect::>(); - - let (db, mut test_context) = setup_test_environment(ALL_IMPORTED_TESTNET_TXNS).await; - - // Step 2: Loop over each transaction and run the test for each - for (ind, _txn) in transaction_batches.iter().enumerate() { - let txn_version = (ind + 1) as u64; - - // Step 3: Run the processor - let db_url = db.get_db_url(); - - let (indexer_processor_config, processor_name) = - setup_events_processor_config(&test_context, txn_version, 1, &db_url); - - let events_processor = EventsProcessor::new(indexer_processor_config) - .await - .expect("Failed to create EventsProcessor"); - - match run_processor_test( - &mut test_context, - events_processor, - load_data, - db_url, - vec![txn_version as i64], - diff_flag, - output_path.clone(), - None, - ) - .await - { - Ok(mut db_value) => { - let _ = validate_json( - &mut db_value, - txn_version, - processor_name, - output_path.clone(), - None, - ); - }, - Err(e) => { - eprintln!( - "[ERROR] Failed to run processor for txn version {}: {}", - txn_version, e - ); - panic!("Test failed due to processor error"); - }, - } - } + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_fa_activities() { + process_single_testnet_event_txn( + IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, + "fa_activities_test", + ) + .await; } // Example 2: Test for multiple transactions handling @@ -159,12 +130,8 @@ mod tests { let starting_version = 1; let db_url = db.get_db_url(); - let (indexer_processor_config, _processor_name) = setup_events_processor_config( - &test_context, - starting_version, - transaction_batches.len(), - &db_url, - ); + let (indexer_processor_config, _processor_name) = + setup_events_processor_config(&test_context, transaction_batches.len(), &db_url).await; let events_processor = EventsProcessor::new(indexer_processor_config) .await @@ -175,7 +142,7 @@ mod tests { events_processor, load_data, db_url, - vec![(starting_version as i64), ((starting_version + 1) as i64)], // we can pass multiple versions, + 2, diff_flag, output_path.clone(), Some("multi_txns_handling_test".to_string()), @@ -200,4 +167,51 @@ mod tests { }, } } + + // Helper function to abstract out the single transaction processing + async fn process_single_testnet_event_txn(txn: &[u8], test_case_name: &str) { + let (diff_flag, custom_output_path) = get_test_config(); + let output_path = custom_output_path + .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); + + let (db, mut test_context) = setup_test_environment(&[txn]).await; + + let db_url = db.get_db_url(); + let (indexer_processor_config, processor_name) = + setup_events_processor_config(&test_context, 1, &db_url).await; + + let events_processor = EventsProcessor::new(indexer_processor_config) + .await + .expect("Failed to create EventsProcessor"); + + match run_processor_test( + &mut test_context, + events_processor, + load_data, + db_url, + 1, + diff_flag, + output_path.clone(), + Some(test_case_name.to_string()), + ) + .await + { + Ok(mut db_value) => { + let _ = validate_json( + &mut db_value, + 1, + processor_name, + output_path.clone(), + Some(test_case_name.to_string()), + ); + }, + Err(e) => { + eprintln!( + "[ERROR] Failed to run processor for txn version {}: {}", + 1, e + ); + panic!("Test failed due to processor error"); + }, + } + } } diff --git a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs index 99f5314a9..b1ffbd535 100644 --- a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs @@ -9,12 +9,10 @@ use std::collections::HashSet; pub fn setup_fa_processor_config( test_context: &SdkTestContext, - txn_version: u64, txn_count: usize, db_url: &str, ) -> (IndexerProcessorConfig, &'static str) { - let transaction_stream_config = - test_context.create_transaction_stream_config(txn_version, txn_count as u64); + let transaction_stream_config = test_context.create_transaction_stream_config(txn_count as u64); let postgres_config = PostgresConfig { connection_string: db_url.to_string(), db_pool_size: 100, @@ -50,68 +48,87 @@ mod tests { setup_test_environment, validate_json, DEFAULT_OUTPUT_FOLDER, }, }; - use aptos_indexer_test_transactions::ALL_IMPORTED_TESTNET_TXNS; + use aptos_indexer_test_transactions::{ + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, + IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, + }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; - use aptos_protos::transaction::v1::Transaction; use sdk_processor::processors::fungible_asset_processor::FungibleAssetProcessor; - // TODO - Add more intentional tests to validate the processor with different scenarios - #[tokio::test] - async fn fa_processor_db_output_diff_test() { - let (diff_flag, custom_output_path) = get_test_config(); - let output_path = custom_output_path - .unwrap_or_else(|| DEFAULT_OUTPUT_FOLDER.to_string() + "/imported_testnet_txns"); - - let transaction_batches = ALL_IMPORTED_TESTNET_TXNS - .iter() - .map(|txn| serde_json::from_slice(txn).unwrap()) - .collect::>(); + // Test case for processing a specific testnet transaction (Validator Transaction) + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_fungible_asset_processor_validator_txn() { + process_single_testnet( + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + "validator_txn_test", + ) + .await; + } - let (db, mut test_context) = setup_test_environment(ALL_IMPORTED_TESTNET_TXNS).await; + // Test case for processing another testnet transaction (Coin Register) + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_fungible_asset_processor_coin_register_txn() { + process_single_testnet( + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, + "coin_register_txn_test", + ) + .await; + } - // Step 2: Loop over each transaction and run the test for each - for (ind, _txn) in transaction_batches.iter().enumerate() { - let txn_version = (ind + 1) as u64; + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_fungible_asset_processor_fa_activities_txn() { + process_single_testnet( + IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, + "fa_activities_txn_test", + ) + .await; + } - // Step 3: Run the processor - let db_url = db.get_db_url(); + // Helper function to abstract out the transaction processing + async fn process_single_testnet(txn: &[u8], test_case_name: &str) { + let (diff_flag, custom_output_path) = get_test_config(); + let output_path = custom_output_path + .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); - let (indexer_processor_config, processor_name) = - setup_fa_processor_config(&test_context, txn_version, 1, &db_url); + let (db, mut test_context) = setup_test_environment(&[txn]).await; - let fungible_asset_processor = FungibleAssetProcessor::new(indexer_processor_config) - .await - .expect("Failed to create FungibleAssetProcessor"); + let db_url = db.get_db_url(); + let (indexer_processor_config, processor_name) = + setup_fa_processor_config(&test_context, 1, &db_url); - match run_processor_test( - &mut test_context, - fungible_asset_processor, - load_data, - db_url, - vec![txn_version as i64], - diff_flag, - output_path.clone(), - None, - ) + let fungible_asset_processor = FungibleAssetProcessor::new(indexer_processor_config) .await - { - Ok(mut db_value) => { - let _ = validate_json( - &mut db_value, - txn_version, - processor_name, - output_path.clone(), - None, - ); - }, - Err(e) => { - eprintln!( - "[ERROR] Failed to run processor for txn version {}: {}", - txn_version, e - ); - panic!("Test failed due to processor error"); - }, - } + .expect("Failed to create FungibleAssetProcessor"); + + match run_processor_test( + &mut test_context, + fungible_asset_processor, + load_data, + db_url, + 1, + diff_flag, + output_path.clone(), + Some(test_case_name.to_string()), + ) + .await + { + Ok(mut db_value) => { + let _ = validate_json( + &mut db_value, + 1, + processor_name, + output_path.clone(), + Some(test_case_name.to_string()), + ); + }, + Err(e) => { + eprintln!( + "[ERROR] Failed to run processor for txn version {}: {}", + 1, e + ); + panic!("Test failed due to processor error"); + }, } } } diff --git a/rust/integration-tests/src/sdk_tests/mod.rs b/rust/integration-tests/src/sdk_tests/mod.rs index f743fce30..d8dcafada 100644 --- a/rust/integration-tests/src/sdk_tests/mod.rs +++ b/rust/integration-tests/src/sdk_tests/mod.rs @@ -62,9 +62,12 @@ pub fn validate_json( for (table_name, db_value) in db_values.iter_mut() { let expected_file_path = match file_name.clone() { Some(custom_name) => { - PathBuf::from(&output_path).join(processor_name).join( - format!("{}.json", custom_name.clone()), // Including table_name in the format - ) + PathBuf::from(&output_path) + .join(processor_name) + .join(custom_name.clone()) + .join( + format!("{}.json", table_name), // Including table_name in the format + ) }, None => { // Default case: use table_name and txn_version to construct file name @@ -96,8 +99,6 @@ pub fn validate_json( table_name, txn_version ); assert_json_eq!(db_value, expected_json); - println!("db value: {:#?}", db_value); - println!("expected json: {:#?}", expected_json); } Ok(()) } @@ -109,7 +110,7 @@ pub async fn run_processor_test( processor: impl ProcessorTrait, load_data: F, db_url: String, - txn_versions: Vec, + txn_count: i64, generate_file_flag: bool, output_path: String, custom_file_name: Option, @@ -123,7 +124,7 @@ where let db_values = test_context .run( &processor, - txn_versions[0] as u64, + 1, generate_file_flag, output_path.clone(), custom_file_name, @@ -132,8 +133,9 @@ where let mut conn = PgConnection::establish(&db_url).expect("Failed to establish DB connection"); - let starting_version = txn_versions[0]; - let ending_version = txn_versions[txn_versions.len() - 1]; + let starting_version = 1; + let ending_version = txn_count; + let txn_versions: Vec = (starting_version..=ending_version).collect(); let db_values = match load_data(&mut conn, txn_versions) { Ok(db_data) => db_data, From 264877c803d51b2d7a3226913692b358d68a6790 Mon Sep 17 00:00:00 2001 From: yuunlimm Date: Mon, 21 Oct 2024 18:48:59 -0700 Subject: [PATCH 4/4] update tests --- rust/Cargo.lock | 16 +- rust/Cargo.toml | 6 +- .../events_processor/5523474016/events.json | 281 ------------------ .../events.json | 0 .../{3 => empty_txn_test}/events.json | 0 .../events.json | 0 .../events.json | 0 .../{1 => genesis_txn_test}/events.json | 0 .../multi_txns_handling_test/events.json | 48 +-- .../{2 => new_block_event_test}/events.json | 0 .../1/coin_supply.json | 10 - .../1255836496/coin_supply.json | 10 - .../current_fungible_asset_balances.json | 46 --- .../1255836496/fungible_asset_activities.json | 74 ----- .../1255836496/fungible_asset_balances.json | 50 ---- .../1255836496/fungible_asset_metadata.json | 19 -- .../2/coin_supply.json | 1 - .../2/current_fungible_asset_balances.json | 1 - .../2/fungible_asset_activities.json | 1 - .../2/fungible_asset_balances.json | 1 - .../278556781/coin_supply.json | 10 - .../current_fungible_asset_balances.json | 24 -- .../278556781/fungible_asset_activities.json | 38 --- .../278556781/fungible_asset_balances.json | 26 -- .../278556781/fungible_asset_metadata.json | 19 -- .../3/coin_supply.json | 1 - .../3/current_fungible_asset_balances.json | 1 - .../3/fungible_asset_activities.json | 1 - .../3/fungible_asset_balances.json | 1 - .../current_fungible_asset_balances.json | 1 - .../5523474016/fungible_asset_activities.json | 1 - .../5523474016/fungible_asset_balances.json | 1 - .../5523474016/fungible_asset_metadata.json | 1 - .../5979639459/fungible_asset_metadata.json | 1 - .../5992795934/fungible_asset_metadata.json | 1 - .../coin_supply.json | 0 .../current_fungible_asset_balances.json | 0 .../fungible_asset_activities.json | 0 .../fungible_asset_balances.json | 0 .../fungible_asset_metadata.json | 0 .../coin_supply.json | 0 .../current_fungible_asset_balances.json | 0 .../fungible_asset_activities.json | 0 .../fungible_asset_balances.json | 0 .../fungible_asset_metadata.json | 0 .../coin_supply.json | 0 .../current_fungible_asset_balances.json | 0 .../fungible_asset_activities.json | 0 .../fungible_asset_balances.json | 0 .../fungible_asset_metadata.json | 0 .../events.json | 32 -- .../empty_txn_test/events.json | 1 - .../fa_activities_test/events.json | 47 --- .../fa_metadata_test/events.json | 77 ----- .../genesis_txn_test/events.json | 94 ------ .../new_block_event_test/events.json | 22 -- .../coin_register_txn_test/coin_supply.json | 10 - .../current_fungible_asset_balances.json | 24 -- .../fungible_asset_activities.json | 56 ---- .../fungible_asset_balances.json | 26 -- .../fungible_asset_metadata.json | 1 - .../fa_activities_txn_test/coin_supply.json | 10 - .../current_fungible_asset_balances.json | 35 --- .../fungible_asset_activities.json | 56 ---- .../fungible_asset_balances.json | 38 --- .../fungible_asset_metadata.json | 1 - .../validator_txn_test/coin_supply.json | 10 - .../current_fungible_asset_balances.json | 1 - .../fungible_asset_activities.json | 1 - .../fungible_asset_balances.json | 1 - .../fungible_asset_metadata.json | 1 - .../src/diff_tests/all_tests.rs | 27 +- .../src/sdk_tests/events_processor_tests.rs | 76 +++-- .../fungible_asset_processor_tests.rs | 35 ++- rust/integration-tests/src/sdk_tests/mod.rs | 13 +- 75 files changed, 119 insertions(+), 1267 deletions(-) delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5523474016/events.json rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{278556781 => coin_register_fa_metadata_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{3 => empty_txn_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{5992795934 => fa_activities_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{1255836496 => fa_metadata_test}/events.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{1 => genesis_txn_test}/events.json (100%) rename rust/integration-tests/{sdk_expected_db_output_files2 => sdk_expected_db_output_files}/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json (92%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/{2 => new_block_event_test}/events.json (100%) delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_metadata.json rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5979639459 => coin_register_txn_test}/coin_supply.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5979639459 => coin_register_txn_test}/current_fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5979639459 => coin_register_txn_test}/fungible_asset_activities.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5979639459 => coin_register_txn_test}/fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{1 => coin_register_txn_test}/fungible_asset_metadata.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5992795934 => fa_activities_txn_test}/coin_supply.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5992795934 => fa_activities_txn_test}/current_fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5992795934 => fa_activities_txn_test}/fungible_asset_activities.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5992795934 => fa_activities_txn_test}/fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{2 => fa_activities_txn_test}/fungible_asset_metadata.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{5523474016 => validator_txn_test}/coin_supply.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{1 => validator_txn_test}/current_fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{1 => validator_txn_test}/fungible_asset_activities.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{1 => validator_txn_test}/fungible_asset_balances.json (100%) rename rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/{3 => validator_txn_test}/fungible_asset_metadata.json (100%) delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json delete mode 100644 rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json diff --git a/rust/Cargo.lock b/rust/Cargo.lock index aa6cb5df2..094b206d5 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -141,7 +141,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aptos-indexer-processor-sdk" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "ahash", "anyhow", @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "aptos-indexer-processor-sdk-server-framework" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -207,7 +207,7 @@ dependencies = [ [[package]] name = "aptos-indexer-testing-framework" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "anyhow", "aptos-indexer-processor-sdk", @@ -234,10 +234,10 @@ dependencies = [ [[package]] name = "aptos-indexer-transaction-stream" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8)", + "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299)", "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb)", "chrono", "futures-util", @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "aptos-moving-average" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "chrono", ] @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "instrumented-channel" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "delegate", "derive_builder", @@ -4129,7 +4129,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sample" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=ed2c5e4c4f5155f86c03624041ccbcec10061cf8#ed2c5e4c4f5155f86c03624041ccbcec10061cf8" +source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?rev=41dd3e52235032d447f736664d28b9ec4fd0a299#41dd3e52235032d447f736664d28b9ec4fd0a299" dependencies = [ "tracing", ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a9d8b375a..6318448d4 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -30,12 +30,12 @@ testing-transactions = { path = "testing-transactions" } ahash = { version = "0.8.7", features = ["serde"] } anyhow = "1.0.86" -aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } -aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } +aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "41dd3e52235032d447f736664d28b9ec4fd0a299" } +aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "41dd3e52235032d447f736664d28b9ec4fd0a299" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" } aptos-system-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "202bdccff2b2d333a385ae86a4fcf23e89da9f62" } aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "3099bbe1e100be815ca0cb262cd7eceef9c75dad" } -aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "ed2c5e4c4f5155f86c03624041ccbcec10061cf8" } +aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "41dd3e52235032d447f736664d28b9ec4fd0a299" } async-trait = "0.1.53" backtrace = "0.3.58" diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5523474016/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5523474016/events.json deleted file mode 100644 index d1a0d7d76..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5523474016/events.json +++ /dev/null @@ -1,281 +0,0 @@ -[ - { - "sequence_number": 9814, - "creation_number": 12, - "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", - "rewards_amount": "789371656" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 0 - }, - { - "sequence_number": 4252, - "creation_number": 12, - "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", - "rewards_amount": "19174256316" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 1 - }, - { - "sequence_number": 9823, - "creation_number": 12, - "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", - "rewards_amount": "19178730843" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 2 - }, - { - "sequence_number": 3697, - "creation_number": 12, - "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", - "rewards_amount": "818123890" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 3 - }, - { - "sequence_number": 9813, - "creation_number": 12, - "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", - "rewards_amount": "19178287161" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 4 - }, - { - "sequence_number": 14143, - "creation_number": 12, - "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", - "rewards_amount": "963055869" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 5 - }, - { - "sequence_number": 9812, - "creation_number": 12, - "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", - "rewards_amount": "19177688699" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 6 - }, - { - "sequence_number": 7807, - "creation_number": 12, - "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", - "rewards_amount": "841058926" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 7 - }, - { - "sequence_number": 9823, - "creation_number": 12, - "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", - "rewards_amount": "19178518163" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 8 - }, - { - "sequence_number": 9829, - "creation_number": 12, - "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x3c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", - "rewards_amount": "19185171265" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 9 - }, - { - "sequence_number": 4252, - "creation_number": 12, - "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", - "rewards_amount": "19174925092" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 10 - }, - { - "sequence_number": 8256, - "creation_number": 12, - "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", - "rewards_amount": "18813123628" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 11 - }, - { - "sequence_number": 8641, - "creation_number": 10, - "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", - "rewards_amount": "828031401" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 12 - }, - { - "sequence_number": 1882, - "creation_number": 12, - "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", - "rewards_amount": "798768182" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 13 - }, - { - "sequence_number": 2197, - "creation_number": 12, - "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", - "rewards_amount": "18896078163" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 14 - }, - { - "sequence_number": 2199, - "creation_number": 12, - "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", - "rewards_amount": "18894077814" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 15 - }, - { - "sequence_number": 225, - "creation_number": 12, - "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", - "rewards_amount": "787639333" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 16 - }, - { - "sequence_number": 405, - "creation_number": 12, - "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", - "rewards_amount": "789473752" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 17 - }, - { - "sequence_number": 330, - "creation_number": 10, - "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", - "rewards_amount": "787913628" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 18 - }, - { - "sequence_number": 16643, - "creation_number": 2, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 5523474016, - "transaction_block_height": 322305240, - "type_": "0x1::reconfiguration::NewEpochEvent", - "data": { - "epoch": "16644" - }, - "indexed_type": "0x1::reconfiguration::NewEpochEvent", - "event_index": 19 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/278556781/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/278556781/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/3/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/empty_txn_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/3/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/empty_txn_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5992795934/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/fa_activities_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/5992795934/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/fa_activities_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/1255836496/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/fa_metadata_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/1255836496/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/fa_metadata_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/1/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/genesis_txn_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/1/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/genesis_txn_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json similarity index 92% rename from rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json index f8a5e1a18..886b72a14 100644 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/multi_txns_handling_test/events.json @@ -3,7 +3,7 @@ "sequence_number": 9814, "creation_number": 12, "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -17,7 +17,7 @@ "sequence_number": 4252, "creation_number": 12, "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -31,7 +31,7 @@ "sequence_number": 9823, "creation_number": 12, "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -45,7 +45,7 @@ "sequence_number": 3697, "creation_number": 12, "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -59,7 +59,7 @@ "sequence_number": 9813, "creation_number": 12, "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -73,7 +73,7 @@ "sequence_number": 14143, "creation_number": 12, "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -87,7 +87,7 @@ "sequence_number": 9812, "creation_number": 12, "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -101,7 +101,7 @@ "sequence_number": 7807, "creation_number": 12, "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -115,7 +115,7 @@ "sequence_number": 9823, "creation_number": 12, "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -129,7 +129,7 @@ "sequence_number": 9829, "creation_number": 12, "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -143,7 +143,7 @@ "sequence_number": 4252, "creation_number": 12, "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -157,7 +157,7 @@ "sequence_number": 8256, "creation_number": 12, "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -171,7 +171,7 @@ "sequence_number": 8641, "creation_number": 10, "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -185,7 +185,7 @@ "sequence_number": 1882, "creation_number": 12, "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -199,7 +199,7 @@ "sequence_number": 2197, "creation_number": 12, "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -213,7 +213,7 @@ "sequence_number": 2199, "creation_number": 12, "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -227,7 +227,7 @@ "sequence_number": 225, "creation_number": 12, "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -241,7 +241,7 @@ "sequence_number": 405, "creation_number": 12, "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -255,7 +255,7 @@ "sequence_number": 330, "creation_number": 10, "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::stake::DistributeRewardsEvent", "data": { @@ -269,7 +269,7 @@ "sequence_number": 16643, "creation_number": 2, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 1, + "transaction_version": 5523474016, "transaction_block_height": 322305240, "type_": "0x1::reconfiguration::NewEpochEvent", "data": { @@ -282,7 +282,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "transaction_version": 2, + "transaction_version": 5979639459, "transaction_block_height": 354619634, "type_": "0x1::account::CoinRegisterEvent", "data": { @@ -299,7 +299,7 @@ "sequence_number": 21684, "creation_number": 3, "account_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "transaction_version": 2, + "transaction_version": 5979639459, "transaction_block_height": 354619634, "type_": "0x1::coin::WithdrawEvent", "data": { @@ -312,7 +312,7 @@ "sequence_number": 0, "creation_number": 2, "account_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "transaction_version": 2, + "transaction_version": 5979639459, "transaction_block_height": 354619634, "type_": "0x1::coin::DepositEvent", "data": { @@ -325,7 +325,7 @@ "sequence_number": 0, "creation_number": 0, "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 2, + "transaction_version": 5979639459, "transaction_block_height": 354619634, "type_": "0x1::transaction_fee::FeeStatement", "data": { diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/2/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/new_block_event_test/events.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/2/events.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/events_processor/new_block_event_test/events.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json deleted file mode 100644 index 05dd7f35b..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 1, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18448344078275751615", - "transaction_timestamp": "2022-09-09T01:24:17", - "transaction_epoch": 1 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/coin_supply.json deleted file mode 100644 index 937a86719..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 1255836496, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "29152644549222814344", - "transaction_timestamp": "2024-06-18T05:07:55", - "transaction_epoch": 15650 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/current_fungible_asset_balances.json deleted file mode 100644 index e5c643eb6..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/current_fungible_asset_balances.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "29450400", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 1255836496, - "token_standard": "v1" - }, - { - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "17374075418", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 1255836496, - "token_standard": "v1" - }, - { - "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "93054699", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 1255836496, - "token_standard": "v2" - }, - { - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "17272186129", - "last_transaction_timestamp": "2024-06-18T05:07:55", - "last_transaction_version": 1255836496, - "token_standard": "v2" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_activities.json deleted file mode 100644 index deda77d29..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_activities.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "transaction_version": 1255836496, - "event_index": -1, - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "50500", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1255836496, - "event_index": 0, - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::coin::WithdrawEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1255836496, - "event_index": 1, - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::coin::DepositEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v1", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1255836496, - "event_index": 2, - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_frozen": null, - "amount": "300000", - "type_": "0x1::fungible_asset::Deposit", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::meso::deposit_coin", - "block_height": 295534162, - "token_standard": "v2", - "transaction_timestamp": "2024-06-18T05:07:55", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_balances.json deleted file mode 100644 index 2dd21aa02..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_balances.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "transaction_version": 1255836496, - "write_set_change_index": 4, - "storage_id": "0x56c216a20a151df2e917008e27f3b70250f1cbb80eeef24e64e2335630825fa3", - "owner_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "17374075418", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v1" - }, - { - "transaction_version": 1255836496, - "write_set_change_index": 5, - "storage_id": "0x7ea259eaaacce518a7479baca008e17fab2d0267a16e11979d52eb6c5433aad6", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "93054699", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v2" - }, - { - "transaction_version": 1255836496, - "write_set_change_index": 8, - "storage_id": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "owner_address": "0xbe1390db94c2f8e83fd870c195656921ed4a2a5dee644c6d9c3168fea082a828", - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "is_primary": false, - "is_frozen": false, - "amount": "17272186129", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v2" - }, - { - "transaction_version": 1255836496, - "write_set_change_index": 16, - "storage_id": "0x2086a7aaf18928233884d1725d4f92c5f26c67ac03cb98fe2dc40c99671282dc", - "owner_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "29450400", - "transaction_timestamp": "2024-06-18T05:07:55", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_metadata.json deleted file mode 100644 index 3bbb1d851..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1255836496/fungible_asset_metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "asset_type": "0x4551f2167c446b219c4dee2aa5496395c82a465cd57c5b362621af451c5d062b", - "creator_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "name": "Aptos Coin", - "symbol": "APT", - "decimals": 8, - "icon_uri": "", - "project_uri": "", - "last_transaction_version": 1255836496, - "last_transaction_timestamp": "2024-06-18T05:07:55", - "supply_aggregator_table_handle_v1": null, - "supply_aggregator_table_key_v1": null, - "token_standard": "v2", - "is_token_v2": null, - "maximum_v2": "340282366920938463463374607431768211455", - "supply_v2": "17374075418" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/coin_supply.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/coin_supply.json deleted file mode 100644 index c7455ae56..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 278556781, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "18544645433533405815", - "transaction_timestamp": "2022-10-13T01:46:57", - "transaction_epoch": 746 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/current_fungible_asset_balances.json deleted file mode 100644 index f45ae6826..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/current_fungible_asset_balances.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10041540182", - "last_transaction_timestamp": "2022-10-13T01:46:57", - "last_transaction_version": 278556781, - "token_standard": "v1" - }, - { - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_primary": true, - "is_frozen": false, - "amount": "1000000000000000000", - "last_transaction_timestamp": "2022-10-13T01:46:57", - "last_transaction_version": 278556781, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_activities.json deleted file mode 100644 index 436b43072..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_activities.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "transaction_version": 278556781, - "event_index": -1, - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "2787000", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::code::publish_package_txn", - "block_height": 20040326, - "token_standard": "v1", - "transaction_timestamp": "2022-10-13T01:46:57", - "storage_refund_amount": "0" - }, - { - "transaction_version": 278556781, - "event_index": 1, - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_frozen": null, - "amount": "1000000000000000000", - "type_": "0x1::coin::DepositEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::code::publish_package_txn", - "block_height": 20040326, - "token_standard": "v1", - "transaction_timestamp": "2022-10-13T01:46:57", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_balances.json deleted file mode 100644 index 779d4957c..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_balances.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "transaction_version": 278556781, - "write_set_change_index": 3, - "storage_id": "0xa0f5bae99aac34d548f1c5f487800e375e451c1d9576bcdae6f3902752c83c01", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10041540182", - "transaction_timestamp": "2022-10-13T01:46:57", - "token_standard": "v1" - }, - { - "transaction_version": 278556781, - "write_set_change_index": 4, - "storage_id": "0xfc6edbad85409914ab088b68fed0528e4d8e36dcee31075bb8252b4f426a6cff", - "owner_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "is_primary": true, - "is_frozen": false, - "amount": "1000000000000000000", - "transaction_timestamp": "2022-10-13T01:46:57", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_metadata.json deleted file mode 100644 index 9733b88cd..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/278556781/fungible_asset_metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "asset_type": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862::proton_cbdy::PRT_KFBCCC", - "creator_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "name": "Aptos", - "symbol": "APT", - "decimals": 10, - "icon_uri": null, - "project_uri": null, - "last_transaction_version": 278556781, - "last_transaction_timestamp": "2022-10-13T01:46:57", - "supply_aggregator_table_handle_v1": null, - "supply_aggregator_table_key_v1": null, - "token_standard": "v1", - "is_token_v2": null, - "maximum_v2": null, - "supply_v2": null - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/coin_supply.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5979639459/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5992795934/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/2/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/5523474016/coin_supply.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/current_fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_activities.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/1/fungible_asset_balances.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json similarity index 100% rename from rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/3/fungible_asset_metadata.json rename to rust/integration-tests/sdk_expected_db_output_files/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json deleted file mode 100644 index 72cf689b7..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/coin_register_fa_metadata_test/events.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "sequence_number": 2, - "creation_number": 0, - "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "transaction_version": 1, - "transaction_block_height": 20040326, - "type_": "0x1::account::CoinRegisterEvent", - "data": { - "type_info": { - "module_name": "0x70726f746f6e5f63626479", - "struct_name": "0x5052545f4b4642434343", - "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862" - } - }, - "indexed_type": "0x1::account::CoinRegisterEvent", - "event_index": 0 - }, - { - "sequence_number": 0, - "creation_number": 10, - "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862", - "transaction_version": 1, - "transaction_block_height": 20040326, - "type_": "0x1::coin::DepositEvent", - "data": { - "amount": "1000000000000000000" - }, - "indexed_type": "0x1::coin::DepositEvent", - "event_index": 1 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/empty_txn_test/events.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json deleted file mode 100644 index 6bb24838e..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_activities_test/events.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 356437526, - "type_": "0x1::fungible_asset::Withdraw", - "data": { - "store": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", - "amount": "100000000" - }, - "indexed_type": "0x1::fungible_asset::Withdraw", - "event_index": 0 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 356437526, - "type_": "0x1::fungible_asset::Deposit", - "data": { - "store": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", - "amount": "100000000" - }, - "indexed_type": "0x1::fungible_asset::Deposit", - "event_index": 1 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 356437526, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "7", - "storage_fee_octas": "0", - "execution_gas_units": "5", - "total_charge_gas_units": "12", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 2 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json deleted file mode 100644 index 742ce4713..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/fa_metadata_test/events.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "sequence_number": 0, - "creation_number": 3, - "account_address": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "transaction_version": 1, - "transaction_block_height": 295534162, - "type_": "0x1::coin::WithdrawEvent", - "data": { - "amount": "300000" - }, - "indexed_type": "0x1::coin::WithdrawEvent", - "event_index": 0 - }, - { - "sequence_number": 707, - "creation_number": 4, - "account_address": "0x6cbd58aec3b1eb5aff37ece4dff62b829ecbc6b851ee94056e852bcde5690ab4", - "transaction_version": 1, - "transaction_block_height": 295534162, - "type_": "0x1::coin::DepositEvent", - "data": { - "amount": "300000" - }, - "indexed_type": "0x1::coin::DepositEvent", - "event_index": 1 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 295534162, - "type_": "0x1::fungible_asset::Deposit", - "data": { - "store": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8", - "amount": "300000" - }, - "indexed_type": "0x1::fungible_asset::Deposit", - "event_index": 2 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 295534162, - "type_": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit", - "data": { - "pool": { - "inner": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8" - }, - "user": "0xf21d4c76354db6492841e31fefeaa5a3e8a1071d2bcbbdd1cf1cbc6fa3954b88", - "token": "0x1::aptos_coin::AptosCoin", - "amount": "300000" - }, - "indexed_type": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit", - "event_index": 3 - }, - { - "sequence_number": 0, - "creation_number": 0, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000000", - "transaction_version": 1, - "transaction_block_height": 295534162, - "type_": "0x1::transaction_fee::FeeStatement", - "data": { - "io_gas_units": "16", - "storage_fee_octas": "45720", - "execution_gas_units": "32", - "total_charge_gas_units": "505", - "storage_fee_refund_octas": "0" - }, - "indexed_type": "0x1::transaction_fee::FeeStatement", - "event_index": 4 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json deleted file mode 100644 index 338e7e633..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/genesis_txn_test/events.json +++ /dev/null @@ -1,94 +0,0 @@ -[ - { - "sequence_number": 1, - "creation_number": 3, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::block::NewBlockEvent", - "data": { - "hash": "0x1f4392dc07a74b39eaea58b912855cbbd1ab67e5089ae6166329e883c2085f0", - "epoch": "1", - "round": "3", - "height": "1", - "proposer": "0xdffe3c93b756bf6fec59b052d6fe71b40c3f9b7899d69ab06ba385b1c6728d16", - "time_microseconds": "1662686657227425", - "failed_proposer_indices": [ - "2", - "1" - ], - "previous_block_votes_bitvec": "0x00" - }, - "indexed_type": "0x1::block::NewBlockEvent", - "event_index": 0 - }, - { - "sequence_number": 0, - "creation_number": 12, - "account_address": "0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c", - "rewards_amount": "0" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 1 - }, - { - "sequence_number": 0, - "creation_number": 12, - "account_address": "0xdffe3c93b756bf6fec59b052d6fe71b40c3f9b7899d69ab06ba385b1c6728d16", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xdffe3c93b756bf6fec59b052d6fe71b40c3f9b7899d69ab06ba385b1c6728d16", - "rewards_amount": "4566200000" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 2 - }, - { - "sequence_number": 0, - "creation_number": 12, - "account_address": "0x828ca971e35c8b9a807439e5a328fdc9a5ed0efbfb12f40bc451d17f6998be3f", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0x828ca971e35c8b9a807439e5a328fdc9a5ed0efbfb12f40bc451d17f6998be3f", - "rewards_amount": "0" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 3 - }, - { - "sequence_number": 0, - "creation_number": 12, - "account_address": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::stake::DistributeRewardsEvent", - "data": { - "pool_address": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f", - "rewards_amount": "0" - }, - "indexed_type": "0x1::stake::DistributeRewardsEvent", - "event_index": 4 - }, - { - "sequence_number": 1, - "creation_number": 2, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 1, - "transaction_block_height": 1, - "type_": "0x1::reconfiguration::NewEpochEvent", - "data": { - "epoch": "2" - }, - "indexed_type": "0x1::reconfiguration::NewEpochEvent", - "event_index": 5 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json deleted file mode 100644 index 368204084..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/events_processor/new_block_event_test/events.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "sequence_number": 2, - "creation_number": 3, - "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "transaction_version": 1, - "transaction_block_height": 2, - "type_": "0x1::block::NewBlockEvent", - "data": { - "hash": "0x7155ede2ab87b66e7beba3210b43367eb90daff8891d44ed05eed20a71b9b55a", - "epoch": "2", - "round": "1", - "height": "2", - "proposer": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f", - "time_microseconds": "1662686657332551", - "failed_proposer_indices": [], - "previous_block_votes_bitvec": "0x00" - }, - "indexed_type": "0x1::block::NewBlockEvent", - "event_index": 0 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json deleted file mode 100644 index 44f79c5df..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 1, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "29164832318786122251", - "transaction_timestamp": "2024-09-13T16:48:29", - "transaction_epoch": 17778 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json deleted file mode 100644 index dd9d3bab7..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", - "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10", - "last_transaction_timestamp": "2024-09-13T16:48:29", - "last_transaction_version": 1, - "token_standard": "v1" - }, - { - "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", - "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "16673484350", - "last_transaction_timestamp": "2024-09-13T16:48:29", - "last_transaction_version": 1, - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json deleted file mode 100644 index fcf6db58b..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_activities.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "transaction_version": 1, - "event_index": -1, - "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "99900", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::aptos_account::transfer", - "block_height": 354619634, - "token_standard": "v1", - "transaction_timestamp": "2024-09-13T16:48:29", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1, - "event_index": 1, - "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "10", - "type_": "0x1::coin::WithdrawEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::aptos_account::transfer", - "block_height": 354619634, - "token_standard": "v1", - "transaction_timestamp": "2024-09-13T16:48:29", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1, - "event_index": 2, - "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "10", - "type_": "0x1::coin::DepositEvent", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x1::aptos_account::transfer", - "block_height": 354619634, - "token_standard": "v1", - "transaction_timestamp": "2024-09-13T16:48:29", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json deleted file mode 100644 index d7d127038..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_balances.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "transaction_version": 1, - "write_set_change_index": 0, - "storage_id": "0x32edf0b123cd57094ba7b0b5a0b1524e0f2117b547adf65e8b0c08b39e30d242", - "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "16673484350", - "transaction_timestamp": "2024-09-13T16:48:29", - "token_standard": "v1" - }, - { - "transaction_version": 1, - "write_set_change_index": 2, - "storage_id": "0x239f9719aceb8223231f615e436fcfc8b7e7a6cb03350d00dc72b47678e5d78b", - "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "10", - "transaction_timestamp": "2024-09-13T16:48:29", - "token_standard": "v1" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/coin_register_txn_test/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json deleted file mode 100644 index eb87b6941..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 1, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "29165678689185321503", - "transaction_timestamp": "2024-09-16T06:58:10", - "transaction_epoch": 17841 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json deleted file mode 100644 index c2a114df9..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json +++ /dev/null @@ -1,35 +0,0 @@ -[ - { - "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", - "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "18901942640", - "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 1, - "token_standard": "v1" - }, - { - "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", - "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_primary": true, - "is_frozen": false, - "amount": "0", - "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 1, - "token_standard": "v2" - }, - { - "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", - "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_primary": true, - "is_frozen": false, - "amount": "9996985969300000000", - "last_transaction_timestamp": "2024-09-16T06:58:10", - "last_transaction_version": 1, - "token_standard": "v2" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json deleted file mode 100644 index 0cc5897f3..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_activities.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "transaction_version": 1, - "event_index": -1, - "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", - "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_frozen": null, - "amount": "1200", - "type_": "0x1::aptos_coin::GasFeeEvent", - "is_gas_fee": true, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", - "block_height": 356437526, - "token_standard": "v1", - "transaction_timestamp": "2024-09-16T06:58:10", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1, - "event_index": 0, - "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", - "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_frozen": null, - "amount": "100000000", - "type_": "0x1::fungible_asset::Withdraw", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", - "block_height": 356437526, - "token_standard": "v2", - "transaction_timestamp": "2024-09-16T06:58:10", - "storage_refund_amount": "0" - }, - { - "transaction_version": 1, - "event_index": 1, - "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", - "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_frozen": null, - "amount": "100000000", - "type_": "0x1::fungible_asset::Deposit", - "is_gas_fee": false, - "gas_fee_payer_address": null, - "is_transaction_success": true, - "entry_function_id_str": "0x7120b5552460116c3734ec3fed721e376bf9afc10c1bba13c678d74cd4608f12::TeviStar::force_transfer", - "block_height": 356437526, - "token_standard": "v2", - "transaction_timestamp": "2024-09-16T06:58:10", - "storage_refund_amount": "0" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json deleted file mode 100644 index f0bfe6ff3..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_balances.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "transaction_version": 1, - "write_set_change_index": 0, - "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c", - "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_primary": true, - "is_frozen": false, - "amount": "0", - "transaction_timestamp": "2024-09-16T06:58:10", - "token_standard": "v2" - }, - { - "transaction_version": 1, - "write_set_change_index": 2, - "storage_id": "0x5120dc6832daa352228ba75c1e7e73f57a80b608c900a7060382516a5c035f20", - "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c", - "asset_type": "0x1::aptos_coin::AptosCoin", - "is_primary": true, - "is_frozen": false, - "amount": "18901942640", - "transaction_timestamp": "2024-09-16T06:58:10", - "token_standard": "v1" - }, - { - "transaction_version": 1, - "write_set_change_index": 4, - "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0", - "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f", - "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f", - "is_primary": true, - "is_frozen": false, - "amount": "9996985969300000000", - "transaction_timestamp": "2024-09-16T06:58:10", - "token_standard": "v2" - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/fa_activities_txn_test/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json deleted file mode 100644 index 809c8549f..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/coin_supply.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "transaction_version": 1, - "coin_type_hash": "91ceb1308a98389691e05158b07ed5f079ab78461a6bb8d5a4054b1bb5cb8bb6", - "coin_type": "0x1::aptos_coin::AptosCoin", - "supply": "29159026553346716168", - "transaction_timestamp": "2024-07-29T00:02:18", - "transaction_epoch": 16643 - } -] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/current_fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_activities.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_balances.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json b/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json deleted file mode 100644 index 0637a088a..000000000 --- a/rust/integration-tests/sdk_expected_db_output_files2/imported_testnet_txns/fungible_asset_processor/validator_txn_test/fungible_asset_metadata.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/rust/integration-tests/src/diff_tests/all_tests.rs b/rust/integration-tests/src/diff_tests/all_tests.rs index aa8e21b89..4ef88d06d 100644 --- a/rust/integration-tests/src/diff_tests/all_tests.rs +++ b/rust/integration-tests/src/diff_tests/all_tests.rs @@ -10,13 +10,11 @@ mod test { }, diff_tests::{ get_expected_imported_mainnet_txns, get_expected_imported_testnet_txns, - get_expected_scripted_txns, remove_inserted_at, remove_transaction_timestamp, + remove_inserted_at, remove_transaction_timestamp, }, DiffTest, TestContext, TestProcessorConfig, TestType, }; - use aptos_indexer_test_transactions::{ - ALL_IMPORTED_MAINNET_TXNS, ALL_IMPORTED_TESTNET_TXNS, ALL_SCRIPTED_TRANSACTIONS, - }; + use aptos_indexer_test_transactions::{ALL_IMPORTED_MAINNET_TXNS, ALL_IMPORTED_TESTNET_TXNS}; use aptos_indexer_testing_framework::{ cli_parser::get_test_config, sdk_test_context::generate_output_file, }; @@ -66,26 +64,6 @@ mod test { .await; } - #[tokio::test] - async fn test_all_scripted_txns_schema_output_for_all_processors() { - let (generate_output_flag, custom_output_path) = get_test_config(); - let output_path = custom_output_path - .unwrap_or_else(|| DEFAULT_OUTPUT_FOLDER.to_string() + "/scripted_txns"); - - let processor_configs = get_processor_configs(); - let test_context = TestContext::new(ALL_SCRIPTED_TRANSACTIONS).await.unwrap(); - - run_processor_tests( - processor_configs, - &test_context, - generate_output_flag, - output_path, - true, - get_expected_scripted_txns, - ) - .await; - } - // Helper function to reduce duplicate code for running tests on all processors async fn run_processor_tests( processor_configs: Vec, @@ -160,7 +138,6 @@ mod test { remove_transaction_timestamp(db_value); remove_inserted_at(&mut expected_json); remove_transaction_timestamp(&mut expected_json); - // Validate the actual vs expected JSON for the current table assert_json_eq!(db_value, expected_json); } diff --git a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs index 5bb2b98d2..0960f4d08 100644 --- a/rust/integration-tests/src/sdk_tests/events_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/events_processor_tests.rs @@ -9,10 +9,12 @@ use std::collections::HashSet; pub async fn setup_events_processor_config( test_context: &SdkTestContext, + staring_version: u64, txn_count: usize, db_url: &str, ) -> (IndexerProcessorConfig, &'static str) { - let transaction_stream_config = test_context.create_transaction_stream_config(txn_count as u64); // since this will be always 1, we can remove from the arg list + let transaction_stream_config = + test_context.create_transaction_stream_config(staring_version, txn_count as u64); // since this will be always 1, we can remove from the arg list let postgres_config = PostgresConfig { connection_string: db_url.to_string(), db_pool_size: 100, @@ -52,40 +54,50 @@ mod tests { IMPORTED_TESTNET_TXNS_1255836496_V2_FA_METADATA_, IMPORTED_TESTNET_TXNS_1_GENESIS, IMPORTED_TESTNET_TXNS_278556781_V1_COIN_REGISTER_FA_METADATA, IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; use aptos_protos::transaction::v1::Transaction; use sdk_processor::processors::events_processor::EventsProcessor; - use testing_transactions::{ - IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, - IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, - }; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_genesis_txn() { - process_single_testnet_event_txn(IMPORTED_TESTNET_TXNS_1_GENESIS, "genesis_txn_test").await; + process_single_testnet_event_txn( + IMPORTED_TESTNET_TXNS_1_GENESIS, + 1, + Some("genesis_txn_test".to_string()), + ) + .await; } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_new_block_event() { process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_2_NEW_BLOCK_EVENT, - "new_block_event_test", + 2, + Some("new_block_event_test".to_string()), ) .await; } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_empty_txn() { - process_single_testnet_event_txn(IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, "empty_txn_test").await; + process_single_testnet_event_txn( + IMPORTED_TESTNET_TXNS_3_EMPTY_TXN, + 3, + Some("empty_txn_test".to_string()), + ) + .await; } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn testnet_events_processor_coin_register_fa_metadata() { process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_278556781_V1_COIN_REGISTER_FA_METADATA, - "coin_register_fa_metadata_test", + 278556781, + Some("coin_register_fa_metadata_test".to_string()), ) .await; } @@ -94,7 +106,8 @@ mod tests { async fn testnet_events_processor_fa_metadata() { process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_1255836496_V2_FA_METADATA_, - "fa_metadata_test", + 1255836496, + Some("fa_metadata_test".to_string()), ) .await; } @@ -103,7 +116,19 @@ mod tests { async fn testnet_events_processor_fa_activities() { process_single_testnet_event_txn( IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, - "fa_activities_test", + 5992795934, + Some("fa_activities_test".to_string()), + ) + .await; + } + + /// Example test case of not using custom name + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn testnet_events_processor_coin_register() { + process_single_testnet_event_txn( + IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, + 5979639459, + None, ) .await; } @@ -127,11 +152,16 @@ mod tests { .map(|txn| serde_json::from_slice(txn).expect("Failed to deserialize transaction")) .collect(); - let starting_version = 1; + let starting_version = transaction_batches[0].version; let db_url = db.get_db_url(); - let (indexer_processor_config, _processor_name) = - setup_events_processor_config(&test_context, transaction_batches.len(), &db_url).await; + let (indexer_processor_config, _processor_name) = setup_events_processor_config( + &test_context, + starting_version, + transaction_batches.len(), + &db_url, + ) + .await; let events_processor = EventsProcessor::new(indexer_processor_config) .await @@ -142,7 +172,7 @@ mod tests { events_processor, load_data, db_url, - 2, + vec![5523474016, 5979639459], diff_flag, output_path.clone(), Some("multi_txns_handling_test".to_string()), @@ -169,7 +199,11 @@ mod tests { } // Helper function to abstract out the single transaction processing - async fn process_single_testnet_event_txn(txn: &[u8], test_case_name: &str) { + async fn process_single_testnet_event_txn( + txn: &[u8], + txn_version: i64, + test_case_name: Option, + ) { let (diff_flag, custom_output_path) = get_test_config(); let output_path = custom_output_path .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); @@ -178,7 +212,7 @@ mod tests { let db_url = db.get_db_url(); let (indexer_processor_config, processor_name) = - setup_events_processor_config(&test_context, 1, &db_url).await; + setup_events_processor_config(&test_context, txn_version as u64, 1, &db_url).await; let events_processor = EventsProcessor::new(indexer_processor_config) .await @@ -189,20 +223,20 @@ mod tests { events_processor, load_data, db_url, - 1, + vec![txn_version], diff_flag, output_path.clone(), - Some(test_case_name.to_string()), + test_case_name.clone(), ) .await { Ok(mut db_value) => { let _ = validate_json( &mut db_value, - 1, + txn_version as u64, processor_name, output_path.clone(), - Some(test_case_name.to_string()), + test_case_name, ); }, Err(e) => { diff --git a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs index b1ffbd535..081e955c4 100644 --- a/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/fungible_asset_processor_tests.rs @@ -9,10 +9,12 @@ use std::collections::HashSet; pub fn setup_fa_processor_config( test_context: &SdkTestContext, + staring_version: u64, txn_count: usize, db_url: &str, ) -> (IndexerProcessorConfig, &'static str) { - let transaction_stream_config = test_context.create_transaction_stream_config(txn_count as u64); + let transaction_stream_config = + test_context.create_transaction_stream_config(staring_version, txn_count as u64); let postgres_config = PostgresConfig { connection_string: db_url.to_string(), db_pool_size: 100, @@ -59,9 +61,10 @@ mod tests { // Test case for processing a specific testnet transaction (Validator Transaction) #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_fungible_asset_processor_validator_txn() { - process_single_testnet( + process_single_testnet_fa_txns( IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, - "validator_txn_test", + 5523474016, + Some("validator_txn_test".to_string()), ) .await; } @@ -69,24 +72,30 @@ mod tests { // Test case for processing another testnet transaction (Coin Register) #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_fungible_asset_processor_coin_register_txn() { - process_single_testnet( + process_single_testnet_fa_txns( IMPORTED_TESTNET_TXNS_5979639459_COIN_REGISTER, - "coin_register_txn_test", + 5979639459, + Some("coin_register_txn_test".to_string()), ) .await; } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_fungible_asset_processor_fa_activities_txn() { - process_single_testnet( + process_single_testnet_fa_txns( IMPORTED_TESTNET_TXNS_5992795934_FA_ACTIVITIES, - "fa_activities_txn_test", + 5992795934, + Some("fa_activities_txn_test".to_string()), ) .await; } // Helper function to abstract out the transaction processing - async fn process_single_testnet(txn: &[u8], test_case_name: &str) { + async fn process_single_testnet_fa_txns( + txn: &[u8], + txn_version: i64, + test_case_name: Option, + ) { let (diff_flag, custom_output_path) = get_test_config(); let output_path = custom_output_path .unwrap_or_else(|| format!("{}/imported_testnet_txns", DEFAULT_OUTPUT_FOLDER)); @@ -95,7 +104,7 @@ mod tests { let db_url = db.get_db_url(); let (indexer_processor_config, processor_name) = - setup_fa_processor_config(&test_context, 1, &db_url); + setup_fa_processor_config(&test_context, txn_version as u64, 1, &db_url); let fungible_asset_processor = FungibleAssetProcessor::new(indexer_processor_config) .await @@ -106,20 +115,20 @@ mod tests { fungible_asset_processor, load_data, db_url, - 1, + vec![txn_version], diff_flag, output_path.clone(), - Some(test_case_name.to_string()), + test_case_name.clone(), ) .await { Ok(mut db_value) => { let _ = validate_json( &mut db_value, - 1, + txn_version as u64, processor_name, output_path.clone(), - Some(test_case_name.to_string()), + test_case_name, ); }, Err(e) => { diff --git a/rust/integration-tests/src/sdk_tests/mod.rs b/rust/integration-tests/src/sdk_tests/mod.rs index d8dcafada..68817a5da 100644 --- a/rust/integration-tests/src/sdk_tests/mod.rs +++ b/rust/integration-tests/src/sdk_tests/mod.rs @@ -19,7 +19,7 @@ pub mod events_processor_tests; pub mod fungible_asset_processor_tests; #[allow(dead_code)] -pub const DEFAULT_OUTPUT_FOLDER: &str = "sdk_expected_db_output_files2"; +pub const DEFAULT_OUTPUT_FOLDER: &str = "sdk_expected_db_output_files"; #[allow(dead_code)] pub fn read_and_parse_json(path: &str) -> anyhow::Result { @@ -110,7 +110,7 @@ pub async fn run_processor_test( processor: impl ProcessorTrait, load_data: F, db_url: String, - txn_count: i64, + txn_versions: Vec, generate_file_flag: bool, output_path: String, custom_file_name: Option, @@ -124,18 +124,16 @@ where let db_values = test_context .run( &processor, - 1, + txn_versions[0] as u64, generate_file_flag, output_path.clone(), custom_file_name, move || { - // TODO: might not need this. let mut conn = PgConnection::establish(&db_url).expect("Failed to establish DB connection"); - let starting_version = 1; - let ending_version = txn_count; - let txn_versions: Vec = (starting_version..=ending_version).collect(); + let starting_version = txn_versions[0]; + let ending_version = txn_versions[txn_versions.len() - 1]; let db_values = match load_data(&mut conn, txn_versions) { Ok(db_data) => db_data, @@ -155,6 +153,5 @@ where }, ) .await?; - Ok(db_values) }