currentstate

Author: janniksam

xsuite/cli.js

@@ -118,7 +118,7 @@
             ]
         },
         {
-            "name": "setArrayrDataTypes",
+            "name": "setArrayDataTypes",
             "mutability": "mutable",
             "inputs": [
                 {
@@ -164,6 +164,25 @@
                 }
             ]
         },
+        {
+            "name": "getPrimitiveMultiValue2",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "multivalue",
+                    "type": "multi<u8,Address>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u8"
+                },
+                {
+                    "type": "Address"
+                }
+            ]
+        },
         {
             "name": "getOptionalValue2ndArg",
             "mutability": "readonly",
@@ -188,6 +207,111 @@
                 }
             ]
         },
+        {
+            "name": "getOptionalMultiValueEncoded",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "value",
+                    "type": "optional<variadic<tuple<Address,u64>>>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<variadic<tuple<Address,u64>>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "getOptionalMultiValue3",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "value",
+                    "type": "optional<multi<u32,BigUint,u8>>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<multi<u32,BigUint,u8>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "getMultiValueEncoded",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "value",
+                    "type": "variadic<Address>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<Address>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "getMultiValueEncodedWithMultiValue2",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "value",
+                    "type": "variadic<multi<u8,Address>>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<multi<u8,Address>>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "getIgnoreValue",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "_id",
+                    "type": "u64"
+                },
+                {
+                    "name": "value",
+                    "type": "ignore",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "ignore",
+                    "multi_result": true
+                }
+            ]
+        },
         {
             "name": "getSingleValueMapper",
             "mutability": "readonly",
@@ -266,6 +390,22 @@
                     "multi_result": true
                 }
             ]
+        },
+        {
+            "name": "getMapMapperComplex",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "input",
+                    "type": "u8"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "variadic<multi<u8,tuple<u16,BigUint,u8>>>",
+                    "multi_result": true
+                }
+            ]
         }
     ],
     "esdtAttributes": [],
@@ -415,6 +555,10 @@
                 {
                     "name": "custom_type",
                     "type": "SubType"
+                },
+                {
+                    "name": "code_metadata",
+                    "type": "CodeMetadata"
                 }
             ]
         },

xsuite/contracts/datatypes/output/datatypes.abi.json

@@ -33,6 +33,14 @@ pub trait DataTypes {
         self.map_mapper(0).insert(1, 2);
         self.map_mapper(1).insert(1, 10);
         self.map_mapper(1).insert(2, 11);
+        self.map_mapper_complex(0)
+            .insert(0, (0, BigUint::from(12u16), 4));
+        self.map_mapper_complex(0)
+            .insert(1, (1, BigUint::from(24u16), 5));
+        self.map_mapper_complex(1)
+            .insert(0, (2, BigUint::from(48u16), 6));
+        self.map_mapper_complex(1)
+            .insert(1, (3, BigUint::from(72u16), 7));
     }
 
     #[view(getPrimitiveDataTypes)]
@@ -131,6 +139,7 @@ pub trait DataTypes {
                 address: self.blockchain().get_sc_address(),
                 big_unsigned_integer: BigUint::from(100000000u64),
             },
+            code_metadata: CodeMetadata::UPGRADEABLE,
         };
         return types;
     }
@@ -153,7 +162,7 @@ pub trait DataTypes {
         data
     }
 
-    #[endpoint(setArrayrDataTypes)]
+    #[endpoint(setArrayDataTypes)]
     fn set_array_datatypes(&self, data: ArrayDataTypes<Self::Api>) -> ArrayDataTypes<Self::Api> {
         data
     }
@@ -171,6 +180,14 @@ pub trait DataTypes {
         optional_value_arg
     }
 
