Merge pull request #197 from multiversx/phase-two

Phase two

common/proxies/src/header_verifier_proxy.rs

@@ -148,4 +148,13 @@ where
             .argument(&operation_hash)
             .original_result()
     }
+
+    pub fn complete_setup_phase(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("completeSetupPhase")
+            .original_result()
+    }
 }

common/proxies/src/sovereign_forge_proxy.rs

@@ -147,12 +147,16 @@ where
             .original_result()
     }
 
-    pub fn deploy_phase_two(
+    pub fn deploy_phase_two<
+        Arg0: ProxyArg<MultiValueEncoded<Env::Api, ManagedBuffer<Env::Api>>>,
+    >(
         self,
+        bls_keys: Arg0,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("deployPhaseTwo")
+            .argument(&bls_keys)
             .original_result()
     }
 

enshrine-esdt-safe/interactor/src/config.rs

@@ -3,25 +3,22 @@
 use serde::Deserialize;
 use std::io::Read;
 
-
 /// Config file
 const CONFIG_FILE: &str = "config.toml";
 
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum ChainType {
     Real,
     Simulator,
-    }
+}
 
 /// Contract Interact configuration
 #[derive(Debug, Deserialize)]
 pub struct Config {
     pub gateway_uri: String,
     pub chain_type: ChainType,
-    }
-
+}
 
 impl Config {
     // Deserializes config from file
@@ -36,7 +33,7 @@ impl Config {
         Config {
             gateway_uri: "http://localhost:8085".to_owned(),
             chain_type: ChainType::Simulator,
-    }
+        }
     }
 
     // Returns the gateway URI
@@ -49,8 +46,6 @@ impl Config {
         match self.chain_type {
             ChainType::Real => false,
             ChainType::Simulator => true,
+        }
     }
-    }
-    }
-
-
+}

header-verifier/Cargo.toml

@@ -17,6 +17,9 @@ path = "../common/transaction"
 [dependencies.proxies]
 path = "../common/proxies"
 
+[dependencies.setup-phase]
+path = "../common/setup-phase"
+
 [dev-dependencies]
 num-bigint = "0.4.2"
 

header-verifier/src/lib.rs

@@ -12,7 +12,7 @@ pub enum OperationHashStatus {
 }
 
 #[multiversx_sc::contract]
-pub trait Headerverifier {
+pub trait Headerverifier: setup_phase::SetupPhaseModule {
     #[init]
     fn init(&self, bls_pub_keys: MultiValueEncoded<ManagedBuffer>) {
         for pub_key in bls_pub_keys {
@@ -90,6 +90,33 @@ pub trait Headerverifier {
         }
     }
 
+    #[only_owner]
+    #[endpoint(completeSetupPhase)]
+    fn complete_setup_phase(&self) {
+        if self.is_setup_phase_complete() {
+            return;
+        }
+
+        let chain_config_mapper = self.chain_config_address();
+        require!(
+            !chain_config_mapper.is_empty(),
+            "The Chain-Config address is not set"
+        );
+
+        let chain_config_address = chain_config_mapper.get();
+        let min_validators = self.min_validators(chain_config_address).get();
+        let number_of_validators = self.bls_pub_keys().len() as u32;
+
+        require!(
+            number_of_validators > min_validators,
+            "There should be at least {} more validators so the setup phase can be completed",
+            (number_of_validators - min_validators)
+        );
+
+        // change ownership
+        self.setup_phase_complete().set(true);
+    }
+
     fn require_caller_esdt_safe(&self) {
         let esdt_safe_mapper = self.esdt_safe_address();
 
@@ -155,4 +182,10 @@ pub trait Headerverifier {
 
     #[storage_mapper("esdtSafeAddress")]
     fn esdt_safe_address(&self) -> SingleValueMapper<ManagedAddress>;
+
+    #[storage_mapper("chainConfigAddress")]
+    fn chain_config_address(&self) -> SingleValueMapper<ManagedAddress>;
+
+    #[storage_mapper_from_address("minValidators")]
+    fn min_validators(&self, sc_address: ManagedAddress) -> SingleValueMapper<u32, ManagedAddress>;
 }

header-verifier/wasm-header-verifier-full/src/lib.rs

@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                            4
+// Endpoints:                            5
 // Async Callback (empty):               1
-// Total number of exported functions:   7
+// Total number of exported functions:   8
 
 #![no_std]
 
@@ -24,6 +24,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         setEsdtSafeAddress => set_esdt_safe_address
         removeExecutedHash => remove_executed_hash
         lockOperationHash => lock_operation_hash
+        completeSetupPhase => complete_setup_phase
     )
 }
 

header-verifier/wasm/src/lib.rs

@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                            4
+// Endpoints:                            5
 // Async Callback (empty):               1
-// Total number of exported functions:   7
+// Total number of exported functions:   8
 
 #![no_std]
 
@@ -24,6 +24,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         setEsdtSafeAddress => set_esdt_safe_address
         removeExecutedHash => remove_executed_hash
         lockOperationHash => lock_operation_hash
+        completeSetupPhase => complete_setup_phase
     )
 }
 

