Merge pull request #321 from ElrondNetwork/governance-extend-1

Governance extend 1
multiversx · Mar 9, 2022 · 0802059 · 0802059
2 parents 32a4ad9 + cb914cb
commit 0802059
Show file tree

Hide file tree

Showing 78 changed files with 418 additions and 231 deletions.
diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml
@@ -17,4 +17,4 @@ path = "../../../common_errors"
 path = "../../token_send"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml
@@ -29,4 +29,4 @@ path = "../../token_merge"
 path = "../config"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml
@@ -14,4 +14,4 @@ path = "../../../common_structs"
 path = "../contexts"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml
@@ -20,4 +20,4 @@ path = "../config"
 path = "../../token_send"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/farm/migration_from_v1_2/Cargo.toml b/common/modules/farm/migration_from_v1_2/Cargo.toml
@@ -26,4 +26,4 @@ path = "../../token_send"
 path = "../rewards"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml
@@ -23,4 +23,4 @@ path = "../farm_token"
 path = "../../token_send"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/token_merge/Cargo.toml b/common/modules/token_merge/Cargo.toml
@@ -14,4 +14,4 @@ path = "../../common_structs"
 path = "../../common_errors"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml
@@ -14,4 +14,4 @@ path = "../../common_structs"
 path = "../../common_errors"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/Cargo.toml b/dex/Cargo.toml
@@ -5,10 +5,10 @@ edition = "2018"
 publish = false
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
 
 [dev-dependencies]
 num-bigint = "0.4.2"

diff --git a/dex/farm-staking-contracts/farm-staking-proxy/Cargo.toml b/dex/farm-staking-contracts/farm-staking-proxy/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies]
 hex-literal = "0.3.1"
@@ -30,7 +30,7 @@ path = "../../../common/modules/token_merge"
 path = "../../../common/common_structs"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
 
 [dev-dependencies]
 num-bigint = "0.4.2"

diff --git a/dex/farm-staking-contracts/farm-staking-proxy/meta/Cargo.toml b/dex/farm-staking-contracts/farm-staking-proxy/meta/Cargo.toml
@@ -11,7 +11,7 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm-staking-contracts/farm-staking-proxy/src/lib.rs b/dex/farm-staking-contracts/farm-staking-proxy/src/lib.rs
@@ -8,8 +8,8 @@ pub mod lp_farm_token;
 pub mod result_types;
 
 pub type StakeResult<Api> = EsdtTokenPayment<Api>;
-pub type ClaimDualYieldResult<Api> = ManagedMultiResultVec<Api, EsdtTokenPayment<Api>>;
-pub type UnstakeResult<Api> = ManagedMultiResultVec<Api, EsdtTokenPayment<Api>>;
+pub type ClaimDualYieldResult<Api> = MultiValueEncoded<Api, EsdtTokenPayment<Api>>;
+pub type UnstakeResult<Api> = MultiValueEncoded<Api, EsdtTokenPayment<Api>>;
 
 #[elrond_wasm::contract]
 pub trait FarmStakingProxy:

diff --git a/dex/farm-staking-contracts/farm-staking-proxy/wasm/Cargo.toml b/dex/farm-staking-contracts/farm-staking-proxy/wasm/Cargo.toml
@@ -24,9 +24,9 @@ panic = "abort"
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29"
 features = [ "vm-validate-token-identifier" ]
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29"
 features = [ "wasm-output-mode",]
diff --git a/dex/farm-staking-contracts/farm-staking/Cargo.toml b/dex/farm-staking-contracts/farm-staking/Cargo.toml
@@ -36,11 +36,10 @@ path = "../../../common/common_structs"
 path = "../../../common/common_errors"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
-features = ["cb_closure_managed_deser"]
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
 
 [dev-dependencies]
 num-bigint = "0.4.2"
diff --git a/dex/farm-staking-contracts/farm-staking/meta/Cargo.toml b/dex/farm-staking-contracts/farm-staking/meta/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm-staking-contracts/farm-staking/wasm/Cargo.toml b/dex/farm-staking-contracts/farm-staking/wasm/Cargo.toml
@@ -25,8 +25,8 @@ default-features = false
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29"
 features = ["wasm-output-mode"]
