From c586b47160c5a4c1b95afc6d7bcd25cfc1e50dc0 Mon Sep 17 00:00:00 2001 From: yuunlimm Date: Thu, 16 Jan 2025 12:02:38 -0800 Subject: [PATCH] add more tests for higher test coverage --- rust/Cargo.lock | 8 +- rust/Cargo.toml | 2 +- .../account_transactions.json | 6 ++ .../account_transactions.json | 22 +++++ .../account_transactions.json | 82 +++++++++++++++++++ .../ans_lookup_v2.json | 74 +++++++++++++++++ .../ans_primary_name_v2.json | 1 + .../current_ans_lookup_v2.json | 68 +++++++++++++++ .../current_ans_primary_name_v2.json | 1 + .../mainnet_proposal_vote_test/events.json | 1 + .../mainnet_stake_delegation_pool/events.json | 1 + .../test_multi_agent/signatures.json | 47 +++++++++++ .../test_multi_agent/user_transactions.json | 18 ++++ .../test_multi_ed25519/user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../test_multi_sig/signatures.json | 15 ++++ .../test_multi_sig/user_transactions.json | 18 ++++ .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../user_transactions.json | 6 +- .../account_transaction_processor_tests.rs | 29 +++++++ .../src/sdk_tests/ans_processor_tests.rs | 12 ++- .../src/sdk_tests/stake_processor_tests.rs | 28 +++++++ .../user_transaction_processor_tests.rs | 20 +++++ 28 files changed, 474 insertions(+), 33 deletions(-) create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_mainnet_block_metadata_transaction/account_transactions.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_genesis_transaction/account_transactions.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_validator_transaction/account_transactions.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_lookup_v2.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_primary_name_v2.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_lookup_v2.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_primary_name_v2.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_proposal_vote_test/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_stake_delegation_pool/events.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/signatures.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/user_transactions.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/signatures.json create mode 100644 rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/user_transactions.json diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 4225ba782..567c097f9 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "aptos-indexer-test-transactions" version = "1.0.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5#60262d93f9a16b286034227018807610f35ceba5" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=ef80673093aa4df271ad33c2401421d642e7ff3c#ef80673093aa4df271ad33c2401421d642e7ff3c" dependencies = [ - "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5)", + "aptos-protos 1.3.1 (git+https://github.com/aptos-labs/aptos-core.git?rev=ef80673093aa4df271ad33c2401421d642e7ff3c)", "serde_json", ] @@ -297,7 +297,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.1" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=60262d93f9a16b286034227018807610f35ceba5#60262d93f9a16b286034227018807610f35ceba5" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e#6116af69aa173ca49e1761daabd6fe103fe2c65e" dependencies = [ "pbjson", "prost 0.13.4", @@ -308,7 +308,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.1" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=6116af69aa173ca49e1761daabd6fe103fe2c65e#6116af69aa173ca49e1761daabd6fe103fe2c65e" +source = "git+https://github.com/aptos-labs/aptos-core.git?rev=ef80673093aa4df271ad33c2401421d642e7ff3c#ef80673093aa4df271ad33c2401421d642e7ff3c" dependencies = [ "pbjson", "prost 0.13.4", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 08a193584..d299db675 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -31,7 +31,7 @@ anyhow = "1.0.86" aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6116af69aa173ca49e1761daabd6fe103fe2c65e" } -aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "60262d93f9a16b286034227018807610f35ceba5" } +aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "ef80673093aa4df271ad33c2401421d642e7ff3c" } aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" } async-trait = "0.1.53" backtrace = "0.3.58" diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_mainnet_block_metadata_transaction/account_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_mainnet_block_metadata_transaction/account_transactions.json new file mode 100644 index 000000000..74097d147 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_mainnet_block_metadata_transaction/account_transactions.json @@ -0,0 +1,6 @@ +[ + { + "transaction_version": 513424821, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_genesis_transaction/account_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_genesis_transaction/account_transactions.json new file mode 100644 index 000000000..d067c9fa5 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_genesis_transaction/account_transactions.json @@ -0,0 +1,22 @@ +[ + { + "transaction_version": 1, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001" + }, + { + "transaction_version": 1, + "account_address": "0x828ca971e35c8b9a807439e5a328fdc9a5ed0efbfb12f40bc451d17f6998be3f" + }, + { + "transaction_version": 1, + "account_address": "0xacb107b98cd634ca32d39d38ab13df8cbcd5fe7856ce2a3c3d123e53f95d0b6f" + }, + { + "transaction_version": 1, + "account_address": "0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c" + }, + { + "transaction_version": 1, + "account_address": "0xdffe3c93b756bf6fec59b052d6fe71b40c3f9b7899d69ab06ba385b1c6728d16" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_validator_transaction/account_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_validator_transaction/account_transactions.json new file mode 100644 index 000000000..8b86aac09 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/account_transactions_processor/test_testnet_validator_transaction/account_transactions.json @@ -0,0 +1,82 @@ +[ + { + "transaction_version": 5523474016, + "account_address": "0x0000000000000000000000000000000000000000000000000000000000000001" + }, + { + "transaction_version": 5523474016, + "account_address": "0x03c04549114877c55f45649aba48ac0a4ff086ab7bdce3b8cc8d3d9947bc0d99" + }, + { + "transaction_version": 5523474016, + "account_address": "0x0a4113560d0b18ba38797f2a899c4b27e0c5b0476be5d8f6be68fba8b1861ed0" + }, + { + "transaction_version": 5523474016, + "account_address": "0x116176e2af223a8b7f8db80dc52f7a423b4d7f8c0553a1747e92ef58849aff4f" + }, + { + "transaction_version": 5523474016, + "account_address": "0x12000330d7cd8a748f46c25e6ce5d236a27e13d0b510d4516ac84ecc5fddd002" + }, + { + "transaction_version": 5523474016, + "account_address": "0x286e8af6717ef6b1e361aae8ab28dd6664bf562c2805dd9a53432246ec66566e" + }, + { + "transaction_version": 5523474016, + "account_address": "0x479ca442491cfd636f84fa8e56fa420c8038587e459e886d16a0b9d3993b16ba" + }, + { + "transaction_version": 5523474016, + "account_address": "0x50e52098d22c91f4c6a0065d03b2602cc2643089b218096e3cfe5f1bd98d80e6" + }, + { + "transaction_version": 5523474016, + "account_address": "0x5176f2252762e527e3598c22f1bdb3a1ac0ff0db2d7518cabbc99305330a864a" + }, + { + "transaction_version": 5523474016, + "account_address": "0x676f640c90cb6c45f21be50974531d440309aa4ddad919ae0429039789a3d8a9" + }, + { + "transaction_version": 5523474016, + "account_address": "0x6d00a8a82bd0b6d187f9a328118ad61b5c80237362e8f5dd2454f2d3a1b03890" + }, + { + "transaction_version": 5523474016, + "account_address": "0x7a2ddb6af66beb0d9987c6c9010cb9053454f067e16775a8ecf19961195c3d28" + }, + { + "transaction_version": 5523474016, + "account_address": "0x95a0e6b1105ba7ef9382e585d32e9dbf1a73833975af77d9b6924aa33468df07" + }, + { + "transaction_version": 5523474016, + "account_address": "0xa562415be88d9f08ba98fa3f6af9be0e36580c0f8fff5100a50b519e8f4a15c9" + }, + { + "transaction_version": 5523474016, + "account_address": "0xa5ed5d5e8c892165b18c2062596e8d1139fbb2cc451d430f787cd707122ce023" + }, + { + "transaction_version": 5523474016, + "account_address": "0xb59c2db675c086d0c07b0f5d5ebd95ea9ead4429d836284fc4a576c4eed5799c" + }, + { + "transaction_version": 5523474016, + "account_address": "0xba08cec00a8cfa1deff6c9212dda8d198c8fa6ee1992f3ada76d645f99e3402b" + }, + { + "transaction_version": 5523474016, + "account_address": "0xeecd6e9fb71f3a67db6321e93deecf7a9d7c3f4fac6cd170deb3e8b183281943" + }, + { + "transaction_version": 5523474016, + "account_address": "0xf0a156ed79ab6ccb5a643af48716263b565fd985ba36560966b4a91bdc8521f4" + }, + { + "transaction_version": 5523474016, + "account_address": "0xfd47a2fb988c959839ea2fe4d7169b48536a42bf5e4933790701a08252ba2039" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_lookup_v2.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_lookup_v2.json new file mode 100644 index 000000000..f1c3c180c --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_lookup_v2.json @@ -0,0 +1,74 @@ +[ + { + "transaction_version": 2080538, + "write_set_change_index": 9, + "domain": "god", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "god.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "transaction_version": 2080538, + "write_set_change_index": 10, + "domain": "max", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "max.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "transaction_version": 2080538, + "write_set_change_index": 11, + "domain": "asha", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "asha.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "transaction_version": 2080538, + "write_set_change_index": 12, + "domain": "chris", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "chris.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "transaction_version": 2080538, + "write_set_change_index": 13, + "domain": "david", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "david.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "transaction_version": 2080538, + "write_set_change_index": 14, + "domain": "maayan", + "subdomain": "", + "token_standard": "v1", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "token_name": "maayan.apt", + "is_deleted": false, + "subdomain_expiration_policy": null + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_primary_name_v2.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_primary_name_v2.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/ans_primary_name_v2.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_lookup_v2.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_lookup_v2.json new file mode 100644 index 000000000..cbd563c0e --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_lookup_v2.json @@ -0,0 +1,68 @@ +[ + { + "domain": "asha", + "subdomain": "", + "token_standard": "v1", + "token_name": "asha.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "domain": "chris", + "subdomain": "", + "token_standard": "v1", + "token_name": "chris.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "domain": "david", + "subdomain": "", + "token_standard": "v1", + "token_name": "david.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "domain": "god", + "subdomain": "", + "token_standard": "v1", + "token_name": "god.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "domain": "maayan", + "subdomain": "", + "token_standard": "v1", + "token_name": "maayan.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + }, + { + "domain": "max", + "subdomain": "", + "token_standard": "v1", + "token_name": "max.apt", + "registered_address": null, + "expiration_timestamp": "2023-10-18T16:54:32", + "last_transaction_version": 2080538, + "is_deleted": false, + "subdomain_expiration_policy": null + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_primary_name_v2.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_primary_name_v2.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/ans_processor/test_mainnet_ans_lookup_v1/current_ans_primary_name_v2.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_proposal_vote_test/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_proposal_vote_test/events.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_proposal_vote_test/events.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_stake_delegation_pool/events.json b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_stake_delegation_pool/events.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/imported_mainnet_txns/stake_processor/mainnet_stake_delegation_pool/events.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/signatures.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/signatures.json new file mode 100644 index 000000000..7b10287a8 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/signatures.json @@ -0,0 +1,47 @@ +[ + { + "transaction_version": 103958588, + "multi_agent_index": 0, + "multi_sig_index": 0, + "transaction_block_height": 40088443, + "signer": "0x214e588b8a8260a97420bf729c0d06d9691f3a1bab65b65f65e61227004505c1", + "is_sender_primary": false, + "type_": "multi_ed25519_signature", + "public_key": "0x0547d1d18f231bd968541e02aae193044d06af7a8cc54763d37c6e42279490bb", + "signature": "0xdcf40897d0e301ffc4d345fef50b6dd5d6a19227581d25748b86a42ac48893634c1c6c6889780c63b6428afc1ad4c5ea6ba11bd48365702363f75fea2e8b1a04", + "threshold": 2, + "public_key_indices": [ + 0, + 3 + ] + }, + { + "transaction_version": 103958588, + "multi_agent_index": 0, + "multi_sig_index": 0, + "transaction_block_height": 40088443, + "signer": "0x66e46c568a91a9ff082dd5eb39920c6e451415ef17301457bd771b3bfd056971", + "is_sender_primary": true, + "type_": "ed25519_signature", + "public_key": "0xd05b8b53a772f04de5d9e839fdc452a0e034cf4c9ef3c4ba6604694d899db12a", + "signature": "0xe5e6bb12fce4c841dbaf5160d8808b897a29eed50009bc86421910db20ac0f19ecf1452e131a2928ea2c3108fad16fa8af44e29b3fe697fb08c056a1e2ba2a0c", + "threshold": 1, + "public_key_indices": [] + }, + { + "transaction_version": 103958588, + "multi_agent_index": 0, + "multi_sig_index": 1, + "transaction_block_height": 40088443, + "signer": "0x214e588b8a8260a97420bf729c0d06d9691f3a1bab65b65f65e61227004505c1", + "is_sender_primary": false, + "type_": "multi_ed25519_signature", + "public_key": "0x033dae765e2e7846ced298e2f33dddf58a0836c59ab04b069afa1f2ca15f9d6e", + "signature": "0xdc4368855c483cdc221561d253c064ed215a35e8f7c8e4d27b0143f66c4beb638fd35b219e0e52a0677b7b423162bcaa472ef2834da78bea306b258727a06a06", + "threshold": 2, + "public_key_indices": [ + 0, + 3 + ] + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/user_transactions.json new file mode 100644 index 000000000..755665c0f --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_agent/user_transactions.json @@ -0,0 +1,18 @@ +[ + { + "version": 103958588, + "block_height": 40088443, + "parent_signature_type": "multi_agent_signature", + "sender": "0x66e46c568a91a9ff082dd5eb39920c6e451415ef17301457bd771b3bfd056971", + "sequence_number": 205, + "max_gas_amount": "50000", + "expiration_timestamp_secs": "2024-02-28T00:00:00", + "gas_unit_price": "101", + "timestamp": "2023-03-18T16:24:26.242260", + "entry_function_id_str": "", + "entry_function_function_name": "", + "epoch": 1885, + "entry_function_contract_address": "", + "entry_function_module_name": "" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_ed25519/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_ed25519/user_transactions.json index 818f1387e..a26d42816 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_ed25519/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_ed25519/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2022-10-18T23:10:04.331016", "entry_function_id_str": "0xa3f6a53c57395401ce64f09a188e2259dc9b156387e76c88a7a80a8fe5254476::momentum_safe::register", + "entry_function_function_name": "register", "epoch": 75, "entry_function_contract_address": "0xa3f6a53c57395401ce64f09a188e2259dc9b156387e76c88a7a80a8fe5254476", - "entry_function_module_name": "momentum_safe", - "entry_function_function_name": "register" + "entry_function_module_name": "momentum_safe" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_key_keyless_signature/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_key_keyless_signature/user_transactions.json index 6336b2db4..79c4d2c28 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_key_keyless_signature/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_key_keyless_signature/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-10-16T17:07:21.987832", "entry_function_id_str": "0x1::aptos_account::transfer", + "entry_function_function_name": "transfer", "epoch": 8870, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "aptos_account", - "entry_function_function_name": "transfer" + "entry_function_module_name": "aptos_account" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/signatures.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/signatures.json new file mode 100644 index 000000000..7c13ac01f --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/signatures.json @@ -0,0 +1,15 @@ +[ + { + "transaction_version": 769222973, + "multi_agent_index": 0, + "multi_sig_index": 0, + "transaction_block_height": 168057583, + "signer": "0xf394d0ecffd4a498ab19347d0f5dff37da6d73a5ebbbeaf03d3079603f1bbeaf", + "is_sender_primary": true, + "type_": "single_sender_ed25519_signature", + "public_key": "0x8350056dcf1cc72a6c6d33c3efcf55b9db49c822314f60a93ec5cc8165e665cc", + "signature": "0x66d199cb4c73e52a7756ef7ad9cf7c132a9d1d1faa28d319bb4a3c6bed730af3234ae473b769d7a4e49568eef0e47008dbf6e421f303e67861c9f66272a45f07", + "threshold": 1, + "public_key_indices": [] + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/user_transactions.json new file mode 100644 index 000000000..6b7eacbb7 --- /dev/null +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_multi_sig/user_transactions.json @@ -0,0 +1,18 @@ +[ + { + "version": 769222973, + "block_height": 168057583, + "parent_signature_type": "single_key_signature", + "sender": "0xf394d0ecffd4a498ab19347d0f5dff37da6d73a5ebbbeaf03d3079603f1bbeaf", + "sequence_number": 0, + "max_gas_amount": "200000", + "expiration_timestamp_secs": "2023-11-14T10:28:37", + "gas_unit_price": "100", + "timestamp": "2023-11-14T10:28:17.493428", + "entry_function_id_str": "0x1::code::publish_package_txn", + "entry_function_function_name": "publish_package_txn", + "epoch": 10348, + "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", + "entry_function_module_name": "code" + } +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_ed25519/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_ed25519/user_transactions.json index ae000791b..1eeb9ffd8 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_ed25519/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_ed25519/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2022-10-12T21:26:20.299882", "entry_function_id_str": "0x1::stake::update_network_and_fullnode_addresses", + "entry_function_function_name": "update_network_and_fullnode_addresses", "epoch": 2, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "stake", - "entry_function_function_name": "update_network_and_fullnode_addresses" + "entry_function_module_name": "stake" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_ed25519/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_ed25519/user_transactions.json index 7f931b541..ffc03b8a2 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_ed25519/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_ed25519/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-02-23T22:21:53.482262", "entry_function_id_str": "0x1::coin::transfer", + "entry_function_function_name": "transfer", "epoch": 6013, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "coin", - "entry_function_function_name": "transfer" + "entry_function_module_name": "coin" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_secp/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_secp/user_transactions.json index 27f5c965d..afa294b26 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_secp/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_key_secp/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-01-16T09:35:08.981259", "entry_function_id_str": "0x1::coin::transfer", + "entry_function_function_name": "transfer", "epoch": 5547, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "coin", - "entry_function_function_name": "transfer" + "entry_function_module_name": "coin" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_ed25519/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_ed25519/user_transactions.json index 35b50d15c..17fd0062e 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_ed25519/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_ed25519/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-05-09T01:18:59.975711", "entry_function_id_str": "0x1::aptos_account::transfer_coins", + "entry_function_function_name": "transfer_coins", "epoch": 6924, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "aptos_account", - "entry_function_function_name": "transfer_coins" + "entry_function_module_name": "aptos_account" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_keyless/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_keyless/user_transactions.json index fbea4208d..43c6746dd 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_keyless/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_keyless/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-06-10T15:51:10.170250", "entry_function_id_str": "0x1::aptos_account::transfer_coins", + "entry_function_function_name": "transfer_coins", "epoch": 7324, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "aptos_account", - "entry_function_function_name": "transfer_coins" + "entry_function_module_name": "aptos_account" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_secp/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_secp/user_transactions.json index e163ab65f..c3ccf4282 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_secp/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_secp/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-03-29T13:51:13.448212", "entry_function_id_str": "0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12::scripts_v2::swap", + "entry_function_function_name": "swap", "epoch": 6429, "entry_function_contract_address": "0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12", - "entry_function_module_name": "scripts_v2", - "entry_function_function_name": "swap" + "entry_function_module_name": "scripts_v2" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_webauth/user_transactions.json b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_webauth/user_transactions.json index a65e1009a..e17c18d32 100644 --- a/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_webauth/user_transactions.json +++ b/rust/integration-tests/sdk_expected_db_output_files/user_transaction_processor/test_single_sender_webauth/user_transactions.json @@ -10,9 +10,9 @@ "gas_unit_price": "100", "timestamp": "2024-04-13T17:59:30.751467", "entry_function_id_str": "0x1::aptos_account::transfer_coins", + "entry_function_function_name": "transfer_coins", "epoch": 6620, "entry_function_contract_address": "0x0000000000000000000000000000000000000000000000000000000000000001", - "entry_function_module_name": "aptos_account", - "entry_function_function_name": "transfer_coins" + "entry_function_module_name": "aptos_account" } -] +] \ No newline at end of file diff --git a/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs index 074ff6a2e..f2cb601b5 100644 --- a/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/account_transaction_processor_tests.rs @@ -50,6 +50,8 @@ mod tests { use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_145959468_ACCOUNT_TRANSACTION, IMPORTED_MAINNET_TXNS_423176063_ACCOUNT_TRANSACTION_DELETE, + IMPORTED_MAINNET_TXNS_513424821_DEFAULT_BLOCK_METADATA_TRANSACTIONS, + IMPORTED_TESTNET_TXNS_1_GENESIS, IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; use sdk_processor::processors::account_transactions_processor::AccountTransactionsProcessor; @@ -84,6 +86,33 @@ mod tests { .await; } + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_testnet_validator_transaction() { + process_single_mainnet_txn( + IMPORTED_TESTNET_TXNS_5523474016_VALIDATOR_TXN, + Some("test_testnet_validator_transaction".to_string()), + ) + .await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_testnet_genesis_transaction() { + process_single_mainnet_txn( + IMPORTED_TESTNET_TXNS_1_GENESIS, + Some("test_testnet_genesis_transaction".to_string()), + ) + .await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_mainnet_block_metadata_transaction() { + process_single_mainnet_txn( + IMPORTED_MAINNET_TXNS_513424821_DEFAULT_BLOCK_METADATA_TRANSACTIONS, + Some("test_mainnet_block_metadata_transaction".to_string()), + ) + .await; + } + // Helper function to abstract out the single transaction processing async fn process_single_mainnet_txn(txn: &[u8], test_case_name: Option) { let (diff_flag, custom_output_path) = get_test_config(); diff --git a/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs b/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs index c6bf33a95..d31b49522 100644 --- a/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/ans_processor_tests.rs @@ -61,7 +61,7 @@ mod tests { }; use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ IMPORTED_MAINNET_TXNS_1056780409_ANS_CURRENT_ANS_PRIMARY_NAME_V2, - IMPORTED_MAINNET_TXNS_303690531_ANS_LOOKUP_V2, + IMPORTED_MAINNET_TXNS_2080538_ANS_LOOKUP_V1, IMPORTED_MAINNET_TXNS_303690531_ANS_LOOKUP_V2, IMPORTED_MAINNET_TXNS_438536688_ANS_CURRENT_ANS_LOOKUP_V2, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; @@ -113,6 +113,16 @@ mod tests { ) .await; } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_mainnet_ans_lookup_v1() { + process_single_mainnet_event_txn( + IMPORTED_MAINNET_TXNS_2080538_ANS_LOOKUP_V1, + Some("test_mainnet_ans_lookup_v1".to_string()), + ) + .await; + } + // Helper function to abstract out the single transaction processing async fn process_single_mainnet_event_txn(txn: &[u8], test_case_name: Option) { let (diff_flag, custom_output_path) = get_test_config(); diff --git a/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs b/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs index d22906726..7d9884f42 100644 --- a/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/stake_processor_tests.rs @@ -57,6 +57,7 @@ mod tests { }, }; use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ + IMPORTED_MAINNET_TXNS_118489_PROPOSAL_VOTE, IMPORTED_MAINNET_TXNS_121508544_STAKE_DISTRIBUTE, IMPORTED_MAINNET_TXNS_139449359_STAKE_REACTIVATE, IMPORTED_MAINNET_TXNS_1830706009_STAKER_GOVERNANCE_RECORD, @@ -129,6 +130,33 @@ mod tests { .await; } + /** + * - 0x1::voting::VoteEvent + */ + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn mainnet_proposal_vote() { + process_single_mainnet_event_txn( + IMPORTED_MAINNET_TXNS_118489_PROPOSAL_VOTE, + Some("mainnet_proposal_vote_test".to_string()), + ) + .await; + } + + /** + * - 0x1::delegation_pool::DistributeCommissionEvent + * - 0x1::delegation_pool::DistributeCommission + * - 0x1::stake::UnlockStakeEvent + * - 0x1::delegation_pool::UnlockStakeEvent + */ + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn mainnet_stake_delegation_pool() { + process_single_mainnet_event_txn( + IMPORTED_MAINNET_TXNS_1831971037_STAKE_DELEGATION_POOL, + Some("mainnet_stake_delegation_pool".to_string()), + ) + .await; + } + // Helper function to abstract out the single transaction processing async fn process_single_mainnet_event_txn(txn: &[u8], test_case_name: Option) { let (diff_flag, custom_output_path) = get_test_config(); diff --git a/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs b/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs index ae48ecb24..650d4b46f 100644 --- a/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs +++ b/rust/integration-tests/src/sdk_tests/user_transaction_processor_tests.rs @@ -49,6 +49,7 @@ mod sdk_user_txn_processor_tests { }, }; use aptos_indexer_test_transactions::json_transactions::generated_transactions::{ + IMPORTED_MAINNET_TXNS_103958588_MULTI_AGENTS, IMPORTED_MAINNET_TXNS_1803170308_USER_TXN_MULTI_KEY_KEYLESS, IMPORTED_MAINNET_TXNS_2175935_USER_TXN_MULTI_ED25519, IMPORTED_MAINNET_TXNS_407418623_USER_TXN_SINGLE_KEY_SECP256K1_ECDSA, @@ -58,6 +59,7 @@ mod sdk_user_txn_processor_tests { IMPORTED_MAINNET_TXNS_590098441_USER_TXN_SINGLE_SENDER_ED25519, IMPORTED_MAINNET_TXNS_685_USER_TXN_ED25519, IMPORTED_MAINNET_TXNS_976087151_USER_TXN_SINGLE_SENDER_KEYLESS, + IMPORTED_TESTNET_TXNS_769222973_MULTISIG, }; use aptos_indexer_testing_framework::{cli_parser::get_test_config, database::TestDatabase}; use sdk_processor::processors::user_transaction_processor::UserTransactionProcessor; @@ -143,6 +145,24 @@ mod sdk_user_txn_processor_tests { .await; } + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_multi_sig() { + process_single_transactions( + IMPORTED_TESTNET_TXNS_769222973_MULTISIG, + Some("test_multi_sig".to_string()), + ) + .await; + } + + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_multi_agent() { + process_single_transactions( + IMPORTED_MAINNET_TXNS_103958588_MULTI_AGENTS, + Some("test_multi_agent".to_string()), + ) + .await; + } + // Helper function to abstract out the transaction processing async fn process_single_transactions(txn: &[u8], test_case_name: Option) { let (diff_flag, custom_output_path) = get_test_config();