merge pop-api

contracts/pop-api-examples/nfts/Cargo.toml

@@ -6,12 +6,9 @@ edition = "2021"
 
 [dependencies]
 ink = { version = "4.3.0", default-features = false }
-
-pop-api = { path = "../../../pop-api", default-features = false}
-
+pop-api = { path = "../../../pop-api", default-features = false }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true }
-
 sp-io = { version = "23.0.0", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
 sp-runtime = { version = "24.0.0", default-features = false }
 

contracts/pop-api-examples/nfts/lib.rs

@@ -1,21 +1,22 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 
-use ink::{
-    env::Environment,
-    prelude::vec::Vec,
-};
+use pop_api::PopApiError;
 
-use ink::primitives::AccountId;
-use sp_runtime::MultiAddress;
-use pop_api::impls::pop_network::PopEnv;
-use pop_api::impls::pop_network::PopApiError;
+#[derive(Debug, Copy, Clone, PartialEq, Eq, scale::Encode, scale::Decode)]
+#[cfg_attr(feature = "std", derive(scale_info::TypeInfo))]
+pub enum ContractError {
+    SomeError,
+}
 
-#[ink::contract(env = crate::PopEnv)]
-mod pop_api_extension_demo {
+impl From<PopApiError> for ContractError {
+    fn from(_value: PopApiError) -> Self {
+        ContractError::SomeError
+    }
+}
 
-    use super::PopApiError;
-    use scale::Encode;
-    use ink::env::Error as EnvError;
+#[ink::contract(env = pop_api::PopEnv)]
+mod pop_api_extension_demo {
+    use super::ContractError;
 
     #[ink(storage)]
     #[derive(Default)]
@@ -34,14 +35,24 @@ mod pop_api_extension_demo {
             collection_id: u32,
             item_id: u32,
             receiver: AccountId,
-        ) {
+        ) -> Result<(), ContractError> {
             ink::env::debug_println!("PopApiExtensionDemo::mint_through_runtime: collection_id: {:?} \nitem_id {:?} \nreceiver: {:?}, ", collection_id, item_id, receiver);
 
-            let call = pop_api::impls::pop_network::Nfts::mint(collection_id, item_id, receiver);
-            self.env().extension().dispatch(call);
+            // simplified API call
+            pop_api::nfts::mint(collection_id, item_id, receiver)?;
 
             ink::env::debug_println!("PopApiExtensionDemo::mint_through_runtime end");
-
+            Ok(())
+        }
+    }
+
+    #[cfg(test)]
+    mod tests {
+        use super::*;
+
+        #[ink::test]
+        fn default_works() {
+            PopApiExtensionDemo::new();
         }
     }
-}
+}

pop-api/Cargo.toml

@@ -10,7 +10,6 @@ edition = "2021"
 pop-api-primitives = { path = "./primitives" }
 
 ink = { version = "4.3.0", default-features = false }
-# pallet-nfts = {version = "22.0.0", default-features = false}
 sp-runtime = { version = "24.0.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
@@ -23,12 +22,10 @@ crate-type = [
     "rlib",
 ]
 
-
 [features]
 default = ["std"]
 std = [
     "ink/std",
-    # "pallet-nfts/std",
     "sp-runtime/std",
     "scale/std",
     "scale-info/std",

pop-api/src/lib.rs

@@ -4,3 +4,78 @@ pub mod impls;
 pub mod interfaces;
 
 use pop_api_primitives::storage_keys;
+pub mod v0;
+
+use ink::{env::Environment, prelude::vec::Vec, ChainExtensionInstance};
+use scale;
+use sp_runtime::MultiSignature;
+pub use v0::nfts;
+use v0::RuntimeCall;
+
+// Id used for identifying non-fungible collections.
+pub type CollectionId = u32;
+
+// Id used for identifying non-fungible items.
+pub type ItemId = u32;
+
+type AccountId = <ink::env::DefaultEnvironment as Environment>::AccountId;
+type Balance = <ink::env::DefaultEnvironment as Environment>::Balance;
+type BlockNumber = <ink::env::DefaultEnvironment as Environment>::BlockNumber;
+type Signature = MultiSignature;
+type StringLimit = u32;
+type KeyLimit = u32;
+type MaxTips = u32;
+
+pub type Result<T> = core::result::Result<T, PopApiError>;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, scale::Encode, scale::Decode)]
+#[cfg_attr(feature = "std", derive(scale_info::TypeInfo))]
+pub enum PopApiError {
+    PlaceholderError,
+}
+
+impl ink::env::chain_extension::FromStatusCode for PopApiError {
+    fn from_status_code(status_code: u32) -> core::result::Result<(), Self> {
+        match status_code {
+            0 => Ok(()),
+            1 => Err(Self::PlaceholderError),
+            _ => panic!("encountered unknown status code"),
+        }
+    }
+}
+
+impl From<scale::Error> for PopApiError {
+    fn from(_: scale::Error) -> Self {
+        panic!("encountered unexpected invalid SCALE encoding")
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(scale_info::TypeInfo))]
+pub enum PopEnv {}
+
+impl Environment for PopEnv {
+    const MAX_EVENT_TOPICS: usize = <ink::env::DefaultEnvironment as Environment>::MAX_EVENT_TOPICS;
+
+    type AccountId = <ink::env::DefaultEnvironment as Environment>::AccountId;
+    type Balance = <ink::env::DefaultEnvironment as Environment>::Balance;
+    type Hash = <ink::env::DefaultEnvironment as Environment>::Hash;
+    type BlockNumber = <ink::env::DefaultEnvironment as Environment>::BlockNumber;
+    type Timestamp = <ink::env::DefaultEnvironment as Environment>::Timestamp;
+
+    type ChainExtension = PopApi;
+}
+
+#[ink::chain_extension]
+pub trait PopApi {
+    type ErrorCode = PopApiError;
+
+    #[ink(extension = 0xfecb)]
+    #[allow(private_interfaces)]
+    fn dispatch(call: RuntimeCall) -> crate::Result<Vec<u8>>;
+}
+
+fn call_runtime(call: RuntimeCall) -> Result<Vec<u8>> {
+    <<PopEnv as Environment>::ChainExtension as ChainExtensionInstance>::instantiate()
+        .dispatch(call)
+}

pop-api/src/v0/balances.rs

@@ -0,0 +1 @@
+

pop-api/src/v0/mod.rs

@@ -0,0 +1,8 @@
+pub mod balances;
+pub mod nfts;
+
+#[derive(scale::Encode)]
+pub(crate) enum RuntimeCall {
+    #[codec(index = 50)]
+    Nfts(nfts::NftCalls),
+}