add current fungible asset balance (#690)

Current fungible asset balance was commented out in the test.
aptos-labs · Jan 22, 2025 · 848e722 · 848e722
1 parent 612fced
commit 848e722
Show file tree

Hide file tree

Showing 12 changed files with 265 additions and 100 deletions.
diff --git a/.../fungible_asset_processor/coin_and_fa_transfers_test/current_fungible_asset_balances.json b/.../fungible_asset_processor/coin_and_fa_transfers_test/current_fungible_asset_balances.json
@@ -2,89 +2,153 @@
   {
     "storage_id": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
     "owner_address": "0x4bf51972879e3b95c4781a5cdcb9e1ee24ef483e7d22f2d903626f126df62bd1",
-    "asset_type": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
+    "asset_type_v2": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
+    "asset_type_v1": null,
     "is_primary": false,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "1000",
     "amount": "1000",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 999929475,
     "last_transaction_version": 999929475,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-06-25T23:55:53",
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v2",
+    "asset_type": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c"
   },
   {
     "storage_id": "0x27af54b1bb7cb1f4ef3e1ac6577616f62d94fb670fd33d385c439bc3967c49b3",
     "owner_address": "0xaf1fbd1c118239498c0fec0e5cec54a50d03250fe1aca589a6b903566ba1d4db",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "114994000",
+    "amount_v2": null,
     "amount": "114994000",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": 999929475,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 999929475,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-06-25T23:55:53",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   },
   {
     "storage_id": "0x89cee32338902b6f79f9c75c317d32ac061771817c0d5b0802f97ec44ebfc7d4",
     "owner_address": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
-    "asset_type": "0x50fdfa97914bd00b656e3041e143f157c84931eb1ca7224b8a8570e7d5be70f2",
+    "asset_type_v2": "0x50fdfa97914bd00b656e3041e143f157c84931eb1ca7224b8a8570e7d5be70f2",
+    "asset_type_v1": null,
     "is_primary": false,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "429891425615",
     "amount": "429891425615",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 999929475,
     "last_transaction_version": 999929475,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-06-25T23:55:53",
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v2",
+    "asset_type": "0x50fdfa97914bd00b656e3041e143f157c84931eb1ca7224b8a8570e7d5be70f2"
   },
   {
     "storage_id": "0x8ca15f49a4147c76f4121550f3cf9de391e4e14d2ec8485dcdbda99387b9689e",
     "owner_address": "0x3b38735644d0be8ac37ebd84a1e42fa5c2487495ef8782f6c694b1a147f82426",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "111198107496469",
+    "amount_v2": null,
     "amount": "111198107496469",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": 999929475,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 999929475,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-06-25T23:55:53",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   },
   {
     "storage_id": "0x9120a6a57b1463607f27c140b3a8c5542c74a2411d632eb6f25bab0b40a987a4",
     "owner_address": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
-    "asset_type": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e",
+    "asset_type_v2": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e",
+    "asset_type_v1": null,
     "is_primary": false,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "6184986629106",
     "amount": "6184986629106",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 999929475,
     "last_transaction_version": 999929475,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-06-25T23:55:53",
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v2",
+    "asset_type": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e"
   },
   {
     "storage_id": "0x947f8404b90af90a508d2735af771a3e826cefe45dfe993dfa43e0f5650465f9",
     "owner_address": "0x3b38735644d0be8ac37ebd84a1e42fa5c2487495ef8782f6c694b1a147f82426",
-    "asset_type": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC",
+    "asset_type_v2": null,
+    "asset_type_v1": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "2060898834867",
+    "amount_v2": null,
     "amount": "2060898834867",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": 999929475,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 999929475,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-06-25T23:55:53",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v1",
+    "asset_type": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
   },
   {
     "storage_id": "0x97325d3a5abbfe422b8dece076302efd20c0a2dc5c2a5b7954ba8cc203d2f08e",
     "owner_address": "0x234f0be57d6acfb2f0f19c17053617311a8d03c9ce358bdf9cd5c460e4a02b7c",
-    "asset_type": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e",
+    "asset_type_v2": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e",
+    "asset_type_v1": null,
     "is_primary": false,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "5880750526",
     "amount": "5880750526",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 999929475,
     "last_transaction_version": 999929475,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-06-25T23:55:53",
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v2",
+    "asset_type": "0xedc2704f2cef417a06d1756a04a16a9fa6faaed13af469be9cdfcac5a21a8e2e"
   },
   {
     "storage_id": "0xc1127536fd32095434185bab96467d80c65fde6191c7c44d31fbf0a6d5e59148",
     "owner_address": "0xaf1fbd1c118239498c0fec0e5cec54a50d03250fe1aca589a6b903566ba1d4db",
-    "asset_type": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC",
+    "asset_type_v2": null,
+    "asset_type_v1": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "162105637",
+    "amount_v2": null,
     "amount": "162105637",
-    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "last_transaction_version_v1": 999929475,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 999929475,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-06-25T23:55:53",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-06-25T23:55:53",
+    "token_standard": "v1",
+    "asset_type": "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
   }
 ]
