Merge pull request #88 from gfusee/feature/unified_syntax

Refactoring to handle unified syntax and reduce SDK dependency
gfusee · May 31, 2024 · eadca9d · eadca9d
2 parents 9ab94a2 + 4417151
commit eadca9d
Show file tree

Hide file tree

Showing 112 changed files with 10,821 additions and 1,912 deletions.
diff --git a/.novax/abis/contract-with-upgrade-endpoint.abi.json b/.novax/abis/contract-with-upgrade-endpoint.abi.json
@@ -0,0 +1,37 @@
+{
+  "buildInfo": {
+    "rustc": {
+      "version": "1.76.0-nightly",
+      "commitHash": "d86d65bbc19b928387f68427fcc3a0da498d8a19",
+      "commitDate": "2023-12-10",
+      "channel": "Nightly",
+      "short": "rustc 1.76.0-nightly (d86d65bbc 2023-12-10)"
+    },
+    "contractCrate": {
+      "name": "contract",
+      "version": "0.0.0"
+    },
+    "framework": {
+      "name": "multiversx-sc",
+      "version": "0.48.0"
+    }
+  },
+  "name": "ContractWithUpgradeEndpoint",
+  "constructor": {
+    "inputs": [],
+    "outputs": []
+  },
+  "endpoints": [
+    {
+      "name": "upgrade",
+      "mutability": "mutable",
+      "inputs": [],
+      "outputs": []
+    }
+  ],
+  "esdtAttributes": [],
+  "hasCallback": false,
+  "types": {
+
+  }
+}
diff --git a/.novax/abis/tester-contract-deploy-return.abi.json b/.novax/abis/tester-contract-deploy-return.abi.json
@@ -1,19 +1,20 @@
 {
     "buildInfo": {
         "rustc": {
-            "version": "1.74.0-nightly",
-            "commitHash": "ec08a0337f3556212525dbf1d3b41e19bdf27621",
-            "commitDate": "2023-09-04",
-            "channel": "Nightly",
-            "short": "rustc 1.74.0-nightly (ec08a0337 2023-09-04)"
+            "version": "1.78.0",
+            "commitHash": "9b00956e56009bab2aa15d7bff10916599e3d6d6",
+            "commitDate": "2024-04-29",
+            "channel": "Stable",
+            "short": "rustc 1.78.0 (9b00956e5 2024-04-29)"
         },
         "contractCrate": {
             "name": "tester-contract",
-            "version": "0.0.0"
+            "version": "0.0.0",
+            "gitVersion": "0.1.6-17-gaeef5de"
         },
         "framework": {
             "name": "multiversx-sc",
-            "version": "0.43.3"
+            "version": "0.50.3"
         }
     },
     "name": "TesterWithReturningDeploy",
@@ -30,6 +31,10 @@
             }
         ]
     },
+    "upgradeConstructor": {
+        "inputs": [],
+        "outputs": []
+    },
     "endpoints": [
         {
             "name": "getSum",
@@ -52,6 +57,56 @@
             ],
             "outputs": []
         },
+        {
+            "name": "returnNftProperties",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "TestTokenProperties"
+                }
+            ]
+        },
+        {
+            "name": "returnNftEnumProperties",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "TestEnumProperties"
+                }
+            ]
+        },
+        {
+            "name": "returnNftEnumFieldsProperties",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "TestEnumPropertiesWithFields"
+                }
+            ]
+        },
+        {
+            "name": "returnFungibleBalance",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
+        {
+            "name": "returnNonFungibleBalance",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "BigUint"
+                }
+            ]
+        },
         {
             "name": "noArgNoReturnEndpoint",
             "mutability": "mutable",
@@ -78,6 +133,21 @@
                 }
             ]
         },
+        {
+            "name": "returnContractAddress",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "contract_address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "Address"
+                }
+            ]
+        },
         {
             "name": "returnBiguint",
             "mutability": "mutable",
@@ -467,6 +537,34 @@
                 }
             ]
         },
