feat: display supply obj for more interfaces (metaplex-foundation#234)

rpcpool · Jan 29, 2025 · 82ef80f · 82ef80f
1 parent 06297e1
commit 82ef80f
Show file tree

Hide file tree

Showing 24 changed files with 148 additions and 101 deletions.
diff --git a/digital_asset_types/src/dapi/common/asset.rs b/digital_asset_types/src/dapi/common/asset.rs
@@ -503,7 +503,11 @@ pub fn asset_to_rpc(asset: FullAsset, options: &Options) -> Result<RpcAsset, DbE
                 .unwrap_or("".to_string()),
         }),
         supply: match interface {
-            Interface::V1NFT => Some(Supply {
+            Interface::V1NFT
+            | Interface::LEGACY_NFT
+            | Interface::Nft
+            | Interface::ProgrammableNFT
+            | Interface::Custom => Some(Supply {
                 edition_nonce,
                 print_current_supply: 0,
                 print_max_supply: 0,

diff --git a/.../snapshots/integration_tests__account_update_tests__account_updates-metadata-updated.snap b/.../snapshots/integration_tests__account_update_tests__account_updates-metadata-updated.snap
@@ -63,6 +63,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "BzbdvwEkQKeghTY53aZxTYjUienhdbkNVkgrLV6cErke"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 253
+  },
   "mutable": false,
   "burnt": false
 }
diff --git a/...sts/snapshots/integration_tests__account_update_tests__account_updates-token-updated.snap b/...sts/snapshots/integration_tests__account_update_tests__account_updates-token-updated.snap
@@ -63,6 +63,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "1111111QLbz7JHiBTspS962RLKV8GndWFwiEaqKM"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 253
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/.../snapshots/integration_tests__account_update_tests__account_updates-with-all-updates.snap b/.../snapshots/integration_tests__account_update_tests__account_updates-with-all-updates.snap
@@ -63,6 +63,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "1111111QLbz7JHiBTspS962RLKV8GndWFwiEaqKM"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 253
+  },
   "mutable": false,
   "burnt": false
 }
diff --git a/...integration_tests/snapshots/integration_tests__account_update_tests__account_updates.snap b/...integration_tests/snapshots/integration_tests__account_update_tests__account_updates.snap
@@ -63,6 +63,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "BzbdvwEkQKeghTY53aZxTYjUienhdbkNVkgrLV6cErke"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 253
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/...integration_tests/snapshots/integration_tests__general_scenario_tests__asset_parsing.snap b/...integration_tests/snapshots/integration_tests__general_scenario_tests__asset_parsing.snap
@@ -63,6 +63,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "BzbdvwEkQKeghTY53aZxTYjUienhdbkNVkgrLV6cErke"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 253
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/...ation_tests/snapshots/integration_tests__general_scenario_tests__creators_reordering.snap b/...ation_tests/snapshots/integration_tests__general_scenario_tests__creators_reordering.snap
@@ -78,6 +78,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "AZgXpkRSetUJHy6C3NBvG6jNe49MpgrkZ2RkdMkjCjkW"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 254
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/...ests/integration_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset.snap b/...ests/integration_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset.snap
@@ -68,6 +68,11 @@ snapshot_kind: text
     "ownership_model": "single",
     "owner": "A59E2tNJEqNN9TDnzgGnmLmnTsdRDoPocGx3n1w2dqZw"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 255
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/...napshots/integration_tests__regular_nft_tests__reg_get_asset_batch-2-and-a-missing-1.snap b/...napshots/integration_tests__regular_nft_tests__reg_get_asset_batch-2-and-a-missing-1.snap
@@ -69,6 +69,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "9PacVenjPyQYiWBha89UYRM1nn6mf9bGY7vi32zY6DLn"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 255
+    },
     "mutable": true,
     "burnt": false
   },
@@ -138,6 +143,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "3H3d3hfpZVVdVwuFAxDtDSFN2AdR7kwiDA3ynbnbkhc9"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 255
+    },
     "mutable": true,
     "burnt": false
   }

diff --git a/...apshots/integration_tests__regular_nft_tests__reg_get_asset_batch-only-2-different-2.snap b/...apshots/integration_tests__regular_nft_tests__reg_get_asset_batch-only-2-different-2.snap
@@ -69,6 +69,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "9PacVenjPyQYiWBha89UYRM1nn6mf9bGY7vi32zY6DLn"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 255
+    },
     "mutable": true,
     "burnt": false
   },
@@ -137,6 +142,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "3H3d3hfpZVVdVwuFAxDtDSFN2AdR7kwiDA3ynbnbkhc9"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 255
+    },
     "mutable": true,
     "burnt": false
   }

diff --git a/...ion_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset_batch-only-2.snap b/...ion_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset_batch-only-2.snap
@@ -69,6 +69,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "BaBQKh34KrqZzd4ifSHQYMf86HiBGASN6TWUi1ZwfyKv"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 252
+    },
     "mutable": true,
     "burnt": false
   },
@@ -137,6 +142,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": "9PacVenjPyQYiWBha89UYRM1nn6mf9bGY7vi32zY6DLn"
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 255
+    },
     "mutable": true,
     "burnt": false
   }

diff --git a/...gration_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset_by_group.snap b/...gration_tests/snapshots/integration_tests__regular_nft_tests__reg_get_asset_by_group.snap
@@ -78,6 +78,11 @@ snapshot_kind: text
         "ownership_model": "single",
         "owner": "9qUcfdADyrrTSetFjNjF9Ro7LKAqzJkzZV6WKLHfv5MU"
       },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 254