+    #[view(getPrimitiveMultiValue2)]
+    fn get_primitive_mutlivalue2(
+        &self,
+        multivalue: MultiValue2<u8, ManagedAddress>,
+    ) -> MultiValue2<u8, ManagedAddress> {
+        multivalue
+    }
+
     #[view(getOptionalValue2ndArg)]
     fn get_optional_value_2nd_arg(
         &self,
@@ -181,6 +198,47 @@ pub trait DataTypes {
         result
     }
 
+    #[view(getOptionalMultiValueEncoded)]
+    fn get_optional_multi_value_encoded(
+        &self,
+        _id: u64,
+        value: OptionalValue<MultiValueEncoded<(ManagedAddress, u64)>>,
+    ) -> OptionalValue<MultiValueEncoded<(ManagedAddress, u64)>> {
+        value
+    }
+
+    #[view(getOptionalMultiValue3)]
+    fn get_optional_multi_value_3(
+        &self,
+        _id: u64,
+        value: OptionalValue<MultiValue3<u32, BigUint, u8>>,
+    ) -> OptionalValue<MultiValue3<u32, BigUint, u8>> {
+        value
+    }
+
+    #[view(getMultiValueEncoded)]
+    fn get_multi_value_encoded(
+        &self,
+        _id: u64,
+        value: MultiValueEncoded<ManagedAddress>,
+    ) -> MultiValueEncoded<ManagedAddress> {
+        value
+    }
+
+    #[view(getMultiValueEncodedWithMultiValue2)]
+    fn get_multi_value_encoded_with_multivalue2(
+        &self,
+        _id: u64,
+        value: MultiValueEncoded<MultiValue2<u8, ManagedAddress>>,
+    ) -> MultiValueEncoded<MultiValue2<u8, ManagedAddress>> {
+        value
+    }
+
+    #[view(getIgnoreValue)]
+    fn get_ignore_value(&self, _id: u64, value: IgnoreValue) -> IgnoreValue {
+        value
+    }
+
     #[view(getSingleValueMapper)]
     #[storage_mapper("single_value_mapper")]
     fn single_value_mapper(&self, input: u8) -> SingleValueMapper<u64>;
@@ -201,6 +259,10 @@ pub trait DataTypes {
     #[storage_mapper("map_mapper")]
     fn map_mapper(&self, input: u8) -> MapMapper<u8, u16>;
 
+    #[view(getMapMapperComplex)]
+    #[storage_mapper("map_mapper_complex")]
+    fn map_mapper_complex(&self, input: u8) -> MapMapper<u8, (u16, BigUint, u8)>;
+
     fn get_sample_mvec(&self) -> ManagedVec<u16> {
         let mut vec = ManagedVec::new();
         vec.push(12u16);

xsuite/contracts/datatypes/output/datatypes.wasm

@@ -1,8 +1,8 @@
 use multiversx_sc::{
     api::ManagedTypeApi,
     types::{
-        BigInt, BigUint, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment, EsdtTokenPayment,
-        ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier,
+        BigInt, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EgldOrEsdtTokenPayment,
+        EsdtTokenPayment, ManagedAddress, ManagedBuffer, ManagedVec, TokenIdentifier,
     },
 };
 
@@ -73,4 +73,5 @@ pub struct ArrayDataTypes<M: ManagedTypeApi> {
 pub struct OtherDataTypes<M: ManagedTypeApi> {
     pub custom_type: SubType<M>,
     // pub complex_enum: ComplexEnum<M>,
+    pub code_metadata: CodeMetadata,
 }

xsuite/contracts/datatypes/src/lib.rs

@@ -14,7 +14,6 @@ import { rustToolchain, rustTarget, rustKey } from "./helpers";
 const cwd = process.cwd();
 let tmpDir: string;
 const pemPath = path.resolve("wallets", "wallet.pem");
-
 const keyKeystorePath = path.resolve("wallets", "keystore_key.json");
 const mneKeystorePath = path.resolve("wallets", "keystore_mnemonic.json");
 

xsuite/contracts/datatypes/src/types/data_types.rs

@@ -0,0 +1,57 @@
+export interface AbiDefinition {
+  types: ContractTypeDefinition;
+  endpoints?: EndpointDefinition[];
+}
+
+export interface EndpointDefinition {
+  name: string;
+  mutability?: EndpointMutability;
+  onlyOwner?: boolean;
+  docs?: string[];
+  inputs: InputDefinition[];
+  outputs: OutputDefinition[];
+  payableInTokens?: string[];
+}
+
+export interface InputDefinition {
+  name: string;
+  type: string;
+  multi_arg?: boolean;
+}
+
+export enum EndpointMutability {
+  mutable = "mutable",
+  readonly = "readonly",
+}
+
+export interface OutputDefinition {
+  type: string;
+  multi_result?: boolean;
+}
+
+export interface FieldDefinition {
+  name: string;
+  type: string;
+  docs?: string[];
+}
+
+export interface ContractTypeDefinition {
+  [key: string]: TypeDefinition;
+}
+
+export enum ContractType {
+  struct = "struct",
+  enum = "enum",
+  explicitEnum = "explicit-enum",
+}
+
+export interface TypeDefinition {
+  type: ContractType;
+  fields?: FieldDefinition[];
+  variants?: {
+    name: string;
+    discriminant: string | number;
+    fields?: FieldDefinition[];
+    docs?: string[];
+  }[];
+}

xsuite/src/cli/cmd.test.ts

@@ -0,0 +1,19 @@
+{
+    "name": "NotSupportedType",
+    "constructor": {},
+    "endpoints": [
+        {
+            "name": "ping",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "_data",
+                    "type": "NOTSUPPORTEDTYPE",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": []
+        }
+    ],
+    "types": {}
+}