Merge pull request #1258 from multiversx/upgrade-attribute

upgrade attribute (basics)

contracts/examples/adder/src/adder.rs

@@ -15,6 +15,11 @@ pub trait Adder {
         self.sum().set(initial_value);
     }
 
+    #[upgrade]
+    fn upgrade(&self, initial_value: BigUint) {
+        self.init(initial_value);
+    }
+
     /// Add desired amount to the storage variable.
     #[endpoint]
     fn add(&self, value: BigUint) {

contracts/examples/adder/wasm/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            2
+// Endpoints:                            3
 // Async Callback (empty):               1
-// Total number of exported functions:   4
+// Total number of exported functions:   5
 
 #![no_std]
 
@@ -23,6 +23,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     (
         init => init
         getSum => sum
+        upgrade => upgrade
         add => add
     )
 }

contracts/examples/multisig/src/multisig.rs

@@ -41,6 +41,11 @@ pub trait Multisig:
         self.quorum().set(quorum);
     }
 
+    #[upgrade]
+    fn upgrade(&self, quorum: usize, board: MultiValueEncoded<ManagedAddress>) {
+        self.init(quorum, board)
+    }
+
     /// Allows the contract to receive funds even if it is marked as unpayable in the protocol.
     #[payable("*")]
     #[endpoint]

contracts/examples/multisig/wasm-multisig-full/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           28
+// Endpoints:                           29
 // Async Callback:                       1
-// Total number of exported functions:  30
+// Total number of exported functions:  31
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multisig
     (
         init => init
+        upgrade => upgrade
         deposit => deposit
         signed => signed
         sign => sign

contracts/examples/multisig/wasm/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           20
+// Endpoints:                           21
 // Async Callback:                       1
-// Total number of exported functions:  22
+// Total number of exported functions:  23
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multisig
     (
         init => init
+        upgrade => upgrade
         deposit => deposit
         signed => signed
         sign => sign

contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs

@@ -79,7 +79,7 @@ pub trait ProxyTestFirst {
 
         self.message_me_proxy()
             .contract(other_contract)
-            .init(456)
+            .init(456) // TODO: upgrade proxy
             .with_egld_transfer(payment.clone_value())
             .upgrade_contract(&code, CodeMetadata::DEFAULT);
     }

contracts/feature-tests/composability/proxy-test-second/src/proxy-test-second.rs

@@ -34,6 +34,12 @@ pub trait ProxyTestSecond {
         init_arg + 1
     }
 
+    #[upgrade]
+    #[payable("EGLD")]
+    fn upgrade(&self, init_arg: i32) -> i32 {
+        self.init(init_arg)
+    }
+
     #[payable("EGLD")]
     #[endpoint(payMe)]
     fn pay_me(&self, arg1: i64) {

contracts/feature-tests/composability/proxy-test-second/wasm/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                            3
+// Endpoints:                            4
 // Async Callback (empty):               1
-// Total number of exported functions:   5
+// Total number of exported functions:   6
 
 #![no_std]
 
@@ -22,6 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     proxy_test_second
     (
         init => init
+        upgrade => upgrade
         payMe => pay_me
         payMeWithResult => pay_me_with_result_endpoint
         messageMe => message_me

contracts/feature-tests/composability/vault/sc-config.toml

@@ -4,8 +4,14 @@ main = "main"
 [contracts.main]
 name = "vault"
 add-unlabelled = true
+add-labels = ["upgrade"]
 
 [contracts.promises]
 name = "vault-promises"
 add-unlabelled = true
-add-labels = ["promises-endpoint"]
+add-labels = ["promises-endpoint"]
+
+[contracts.upgrade]
+name = "vault-upgrade"
+add-unlabelled = false
+add-labels = ["upgrade"]

contracts/feature-tests/composability/vault/src/vault.rs

@@ -14,6 +14,19 @@ pub trait Vault {
         opt_arg_to_echo
     }
 
+    #[upgrade]
+    #[label("upgrade")]
+    fn upgrade(
+        &self,
+        opt_arg_to_echo: OptionalValue<ManagedBuffer>,
+    ) -> MultiValue2<&'static str, OptionalValue<ManagedBuffer>> {
+        self.upgraded_event();
+        ("upgraded", opt_arg_to_echo).into()
+    }
+
+    #[event("upgraded")]
+    fn upgraded_event(&self);
+
     #[endpoint]
     fn echo_arguments(
         &self,

contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml

@@ -7,12 +7,14 @@ publish = false
 
 [lib]
 crate-type = ["cdylib"]
+
 [profile.release]
 codegen-units = 1
 opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
 [dependencies.vault]
 path = ".."