Merge pull request #189 from multiversx/feat/sovereign-forge

`feat/sovereign-forge` merge into `feat/beta`

Cargo.toml

@@ -20,4 +20,6 @@ members = [
   "token-handler/meta",
   "testing-sc",
   "testing-sc/meta",
+  "sovereign-forge",
+  "sovereign-forge/meta",
 ]

chain-config/Cargo.toml

@@ -19,3 +19,6 @@ version = "=0.54.3"
 
 [dependencies.multiversx-sc-modules]
 version = "=0.54.3"
+
+[dependencies.transaction]
+path = "../common/transaction"

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>>,

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)]

chain-factory/Cargo.toml

@@ -28,3 +28,6 @@ path = "../chain-config"
 
 [dependencies.proxies]
 path = "../common/proxies"
+
+[dependencies.transaction]
+path = "../common/transaction"

chain-factory/src/factory.rs

@@ -1,12 +1,11 @@
-use chain_config::StakeMultiArg;
-
 use multiversx_sc::imports::*;
 use proxies::{
     chain_config_proxy::ChainConfigContractProxy,
     enshrine_esdt_safe_proxy::EnshrineEsdtSafeProxy,
     fee_market_proxy::{FeeMarketProxy, FeeStruct},
     header_verifier_proxy::HeaderverifierProxy,
 };
+use transaction::StakeMultiArg;
 multiversx_sc::derive_imports!();
 
 #[multiversx_sc::module]
@@ -15,8 +14,8 @@ pub trait FactoryModule {
     #[endpoint(deploySovereignChainConfigContract)]
     fn deploy_sovereign_chain_config_contract(
         &self,
-        min_validators: usize,
-        max_validators: usize,
+        min_validators: u64,
+        max_validators: u64,
         min_stake: BigUint,
         additional_stake_required: MultiValueEncoded<StakeMultiArg<Self::Api>>,
     ) -> ManagedAddress {

chain-factory/tests/chain_factory_tests.rs

@@ -1,6 +1,5 @@
 use std::env::current_dir;
 
-use chain_config::StakeMultiArg;
 use multiversx_sc::types::{
     BigUint, CodeMetadata, MultiValueEncoded, TestAddress, TestSCAddress, TokenIdentifier,
 };
@@ -10,6 +9,7 @@ use multiversx_sc_scenario::{
 use proxies::{
     chain_config_proxy::ChainConfigContractProxy, chain_factory_proxy::ChainFactoryContractProxy,
 };
+use transaction::StakeMultiArg;
 
 const FACTORY_ADDRESS: TestSCAddress = TestSCAddress::new("chain-factory");
 const CODE_PATH: MxscPath = MxscPath::new("output/chain-factory.mxsc.json");