add more functions to fungibles extension

Author: indirection42

guest-examples/sum-balance-percent/src/main.rs

@@ -6,9 +6,9 @@ mod sum_balance_percent {
     type AssetId = u32;
     type AccountId = [u8; 32];
     type Balance = u64;
-    #[program::extension_fn(extension_id = 4071833530116166512u64, fn_index = 1)]
+    #[program::extension_fn(extension_id = 1248491991627109725u64, fn_index = 6)]
     fn balance(asset: AssetId, who: AccountId) -> Balance {}
-    #[program::extension_fn(extension_id = 4071833530116166512u64, fn_index = 0)]
+    #[program::extension_fn(extension_id = 1248491991627109725u64, fn_index = 5)]
     fn total_supply(asset: AssetId) -> Balance {}
 
     #[program::entrypoint]

guest-examples/sum-balance/src/main.rs

@@ -20,7 +20,7 @@ mod sum_balance {
         }
     }
 
-    #[program::extension_fn(extension_id = 4071833530116166512u64, fn_index = 1)]
+    #[program::extension_fn(extension_id = 1248491991627109725u64, fn_index = 6)]
     fn balance(asset: AssetId, who: AccountId) -> Balance {}
 
     #[program::entrypoint]

poc/runtime/src/pvq.rs

@@ -1,11 +1,11 @@
-#[allow(unused_imports)]
-use frame::deps::scale_info::prelude::{format, string::String};
-
 use pvq_extension::metadata::Metadata;
 use pvq_extension::{extensions_impl, ExtensionsExecutor, InvokeSource};
 
 #[extensions_impl]
 pub mod extensions {
+    use frame::deps::scale_info::prelude::vec::Vec;
+    use frame::token::fungibles;
+
     #[extensions_impl::impl_struct]
     pub struct ExtensionImpl;
 
@@ -20,14 +20,29 @@ pub mod extensions {
 
     #[extensions_impl::extension]
     impl pvq_extension_fungibles::extension::ExtensionFungibles for ExtensionImpl {
-        type AccountId = [u8; 32];
+        type AccountId = crate::interface::AccountId;
         type Balance = crate::interface::Balance;
         type AssetId = crate::interface::AssetId;
+        fn name(asset: Self::AssetId) -> Vec<u8> {
+            <crate::Assets as fungibles::metadata::Inspect<crate::interface::AccountId>>::name(asset)
+        }
+        fn symbol(asset: Self::AssetId) -> Vec<u8> {
+            <crate::Assets as fungibles::metadata::Inspect<crate::interface::AccountId>>::symbol(asset)
+        }
+        fn decimals(asset: Self::AssetId) -> u8 {
+            <crate::Assets as fungibles::metadata::Inspect<crate::interface::AccountId>>::decimals(asset)
+        }
         fn balance(asset: Self::AssetId, who: Self::AccountId) -> Self::Balance {
-            crate::Assets::balance(asset, crate::interface::AccountId::from(who))
+            <crate::Assets as fungibles::Inspect<crate::interface::AccountId>>::balance(asset, &who)
         }
         fn total_supply(asset: Self::AssetId) -> Self::Balance {
-            crate::Assets::total_supply(asset)
+            <crate::Assets as fungibles::Inspect<crate::interface::AccountId>>::total_issuance(asset)
+        }
+        fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
+            <crate::Assets as fungibles::Inspect<crate::interface::AccountId>>::minimum_balance(asset)
+        }
+        fn asset_exists(asset: Self::AssetId) -> bool {
+            <crate::Assets as fungibles::Inspect<crate::interface::AccountId>>::asset_exists(asset)
         }
     }
 }

pvq-extension-fungibles/src/lib.rs

@@ -3,11 +3,17 @@ use pvq_extension::extension_decl;
 
 #[extension_decl]
 pub mod extension {
+    use scale_info::prelude::vec::Vec;
     #[extension_decl::extension]
     pub trait ExtensionFungibles {
         type AssetId;
         type Balance;
         type AccountId;
+        fn asset_exists(asset: Self::AssetId) -> bool;
+        fn name(asset: Self::AssetId) -> Vec<u8>;
+        fn symbol(asset: Self::AssetId) -> Vec<u8>;
+        fn decimals(asset: Self::AssetId) -> u8;
+        fn minimum_balance(asset: Self::AssetId) -> Self::Balance;
         fn total_supply(asset: Self::AssetId) -> Self::Balance;
         fn balance(asset: Self::AssetId, who: Self::AccountId) -> Self::Balance;
     }

pvq-test-runner/src/lib.rs

@@ -37,9 +37,24 @@ pub mod extensions {
         type AssetId = u32;
         type AccountId = [u8; 32];
         type Balance = u64;
+        fn name(_asset: Self::AssetId) -> Vec<u8> {
+            b"Test".to_vec()
+        }
+        fn symbol(_asset: Self::AssetId) -> Vec<u8> {
+            b"TEST".to_vec()
+        }
+        fn decimals(_asset: Self::AssetId) -> u8 {
+            18
+        }
         fn total_supply(_asset: Self::AssetId) -> Self::Balance {
             100
         }
+        fn minimum_balance(_asset: Self::AssetId) -> Self::Balance {
+            100
+        }
+        fn asset_exists(_asset: Self::AssetId) -> bool {
+            true
+        }
         fn balance(_asset: Self::AssetId, _who: Self::AccountId) -> Self::Balance {
             100
         }
@@ -133,6 +148,9 @@ impl TestRunner {
 
     pub fn expected_result(program_path: &str, chain: &str, entrypoint_idx: u8) -> Vec<u8> {
         // TODO: add more entrypoints
+        if program_path.contains("sum-balance") && chain == "poc" && entrypoint_idx == 0 {
+            return 1000_000_000u64.encode();
+        }
         if program_path.contains("swap-info") && chain == "ah" && entrypoint_idx == 2 {
             return (10_235_709_412_325u128, 12_117_819_770_919u128).encode();
         }