@pimlico/alto 0.0.0-main.20250330T155851 → 0.0.0-main.20250331T140733
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,7 +4,7 @@ import type { Address, BundleResult, UserOperation, GasPriceParameters, UserOper
|
|
|
4
4
|
import type { Logger, Metrics } from "../utils/index.js";
|
|
5
5
|
import { type Account } from "viem";
|
|
6
6
|
import type { AltoConfig } from "../createConfig.js";
|
|
7
|
-
import type
|
|
7
|
+
import { type SignedAuthorizationList } from "viem/experimental";
|
|
8
8
|
type HandleOpsTxParams = {
|
|
9
9
|
gas: bigint;
|
|
10
10
|
account: Account;
|
package/esm/executor/executor.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { maxBigInt, parseViemError, scaleBigIntByPercent } from "../utils/index.js";
|
|
2
2
|
import * as sentry from "@sentry/node";
|
|
3
|
-
import { IntrinsicGasTooLowError, NonceTooLowError, TransactionExecutionError, NonceTooHighError, BaseError } from "viem";
|
|
3
|
+
import { IntrinsicGasTooLowError, NonceTooLowError, TransactionExecutionError, NonceTooHighError, BaseError, concat } from "viem";
|
|
4
4
|
import { calculateAA95GasFloor, encodeHandleOpsCalldata, getAuthorizationList, getUserOpHashes, isTransactionUnderpricedError } from "./utils.js";
|
|
5
5
|
import { sendPflConditional } from "./fastlane.js";
|
|
6
6
|
import { filterOpsAndEstimateGas } from "./filterOpsAndEStimateGas.js";
|
|
@@ -32,12 +32,38 @@ export class Executor {
|
|
|
32
32
|
userOps,
|
|
33
33
|
beneficiary: txParam.account.address
|
|
34
34
|
});
|
|
35
|
-
|
|
35
|
+
// Add authorization state overrides.
|
|
36
|
+
let stateOverride = [];
|
|
37
|
+
for (const opInfo of txParam.userOps) {
|
|
38
|
+
const { userOp } = opInfo;
|
|
39
|
+
if (userOp.eip7702Auth) {
|
|
40
|
+
const delegate = "address" in userOp.eip7702Auth
|
|
41
|
+
? userOp.eip7702Auth.address
|
|
42
|
+
: userOp.eip7702Auth.contractAddress;
|
|
43
|
+
stateOverride.push({
|
|
44
|
+
address: userOp.sender,
|
|
45
|
+
code: concat(["0xef0100", delegate])
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (this.config.balanceOverride) {
|
|
50
|
+
stateOverride = undefined;
|
|
51
|
+
}
|
|
52
|
+
const gas = await this.config.publicClient.estimateGas({
|
|
36
53
|
to: entryPoint,
|
|
37
54
|
data: handleOpsCalldata,
|
|
38
55
|
...txParam,
|
|
39
|
-
...gasOpts
|
|
56
|
+
...gasOpts,
|
|
57
|
+
stateOverride
|
|
40
58
|
});
|
|
59
|
+
const request = {
|
|
60
|
+
to: entryPoint,
|
|
61
|
+
data: handleOpsCalldata,
|
|
62
|
+
from: txParam.account.address,
|
|
63
|
+
...txParam,
|
|
64
|
+
...gasOpts,
|
|
65
|
+
gas
|
|
66
|
+
};
|
|
41
67
|
request.gas = scaleBigIntByPercent(request.gas, this.config.executorGasMultiplier);
|
|
42
68
|
let attempts = 0;
|
|
43
69
|
let transactionHash;
|
|
@@ -71,8 +97,14 @@ export class Executor {
|
|
|
71
97
|
address: account.address,
|
|
72
98
|
blockTag: "latest"
|
|
73
99
|
});
|
|
74
|
-
|
|
75
|
-
|
|
100
|
+
if (request.maxFeePerGas &&
|
|
101
|
+
request.maxPriorityFeePerGas) {
|
|
102
|
+
request.maxFeePerGas = scaleBigIntByPercent(request.maxFeePerGas, 150n);
|
|
103
|
+
request.maxPriorityFeePerGas = scaleBigIntByPercent(request.maxPriorityFeePerGas, 150n);
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
request.gas = scaleBigIntByPercent(request.gas, 150n);
|
|
107
|
+
}
|
|
76
108
|
}
|
|
77
109
|
}
|
|
78
110
|
const error = e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EACH,uBAAuB,EACvB,gBAAgB,EAChB,yBAAyB,EAGzB,iBAAiB,EACjB,SAAS,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { Address, BundleResult, UserOperation, GasPriceParameters, UserOper
|
|
|
4
4
|
import type { Logger, Metrics } from "../utils/index.js";
|
|
5
5
|
import { type Account } from "viem";
|
|
6
6
|
import type { AltoConfig } from "../createConfig.js";
|
|
7
|
-
import type
|
|
7
|
+
import { type SignedAuthorizationList } from "viem/experimental";
|
|
8
8
|
type HandleOpsTxParams = {
|
|
9
9
|
gas: bigint;
|
|
10
10
|
account: Account;
|
package/lib/executor/executor.js
CHANGED
|
@@ -58,12 +58,38 @@ class Executor {
|
|
|
58
58
|
userOps,
|
|
59
59
|
beneficiary: txParam.account.address
|
|
60
60
|
});
|
|
61
|
-
|
|
61
|
+
// Add authorization state overrides.
|
|
62
|
+
let stateOverride = [];
|
|
63
|
+
for (const opInfo of txParam.userOps) {
|
|
64
|
+
const { userOp } = opInfo;
|
|
65
|
+
if (userOp.eip7702Auth) {
|
|
66
|
+
const delegate = "address" in userOp.eip7702Auth
|
|
67
|
+
? userOp.eip7702Auth.address
|
|
68
|
+
: userOp.eip7702Auth.contractAddress;
|
|
69
|
+
stateOverride.push({
|
|
70
|
+
address: userOp.sender,
|
|
71
|
+
code: (0, viem_1.concat)(["0xef0100", delegate])
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
if (this.config.balanceOverride) {
|
|
76
|
+
stateOverride = undefined;
|
|
77
|
+
}
|
|
78
|
+
const gas = await this.config.publicClient.estimateGas({
|
|
62
79
|
to: entryPoint,
|
|
63
80
|
data: handleOpsCalldata,
|
|
64
81
|
...txParam,
|
|
65
|
-
...gasOpts
|
|
82
|
+
...gasOpts,
|
|
83
|
+
stateOverride
|
|
66
84
|
});
|
|
85
|
+
const request = {
|
|
86
|
+
to: entryPoint,
|
|
87
|
+
data: handleOpsCalldata,
|
|
88
|
+
from: txParam.account.address,
|
|
89
|
+
...txParam,
|
|
90
|
+
...gasOpts,
|
|
91
|
+
gas
|
|
92
|
+
};
|
|
67
93
|
request.gas = (0, utils_1.scaleBigIntByPercent)(request.gas, this.config.executorGasMultiplier);
|
|
68
94
|
let attempts = 0;
|
|
69
95
|
let transactionHash;
|
|
@@ -97,8 +123,14 @@ class Executor {
|
|
|
97
123
|
address: account.address,
|
|
98
124
|
blockTag: "latest"
|
|
99
125
|
});
|
|
100
|
-
|
|
101
|
-
|
|
126
|
+
if (request.maxFeePerGas &&
|
|
127
|
+
request.maxPriorityFeePerGas) {
|
|
128
|
+
request.maxFeePerGas = (0, utils_1.scaleBigIntByPercent)(request.maxFeePerGas, 150n);
|
|
129
|
+
request.maxPriorityFeePerGas = (0, utils_1.scaleBigIntByPercent)(request.maxPriorityFeePerGas, 150n);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
request.gas = (0, utils_1.scaleBigIntByPercent)(request.gas, 150n);
|
|
133
|
+
}
|
|
102
134
|
}
|
|
103
135
|
}
|
|
104
136
|
const error = e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,uCAA6E;AAC7E,qDAAsC;AACtC,+
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pimlico/alto",
|
|
3
|
-
"version": "0.0.0-main.
|
|
3
|
+
"version": "0.0.0-main.20250331T140733",
|
|
4
4
|
"description": "A performant and modular ERC-4337 Bundler written in Typescript",
|
|
5
5
|
"repository": "https://github.com/pimlicolabs/alto.git",
|
|
6
6
|
"author": "Pimlico",
|