Merge pull request #110 from weaveVM/implement-tags

chore: Implement tags, refactor exex notification pooler

Cargo.toml

@@ -155,7 +155,7 @@ members = [
     "wvm-apps/wvm-exexed/crates/lambda/",
     "wvm-apps/wvm-exexed/crates/precompiles/",
     "wvm-apps/wvm-exexed/crates/wvm-borsh/",
-    "wvm-apps/wvm-exexed/crates/static/",
+    "crates/wvm-static/",
     "wvm-apps/wvm-exexed/crates/brotli/",
     "wvm-apps/wvm-exexed/crates/tx/",
 ]
@@ -396,7 +396,7 @@ reth-rpc-api = { path = "crates/rpc/rpc-api" }
 reth-rpc-api-testing-util = { path = "crates/rpc/rpc-testing-util" }
 reth-rpc-builder = { path = "crates/rpc/rpc-builder" }
 reth-rpc-engine-api = { path = "crates/rpc/rpc-engine-api" }
-reth-rpc-eth-api = { path = "crates/rpc/rpc-eth-api" }
+reth-rpc-eth-api = { path = "crates/rpc/rpc-eth-api", features = ["client"] }
 reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types", default-features = false }
 reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
 reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
@@ -418,6 +418,9 @@ reth-trie-common = { path = "crates/trie/common" }
 reth-trie-db = { path = "crates/trie/db" }
 reth-trie-parallel = { path = "crates/trie/parallel" }
 
