Merge pull request #41 from firstbatchxyz/erhant/anvil-provider

fix: Anvil impersonation works correctly now

Author: erhant

Cargo.lock

@@ -12,7 +12,7 @@ authors = ["erhant"]
 
 [workspace.dependencies]
 # core
-alloy = { version = "0.8.0", features = ["full", "node-bindings"] }
+alloy = { version = "0.8.0", features = ["full"] }
 alloy-chains = "0.1.24"
 tokio = { version = "1.39.2", features = [
     "macros",
@@ -31,15 +31,9 @@ log = "0.4.22"
 dotenvy = "0.15.7"
 
 # utils
-futures-util = "0.3.30"
 async-trait = "0.1.81"
-bytes = "1.7.1"
-rand = "0.8.5"
 reqwest = "0.12.5"
 
-# b64, hex, serde
-base64 = "0.22.1"
-hex = "0.4.3"
-hex-literal = "0.4.1"
+# serde
 serde = "1.0.204"
 serde_json = "1.0.122"

Cargo.toml

@@ -27,26 +27,28 @@ pub fn contract_error_report(error: Error) -> ErrReport {
         Error::ContractNotDeployed => eyre!("Contract is not deployed"),
         Error::AbiError(e) => eyre!("An error occurred ABI encoding or decoding: {}", e),
         Error::TransportError(error) => {
+            const VALIDATE: bool = false;
+
             // here we try to parse the error w.r.t provided contract interfaces
             // or return a default one in the end if it was not parsed successfully
             if let Some(payload) = error.as_error_resp() {
                 // an ERC20 error
-                if let Some(erc_20_error) = payload.as_decoded_error::<ERC20Errors>(false) {
-                    return erc_20_error.into();
+                if let Some(erc_20_error) = payload.as_decoded_error::<ERC20Errors>(VALIDATE) {
+                    erc_20_error.into()
                 } else
                 // an OracleRegistry error
                 if let Some(registry_error) =
-                    payload.as_decoded_error::<OracleRegistryErrors>(false)
+                    payload.as_decoded_error::<OracleRegistryErrors>(VALIDATE)
                 {
-                    return registry_error.into();
+                    registry_error.into()
                 } else
                 // an OracleCoordinator error
                 if let Some(coordinator_error) =
-                    payload.as_decoded_error::<OracleCoordinatorErrors>(false)
+                    payload.as_decoded_error::<OracleCoordinatorErrors>(VALIDATE)
                 {
-                    return coordinator_error.into();
+                    coordinator_error.into()
                 } else {
-                    return eyre!("Unhandled error response: {:#?}", error);
+                    eyre!("Unhandled error response: {:#?}", error)
                 }
             } else {
                 eyre!("Unknown transport error: {:#?}", error)

contracts/src/errors.rs

@@ -27,7 +27,6 @@ dotenvy = "0.15.7"
 
 # utils
 futures-util = "0.3.30"
-async-trait = "0.1.81"
 bytes = "1.7.1"
 rand = "0.8.5"
 reqwest.workspace = true
@@ -36,8 +35,8 @@ reqwest.workspace = true
 base64 = "0.22.1"
 hex = "0.4.3"
 hex-literal = "0.4.1"
-serde = "1.0.204"
-serde_json = "1.0.122"
+serde.workspace = true
+serde_json.workspace = true
 
 # cli
 clap = { version = "4.5.13", features = ["derive", "env"] }

core/Cargo.toml

@@ -40,7 +40,7 @@ impl DriaOracle {
                     log::debug!("Cancellation signal received. Stopping...");
                     return Ok(());
                 }
-                result = self.process_tasks_within_range(from_block, to_block.clone().unwrap_or(BlockNumberOrTag::Latest)) => {
+                result = self.process_tasks_within_range(from_block, to_block.unwrap_or(BlockNumberOrTag::Latest)) => {
                     if let Err(e) = result {
                         log::error!("Could not handle previous tasks: {:?}", e);
                         log::warn!("Continuing anyways...");

core/src/cli/commands/coordinator/mod.rs

@@ -110,8 +110,6 @@ pub async fn execute_generation(
 mod tests {
     use super::*;
     use crate::compute::generation::request::{ChatHistoryRequest, GenerationRequest};
-    use dkn_workflows::Model;
-
     #[tokio::test]
     #[ignore = "run this manually"]
     async fn test_ollama_generation() {
@@ -160,11 +158,11 @@ mod tests {
 
     #[tokio::test]
     #[ignore = "run this manually"]
-    async fn test_raw_workflow() {
+    async fn test_workflow_on_arweave() {
         // cargo test --package dria-oracle --lib --all-features -- compute::generation::execute::tests::test_raw_workflow --exact --show-output --ignored
         dotenvy::dotenv().unwrap();
 
-        let contract_result = hex_literal::hex!("7b2261727765617665223a224d49555775656361634b417a62755442335a6a57613463784e6461774d71435a704550694f71675a625a63227d");
+        let contract_result = hex_literal::hex!("7b2261727765617665223a22396e52546d4e6742703758384650714968794430546f65447259687579414f345f507342476638566c6e73227d");
         let request = GenerationRequest::try_parse_bytes(&contract_result.into())
             .await
             .unwrap();