test: test 4337 aggregated, and ops validation

worldcoin · Nov 21, 2024 · e659299 · e659299
1 parent b5ac4b1
commit e659299
Show file tree

Hide file tree

Showing 11 changed files with 564 additions and 198 deletions.
diff --git a/world-chain-builder/Cargo.lock b/world-chain-builder/Cargo.lock
diff --git a/world-chain-builder/Cargo.toml b/world-chain-builder/Cargo.toml
@@ -61,6 +61,7 @@ alloy-rpc-types = { version = "0.5.4", features = [
 alloy-rlp = "0.3.4"
 alloy-eips = { version = "0.5.4", default-features = false }
 alloy-genesis = { version = "0.5.4", default-features = false }
+alloy-sol-types = { version = "0.5.4", default-features = false }
 
 # revm
 # revm

diff --git a/world-chain-builder/benches/validate_transaction.rs b/world-chain-builder/benches/validate_transaction.rs
@@ -1,5 +1,6 @@
 use std::future::Future;
 
+use alloy_primitives::Address;
 use criterion::{criterion_group, criterion_main, Criterion};
 use reth::transaction_pool::blobstore::InMemoryBlobStore;
 use reth::transaction_pool::{Pool, PoolTransaction as _, TransactionPool, TransactionValidator};
@@ -36,7 +37,7 @@ where
 
 fn validator_setup() -> WorldChainTransactionValidator<MockEthProvider, WorldChainPooledTransaction>
 {
-    let validator = world_chain_validator();
+    let validator = world_chain_validator(Address::with_last_byte(1));
     let transaction = get_pbh_transaction(0);
     validator.inner().client().add_account(
         transaction.sender(),

diff --git a/world-chain-builder/src/node/args.rs b/world-chain-builder/src/node/args.rs
@@ -28,7 +28,7 @@ pub struct WorldChainBuilderArgs {
     /// Sets the ERC-4337 EntryPoint contract address
     /// This contract is used to verify World-Id Proofs attached to 4337 payloads.
     #[arg(long = "builder.entry_point_contract")]
-    pub entry_point_contract: Address,
+    pub entry_point: Address,
 
     /// Sets the max blockspace reserved for verified transactions. If there are not enough
     /// verified transactions to fill the capacity, the remaining blockspace will be filled with

diff --git a/world-chain-builder/src/node/builder.rs b/world-chain-builder/src/node/builder.rs
@@ -62,7 +62,7 @@ impl WorldChainBuilder {
             clear_nullifiers,
             num_pbh_txs,
             verified_blockspace_capacity,
-            entry_point_contract,
+            entry_point,
         } = args.builder_args;
 
         let RollupArgs {
@@ -78,7 +78,7 @@ impl WorldChainBuilder {
                 num_pbh_txs,
                 clear_nullifiers,
                 db: db.clone(),
-                entry_point_contract,
+                entry_point,
             })
             .payload(WorldChainPayloadServiceBuilder::new(
                 compute_pending_block,

diff --git a/world-chain-builder/src/pool/bindings.rs b/world-chain-builder/src/pool/bindings.rs
@@ -0,0 +1,36 @@
+use alloy_sol_types::sol;
+
+sol! {
+    #[allow(missing_docs)]
+    contract IEntryPoint {
+        #[derive(Default)]
+        struct PackedUserOperation {
+            address sender;
+            uint256 nonce;
+            bytes initCode;
+            bytes callData;
+            bytes32 accountGasLimits;
+            uint256 preVerificationGas;
+            bytes32 gasFees;
+            bytes paymasterAndData;
+            bytes signature;
+        }
+
+        #[derive(Default)]
+        struct UserOpsPerAggregator {
+            PackedUserOperation[] userOps;
+            address aggregator;
+            bytes signature;
+        }
+
+        function handleOps(
+            PackedUserOperation[] calldata,
+            address payable
+        ) external;
+
+        function handleAggregatedOps(
+            UserOpsPerAggregator[] calldata,
+            address payable
+        ) public;
+    }
+}
diff --git a/world-chain-builder/src/pool/builder.rs b/world-chain-builder/src/pool/builder.rs
@@ -24,7 +24,7 @@ pub struct WorldChainPoolBuilder {
     pub clear_nullifiers: bool,
     pub num_pbh_txs: u16,
     pub db: Arc<DatabaseEnv>,
-    pub entry_point_contract: Address,
+    pub entry_point: Address,
 }
 
 impl<Node> PoolBuilder<Node> for WorldChainPoolBuilder
@@ -59,7 +59,7 @@ where
                 root_validator,
                 self.db.clone(),
                 self.num_pbh_txs,
-                self.entry_point_contract,
+                self.entry_point,
             )
         });
 

diff --git a/world-chain-builder/src/pool/error.rs b/world-chain-builder/src/pool/error.rs
@@ -29,6 +29,12 @@ pub enum WorldChainTransactionPoolInvalid {
     InvalidRoot,
     #[error("invalid 4337 EntryPoint calldata length")]
     Invalid4337CalldataLength,
+    #[error("invalid 4337 EntryPoint Selector")]
+    Invalid4337EntryPointSelector,
+    #[error("4337 Abi decode error")]
+    AbiDecodeError,
+    #[error("4337 More than one user operation")]
+    Invalid4337UserOpsLength,
 }
 
 #[derive(Debug, thiserror::Error)]

diff --git a/world-chain-builder/src/pool/mod.rs b/world-chain-builder/src/pool/mod.rs
@@ -1,3 +1,4 @@
+pub mod bindings;
 pub mod builder;
 pub mod error;
 pub mod noop;