Merge pull request #936 from multiversx/legacy-contracts-only-with-si…

…gnatures legacy contracts only with signatures
multiversx · Aug 3, 2024 · df928d2 · df928d2
2 parents 656c8d8 + b7fedab
commit df928d2
Show file tree

Hide file tree

Showing 78 changed files with 16,038 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,14 +39,24 @@ members = [
 
   "legacy-contracts/simple-lock-legacy",
   "legacy-contracts/simple-lock-legacy/meta",
-  "legacy-contracts/farm-staking-proxy-v-13",
-  "legacy-contracts/farm-staking-proxy-v-13/meta",
-  "legacy-contracts/farm-v-13",
-  "legacy-contracts/farm-v-13/meta",
+  "legacy-contracts/farm-staking-proxy-v13",
+  "legacy-contracts/farm-staking-proxy-v13/meta",
+  "legacy-contracts/farm-v12",
+  "legacy-contracts/farm-v12/meta",
+  "legacy-contracts/farm-v13",
+  "legacy-contracts/farm-v13/meta",
+  "legacy-contracts/farm-v13-locked-rewards",
+  "legacy-contracts/farm-v13-locked-rewards/meta",
+  "legacy-contracts/farm-v13-custom-rewards",
+  "legacy-contracts/farm-v13-custom-rewards/meta",
   "legacy-contracts/proxy-dex-legacy",
   "legacy-contracts/proxy-dex-legacy/meta",
   "legacy-contracts/factory-legacy",
   "legacy-contracts/factory-legacy/meta",
+  "legacy-contracts/price-discovery-v1",
+  "legacy-contracts/price-discovery-v1/meta",
+  "legacy-contracts/price-discovery-v2",
+  "legacy-contracts/price-discovery-v2/meta",
 
   "locked-asset/",
   "locked-asset/distribution",

diff --git a/legacy-contracts/farm-staking-proxy-v-13/meta/src/main.rs b/legacy-contracts/farm-staking-proxy-v-13/meta/src/main.rs
diff --git a/...tracts/farm-staking-proxy-v-13/.gitignore → ...ntracts/farm-staking-proxy-v13/.gitignore b/...tracts/farm-staking-proxy-v-13/.gitignore → ...ntracts/farm-staking-proxy-v13/.gitignore
diff --git a/...tracts/farm-staking-proxy-v-13/Cargo.toml → ...ntracts/farm-staking-proxy-v13/Cargo.toml b/...tracts/farm-staking-proxy-v-13/Cargo.toml → ...ntracts/farm-staking-proxy-v13/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "farm-staking-proxy-v-13"
+name = "farm-staking-proxy-v13"
 version = "0.0.0"
 authors = ["MultiversX <[email protected]>"]
 edition = "2021"
@@ -27,8 +27,8 @@ path = "../../farm-staking/farm-staking"
 [dependencies.pair]
 path = "../../dex/pair"
 
-[dependencies.farm-v-13]
-path = "../farm-v-13"
+[dependencies.farm-v13-locked-rewards]
+path = "../farm-v13-locked-rewards"
 
 [dev-dependencies.energy-factory]
 path = "../../locked-asset/energy-factory"

diff --git a/...s/farm-staking-proxy-v-13/meta/Cargo.toml → ...ts/farm-staking-proxy-v13/meta/Cargo.toml b/...s/farm-staking-proxy-v-13/meta/Cargo.toml → ...ts/farm-staking-proxy-v13/meta/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "farm-staking-proxy-v-13-meta"
+name = "farm-staking-proxy-v13-meta"
 version = "0.0.0"
 edition = "2021"
 publish = false
 authors = ["MultiversX <[email protected]>"]
 
-[dependencies.farm-staking-proxy-v-13]
+[dependencies.farm-staking-proxy-v13]
 path = ".."
 
 [dependencies.multiversx-sc-meta]

diff --git a/legacy-contracts/farm-staking-proxy-v13/meta/src/main.rs b/legacy-contracts/farm-staking-proxy-v13/meta/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    multiversx_sc_meta::cli_main::<farm_staking_proxy_v13::AbiProvider>();
+}
diff --git a/...s/farm-staking-proxy-v-13/multiversx.json → ...ts/farm-staking-proxy-v13/multiversx.json b/...s/farm-staking-proxy-v-13/multiversx.json → ...ts/farm-staking-proxy-v13/multiversx.json
diff --git a/...taking-proxy-v-13/src/dual_yield_token.rs → ...staking-proxy-v13/src/dual_yield_token.rs b/...taking-proxy-v-13/src/dual_yield_token.rs → ...staking-proxy-v13/src/dual_yield_token.rs
diff --git a/...13/src/external_contracts_interactions.rs → ...13/src/external_contracts_interactions.rs b/...13/src/external_contracts_interactions.rs → ...13/src/external_contracts_interactions.rs
@@ -134,7 +134,7 @@ pub trait ExternalContractsInteractionsModule:
     fn staking_farm_proxy_obj(&self, sc_address: ManagedAddress) -> farm_staking::Proxy<Self::Api>;
 
     #[proxy]
-    fn lp_farm_proxy_obj(&self, sc_address: ManagedAddress) -> farm_v_13::Proxy<Self::Api>;
+    fn lp_farm_proxy_obj(&self, sc_address: ManagedAddress) -> farm_v13_locked_rewards::Proxy<Self::Api>;
 
     #[proxy]
     fn pair_proxy_obj(&self, sc_address: ManagedAddress) -> pair::Proxy<Self::Api>;

