deploy success

Author: hpmaxi

cli/src/main.rs

@@ -113,7 +113,7 @@ async fn main() -> anyhow::Result<()> {
         } => {
             let wallet = get_wallet_from_keystore(path.as_str(), password).await?;
             let addr = deployer::deploy_contract(&contract, provider, wallet).await?;
-            println!("Deployed `{}` at {}\n", contract, addr);
+            println!("Deployed `{}` at {:?}\n", contract, addr);
         }
         Commands::Compile => {
             println!("Compiling contract...");

core/src/deployer.rs

@@ -1,29 +1,38 @@
 use crate::artifacts;
 use anyhow::Result;
-use ethers::{abi::Token, prelude::*};
+use ethers::prelude::*;
 use std::sync::Arc;
 
 pub async fn deploy_contract(
     contract_name: &str,
     provider: Provider<Http>,
     wallet: LocalWallet,
 ) -> Result<Address> {
-    let endpoint_address = "0x0000000000000000000000000000000000000001".parse::<Address>()?;
-    let constructor_args = vec![
-        abi::Token::Address(endpoint_address),
-        abi::Token::Address(endpoint_address),
-    ];
+    // TODO Extract
+    let endpoint_address = "0x6EDCE65403992e310A62460808c4b910D972f10f".parse::<Address>()?;
+    let delegator_address = "0x6EDCE65403992e310A62460808c4b910D972f10f".parse::<Address>()?;
 
-    let abi = artifacts::load_abi(contract_name)?;
-    let bytecode = artifacts::load_bytecode(contract_name)?;
-    println!("ABI {:?}\nBytecode {:?}", abi, bytecode);
-    let client = Arc::new(SignerMiddleware::new(provider, wallet));
-
-    let factory = ContractFactory::new(abi, bytecode, Arc::new(client.clone()));
+    // FIXME abi is not used, is replaced by abigen! macro. Remove from artifacts module
+    // let abi = artifacts::load_abi(contract_name)?;
+    // TODO Move closer to artifact reading
+    abigen!(MyOApp, "core/src/solidity/artifacts/MyOApp.sol/MyOApp.json");
 
-    println!("Factory {:?}", factory);
+    // FIXME bytecode is not used, is replaced by abigen! macro. Remove from artifacts module
+    // let bytecode = artifacts::load_bytecode(contract_name)?;
+    let client = Arc::new(SignerMiddleware::new(provider, wallet));
 
-    let deployed = factory.deploy(constructor_args)?.send().await?;
+    // Tuples are used.
+    let deployed = MyOApp::deploy(client, (endpoint_address, delegator_address))
+        .map_err(|e| {
+            println!("Deployment preparation error: {:?}", e);
+            anyhow::Error::from(e)
+        })?
+        .send()
+        .await
+        .map_err(|e| {
+            println!("Deployment execution error: {:?}", e);
+            anyhow::Error::from(e)
+        })?;
 
     Ok(deployed.address())
 }