Merge branch 'main' of https://github.com/pimlicolabs/alto into feat/…

…v2-bundler-api
pimlicolabs · Feb 6, 2024 · 225d867 · 225d867
2 parents d446c27 + cbd258c
commit 225d867
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 675 deletions.
diff --git a/packages/executor/src/executor.ts b/packages/executor/src/executor.ts
@@ -512,6 +512,7 @@ export class BasicExecutor implements IExecutor {
         if (
             simulatedOps.every((sop) => sop.reason === FeeCapTooLowError.name)
         ) {
+            this.markWalletProcessed(wallet)
             return opsWithHashes.map((owh) => {
                 return {
                     status: "resubmit",
@@ -731,6 +732,7 @@ export class BasicExecutor implements IExecutor {
         if (
             simulatedOps.every((sop) => sop.reason === FeeCapTooLowError.name)
         ) {
+            this.markWalletProcessed(wallet)
             return compressedOps.map((compressedOp) => {
                 return {
                     status: "resubmit",

diff --git a/packages/rpc/src/rpcHandler.ts b/packages/rpc/src/rpcHandler.ts
@@ -315,8 +315,12 @@ export class RpcHandler implements IRpcEndpoint {
             userOperation.verificationGasLimit = 10_000_000n
             userOperation.callGasLimit = 10_000_000n
 
+            if (this.chainId === chains.base.id) {
+                userOperation.verificationGasLimit = 2_500_000n
+                userOperation.callGasLimit = 2_500_000n
+            }
+
             if (
-                this.chainId === 8453 ||
                 this.chainId === chains.celoAlfajores.id ||
                 this.chainId === chains.celo.id
             ) {

diff --git a/packages/rpc/src/validation/SafeValidator.ts b/packages/rpc/src/validation/SafeValidator.ts
@@ -92,10 +92,22 @@ export class SafeValidator extends UnsafeValidator implements IValidator {
                 )
             }
 
-            if (
-                validationResult.returnInfo.validUntil <
-                Date.now() / 1000 + 30
-            ) {
+            const now = Date.now() / 1000
+
+            this.logger.debug({
+                validAfter: validationResult.returnInfo.validAfter,
+                validUntil: validationResult.returnInfo.validUntil,
+                now: now
+            })
+
+            if (validationResult.returnInfo.validAfter > now - 5) {
+                throw new RpcError(
+                    "User operation is not valid yet",
+                    ValidationErrors.ExpiresShortly
+                )
+            }
+
+            if (validationResult.returnInfo.validUntil < now + 30) {
                 throw new RpcError(
                     "expires too soon",
                     ValidationErrors.ExpiresShortly

diff --git a/packages/rpc/src/validation/UnsafeValidator.ts b/packages/rpc/src/validation/UnsafeValidator.ts
@@ -239,8 +239,6 @@ export class UnsafeValidator implements IValidator {
                 throw e
             })
 
-        console.log("errorResult ==========> ", errorResult)
-
         return getSimulationResult(
             errorResult,
             this.logger,
@@ -336,10 +334,22 @@ export class UnsafeValidator implements IValidator {
                 )
             }
 
-            if (
-                validationResult.returnInfo.validUntil <
-                Date.now() / 1000 + 30
-            ) {
+            const now = Date.now() / 1000
+
+            this.logger.debug({
+                validAfter: validationResult.returnInfo.validAfter,
+                validUntil: validationResult.returnInfo.validUntil,
+                now
+            })
+
+            if (validationResult.returnInfo.validAfter > now - 5) {
+                throw new RpcError(
+                    "User operation is not valid yet",
+                    ValidationErrors.ExpiresShortly
+                )
+            }
+
+            if (validationResult.returnInfo.validUntil < now + 30) {
                 throw new RpcError(
                     "expires too soon",
                     ValidationErrors.ExpiresShortly