diff --git a/dex/farm-staking-contracts/metabonding-staking/Cargo.toml b/dex/farm-staking-contracts/metabonding-staking/Cargo.toml
@@ -9,16 +9,16 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29.0"
 
 [dependencies.elrond-wasm-modules]
-version = "0.28.0"
+version = "0.29.0"
 
 [dependencies.factory]
 path = "../../../locked-asset/factory"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29.0"
 
 [dev-dependencies]
 num-bigint = "0.4.2"

diff --git a/dex/farm-staking-contracts/metabonding-staking/meta/Cargo.toml b/dex/farm-staking-contracts/metabonding-staking/meta/Cargo.toml
@@ -11,7 +11,7 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29.0"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29.0"
diff --git a/dex/farm-staking-contracts/metabonding-staking/src/lib.rs b/dex/farm-staking-contracts/metabonding-staking/src/lib.rs
@@ -101,8 +101,8 @@ pub trait MetabondingStaking: locked_asset_token::LockedAssetTokenModule {
     }
 
     #[view(getSnapshot)]
-    fn get_snapshot(&self) -> ManagedMultiResultVec<SnapshotEntry<Self::Api>> {
-        let mut result = ManagedMultiResultVec::new();
+    fn get_snapshot(&self) -> MultiValueEncoded<SnapshotEntry<Self::Api>> {
+        let mut result = MultiValueEncoded::new();
 
         for user_address in self.user_list().iter() {
             let entry: StakingEntry<Self::Api> = self.staking_entry_for_user(&user_address).get();

diff --git a/dex/farm-staking-contracts/metabonding-staking/wasm/Cargo.toml b/dex/farm-staking-contracts/metabonding-staking/wasm/Cargo.toml
@@ -24,8 +24,8 @@ panic = "abort"
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29.0"
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29.0"
 features = [ "wasm-output-mode",]
diff --git a/dex/farm/Cargo.toml b/dex/farm/Cargo.toml
@@ -45,8 +45,7 @@ path = "../../common/common_structs"
 path = "../../common/common_errors"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
-features = ["cb_closure_managed_deser"]
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm/meta/Cargo.toml b/dex/farm/meta/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm/wasm/Cargo.toml b/dex/farm/wasm/Cargo.toml
@@ -25,8 +25,8 @@ default-features = false
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29"
 features = ["wasm-output-mode"]
diff --git a/dex/farm_v1_2_mock/Cargo.toml b/dex/farm_v1_2_mock/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm_v1_2_mock/meta/Cargo.toml b/dex/farm_v1_2_mock/meta/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm_v1_2_mock/wasm/Cargo.toml b/dex/farm_v1_2_mock/wasm/Cargo.toml
@@ -25,8 +25,8 @@ default-features = false
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29"
 features = ["wasm-output-mode"]
diff --git a/dex/farm_with_lock/Cargo.toml b/dex/farm_with_lock/Cargo.toml
@@ -45,8 +45,7 @@ path = "../../common/common_structs"
 path = "../../common/common_errors"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
-features = ["cb_closure_managed_deser"]
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm_with_lock/meta/Cargo.toml b/dex/farm_with_lock/meta/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
diff --git a/dex/farm_with_lock/wasm/Cargo.toml b/dex/farm_with_lock/wasm/Cargo.toml
@@ -25,8 +25,8 @@ default-features = false
 path = ".."
 
 [dependencies.elrond-wasm-node]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-output]
-version = "0.28.0"
+version = "0.29"
 features = ["wasm-output-mode"]
diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28.0"
+version = "0.29"
 
 [dependencies.config]
 path = "../../common/modules/farm/config"

diff --git a/dex/governance/Cargo.toml b/dex/governance/Cargo.toml
@@ -9,10 +9,13 @@ publish = false
 path = "src/contract.rs"
 
 [dependencies.elrond-wasm]
-version = "0.28"
+version = "0.29"
 
 [dev-dependencies.elrond-wasm-debug]
-version = "0.28"
+version = "0.29"
 
 [dev-dependencies]
 num-bigint = "0.4.2"
+
+[dev-dependencies.pair-mock]
+path = "../../pair-mock"
diff --git a/dex/governance/meta/Cargo.toml b/dex/governance/meta/Cargo.toml
@@ -11,7 +11,7 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.elrond-wasm]
-version = "0.28"
+version = "0.29"
 
 [dependencies.elrond-wasm-debug]
-version = "0.28"
+version = "0.29"