Merge pull request #21 from multiversx/upgrade-framework

upgrade framework
multiversx · Dec 13, 2024 · c6c1068 · c6c1068
2 parents 204acc2 + 4f1fa75
commit c6c1068
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 39 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -13,9 +13,11 @@ permissions:
 jobs:
   contracts:
     name: Contracts
-    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.3.1
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@72dc7659e6945c8749d01ec28638843bae33437e
     with:
       rust-toolchain: stable
+      sc-meta-hash-git: ca051fc3d0c03ec1ce5624cf81bdada57b5fc3e2
+      mx-scenario-go-version: v3.0.0
       enable-contracts-size-report: false
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,3 @@
 [workspace]
-members = [
-  "ping-pong",
-  "ping-pong/meta"
-]
+resolver = "2"
+members = ["ping-pong", "ping-pong/meta"]
diff --git a/elrond.workspace.json b/elrond.workspace.json
diff --git a/ping-pong/Cargo.toml b/ping-pong/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 path = "src/ping_pong.rs"
 
 [dependencies.multiversx-sc]
-version = "0.52.3"
+version = "0.54.6"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.52.3"
+version = "0.54.6"
diff --git a/ping-pong/meta/Cargo.toml b/ping-pong/meta/Cargo.toml
@@ -4,8 +4,9 @@ version = "0.0.0"
 authors = ["Bruda Claudiu-Marcel <[email protected]>"]
 edition = "2021"
 publish = false
+
 [dependencies.ping-pong]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.52.3"
+version = "0.54.6"
diff --git a/ping-pong/mxpy.json b/ping-pong/mxpy.json
diff --git a/ping-pong/scenarios/ping-pong-call-ping-second-user.scen.json b/ping-pong/scenarios/ping-pong-call-ping-second-user.scen.json
@@ -57,9 +57,9 @@
                         "str:userPingTimestamp|address:participant1": "781",
                         "str:userPingTimestamp|address:participant2": "781"
                     },
-                    "code": "file:../output/ping-pong.wasm"
+                    "code": "mxsc:../output/ping-pong.mxsc.json"
                 }
             }
         }
     ]
-}
+}
diff --git a/ping-pong/scenarios/ping-pong-call-ping.scen.json b/ping-pong/scenarios/ping-pong-call-ping.scen.json
@@ -56,9 +56,9 @@
                         "str:acceptedPaymentTokenId": "str:EGLD",
                         "str:userPingTimestamp|address:participant1": "781"
                     },
-                    "code": "file:../output/ping-pong.wasm"
+                    "code": "mxsc:../output/ping-pong.mxsc.json"
                 }
             }
         }
     ]
-}
+}
diff --git a/ping-pong/scenarios/ping-pong-call-pong.scen.json b/ping-pong/scenarios/ping-pong-call-pong.scen.json
@@ -56,7 +56,7 @@
                         "str:durationInSeconds": "123,000",
                         "str:acceptedPaymentTokenId": "str:EGLD"
                     },
-                    "code": "file:../output/ping-pong.wasm"
+                    "code": "mxsc:../output/ping-pong.mxsc.json"
                 }
             }
         }

diff --git a/ping-pong/scenarios/ping-pong-init.scen.json b/ping-pong/scenarios/ping-pong-init.scen.json
@@ -34,7 +34,7 @@
         "txId": "deploy",
         "tx": {
           "from": "address:my_address",
-          "contractCode": "file:../output/ping-pong.wasm",
+          "contractCode": "mxsc:../output/ping-pong.mxsc.json",
           "value": "0",
           "arguments": [
               "500,000,000,000",
@@ -75,7 +75,7 @@
               "str:durationInSeconds": "123,000",
               "str:acceptedPaymentTokenId": "str:EGLD"
             },
-            "code": "file:../output/ping-pong.wasm"
+            "code": "mxsc:../output/ping-pong.mxsc.json"
           }
         }
       }

diff --git a/ping-pong/src/ping_pong.rs b/ping-pong/src/ping_pong.rs
@@ -38,6 +38,15 @@ pub trait PingPong {
         self.accepted_payment_token_id().set(&token_id);
     }
 
+    #[upgrade]
+    fn upgrade(&self, ping_amount: BigUint, duration_in_seconds: u64) {
+        self.init(
+            ping_amount,
+            duration_in_seconds,
+            OptionalValue::Some(self.accepted_payment_token_id().get()),
+        )
+    }
+
     // endpoints
 
     /// User sends some tokens to be locked in the contract for a period of time.

diff --git a/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs b/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
@@ -3,7 +3,10 @@ use multiversx_sc_scenario::*;
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
-    blockchain.register_contract("file:output/ping-pong.wasm", ping_pong::ContractBuilder);
+    blockchain.register_contract(
+        "mxsc:output/ping-pong.mxsc.json",
+        ping_pong::ContractBuilder,
+    );
     blockchain
 }
 

diff --git a/ping-pong/wasm/Cargo.toml b/ping-pong/wasm/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.52.3"
+version = "0.54.6"
 
 [workspace]
 members = ["."]
diff --git a/ping-pong/wasm/src/lib.rs b/ping-pong/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
+// Upgrade:                              1
 // Endpoints:                            9
 // Async Callback (empty):               1
-// Total number of exported functions:  11
+// Total number of exported functions:  12
 
 #![no_std]
 
@@ -18,6 +19,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     ping_pong
     (
         init => init
+        upgrade => upgrade
         ping => ping
         pong => pong
         didUserPing => did_user_ping