Feature: New payment types

Cargo.toml

@@ -65,8 +65,8 @@ members = [
   "contracts/examples/esdt-transfer-with-fee/meta",
   "contracts/examples/bonding-curve-contract",
   "contracts/examples/bonding-curve-contract/meta",
-  "contracts/examples/crowdfunding-esdt",
-  "contracts/examples/crowdfunding-esdt/meta",
+  "contracts/examples/crowdfunding",
+  "contracts/examples/crowdfunding/meta",
   "contracts/examples/crypto-bubbles",
   "contracts/examples/crypto-bubbles/meta",
   "contracts/examples/crypto-zombies",

chain/vm/src/host/context/managed_type_container/tx_managed_buffer.rs

@@ -97,7 +97,7 @@ impl ManagedTypeContainer {
         let mut num_bytes_copied = 0;
         let data = self.mb_get(source_handle);
         assert!(
-            data.len() % 4 == 0,
+            data.len().is_multiple_of(4),
             "malformed ManagedVec<ManagedBuffer> data"
         );
         for chunk in data.chunks(4) {
@@ -134,7 +134,7 @@ impl ManagedTypeContainer {
         let mut num_bytes_copied = 0;
         let data = self.mb_get(source_handle);
         assert!(
-            data.len() % 16 == 0,
+            data.len().is_multiple_of(16),
             "malformed ManagedVec<EsdtTokenPayment> data"
         );
         for chunk in data.chunks(16) {

contracts/core/price-aggregator/src/median.rs

@@ -11,7 +11,7 @@ pub fn calculate<M: ManagedTypeApi>(
     list.sort_unstable();
     let len = list.len();
     let middle_index = len / 2;
-    if len % 2 == 0 {
+    if len.is_multiple_of(2) {
         let median1 = list.get(middle_index - 1).ok_or("median1 invalid index")?;
         let median2 = list.get(middle_index).ok_or("median2 invalid index")?;
         Result::Ok(Some((median1.clone() + median2.clone()) / 2u64))

contracts/core/wegld-swap/src/wegld.rs

@@ -58,7 +58,7 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
     #[title("lockedEgldBalance")]
     fn get_locked_egld_balance(&self) -> BigUint {
         self.blockchain()
-            .get_sc_balance(&EgldOrEsdtTokenIdentifier::egld(), 0)
+            .get_sc_balance(EgldOrEsdtTokenIdentifier::egld(), 0)
     }
 
     #[view(getWrappedEgldTokenId)]

contracts/examples/crowdfunding-esdt/Cargo.toml → contracts/examples/crowdfunding/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "crowdfunding-esdt"
+name = "crowdfunding"
 version = "0.0.0"
 authors = ["Dorin Iancu <[email protected]>"]
 edition = "2021"
 publish = false
 
 [lib]
-path = "src/crowdfunding_esdt.rs"
+path = "src/crowdfunding.rs"
 
 [dependencies.multiversx-sc]
 version = "0.63.1"

contracts/examples/crowdfunding-esdt/meta/Cargo.toml → contracts/examples/crowdfunding/meta/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "crowdfunding-esdt-meta"
+name = "crowdfunding-meta"
 version = "0.0.0"
 authors = ["Andrei Marinica <[email protected]>"]
 edition = "2021"
 publish = false
 
-[dependencies.crowdfunding-esdt]
+[dependencies.crowdfunding]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]

contracts/examples/crowdfunding/meta/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta_lib::cli_main::<crowdfunding::AbiProvider>();
+}

contracts/examples/crowdfunding/sc-config.toml

@@ -0,0 +1,2 @@
+[[proxy]]
+path = "src/crowdfunding_proxy.rs"

contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json → contracts/examples/crowdfunding/scenarios/_generated_fund.scen.json

@@ -29,7 +29,7 @@
             "accounts": {
                 "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": {
                     "balance": "0",
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
                 }
             }
@@ -89,7 +89,7 @@
                         "str:target": "0x07d0",
                         "str:tokenIdentifier": "0x43524f57442d313233343536"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925",
                     "developerRewards": "0"
                 }

contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json → contracts/examples/crowdfunding/scenarios/_generated_init.scen.json

@@ -29,7 +29,7 @@
             "accounts": {
                 "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": {
                     "balance": "0",
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
                 }
             }
@@ -89,7 +89,7 @@
                         "str:target": "0x07d0",
                         "str:tokenIdentifier": "0x43524f57442d313233343536"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925",
                     "developerRewards": "0"
                 }

contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json → contracts/examples/crowdfunding/scenarios/_generated_query_status.scen.json

@@ -29,7 +29,7 @@
             "accounts": {
                 "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": {
                     "balance": "0",
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
                 }
             }
@@ -89,7 +89,7 @@
                         "str:target": "0x07d0",
                         "str:tokenIdentifier": "0x43524f57442d313233343536"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925",
                     "developerRewards": "0"
                 }

contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json → contracts/examples/crowdfunding/scenarios/_generated_sc_err.scen.json

@@ -29,7 +29,7 @@
             "accounts": {
                 "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": {
                     "balance": "0",
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925"
                 }
             }
@@ -89,7 +89,7 @@
                         "str:target": "0x07d0",
                         "str:tokenIdentifier": "0x43524f57442d313233343536"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                    "code": "mxsc:../output/crowdfunding.mxsc.json",
                     "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925",
                     "developerRewards": "0"
                 }

contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json → contracts/examples/crowdfunding/scenarios/crowdfunding-claim-failed.scen.json

@@ -79,7 +79,7 @@
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "200,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },
@@ -188,7 +188,7 @@
                         "str:deposit|address:donor1": "0",
                         "str:deposit|address:donor2": "0"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json → contracts/examples/crowdfunding/scenarios/crowdfunding-claim-successful.scen.json

@@ -78,7 +78,7 @@
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },
@@ -178,7 +178,7 @@
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund-too-late.scen.json → contracts/examples/crowdfunding/scenarios/crowdfunding-fund-too-late.scen.json

@@ -64,7 +64,7 @@
                         "str:tokenIdentifier": "str:CROWD-123456",
                         "str:deposit|address:donor1": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },

contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund.scen.json → contracts/examples/crowdfunding/scenarios/crowdfunding-fund.scen.json

@@ -69,7 +69,7 @@
                         "str:tokenIdentifier": "str:CROWD-123456",
                         "str:deposit|address:donor1": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json → contracts/examples/crowdfunding/scenarios/crowdfunding-init.scen.json

@@ -22,7 +22,7 @@
             "id": "deploy",
             "tx": {
                 "from": "address:my_address",
-                "contractCode": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                "contractCode": "mxsc:../output/crowdfunding.mxsc.json",
                 "arguments": [
                     "500,000,000,000",
                     "123,000",
@@ -54,7 +54,7 @@
                         "str:deadline": "123,000",
                         "str:tokenIdentifier": "str:CROWD-123456"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json → contracts/examples/crowdfunding/scenarios/egld-crowdfunding-claim-failed.scen.json

@@ -57,11 +57,11 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "200,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },
@@ -131,11 +131,11 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "0",
                         "str:deposit|address:donor2": "0"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json → contracts/examples/crowdfunding/scenarios/egld-crowdfunding-claim-successful.scen.json

@@ -57,11 +57,11 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },
@@ -132,11 +132,11 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "250,000,000,000",
                         "str:deposit|address:donor2": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json → contracts/examples/crowdfunding/scenarios/egld-crowdfunding-fund-too-late.scen.json

@@ -50,10 +50,10 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         },

contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json → contracts/examples/crowdfunding/scenarios/egld-crowdfunding-fund.scen.json

@@ -52,10 +52,10 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD",
+                        "str:tokenIdentifier": "str:EGLD-000000",
                         "str:deposit|address:donor1": "250,000,000,000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }

contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json → contracts/examples/crowdfunding/scenarios/egld-crowdfunding-init.scen.json

@@ -22,11 +22,11 @@
             "id": "deploy",
             "tx": {
                 "from": "address:my_address",
-                "contractCode": "mxsc:../output/crowdfunding-esdt.mxsc.json",
+                "contractCode": "mxsc:../output/crowdfunding.mxsc.json",
                 "arguments": [
                     "500,000,000,000",
                     "123,000",
-                    "str:EGLD"
+                    "str:EGLD-000000"
                 ],
                 "gasLimit": "5,000,000",
                 "gasPrice": "0"
@@ -52,9 +52,9 @@
                     "storage": {
                         "str:target": "500,000,000,000",
                         "str:deadline": "123,000",
-                        "str:tokenIdentifier": "str:EGLD"
+                        "str:tokenIdentifier": "str:EGLD-000000"
                     },
-                    "code": "mxsc:../output/crowdfunding-esdt.mxsc.json"
+                    "code": "mxsc:../output/crowdfunding.mxsc.json"
                 }
             }
         }