+# wvm
+wvm-static = { path = "crates/wvm-static" }
+
 # revm
 revm = { git = "https://github.com/weaveVM/wvm-revm", branch = "main", features = [
     "std",
@@ -608,7 +611,7 @@ brotlic = "0.8.2"
 
 # exex-templates
 exex-wvm-da = { git = "https://github.com/weaveVM/exex-templates?a", branch = "main" }
-exex-wvm-bigquery = { git = "https://github.com/weaveVM/exex-templates?b", branch = "main" }
+exex-wvm-bigquery = { git = "https://github.com/weaveVM/exex-templates?e", branch = "main" }
 
 # fees
 fees = { git = "https://github.com/weaveVM/miscalleneous?c", branch = "main" }

crates/rpc/rpc-eth-api/Cargo.toml

@@ -56,6 +56,11 @@ auto_impl.workspace = true
 dyn-clone.workspace = true
 tracing.workspace = true
 
+# wvm
+wvm-static.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
 [features]
 js-tracer = ["revm-inspectors/js-tracer", "reth-rpc-eth-types/js-tracer"]
 client = ["jsonrpsee/client", "jsonrpsee/async-client"]

crates/rpc/rpc-eth-api/src/core.rs

@@ -16,7 +16,7 @@ use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use reth_primitives::{BlockId, BlockNumberOrTag};
 use reth_rpc_server_types::{result::internal_rpc_err, ToRpcResult};
 use tracing::trace;
-
+use reth_rpc_eth_types::wvm::WvmTransactionRequest;
 use crate::{
     helpers::{EthApiSpec, EthBlocks, EthCall, EthFees, EthState, EthTransactions, FullEthApi},
     RpcBlock, RpcReceipt, RpcTransaction,
@@ -332,6 +332,11 @@ pub trait EthApi<T: RpcObject, B: RpcObject, R: RpcObject> {
     #[method(name = "sendTransaction")]
     async fn send_transaction(&self, request: TransactionRequest) -> RpcResult<B256>;
 
+    /// Sends WVM transaction; will block waiting for signer to return the
+    /// transaction hash.
+    #[method(name = "sendWvmTransaction")]
+    async fn send_wvm_transaction(&self, request: WvmTransactionRequest) -> RpcResult<B256>;
+
     /// Sends signed transaction, returning its hash.
     #[method(name = "sendRawTransaction")]
     async fn send_raw_transaction(&self, bytes: Bytes) -> RpcResult<B256>;
@@ -767,6 +772,12 @@ where
         Ok(EthTransactions::send_transaction(self, request).await?)
     }
 
+    /// Handler for: `eth_sendWvmTransaction`
+    async fn send_wvm_transaction(&self, request: WvmTransactionRequest) -> RpcResult<B256> {
+        trace!(target: "rpc::eth", ?request, "Serving eth_sendWvmTransaction");
+        Ok(EthTransactions::send_wvm_transaction(self, request).await?)
+    }
+
     /// Handler for: `eth_sendRawTransaction`
     async fn send_raw_transaction(&self, tx: Bytes) -> RpcResult<B256> {
         trace!(target: "rpc::eth", ?tx, "Serving eth_sendRawTransaction");

crates/rpc/rpc-eth-api/src/helpers/transaction.rs

@@ -1,6 +1,7 @@
 //! Database access for `eth_` transaction RPC methods. Loads transaction and receipt data w.r.t.
 //! network.
 
+use std::time::{SystemTime, UNIX_EPOCH};
 use alloy_dyn_abi::TypedData;
 use alloy_eips::eip2718::Encodable2718;
 use alloy_network::TransactionBuilder;
@@ -16,9 +17,11 @@ use reth_rpc_eth_types::{
     utils::{binary_search, recover_raw_transaction},
     EthApiError, EthStateCache, SignError, TransactionSource,
 };
+use reth_rpc_eth_types::wvm::WvmTransactionRequest;
 use reth_rpc_types_compat::transaction::{from_recovered, from_recovered_with_block_context};
 use reth_transaction_pool::{PoolTransaction, TransactionOrigin, TransactionPool};
-
+use serde::Serialize;
+use wvm_static::PRECOMPILE_WVM_BIGQUERY_CLIENT;
 use crate::{FromEthApiError, FullEthApiTypes, IntoEthApiError, RpcReceipt, RpcTransaction};
 
 use super::{
@@ -336,6 +339,45 @@ pub trait EthTransactions: LoadTransaction {
         }
     }
 
+    /// WVM Exclusive
+    /// Sends a transaction to the blockchain (raw)
+    /// And saves the transaction with tags in GBQ.
+    /// Tags will be then be used for easier indexing of the chain transaction itself
+    fn send_wvm_transaction(&self, mut request: WvmTransactionRequest) -> impl Future<Output = Result<B256, Self::Error>> + Send
+    where
+        Self: EthApiSpec + LoadBlock + LoadPendingBlock + Call, {
+
+        // WVM
+        let bq_client = (&*PRECOMPILE_WVM_BIGQUERY_CLIENT).clone();
+
+        async move {
+            let tags = request.tags;
+            let hash = self.send_raw_transaction(request.tx).await?;
+            let created_at = {
+                let now = SystemTime::now();
+                let since_epoch = now.duration_since(UNIX_EPOCH).expect("Time went backwards");
+                since_epoch.as_millis()
+            };
+
+            #[derive(Serialize)]
+            struct TagsTbl {
+                hash: String,
+                tags: String,
+                created_at: u128
+            }
+
+            bq_client.insert_generic("tags", None, TagsTbl {
+                hash: hash.to_string(),
+                tags: serde_json::to_string(&tags).unwrap(),
+                created_at
+            }).await
+                .map_err(|_| EthApiError::InternalEthError)?;
+
+            Ok(hash)
+        }
+
+    }
+
     /// Signs transaction with a matching signer, if any and submits the transaction to the pool.
     /// Returns the hash of the signed transaction.
     fn send_transaction(

crates/rpc/rpc-eth-types/src/lib.rs

@@ -21,6 +21,7 @@ pub mod revm_utils;
 pub mod simulate;
 pub mod transaction;
 pub mod utils;
+pub mod wvm;
 
 pub use builder::{
     config::{EthConfig, EthFilterConfig},

crates/rpc/rpc-eth-types/src/wvm.rs

@@ -0,0 +1,13 @@
+use alloy_primitives::Bytes;
+use alloy_rpc_types_eth::TransactionRequest;
+use jsonrpsee_core::Serialize;
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WvmTransactionRequest {
+    pub tx: Bytes,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub tags: Option<Vec<(String, String)>>
+}
+

wvm-apps/wvm-exexed/crates/static/Cargo.toml → crates/wvm-static/Cargo.toml

@@ -12,5 +12,5 @@ exex-wvm-bigquery.workspace = true
 tracing.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
-tokio-util = { version = "0.7.12", features = ["full"] }
-once_cell = { version = "1.20.2" }
+tokio-util = { workspace = true, features = ["full"] }
+once_cell = { workspace = true }

wvm-apps/wvm-exexed/Cargo.toml

@@ -38,7 +38,7 @@ lambda = { path = "crates/lambda" }
 arweave-upload = { path = "crates/arweave-upload" }
 precompiles = { path = "crates/precompiles" }
 wvm-borsh = { path = "crates/wvm-borsh" }
-wvm-static = { path = "crates/static" }
+wvm-static.workspace = true
 exex-etl = { path = "crates/exex-etl" }
 rbrotli = { path = "crates/brotli" }
 wvm-tx = { path = "crates/tx" }

wvm-apps/wvm-exexed/crates/precompiles/Cargo.toml

@@ -26,7 +26,7 @@ tokio.workspace = true
 reqwest-graphql = "1.0.0"
 rbrotli = { path = "../brotli" }
 wvm-borsh = { path = "../wvm-borsh", name = "wvm-borsh" }
-wvm-static = { path = "../static" }
+wvm-static = { path = "../../../../crates/wvm-static" }
 borsh.workspace = true
 alloy-primitives.workspace = true
 reth-evm-ethereum.workspace = true

wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml

@@ -22,7 +22,7 @@ lambda = { path = "../lambda" }
 arweave-upload = { path = "../arweave-upload" }
 precompiles = { path = "../precompiles" }
 rbrotli = { path = "../brotli" }
-wvm-static = { path = "../static" }
+wvm-static = { path = "../../../../crates/wvm-static" }
 tokio.workspace = true
 exex-wvm-da.workspace = true
 exex-wvm-bigquery.workspace = true