Merge pull request #889 from multiversx/upgrade-annotation

Upgrade annotation
multiversx · Apr 12, 2024 · cb32307 · cb32307
2 parents 7bdcf2f + 0f92c4f
commit cb32307
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 25 deletions.
diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs
@@ -82,7 +82,7 @@ pub trait Farm:
         self.try_set_farm_position_migration_nonce(farm_token_mapper);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {
         let current_epoch = self.blockchain().get_block_epoch();
         self.first_week_start_epoch().set_if_empty(current_epoch);

diff --git a/dex/farm/src/lib.rs b/dex/farm/src/lib.rs
@@ -85,7 +85,7 @@ pub trait Farm:
         self.try_set_farm_position_migration_nonce(farm_token_mapper);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {
         let current_epoch = self.blockchain().get_block_epoch();
         self.first_week_start_epoch().set_if_empty(current_epoch);

diff --git a/dex/governance/src/lib.rs b/dex/governance/src/lib.rs
@@ -49,7 +49,7 @@ pub trait Governance:
         self.try_change_price_providers(price_providers);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[payable("*")]

diff --git a/dex/pair/src/lib.rs b/dex/pair/src/lib.rs
@@ -101,7 +101,7 @@ pub trait Pair<ContractReader>:
         };
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[endpoint(setLpTokenIdentifier)]

diff --git a/dex/pair/src/read_pair_storage.rs b/dex/pair/src/read_pair_storage.rs
@@ -73,4 +73,4 @@ pub trait ReadPairStorageModule {
 
         SingleValueMapper::<_, _, ManagedAddress>::new_from_address(pair_address, storage_key)
     }
-}
+}
diff --git a/dex/price-discovery/src/lib.rs b/dex/price-discovery/src/lib.rs
@@ -113,7 +113,7 @@ pub trait PriceDiscovery:
         self.set_locking_sc_address(locking_sc_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     /// Users can deposit either launched_token or accepted_token.

diff --git a/dex/proxy-deployer/src/lib.rs b/dex/proxy-deployer/src/lib.rs
@@ -16,6 +16,6 @@ pub trait ProxyDeployer: farm_deploy::FarmDeployModule {
         self.farm_template_address().set(&farm_template_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 }
diff --git a/dex/router/src/contract.rs b/dex/router/src/contract.rs
@@ -41,7 +41,7 @@ pub trait Router:
         self.owner().set(&self.blockchain().get_caller());
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {
         self.state().set(false);
     }

diff --git a/dex/router/src/multi_pair_swap.rs b/dex/router/src/multi_pair_swap.rs
@@ -19,7 +19,10 @@ pub trait MultiPairSwap:
 {
     #[payable("*")]
     #[endpoint(multiPairSwap)]
-    fn multi_pair_swap(&self, swap_operations: MultiValueEncoded<SwapOperationType<Self::Api>>) -> ManagedVec<EsdtTokenPayment> {
+    fn multi_pair_swap(
+        &self,
+        swap_operations: MultiValueEncoded<SwapOperationType<Self::Api>>,
+    ) -> ManagedVec<EsdtTokenPayment> {
         require!(self.is_active(), "Not active");
 
         let (token_id, nonce, amount) = self.call_value().single_esdt().into_tuple();

diff --git a/energy-integration/energy-update/src/lib.rs b/energy-integration/energy-update/src/lib.rs
@@ -9,7 +9,7 @@ pub trait EnergyUpdate {
     #[init]
     fn init(&self) {}
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[endpoint(updateFarmsEnergyForUser)]

diff --git a/energy-integration/fees-collector/src/lib.rs b/energy-integration/fees-collector/src/lib.rs
@@ -44,7 +44,7 @@ pub trait FeesCollector:
         self.energy_factory_address().set(&energy_factory_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[endpoint(claimRewards)]

diff --git a/energy-integration/governance-v2/src/lib.rs b/energy-integration/governance-v2/src/lib.rs
@@ -61,7 +61,7 @@ pub trait GovernanceV2:
         self.try_change_fee_token_id(fee_token);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     /// Propose a list of actions.

diff --git a/farm-staking/farm-staking-proxy/src/lib.rs b/farm-staking/farm-staking-proxy/src/lib.rs
@@ -58,6 +58,6 @@ pub trait FarmStakingProxy:
         self.lp_token_id().set_if_empty(&lp_token_id);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 }
diff --git a/farm-staking/farm-staking/src/lib.rs b/farm-staking/farm-staking/src/lib.rs
@@ -97,7 +97,7 @@ pub trait FarmStaking:
         self.try_set_farm_position_migration_nonce(farm_token_mapper);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {
         let current_epoch = self.blockchain().get_block_epoch();
         self.first_week_start_epoch().set_if_empty(current_epoch);

diff --git a/farm-staking/metabonding-staking/src/lib.rs b/farm-staking/metabonding-staking/src/lib.rs
@@ -26,7 +26,7 @@ pub trait MetabondingStaking:
             .set_if_empty(&locked_asset_factory_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[payable("*")]

diff --git a/locked-asset/distribution/src/lib.rs b/locked-asset/distribution/src/lib.rs
@@ -47,7 +47,7 @@ pub trait Distribution: global_op::GlobalOperationModule {
             .set_if_empty(&locked_asset_factory_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[only_owner]

diff --git a/locked-asset/energy-factory/src/lib.rs b/locked-asset/energy-factory/src/lib.rs
@@ -91,7 +91,7 @@ pub trait SimpleLockEnergy:
         self.set_paused(true);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     /// Locks a whitelisted token until `unlock_epoch` and receive meta ESDT LOCKED tokens

diff --git a/locked-asset/factory/src/lib.rs b/locked-asset/factory/src/lib.rs
@@ -63,7 +63,7 @@ pub trait LockedAssetFactory:
         self.set_paused(true);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     fn set_extended_attributes_activation_nonce(&self, is_sc_upgrade: bool) {

diff --git a/locked-asset/lkmex-transfer/src/lib.rs b/locked-asset/lkmex-transfer/src/lib.rs
@@ -56,7 +56,7 @@ pub trait LkmexTransfer:
         self.add_permissions(caller, Permissions::OWNER);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[endpoint]

diff --git a/locked-asset/locked-token-wrapper/src/lib.rs b/locked-asset/locked-token-wrapper/src/lib.rs
@@ -20,7 +20,7 @@ pub trait LockedTokenWrapper:
         self.energy_factory_address().set(&energy_factory_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[payable("*")]

diff --git a/locked-asset/proxy_dex/src/lib.rs b/locked-asset/proxy_dex/src/lib.rs
@@ -58,7 +58,7 @@ pub trait ProxyDexImpl:
             .set_if_empty(&energy_factory_address);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self, old_locked_token_id: TokenIdentifier, old_factory_address: ManagedAddress) {
         require!(
             old_locked_token_id.is_valid_esdt_identifier(),

diff --git a/locked-asset/simple-lock-whitelist/src/lib.rs b/locked-asset/simple-lock-whitelist/src/lib.rs
@@ -30,7 +30,7 @@ pub trait SimpleLockWhitelist:
         self.transfer_roles_not_set().set(true);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     /// Sets the transfer role for the given address. Defaults to own address.

diff --git a/locked-asset/simple-lock/src/lib.rs b/locked-asset/simple-lock/src/lib.rs
@@ -25,7 +25,7 @@ pub trait SimpleLock:
     #[init]
     fn init(&self) {}
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     /// Locks any token (including EGLD) until `unlock_epoch` and receive meta ESDT LOCKED tokens.

diff --git a/locked-asset/token-unstake/src/lib.rs b/locked-asset/token-unstake/src/lib.rs
@@ -42,6 +42,6 @@ pub trait TokenUnstakeModule:
         self.fees_burn_percentage().set(fees_burn_percentage);
     }
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 }
diff --git a/pause-all/src/lib.rs b/pause-all/src/lib.rs
@@ -28,7 +28,7 @@ pub trait PauseAll:
     #[init]
     fn init(&self) {}
 
-    #[endpoint]
+    #[upgrade]
     fn upgrade(&self) {}
 
     #[only_owner]
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,4 +73,4 @@ pub trait ReadPairStorageModule { @@
             SingleValueMapper::<_, _, ManagedAddress>::new_from_address(pair_address, storage_key)
         }
-    }
+    }