+      },
       "mutable": true,
       "burnt": false
     }

diff --git a/.../integration_tests/snapshots/integration_tests__regular_nft_tests__reg_search_assets.snap b/.../integration_tests/snapshots/integration_tests__regular_nft_tests__reg_search_assets.snap
@@ -72,6 +72,11 @@ expression: response
         "ownership_model": "single",
         "owner": "6Cr66AabRYymhZgYQSfTCo6FVpH18wXrMZswAbcErpyX"
       },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 255
+      },
       "mutable": true,
       "burnt": false
     }

diff --git a/...how_collection_metadata_option_tests__get_asset_with_show_collection_metadata_option.snap b/...how_collection_metadata_option_tests__get_asset_with_show_collection_metadata_option.snap
@@ -68,6 +68,11 @@ expression: response
     "ownership_model": "single",
     "owner": "GqPnSDXwp4JFtKS7YZ2HERgBbYLKpKVYy9TpVunzLRa9"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 255
+  },
   "mutable": true,
   "burnt": false
 }
diff --git a/...tegration_tests__show_fungible_flag_tests__get_asset_by_authority_with_show_fungible.snap b/...tegration_tests__show_fungible_flag_tests__get_asset_by_authority_with_show_fungible.snap
@@ -72,6 +72,11 @@ expression: response
         "ownership_model": "single",
         "owner": "GqPnSDXwp4JFtKS7YZ2HERgBbYLKpKVYy9TpVunzLRa9"
       },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 255
+      },
       "mutable": true,
       "burnt": false,
       "token_info": {

diff --git a/...integration_tests__show_fungible_flag_tests__get_asset_by_creator_with_show_fungible.snap b/...integration_tests__show_fungible_flag_tests__get_asset_by_creator_with_show_fungible.snap
@@ -72,6 +72,11 @@ expression: response
         "ownership_model": "single",
         "owner": "GqPnSDXwp4JFtKS7YZ2HERgBbYLKpKVYy9TpVunzLRa9"
       },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 255
+      },
       "mutable": true,
       "burnt": false,
       "token_info": {

diff --git a/...s/integration_tests__show_fungible_flag_tests__get_asset_by_owner_with_show_fungible.snap b/...s/integration_tests__show_fungible_flag_tests__get_asset_by_owner_with_show_fungible.snap
@@ -72,6 +72,11 @@ expression: response
         "ownership_model": "single",
         "owner": "GqPnSDXwp4JFtKS7YZ2HERgBbYLKpKVYy9TpVunzLRa9"
       },
+      "supply": {
+        "print_max_supply": 0,
+        "print_current_supply": 0,
+        "edition_nonce": 255
+      },
       "mutable": true,
       "burnt": false,
       "token_info": {

diff --git a/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_1.snap b/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_1.snap
@@ -67,6 +67,11 @@ expression: response
     "ownership_model": "single",
     "owner": "J1ep1LizHMU3Bf1GKkWePGHU3Qwwzw6FvwW5ySFWdCkn"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 255
+  },
   "mutable": true,
   "burnt": false,
   "token_info": {

diff --git a/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_2.snap b/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_2.snap
@@ -67,6 +67,11 @@ expression: response
     "ownership_model": "single",
     "owner": "GqPnSDXwp4JFtKS7YZ2HERgBbYLKpKVYy9TpVunzLRa9"
   },
+  "supply": {
+    "print_max_supply": 0,
+    "print_current_supply": 0,
+    "edition_nonce": 255
+  },
   "mutable": true,
   "burnt": false,
   "token_info": {

diff --git a/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_3.snap b/...integration_tests__show_fungible_flag_tests__get_asset_with_show_fungible_scenario_3.snap
@@ -1,5 +1,6 @@
 ---
 source: integration_tests/tests/integration_tests/show_fungible_flag_tests.rs
+assertion_line: 117
 expression: response
 ---
 {
@@ -89,107 +90,9 @@ expression: response
     },
     "confidential_transfer_fee_config": {
       "authority": "2apBGMsS6ti9RyF5TwQTDswXBWskiJP2LD4cUEDqYJjk",
-      "withheld_amount": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-      ],
+      "withheld_amount": "1111111111111111111111111111111111111111111111111111111111111111",
       "harvest_to_mint_enabled": true,
-      "withdraw_withheld_authority_elgamal_pubkey": [
-        28,
-        55,
-        230,
-        67,
-        59,
-        115,
-        4,
-        221,
-        130,
-        115,
-        122,
-        228,
-        13,
-        155,
-        139,
-        243,
-        196,
-        159,
-        91,
-        14,
-        108,
-        73,
-        168,
-        213,
-        51,
-        40,
-        179,
-        229,
-        6,
-        144,
-        28,
-        87
-      ]
+      "withdraw_withheld_authority_elgamal_pubkey": "2u9rVXG8n3sN1ChKwrkQZaWoPapzC49iBXd2Y9Kpg5cJ"
     }
   },
   "token_info": {

diff --git a/...ion_tests__test_get_assets_with_multiple_same_ids__get_assets_with_multiple_same_ids.snap b/...ion_tests__test_get_assets_with_multiple_same_ids__get_assets_with_multiple_same_ids.snap
@@ -69,6 +69,11 @@ snapshot_kind: text
       "ownership_model": "single",
       "owner": ""
     },
+    "supply": {
+      "print_max_supply": 0,
+      "print_current_supply": 0,
+      "edition_nonce": 254
+    },
     "mutable": true,
     "burnt": false
   },