diff --git a/...iles/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json b/...iles/fungible_asset_processor/coin_register_txn_test/current_fungible_asset_balances.json
@@ -2,23 +2,39 @@
   {
     "storage_id": "0x1fe363ac8c9a2369f4ad6737dc788cfd37e6c90d1ad9637b18347b779ab5e188",
     "owner_address": "0x54ce130990ecf55cd12de74bff03dcfaacf63066e0945d3c415d61644303da39",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "16673484350",
+    "amount_v2": null,
     "amount": "16673484350",
-    "last_transaction_timestamp": "2024-09-13T16:48:29",
+    "last_transaction_version_v1": 5979639459,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 5979639459,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-09-13T16:48:29",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-09-13T16:48:29",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   },
   {
     "storage_id": "0x5678ad8283b596889ecbce6e63df1e0f86e0a08bd7b7ae2ea70c1f710c1e2e7f",
     "owner_address": "0xb7a4a81a3d513e3e18ee6bec61a001d7e18c5d92bb6645a2f21f0b0fec2531a6",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "10",
+    "amount_v2": null,
     "amount": "10",
-    "last_transaction_timestamp": "2024-09-13T16:48:29",
+    "last_transaction_version_v1": 5979639459,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 5979639459,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-09-13T16:48:29",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-09-13T16:48:29",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   }
 ]
diff --git a/...output_files/fungible_asset_processor/coin_v2_events/current_fungible_asset_balances.json b/...output_files/fungible_asset_processor/coin_v2_events/current_fungible_asset_balances.json
@@ -2,23 +2,39 @@
   {
     "storage_id": "0x49766709699892caa0d9bc44764e7b8dfdec4227f98a82cfc4176e09091045f4",
     "owner_address": "0xe93dcd3dd5febf8d72bf8d33e1d85a6115300fedfe055c062834d264f103ce4c",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "34464975541459",
+    "amount_v2": null,
     "amount": "34464975541459",
-    "last_transaction_timestamp": "2024-12-02T19:50:23",
+    "last_transaction_version_v1": 78753811,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 78753811,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-12-02T19:50:23",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-12-02T19:50:23",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   },
   {
     "storage_id": "0x95aeea33c4b967dabe1190931fe5fad020709881e99f6476df2a91a3e82e00c6",
     "owner_address": "0x74512d8383e6857a9a587012c44ad98420cbc713301714402611d7f87a7f4fe0",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "2",
+    "amount_v2": null,
     "amount": "2",
-    "last_transaction_timestamp": "2024-12-02T19:50:23",
+    "last_transaction_version_v1": 78753811,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 78753811,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-12-02T19:50:23",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-12-02T19:50:23",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   }
 ]
