Merge pull request #185 from multiversx/forge-deploy-config

Sovereign-Forge SC
multiversx · Nov 20, 2024 · 2a7019a · 2a7019a
2 parents cff6c8a + 60ba9f8
commit 2a7019a
Show file tree

Hide file tree

Showing 108 changed files with 2,968 additions and 301 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,4 +20,6 @@ members = [
   "token-handler/meta",
   "testing-sc",
   "testing-sc/meta",
+  "sovereign-forge",
+  "sovereign-forge/meta",
 ]
diff --git a/chain-config/Cargo.toml b/chain-config/Cargo.toml
@@ -12,10 +12,13 @@ path = "src/lib.rs"
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.54.2"
+version = "=0.54.3"
 
 [dependencies.multiversx-sc]
-version = "=0.54.2"
+version = "=0.54.3"
 
 [dependencies.multiversx-sc-modules]
-version = "=0.54.2"
+version = "=0.54.3"
+
+[dependencies.transaction]
+path = "../common/transaction"
diff --git a/chain-config/meta/Cargo.toml b/chain-config/meta/Cargo.toml
@@ -11,4 +11,4 @@ authors = ["you"]
 path = ".."
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.54.2"
+version = "=0.54.3"
diff --git a/chain-config/src/lib.rs b/chain-config/src/lib.rs
@@ -1,24 +1,23 @@
 #![no_std]
 
 use multiversx_sc_modules::only_admin;
+use transaction::StakeMultiArg;
 use validator_rules::TokenIdAmountPair;
 
 multiversx_sc::imports!();
 
 pub mod bridge;
 pub mod validator_rules;
 
-pub type StakeMultiArg<M> = MultiValue2<TokenIdentifier<M>, BigUint<M>>;
-
 #[multiversx_sc::contract]
 pub trait ChainConfigContract:
     bridge::BridgeModule + validator_rules::ValidatorRulesModule + only_admin::OnlyAdminModule
 {
     #[init]
     fn init(
         &self,
-        min_validators: usize,
-        max_validators: usize,
+        min_validators: u64,
+        max_validators: u64,
         min_stake: BigUint,
         admin: ManagedAddress,
         additional_stake_required: MultiValueEncoded<StakeMultiArg<Self::Api>>,

diff --git a/chain-config/src/validator_rules.rs b/chain-config/src/validator_rules.rs
@@ -15,11 +15,11 @@ pub struct TokenIdAmountPair<M: ManagedTypeApi> {
 pub trait ValidatorRulesModule {
     #[view(getMinValidators)]
     #[storage_mapper("minValidators")]
-    fn min_validators(&self) -> SingleValueMapper<usize>;
+    fn min_validators(&self) -> SingleValueMapper<u64>;
 
     #[view(getMaxValidators)]
     #[storage_mapper("maxValidators")]
-    fn max_validators(&self) -> SingleValueMapper<usize>;
+    fn max_validators(&self) -> SingleValueMapper<u64>;
 
     // TODO: Read user stake and verify
     #[view(getMinStake)]

diff --git a/chain-config/wasm-chain-config-full/Cargo.lock b/chain-config/wasm-chain-config-full/Cargo.lock
diff --git a/chain-config/wasm-chain-config-full/Cargo.toml b/chain-config/wasm-chain-config-full/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "=0.54.2"
+version = "=0.54.3"
 
 [workspace]
 members = ["."]
diff --git a/chain-config/wasm-chain-config-view/Cargo.lock b/chain-config/wasm-chain-config-view/Cargo.lock
diff --git a/chain-config/wasm-chain-config-view/Cargo.toml b/chain-config/wasm-chain-config-view/Cargo.toml
@@ -28,7 +28,7 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "=0.54.2"
+version = "=0.54.3"
 
 [workspace]
 members = ["."]