Fetch bytecode hash from contract and more logs (#103)

Author: m30m

auction-server/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "auction-server"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 license-file = "license.txt"
 

auction-server/Cargo.toml

@@ -34,7 +34,6 @@ use {
             abigen,
             ContractError,
             ContractRevert,
-            EthError,
             EthEvent,
             FunctionCall,
         },

auction-server/src/auction.rs

@@ -63,7 +63,7 @@ use {
             Signature,
             U256,
         },
-        utils::get_create2_address,
+        utils::get_create2_address_from_hash,
     },
     rand::Rng,
     serde::{
@@ -115,6 +115,18 @@ pub async fn get_weth_address(
         .map_err(|e| anyhow!("Error getting WETH address from adapter: {:?}", e))
 }
 
+pub async fn get_adapter_bytecode_hash(
+    adapter_contract: Address,
+    provider: Provider<TracedClient>,
+) -> Result<[u8; 32]> {
+    let adapter = AdapterFactory::new(adapter_contract, Arc::new(provider));
+    adapter
+        .get_opportunity_adapter_creation_code_hash()
+        .call()
+        .await
+        .map_err(|e| anyhow!("Error getting adapter code hash from adapter: {:?}", e))
+}
+
 pub async fn get_permit2_address(
     adapter_contract: Address,
     provider: Provider<TracedClient>,
@@ -248,7 +260,14 @@ pub async fn verify_opportunity(
     match MulticallReturn::decode(&result) {
         Ok(result) => {
             if !result.multicall_statuses[0].external_success {
-                return Err(anyhow!("Express Relay Simulation failed"));
+                tracing::info!(
+                    "Opportunity simulation failed: {:?}",
+                    result.multicall_statuses[0]
+                );
+                return Err(anyhow!(
+                    "Express Relay Simulation failed: {:?}",
+                    result.multicall_statuses[0].external_result
+                ));
             }
         }
         Err(e) => return Err(anyhow!(format!("Error decoding multicall result: {:?}", e))),
@@ -403,10 +422,10 @@ pub fn make_opportunity_execution_params(
 ) -> ExecutionParamsWithSignature {
     let mut salt = [0u8; 32];
     salt[12..32].copy_from_slice(bid.executor.as_bytes());
-    let executor_adapter_address = get_create2_address(
+    let executor_adapter_address = get_create2_address_from_hash(
         chain_store.config.adapter_factory_contract,
         salt,
-        &OPPORTUNITYADAPTER_BYTECODE,
+        chain_store.adapter_bytecode_hash,
     );
     let eip_712_domain = EIP712Domain {
         name:               Some("Permit2".to_string()),

auction-server/src/opportunity_adapter.rs

@@ -17,6 +17,7 @@ use {
         },
         models,
         opportunity_adapter::{
+            get_adapter_bytecode_hash,
             get_permit2_address,
             get_weth_address,
             run_verification_loop,
@@ -182,6 +183,11 @@ pub async fn start_server(run_options: RunOptions) -> anyhow::Result<()> {
                 let weth =
                     get_weth_address(chain_config.adapter_factory_contract, provider.clone())
                         .await?;
+                let adapter_bytecode_hash = get_adapter_bytecode_hash(
+                    chain_config.adapter_factory_contract,
+                    provider.clone(),
+                )
+                .await?;
 
                 Ok((
                     chain_id.clone(),
@@ -193,6 +199,7 @@ pub async fn start_server(run_options: RunOptions) -> anyhow::Result<()> {
                         config: chain_config.clone(),
                         permit2,
                         weth,
+                        adapter_bytecode_hash,
                         express_relay_contract: Arc::new(express_relay_contract),
                         block_gas_limit: block.gas_limit,
                     },

auction-server/src/server.rs

@@ -190,6 +190,7 @@ pub struct ChainStore {
     pub network_id:             u64,
     pub config:                 EthereumConfig,
     pub permit2:                Address,
+    pub adapter_bytecode_hash:  [u8; 32],
     pub weth:                   Address,
     pub token_spoof_info:       RwLock<HashMap<Address, SpoofInfo>>,
     pub express_relay_contract: Arc<SignableExpressRelayContract>,