diff --git a/...ut_files/fungible_asset_processor/concurrent_fa_test/current_fungible_asset_balances.json b/...ut_files/fungible_asset_processor/concurrent_fa_test/current_fungible_asset_balances.json
@@ -2,12 +2,20 @@
   {
     "storage_id": "0x6999cbf188405f4732f0561e196c5fdde1e057415dd16c6c9e83e30c9a0e3019",
     "owner_address": "0x75fc2a90fa8ef566ddc3d82e84944eb886415bc19226ae1d88d5e7577aec1be5",
-    "asset_type": "0x000000000000000000000000000000000000000000000000000000000000000a",
+    "asset_type_v2": "0x000000000000000000000000000000000000000000000000000000000000000a",
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "398922140",
     "amount": "398922140",
-    "last_transaction_timestamp": "2024-07-01T22:15:07",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 2646510387,
     "last_transaction_version": 2646510387,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-07-01T22:15:07",
+    "last_transaction_timestamp": "2024-07-01T22:15:07",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   }
 ]
diff --git a/...iles/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json b/...iles/fungible_asset_processor/fa_activities_txn_test/current_fungible_asset_balances.json
@@ -2,34 +2,58 @@
   {
     "storage_id": "0x8bd5745daa2d6e5817819c6bf37600196e55cfba8c5bcdfdf55684bf4accbb9c",
     "owner_address": "0x422e4585fdb8705aeaafb9501e7e03dc8125134da04ed8322244687c50c3fa55",
-    "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f",
+    "asset_type_v2": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f",
+    "asset_type_v1": null,
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "0",
     "amount": "0",
-    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 5992795934,
     "last_transaction_version": 5992795934,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-09-16T06:58:10",
+    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "token_standard": "v2",
+    "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f"
   },
   {
     "storage_id": "0xf09710fcbf8de0c02a244b7523c59789eab9c69d5f3b13a6cecbf1127edc7698",
     "owner_address": "0xd34ea8c6faa9d25a9f07504759c1d92bd5ad05af89062d57cf69dd4861fe3e3c",
-    "asset_type": "0x1::aptos_coin::AptosCoin",
+    "asset_type_v2": null,
+    "asset_type_v1": "0x1::aptos_coin::AptosCoin",
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": "18901942640",
+    "amount_v2": null,
     "amount": "18901942640",
-    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "last_transaction_version_v1": 5992795934,
+    "last_transaction_version_v2": null,
     "last_transaction_version": 5992795934,
-    "token_standard": "v1"
+    "last_transaction_timestamp_v1": "2024-09-16T06:58:10",
+    "last_transaction_timestamp_v2": null,
+    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "token_standard": "v1",
+    "asset_type": "0x1::aptos_coin::AptosCoin"
   },
   {
     "storage_id": "0xfe90bdd996728b93e09f5d59fd91d6d44be85ab7acea5d1ed535b4c13b2c32c0",
     "owner_address": "0x13fc6cb932ab90e65ce901460ce8d4b232d4e365294c6ea5afca94625adba47f",
-    "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f",
+    "asset_type_v2": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f",
+    "asset_type_v1": null,
     "is_primary": true,
     "is_frozen": false,
+    "amount_v1": null,
+    "amount_v2": "9996985969300000000",
     "amount": "9996985969300000000",
-    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "last_transaction_version_v1": null,
+    "last_transaction_version_v2": 5992795934,
     "last_transaction_version": 5992795934,
-    "token_standard": "v2"
+    "last_transaction_timestamp_v1": null,
+    "last_transaction_timestamp_v2": "2024-09-16T06:58:10",
+    "last_transaction_timestamp": "2024-09-16T06:58:10",
+    "token_standard": "v2",
+    "asset_type": "0x618d700859af35c08518d1552c2601808261288cfd032461fb3424587484ac7f"
   }
 ]