sovereign-forge/src/common/mod.rs

@@ -1,2 +1,3 @@
+pub mod sc_deploy;
 pub mod storage;
 pub mod utils;

sovereign-forge/src/common/sc_deploy.rs

@@ -0,0 +1,48 @@
+use crate::err_msg;
+use multiversx_sc::types::{MultiValueEncoded, ReturnsResult};
+use proxies::chain_factory_proxy::ChainFactoryContractProxy;
+use transaction::StakeMultiArg;
+
+#[multiversx_sc::module]
+pub trait ScDeployModule: super::utils::UtilsModule + super::storage::StorageModule {
+    #[inline]
+    fn deploy_chain_config(
+        &self,
+        min_validators: u64,
+        max_validators: u64,
+        min_stake: BigUint,
+        additional_stake_required: MultiValueEncoded<StakeMultiArg<Self::Api>>,
+    ) -> ManagedAddress {
+        self.tx()
+            .to(self.get_chain_factory_address())
+            .typed(ChainFactoryContractProxy)
+            .deploy_sovereign_chain_config_contract(
+                min_validators,
+                max_validators,
+                min_stake,
+                additional_stake_required,
+            )
+            .returns(ReturnsResult)
+            .sync_call()
+    }
+
+    #[inline]
+    fn deploy_header_verifier(&self, bls_keys: MultiValueEncoded<ManagedBuffer>) -> ManagedAddress {
+        self.tx()
+            .to(self.get_chain_factory_address())
+            .typed(ChainFactoryContractProxy)
+            .deploy_header_verifier(bls_keys)
+            .returns(ReturnsResult)
+            .sync_call()
+    }
+
+    #[inline]
+    fn deploy_esdt_safe(&self, is_sovereign_chain: bool) -> ManagedAddress {
+        self.tx()
+            .to(self.get_chain_factory_address())
+            .typed(ChainFactoryContractProxy)
+            .deploy_esdt_safe(is_sovereign_chain)
+            .returns(ReturnsResult)
+            .sync_call()
+    }
+}

sovereign-forge/src/common/storage.rs

@@ -1,19 +1,24 @@
-use multiversx_sc::imports::{SingleValueMapper, UnorderedSetMapper};
+use multiversx_sc::{
+    imports::{SingleValueMapper, UnorderedSetMapper},
+    types::ManagedBuffer,
+};
 
 use super::utils::ContractInfo;
 
+pub type ChainId<M> = ManagedBuffer<M>;
+
 #[multiversx_sc::module]
 pub trait StorageModule {
     #[storage_mapper("sovereignsMapper")]
     fn sovereigns_mapper(
         &self,
         sovereign_creator: &ManagedAddress,
-    ) -> SingleValueMapper<ManagedBuffer>;
+    ) -> SingleValueMapper<ChainId<Self::Api>>;
 
     #[storage_mapper("sovereignDeployedContracts")]
     fn sovereign_deployed_contracts(
         &self,
-        chain_id: &ManagedBuffer,
+        chain_id: &ChainId<Self::Api>,
     ) -> UnorderedSetMapper<ContractInfo<Self::Api>>;
 
     #[view(getChainFactoryAddress)]