support multi txns testing

aptos-labs · Oct 17, 2024 · 597e4e2 · 597e4e2
1 parent 006e9aa
commit 597e4e2
Show file tree

Hide file tree

Showing 106 changed files with 899 additions and 665 deletions.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git 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 = "a12b31492285c70d5afbdd42aa10fe76e1fb79e1" }
-aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a12b31492285c70d5afbdd42aa10fe76e1fb79e1" }
+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-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 = "c583502c69529fddbbf7e47bf920f1dc60e71b72" }
-aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a12b31492285c70d5afbdd42aa10fe76e1fb79e1" }
+aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "87acec023264cdd756e5eae073ddf302fda0917a" }
+aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "1f989c65abbd5cf00a0631a30755ef05818e1894" }
 
 async-trait = "0.1.53"
 backtrace = "0.3.58"

diff --git a/...sts/expected_db_output_files/imported_mainnet_txns/events_processor/308783012/events.json b/...sts/expected_db_output_files/imported_mainnet_txns/events_processor/308783012/events.json
@@ -10,9 +10,8 @@
       "index": "3723914",
       "token": "0x6fd8ee875fb55e03b1f9643d3f229f0b077a71cfe7ffc8ba7e09ff4392950e5c"
     },
-    "inserted_at": "2024-10-15T04:55:32.404918",
-    "event_index": 0,
-    "indexed_type": "0x4::collection::MintEvent"
+    "indexed_type": "0x4::collection::MintEvent",
+    "event_index": 0
   },
   {
     "sequence_number": 0,
@@ -26,9 +25,8 @@
       "from": "0x7efbc33cf69ad534412eab0ccd0f5fbec7793bdebf08a3620afe8e5f89ef13a0",
       "object": "0x6fd8ee875fb55e03b1f9643d3f229f0b077a71cfe7ffc8ba7e09ff4392950e5c"
     },
-    "inserted_at": "2024-10-15T04:55:32.404918",
-    "event_index": 1,
-    "indexed_type": "0x1::object::TransferEvent"
+    "indexed_type": "0x1::object::TransferEvent",
+    "event_index": 1
   },
   {
     "sequence_number": 0,
@@ -44,8 +42,7 @@
       "total_charge_gas_units": "520",
       "storage_fee_refund_octas": "0"
     },
-    "inserted_at": "2024-10-15T04:55:32.404918",
-    "event_index": 2,
-    "indexed_type": "0x1::transaction_fee::FeeStatement"
+    "indexed_type": "0x1::transaction_fee::FeeStatement",
+    "event_index": 2
   }
 ]
diff --git a/...s/imported_mainnet_txns/fungible_asset_processor/308783012/fungible_asset_activities.json b/...s/imported_mainnet_txns/fungible_asset_processor/308783012/fungible_asset_activities.json
@@ -15,7 +15,6 @@
     "block_height": 106350614,
     "token_standard": "v1",
     "transaction_timestamp": "2023-10-24T09:08:03",
-    "inserted_at": "2024-10-15T04:55:33.359030",
     "storage_refund_amount": "0"
   }
 ]
diff --git a/..._output_files/imported_mainnet_txns/token_v2_processor/308783012/token_activities_v2.json b/..._output_files/imported_mainnet_txns/token_v2_processor/308783012/token_activities_v2.json
@@ -14,8 +14,7 @@
     "entry_function_id_str": "0x8d2d7bcde13b2513617df3f98cdd5d0e4b9f714c6308b9204fe18ad900d92609::mint::resource_mint_token_memo",
     "token_standard": "v2",
     "is_fungible_v2": null,
-    "transaction_timestamp": "2023-10-24T09:08:03.606880",
-    "inserted_at": "2024-10-15T04:55:34.472476"
+    "transaction_timestamp": "2023-10-24T09:08:03.606880"
   },
   {
     "transaction_version": 308783012,
@@ -32,7 +31,6 @@
     "entry_function_id_str": "0x8d2d7bcde13b2513617df3f98cdd5d0e4b9f714c6308b9204fe18ad900d92609::mint::resource_mint_token_memo",
     "token_standard": "v2",
     "is_fungible_v2": null,
-    "transaction_timestamp": "2023-10-24T09:08:03.606880",
-    "inserted_at": "2024-10-15T04:55:34.472476"
+    "transaction_timestamp": "2023-10-24T09:08:03.606880"
   }
 ]
diff --git a/...ation-tests/expected_db_output_files/imported_testnet_txns/events_processor/1/events.json b/...ation-tests/expected_db_output_files/imported_testnet_txns/events_processor/1/events.json
@@ -19,9 +19,8 @@
       ],
       "previous_block_votes_bitvec": "0x00"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 0,