+        {
+            "name": "returnOptionalValueBool",
+            "mutability": "mutable",
+            "inputs": [],
+            "outputs": [
+                {
+                    "type": "optional<bool>",
+                    "multi_result": true
+                }
+            ]
+        },
+        {
+            "name": "returnOptionalValueBoolArg",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "arg",
+                    "type": "optional<bool>",
+                    "multi_arg": true
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "optional<bool>",
+                    "multi_result": true
+                }
+            ]
+        },
         {
             "name": "returnMultiValueTwo",
             "mutability": "mutable",
@@ -483,10 +581,76 @@
                     "multi_result": true
                 }
             ]
+        },
+        {
+            "name": "returnBigIntArg",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "value",
+                    "type": "BigInt"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "BigInt"
+                }
+            ]
+        },
+        {
+            "name": "callAnotherContractReturnTwoU64",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "u64"
+                },
+                {
+                    "type": "u64"
+                }
+            ]
+        },
+        {
+            "name": "asyncCallAnotherContractReturnTwoU64NoCallback",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "asyncCallAnotherContractReturnTwoU64WithReturningCallback",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": []
+        },
+        {
+            "name": "asyncCallAnotherContractReturnTwoU64WithNonReturningCallback",
+            "mutability": "mutable",
+            "inputs": [
+                {
+                    "name": "address",
+                    "type": "Address"
+                }
+            ],
+            "outputs": []
         }
     ],
-    "events": [],
-    "hasCallback": false,
+    "esdtAttributes": [],
+    "hasCallback": true,
     "types": {
         "CustomEnum": {
             "type": "enum",
@@ -620,6 +784,61 @@
                     "type": "CustomStruct"
                 }
             ]
+        },
+        "TestEnumProperties": {
+            "type": "enum",
+            "variants": [
+                {
+                    "name": "First",
+                    "discriminant": 0
+                },
+                {
+                    "name": "Second",
+                    "discriminant": 1,
+                    "fields": [
+                        {
+                            "name": "0",
+                            "type": "bytes"
+                        },
+                        {
+                            "name": "1",
+                            "type": "BigUint"
+                        }
+                    ]
+                }
+            ]
+        },
+        "TestEnumPropertiesWithFields": {
+            "type": "enum",
+            "variants": [
+                {
+                    "name": "First",
+                    "discriminant": 0,
+                    "fields": [
+                        {
+                            "name": "buffer_value",
+                            "type": "bytes"
+                        },
+                        {
+                            "name": "integer",
+                            "type": "BigUint"
+                        }
+                    ]
+                }
+            ]
+        },
+        "TestTokenProperties": {
+            "type": "struct",
+            "fields": [
+                {
+                    "name": "buffer",
+                    "type": "bytes"
+                },
+                {
+                    "name": "integer",
+                    "type": "BigUint"
+                }
+            ]
         }
     }
 }
diff --git a/.novax/abis/tester-contract.abi.json b/.novax/abis/tester-contract.abi.json
@@ -1,20 +1,20 @@
 {
     "buildInfo": {
         "rustc": {
-            "version": "1.70.0-nightly",
-            "commitHash": "8a73f50d875840b8077b8ec080fa41881d7ce40d",
-            "commitDate": "2023-03-11",
-            "channel": "Nightly",
-            "short": "rustc 1.70.0-nightly (8a73f50d8 2023-03-11)"
+            "version": "1.78.0",
+            "commitHash": "9b00956e56009bab2aa15d7bff10916599e3d6d6",
+            "commitDate": "2024-04-29",
+            "channel": "Stable",
+            "short": "rustc 1.78.0 (9b00956e5 2024-04-29)"
         },
         "contractCrate": {
             "name": "tester-contract",
             "version": "0.0.0",
-            "gitVersion": "0.0.25-1-gb35f7e9"
+            "gitVersion": "0.1.6-17-gaeef5de"
         },
         "framework": {
             "name": "multiversx-sc",
-            "version": "0.43.3"
+            "version": "0.50.3"
         }
     },
     "name": "Tester",
@@ -27,6 +27,10 @@
         ],
         "outputs": []
     },
+    "upgradeConstructor": {
+        "inputs": [],
+        "outputs": []
+    },
     "endpoints": [
         {
             "name": "getSum",
@@ -641,7 +645,7 @@
             "outputs": []
         }
     ],
-    "events": [],
+    "esdtAttributes": [],
     "hasCallback": true,
     "types": {
         "CustomEnum": {

diff --git a/.novax/tester-contract.wasm b/.novax/tester-contract.wasm