Eth-connector: add the way to set contract data. Minor refactoring.

src/connector.rs

@@ -72,36 +72,32 @@ impl EthConnectorContract {
     }
 
     /// Init eth-connector contract specific data
-    pub fn init_contract() {
+    pub fn init_contract(args: InitCallArgs) {
         // Check is it already initialized
         assert!(
             !sdk::storage_has_key(&Self::get_contract_key(&EthConnectorStorageId::Contract)),
             "ERR_CONTRACT_INITIALIZED"
         );
         #[cfg(feature = "log")]
         sdk::log("[init contract]");
-        // Get initial contract arguments
-        let args = InitCallArgs::try_from_slice(&sdk::read_input()).expect(ERR_FAILED_PARSE);
+
+        let contract_data = Self::set_contract_data(SetContractDataCallArgs {
+            prover_account: args.prover_account,
+            eth_custodian_address: args.eth_custodian_address,
+        });
+
         let current_account_id = sdk::current_account_id();
         let owner_id = String::from_utf8(current_account_id).unwrap();
         let mut ft = FungibleToken::new();
         // Register FT account for current contract
         ft.internal_register_account(&owner_id);
-        let contract_data = EthConnector {
-            prover_account: args.prover_account,
-            eth_custodian_address: validate_eth_address(args.eth_custodian_address),
-        };
-        // Save eth-connector specific data
-        sdk::save_contract(
-            &Self::get_contract_key(&EthConnectorStorageId::Contract),
-            &contract_data,
-        );
 
         let paused_mask = UNPAUSE_ALL;
         sdk::save_contract(
             &Self::get_contract_key(&EthConnectorStorageId::PausedMask),
             &paused_mask,
         );
+
         Self {
             contract: contract_data,
             ft,
@@ -110,6 +106,22 @@ impl EthConnectorContract {
         .save_ft_contract();
     }
 
+    /// Sets the contract data and returns it back
+    pub fn set_contract_data(args: SetContractDataCallArgs) -> EthConnector {
+        // Get initial contract arguments
+        let contract_data = EthConnector {
+            prover_account: args.prover_account,
+            eth_custodian_address: validate_eth_address(args.eth_custodian_address),
+        };
+        // Save eth-connector specific data
+        sdk::save_contract(
+            &Self::get_contract_key(&EthConnectorStorageId::Contract),
+            &contract_data,
+        );
+
+        contract_data
+    }
+
     /// Parse event message data for tokens
     fn parse_event_message(&self, message: &str) -> TokenMessageData {
         let data: Vec<_> = message.split(':').collect();

src/lib.rs

@@ -86,8 +86,8 @@ mod contract {
     #[cfg(feature = "evm_bully")]
     use crate::parameters::{BeginBlockArgs, BeginChainArgs};
     use crate::parameters::{
-        ExpectUtf8, FunctionCallArgs, GetStorageAtArgs, NewCallArgs, PauseEthConnectorCallArgs,
-        TransferCallCallArgs, ViewCallArgs,
+        ExpectUtf8, FunctionCallArgs, GetStorageAtArgs, InitCallArgs, NewCallArgs,
+        PauseEthConnectorCallArgs, SetContractDataCallArgs, TransferCallCallArgs, ViewCallArgs,
     };
     use crate::prelude::{Address, H256, U256};
     use crate::sdk;
@@ -370,7 +370,20 @@ mod contract {
         // Only the owner can initialize the EthConnector
         sdk::assert_private_call();
 
-        EthConnectorContract::init_contract()
+        let args = InitCallArgs::try_from_slice(&sdk::read_input()).expect(ERR_FAILED_PARSE);
+
+        EthConnectorContract::init_contract(args);
+    }
+
+    #[no_mangle]
+    pub extern "C" fn set_eth_connector_contract_data() {
+        // Only the owner can set the EthConnector contract data
+        sdk::assert_private_call();
+
+        let args =
+            SetContractDataCallArgs::try_from_slice(&sdk::read_input()).expect(ERR_FAILED_PARSE);
+
+        EthConnectorContract::set_contract_data(args);
     }
 
     #[no_mangle]

src/parameters.rs

@@ -234,13 +234,16 @@ pub struct FinishDepositEthCallArgs {
     pub proof: Proof,
 }
 
-/// eth-connector initial args
+/// Eth-connector initial args
 #[derive(BorshSerialize, BorshDeserialize)]
 pub struct InitCallArgs {
     pub prover_account: AccountId,
     pub eth_custodian_address: AccountId,
 }
 
+/// Eth-connector Set contract data call args
+pub type SetContractDataCallArgs = InitCallArgs;
+
 /// transfer eth-connector call args
 #[cfg(feature = "engine")]
 #[derive(BorshSerialize, BorshDeserialize)]