-    "indexed_type": "0x1::block::NewBlockEvent"
+    "indexed_type": "0x1::block::NewBlockEvent",
+    "event_index": 0
   },
   {
     "sequence_number": 0,
@@ -34,9 +33,8 @@
       "pool_address": "0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c",
       "rewards_amount": "0"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 1,
-    "indexed_type": "0x1::stake::DistributeRewardsEvent"
+    "indexed_type": "0x1::stake::DistributeRewardsEvent",
+    "event_index": 1
   },
   {
     "sequence_number": 0,
@@ -49,9 +47,8 @@
       "pool_address": "0xdffe3c93b756bf6fec59b052d6fe71b40c3f9b7899d69ab06ba385b1c6728d16",
       "rewards_amount": "4566200000"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 2,
-    "indexed_type": "0x1::stake::DistributeRewardsEvent"
+    "indexed_type": "0x1::stake::DistributeRewardsEvent",
+    "event_index": 2
   },
   {
     "sequence_number": 0,
@@ -64,9 +61,8 @@
       "pool_address": "0x828ca971e35c8b9a807439e5a328fdc9a5ed0efbfb12f40bc451d17f6998be3f",
       "rewards_amount": "0"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 3,
-    "indexed_type": "0x1::stake::DistributeRewardsEvent"
+    "indexed_type": "0x1::stake::DistributeRewardsEvent",
+    "event_index": 3
   },
   {
     "sequence_number": 0,
@@ -79,9 +75,8 @@
       "pool_address": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f",
       "rewards_amount": "0"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 4,
-    "indexed_type": "0x1::stake::DistributeRewardsEvent"
+    "indexed_type": "0x1::stake::DistributeRewardsEvent",
+    "event_index": 4
   },
   {
     "sequence_number": 1,
@@ -93,8 +88,7 @@
     "data": {
       "epoch": "2"
     },
-    "inserted_at": "2024-10-15T05:15:50.241072",
-    "event_index": 5,
-    "indexed_type": "0x1::reconfiguration::NewEpochEvent"
+    "indexed_type": "0x1::reconfiguration::NewEpochEvent",
+    "event_index": 5
   }
 ]
diff --git a/...ts/expected_db_output_files/imported_testnet_txns/events_processor/1255836496/events.json b/...ts/expected_db_output_files/imported_testnet_txns/events_processor/1255836496/events.json
@@ -9,9 +9,8 @@
     "data": {
       "amount": "300000"
     },
-    "inserted_at": "2024-10-15T05:15:48.641863",
-    "event_index": 0,
-    "indexed_type": "0x1::coin::WithdrawEvent"
+    "indexed_type": "0x1::coin::WithdrawEvent",
+    "event_index": 0
   },
   {
     "sequence_number": 707,
@@ -23,9 +22,8 @@
     "data": {
       "amount": "300000"
     },
-    "inserted_at": "2024-10-15T05:15:48.641863",
-    "event_index": 1,
-    "indexed_type": "0x1::coin::DepositEvent"
+    "indexed_type": "0x1::coin::DepositEvent",
+    "event_index": 1
   },
   {
     "sequence_number": 0,
@@ -38,9 +36,8 @@
       "store": "0x8f4f0991e18bd9620a4b3756dbe15afd20135eaaa93e0d0b82e6e2412a8e12b8",
       "amount": "300000"
     },
-    "inserted_at": "2024-10-15T05:15:48.641863",
-    "event_index": 2,
-    "indexed_type": "0x1::fungible_asset::Deposit"
+    "indexed_type": "0x1::fungible_asset::Deposit",
+    "event_index": 2
   },
   {
     "sequence_number": 0,
@@ -57,9 +54,8 @@
       "token": "0x1::aptos_coin::AptosCoin",
       "amount": "300000"
     },
-    "inserted_at": "2024-10-15T05:15:48.641863",
-    "event_index": 3,
-    "indexed_type": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit"
+    "indexed_type": "0xfabb471223cefd7064b1f19f6e0e06468d2bd830d8ae832916406dd8297098af::lending_pool::Deposit",
+    "event_index": 3
   },
   {
     "sequence_number": 0,
@@ -75,8 +71,7 @@
       "total_charge_gas_units": "505",
       "storage_fee_refund_octas": "0"
     },
-    "inserted_at": "2024-10-15T05:15:48.641863",
-    "event_index": 4,
-    "indexed_type": "0x1::transaction_fee::FeeStatement"
+    "indexed_type": "0x1::transaction_fee::FeeStatement",
+    "event_index": 4
   }
 ]
diff --git a/...ation-tests/expected_db_output_files/imported_testnet_txns/events_processor/2/events.json b/...ation-tests/expected_db_output_files/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
+  }
+]
diff --git a/...sts/expected_db_output_files/imported_testnet_txns/events_processor/278556781/events.json b/...sts/expected_db_output_files/imported_testnet_txns/events_processor/278556781/events.json
@@ -13,9 +13,8 @@
         "account_address": "0x589dabf3b43ef5c331ea3c0f9b6b005860c1f0ef94a5948d133e051b20c22862"
       }
     },
-    "inserted_at": "2024-10-15T05:15:49.422609",
-    "event_index": 0,
-    "indexed_type": "0x1::account::CoinRegisterEvent"
+    "indexed_type": "0x1::account::CoinRegisterEvent",
+    "event_index": 0
   },
   {
     "sequence_number": 0,
@@ -27,8 +26,7 @@
     "data": {
       "amount": "1000000000000000000"
     },
-    "inserted_at": "2024-10-15T05:15:49.422609",
-    "event_index": 1,
-    "indexed_type": "0x1::coin::DepositEvent"
+    "indexed_type": "0x1::coin::DepositEvent",
+    "event_index": 1
   }
 ]
diff --git a/...ation-tests/expected_db_output_files/imported_testnet_txns/events_processor/3/events.json b/...ation-tests/expected_db_output_files/imported_testnet_txns/events_processor/3/events.json
@@ -0,0 +1 @@
+[]