diff --git a/...tracts/farm-staking-proxy-v-13/src/lib.rs → ...ntracts/farm-staking-proxy-v13/src/lib.rs b/...tracts/farm-staking-proxy-v-13/src/lib.rs → ...ntracts/farm-staking-proxy-v13/src/lib.rs
diff --git a/...m-staking-proxy-v-13/src/lp_farm_token.rs → ...rm-staking-proxy-v13/src/lp_farm_token.rs b/...m-staking-proxy-v-13/src/lp_farm_token.rs → ...rm-staking-proxy-v13/src/lp_farm_token.rs
diff --git a/...rm-staking-proxy-v-13/src/result_types.rs → ...arm-staking-proxy-v13/src/result_types.rs b/...rm-staking-proxy-v-13/src/result_types.rs → ...arm-staking-proxy-v13/src/result_types.rs
diff --git a/...staking-proxy-v-13/tests/constants/mod.rs → ...-staking-proxy-v13/tests/constants/mod.rs b/...staking-proxy-v-13/tests/constants/mod.rs → ...-staking-proxy-v13/tests/constants/mod.rs
diff --git a/...-proxy-v-13/tests/staking_farm_with_lp.rs → ...g-proxy-v13/tests/staking_farm_with_lp.rs b/...-proxy-v-13/tests/staking_farm_with_lp.rs → ...g-proxy-v13/tests/staking_farm_with_lp.rs
diff --git a/...ng_farm_with_lp_external_contracts/mod.rs → ...ng_farm_with_lp_external_contracts/mod.rs b/...ng_farm_with_lp_external_contracts/mod.rs → ...ng_farm_with_lp_external_contracts/mod.rs
diff --git a/...h_lp_staking_contract_interactions/mod.rs → ...h_lp_staking_contract_interactions/mod.rs b/...h_lp_staking_contract_interactions/mod.rs → ...h_lp_staking_contract_interactions/mod.rs
diff --git a/...arm_with_lp_staking_contract_setup/mod.rs → ...arm_with_lp_staking_contract_setup/mod.rs b/...arm_with_lp_staking_contract_setup/mod.rs → ...arm_with_lp_staking_contract_setup/mod.rs
diff --git a/...s/farm-staking-proxy-v-13/wasm/Cargo.lock → ...ts/farm-staking-proxy-v13/wasm/Cargo.lock b/...s/farm-staking-proxy-v-13/wasm/Cargo.lock → ...ts/farm-staking-proxy-v13/wasm/Cargo.lock
diff --git a/...s/farm-staking-proxy-v-13/wasm/Cargo.toml → ...ts/farm-staking-proxy-v13/wasm/Cargo.toml b/...s/farm-staking-proxy-v-13/wasm/Cargo.toml → ...ts/farm-staking-proxy-v13/wasm/Cargo.toml
@@ -5,7 +5,7 @@
 # ##########################################
 
 [package]
-name = "farm-staking-proxy-v-13-wasm"
+name = "farm-staking-proxy-v13-wasm"
 version = "0.0.0"
 edition = "2021"
 publish = false
@@ -24,7 +24,7 @@ overflow-checks = false
 [profile.dev]
 panic = "abort"
 
-[dependencies.farm-staking-proxy-v-13]
+[dependencies.farm-staking-proxy-v13]
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]

diff --git a/...s/farm-staking-proxy-v-13/wasm/src/lib.rs → ...ts/farm-staking-proxy-v13/wasm/src/lib.rs b/...s/farm-staking-proxy-v-13/wasm/src/lib.rs → ...ts/farm-staking-proxy-v13/wasm/src/lib.rs
@@ -16,7 +16,7 @@ multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
 
 multiversx_sc_wasm_adapter::endpoints! {
-    farm_staking_proxy_v_13
+    farm_staking_proxy_v13
     (
         init => init
         upgrade => upgrade

diff --git a/legacy-contracts/farm-v-13/meta/src/main.rs b/legacy-contracts/farm-v-13/meta/src/main.rs
diff --git a/legacy-contracts/farm-v-13/src/lib.rs b/legacy-contracts/farm-v-13/src/lib.rs
diff --git a/legacy-contracts/farm-v-13/wasm/src/lib.rs b/legacy-contracts/farm-v-13/wasm/src/lib.rs
diff --git a/legacy-contracts/farm-v-13/Cargo.lock → legacy-contracts/farm-v12/Cargo.lock b/legacy-contracts/farm-v-13/Cargo.lock → legacy-contracts/farm-v12/Cargo.lock
diff --git a/legacy-contracts/farm-v-13/Cargo.toml → legacy-contracts/farm-v12/Cargo.toml b/legacy-contracts/farm-v-13/Cargo.toml → legacy-contracts/farm-v12/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "farm-v-13"
+name = "farm-v12"
 version = "0.0.0"
 authors = ["you"]
 edition = "2021"

diff --git a/legacy-contracts/farm-v-13/meta/Cargo.toml → legacy-contracts/farm-v12/meta/Cargo.toml b/legacy-contracts/farm-v-13/meta/Cargo.toml → legacy-contracts/farm-v12/meta/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "farm-v-13-meta"
+name = "farm-v12-meta"
 version = "0.0.0"
 edition = "2021"
 publish = false
 
-[dependencies.farm-v-13]
+[dependencies.farm-v12]
 path = ".."
 
 [dependencies.multiversx-sc-meta]