From 972b206b54e9594982f3946a7ea7fe744b07c833 Mon Sep 17 00:00:00 2001 From: Jesse Schulman Date: Sun, 13 Oct 2024 09:15:25 -0700 Subject: [PATCH] Update antelope client for send transaction resposne parsing fix --- Cargo.lock | 44 +++------------------- Cargo.toml | 2 +- crates/telos/node/src/args.rs | 2 +- crates/telos/rpc-engine-api/src/compare.rs | 8 ++-- crates/telos/rpc/src/eth/telos_client.rs | 2 +- 5 files changed, 13 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99cc9b3b2290..618b555550ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1226,39 +1226,7 @@ dependencies = [ [[package]] name = "antelope-client" version = "0.2.1" -source = "git+https://github.com/telosnetwork/antelope-rs.git?branch=development#fd547fd5b92a0a92bfdc962a4bf6f1b20e3a3449" -dependencies = [ - "antelope-client-macros", - "async-trait", - "base64 0.21.7", - "bs58", - "chrono", - "digest 0.10.7", - "ecdsa", - "flate2", - "hex", - "hmac 0.12.1", - "k256", - "log", - "once_cell", - "p256", - "rand 0.8.5", - "rand_core 0.6.4", - "reqwest 0.11.27", - "ripemd", - "serde", - "serde-big-array", - "serde_json", - "sha2 0.10.8", - "signature", - "thiserror", - "tokio", -] - -[[package]] -name = "antelope-client" -version = "0.2.1" -source = "git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params#feb151b28499946698c25c3411b574801cc869e6" +source = "git+https://github.com/telosnetwork/antelope-rs?branch=development#ed53c75b6b9ce14aa72002ddd491a6697ae563d9" dependencies = [ "antelope-client-macros", "async-trait", @@ -4605,7 +4573,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -9424,7 +9392,7 @@ dependencies = [ "alloy-signer-local", "alloy-sol-types", "alloy-transport-http 0.4.2", - "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params)", + "antelope-client", "clap", "derive_more 1.0.0", "env_logger 0.11.5", @@ -10609,7 +10577,7 @@ dependencies = [ "alloy-network 0.4.2", "alloy-primitives", "alloy-rpc-types 0.4.2", - "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params)", + "antelope-client", "async-trait", "derive_more 1.0.0", "jsonrpsee-types", @@ -12081,7 +12049,7 @@ dependencies = [ "alloy", "alloy-consensus 0.3.6", "alloy-rlp", - "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs.git?branch=development)", + "antelope-client", "arrowbatch", "base64 0.22.1", "bytes", @@ -12133,7 +12101,7 @@ dependencies = [ "alloy-consensus 0.3.6", "alloy-eips 0.3.6", "alloy-rlp", - "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs.git?branch=development)", + "antelope-client", "bytes", "clap", "dashmap 5.5.3", diff --git a/Cargo.toml b/Cargo.toml index 00d907e40543..710e36b25017 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -601,7 +601,7 @@ reth-node-telos = { path = "crates/telos/node" } reth-telos-rpc = { path = "crates/telos/rpc" } reth-telos-primitives-traits = { path = "crates/telos/primitives-traits" } reth-telos-rpc-engine-api = { path = "crates/telos/rpc-engine-api" } -antelope-client = { git = "https://github.com/telosnetwork/antelope-rs", branch = "finish_table_rows_params" } +antelope-client = { git = "https://github.com/telosnetwork/antelope-rs", branch = "development" } [patch.crates-io] #alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "8c499409"} diff --git a/crates/telos/node/src/args.rs b/crates/telos/node/src/args.rs index f087b511946a..f65912512ca2 100644 --- a/crates/telos/node/src/args.rs +++ b/crates/telos/node/src/args.rs @@ -27,7 +27,7 @@ pub struct TelosArgs { #[arg(long = "telos.gas_cache_seconds")] pub gas_cache_seconds: Option, - /// Enable the engine2 experimental features on reth binary + /// Enable the engine2 experimental features on telos-reth binary #[arg(long = "engine.experimental", default_value = "false")] pub experimental: bool, diff --git a/crates/telos/rpc-engine-api/src/compare.rs b/crates/telos/rpc-engine-api/src/compare.rs index dea22c6dcc19..5c0367763ed0 100644 --- a/crates/telos/rpc-engine-api/src/compare.rs +++ b/crates/telos/rpc-engine-api/src/compare.rs @@ -4,9 +4,9 @@ use alloy_primitives::{Address, B256, U256}; use revm_primitives::HashMap; use revm::db::AccountStatus; use revm::{Database, Evm, State, TransitionAccount}; +use tracing::debug; use reth_storage_errors::provider::ProviderError; use crate::structs::{TelosAccountStateTableRow, TelosAccountTableRow}; -use tracing::info; /// This function compares the state diffs between revm and Telos EVM contract pub fn compare_state_diffs( @@ -27,9 +27,9 @@ where { let block_number = evm.block().number; - info!("{block_number} REVM State diffs: {:#?}", revm_state_diffs); - info!("{block_number} TEVM State diffs account: {:#?}", statediffs_account); - info!("{block_number} TEVM State diffs accountstate: {:#?}", statediffs_accountstate); + debug!("{block_number} REVM State diffs: {:#?}", revm_state_diffs); + debug!("{block_number} TEVM State diffs account: {:#?}", statediffs_account); + debug!("{block_number} TEVM State diffs accountstate: {:#?}", statediffs_accountstate); } let revm_db: &mut &mut State = evm.db_mut(); diff --git a/crates/telos/rpc/src/eth/telos_client.rs b/crates/telos/rpc/src/eth/telos_client.rs index ec17c0a88c8c..893beb7f5ed4 100644 --- a/crates/telos/rpc/src/eth/telos_client.rs +++ b/crates/telos/rpc/src/eth/telos_client.rs @@ -51,7 +51,7 @@ impl TelosClient { if telos_client_args.telos_endpoint.is_none() || telos_client_args.signer_account.is_none() || telos_client_args.signer_permission.is_none() || telos_client_args.signer_key.is_none() { panic!("Should not construct TelosClient without proper TelosArgs with telos_endpoint and signer args"); } - let api_client = APIClient::::default_provider(telos_client_args.telos_endpoint.unwrap().into()).unwrap(); + let api_client = APIClient::::default_provider(telos_client_args.telos_endpoint.unwrap().into(), Some(3)).unwrap(); let inner = TelosClientInner { api_client, signer_account: name!(&telos_client_args.signer_account.unwrap()),