Merge branch 'main' into andy/dump-evm-call

alchemyplatform · Feb 18, 2025 · ac818f1 · ac818f1
2 parents 37fc9b7 + 0dc72ec
commit ac818f1
Show file tree

Hide file tree

Showing 29 changed files with 1,380 additions and 856 deletions.
diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
@@ -8,7 +8,7 @@ on:
         type: string
   push:
     tags:
-      - v*.*.*
+      - v(\d+)\.(\d+)\.(\d+)(-.*)?
 
 env:
   CARGO_TERM_COLOR: always
@@ -57,6 +57,8 @@ jobs:
         run: |
           if [ -n "${{ github.event.inputs.version }}" ]; then
             sudo -E env "PATH=$PATH" make GIT_TAG="${{ github.event.inputs.version }}" docker-build 
-          else
+          elif [[ "${{ github.ref_name }}" =~ ^v(\d+)\.(\d+)\.(\d+)$ ]]
             sudo -E env "PATH=$PATH" make docker-build-latest
+          else 
+            sudo -E env "PATH=$PATH" make GIT_TAG="${{ github.ref_name }}" docker-build 
           fi
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 ##@ Test
 
-UNIT_TEST_ARGS := --locked --workspace --all-features
+UNIT_TEST_ARGS := --locked --workspace --all-features --no-fail-fast
 PROFILE ?= release
 DOCKER_IMAGE_NAME ?= alchemyplatform/rundler
 BIN_DIR = "dist/bin"

diff --git a/crates/aggregators/pbh/src/pbh.rs b/crates/aggregators/pbh/src/pbh.rs
@@ -21,7 +21,7 @@ use rundler_types::{
         AggregatorCosts, SignatureAggregator, SignatureAggregatorError, SignatureAggregatorResult,
     },
     v0_7::UserOperation,
-    UserOperationVariant,
+    UserOperation as _, UserOperationVariant,
 };
 
 sol! {
@@ -117,17 +117,17 @@ where
             }
             let uo: UserOperation = user_op.clone().into();
 
-            if uo.signature.len() < PBH_PROOF_LENGTH {
+            if uo.signature().len() < PBH_PROOF_LENGTH {
                 return Err(SignatureAggregatorError::InvalidUserOperation(format!(
                     "User operation signature is not the correct length: {} < {}",
-                    uo.signature.len(),
+                    uo.signature().len(),
                     PBH_PROOF_LENGTH
                 )));
             }
 
-            let proof_start = uo.signature.len() - PBH_PROOF_LENGTH;
+            let proof_start = uo.signature().len() - PBH_PROOF_LENGTH;
             agg_proofs.push(
-                PBHPayload::abi_decode(&uo.signature[proof_start..], true).map_err(|e| {
+                PBHPayload::abi_decode(&uo.signature()[proof_start..], true).map_err(|e| {
                     SignatureAggregatorError::InvalidUserOperation(format!(
                         "Malformed PBH proof: {}",
                         e