thirdweb 5.35.0-nightly-39b329a56e9eb031e1799524d827fdf69a92c854-20240717000718 → 5.35.0
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.
- package/dist/cjs/exports/wallets/smart.js +4 -1
- package/dist/cjs/exports/wallets/smart.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/bundler.js +32 -7
- package/dist/cjs/wallets/smart/lib/bundler.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/paymaster.js +16 -2
- package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/userop.js +4 -1
- package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
- package/dist/cjs/wallets/smart/types.js +41 -0
- package/dist/cjs/wallets/smart/types.js.map +1 -1
- package/dist/esm/exports/wallets/smart.js +2 -1
- package/dist/esm/exports/wallets/smart.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/smart/lib/bundler.js +31 -7
- package/dist/esm/wallets/smart/lib/bundler.js.map +1 -1
- package/dist/esm/wallets/smart/lib/paymaster.js +16 -2
- package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/esm/wallets/smart/lib/userop.js +4 -1
- package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
- package/dist/esm/wallets/smart/types.js +40 -1
- package/dist/esm/wallets/smart/types.js.map +1 -1
- package/dist/types/exports/wallets/smart.d.ts +2 -1
- package/dist/types/exports/wallets/smart.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/bundler.d.ts +20 -1
- package/dist/types/wallets/smart/lib/bundler.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/paymaster.d.ts +16 -2
- package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/userop.d.ts +4 -1
- package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
- package/dist/types/wallets/smart/types.d.ts +14 -0
- package/dist/types/wallets/smart/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/exports/wallets/smart.ts +3 -0
- package/src/version.ts +1 -1
- package/src/wallets/smart/lib/bundler.ts +47 -13
- package/src/wallets/smart/lib/paymaster.ts +16 -2
- package/src/wallets/smart/lib/userop.ts +4 -1
- package/src/wallets/smart/types.ts +60 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_ACCOUNT_FACTORY = exports.ENTRYPOINT_ADDRESS_v0_6 = exports.predictAddress = exports.estimateUserOpGas = exports.getUserOpGasFees = exports.bundleUserOp = exports.getUserOpReceipt = exports.signUserOp = exports.createUnsignedUserOp = exports.waitForUserOpReceipt = exports.smartWallet = void 0;
|
|
3
|
+
exports.DEFAULT_ACCOUNT_FACTORY = exports.ENTRYPOINT_ADDRESS_v0_6 = exports.getPaymasterAndData = exports.predictAddress = exports.estimateUserOpGas = exports.getUserOpGasFees = exports.bundleUserOp = exports.getUserOpReceiptRaw = exports.getUserOpReceipt = exports.signUserOp = exports.createUnsignedUserOp = exports.waitForUserOpReceipt = exports.smartWallet = void 0;
|
|
4
4
|
var smart_wallet_js_1 = require("../../wallets/smart/smart-wallet.js");
|
|
5
5
|
Object.defineProperty(exports, "smartWallet", { enumerable: true, get: function () { return smart_wallet_js_1.smartWallet; } });
|
|
6
6
|
var userop_js_1 = require("../../wallets/smart/lib/userop.js");
|
|
@@ -9,11 +9,14 @@ Object.defineProperty(exports, "createUnsignedUserOp", { enumerable: true, get:
|
|
|
9
9
|
Object.defineProperty(exports, "signUserOp", { enumerable: true, get: function () { return userop_js_1.signUserOp; } });
|
|
10
10
|
var bundler_js_1 = require("../../wallets/smart/lib/bundler.js");
|
|
11
11
|
Object.defineProperty(exports, "getUserOpReceipt", { enumerable: true, get: function () { return bundler_js_1.getUserOpReceipt; } });
|
|
12
|
+
Object.defineProperty(exports, "getUserOpReceiptRaw", { enumerable: true, get: function () { return bundler_js_1.getUserOpReceiptRaw; } });
|
|
12
13
|
Object.defineProperty(exports, "bundleUserOp", { enumerable: true, get: function () { return bundler_js_1.bundleUserOp; } });
|
|
13
14
|
Object.defineProperty(exports, "getUserOpGasFees", { enumerable: true, get: function () { return bundler_js_1.getUserOpGasFees; } });
|
|
14
15
|
Object.defineProperty(exports, "estimateUserOpGas", { enumerable: true, get: function () { return bundler_js_1.estimateUserOpGas; } });
|
|
15
16
|
var calls_js_1 = require("../../wallets/smart/lib/calls.js");
|
|
16
17
|
Object.defineProperty(exports, "predictAddress", { enumerable: true, get: function () { return calls_js_1.predictAddress; } });
|
|
18
|
+
var paymaster_js_1 = require("../../wallets/smart/lib/paymaster.js");
|
|
19
|
+
Object.defineProperty(exports, "getPaymasterAndData", { enumerable: true, get: function () { return paymaster_js_1.getPaymasterAndData; } });
|
|
17
20
|
var constants_js_1 = require("../../wallets/smart/lib/constants.js");
|
|
18
21
|
Object.defineProperty(exports, "ENTRYPOINT_ADDRESS_v0_6", { enumerable: true, get: function () { return constants_js_1.ENTRYPOINT_ADDRESS_v0_6; } });
|
|
19
22
|
Object.defineProperty(exports, "DEFAULT_ACCOUNT_FACTORY", { enumerable: true, get: function () { return constants_js_1.DEFAULT_ACCOUNT_FACTORY; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAAzD,8GAAA,WAAW,OAAA;AAEpB,+DAI2C;AAHzC,iHAAA,oBAAoB,OAAA;AACpB,iHAAA,oBAAoB,OAAA;AACpB,uGAAA,UAAU,OAAA;AAGZ,
|
|
1
|
+
{"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAAzD,8GAAA,WAAW,OAAA;AAEpB,+DAI2C;AAHzC,iHAAA,oBAAoB,OAAA;AACpB,iHAAA,oBAAoB,OAAA;AACpB,uGAAA,UAAU,OAAA;AAGZ,iEAM4C;AAL1C,8GAAA,gBAAgB,OAAA;AAChB,iHAAA,mBAAmB,OAAA;AACnB,0GAAA,YAAY,OAAA;AACZ,8GAAA,gBAAgB,OAAA;AAChB,+GAAA,iBAAiB,OAAA;AAGnB,6DAAkE;AAAzD,0GAAA,cAAc,OAAA;AAEvB,qEAA2E;AAAlE,mHAAA,mBAAmB,OAAA;AAS5B,qEAG8C;AAF5C,uHAAA,uBAAuB,OAAA;AACvB,uHAAA,uBAAuB,OAAA"}
|
package/dist/cjs/version.js
CHANGED
package/dist/cjs/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,QAAQ,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.bundleUserOp = bundleUserOp;
|
|
|
4
4
|
exports.estimateUserOpGas = estimateUserOpGas;
|
|
5
5
|
exports.getUserOpGasFees = getUserOpGasFees;
|
|
6
6
|
exports.getUserOpReceipt = getUserOpReceipt;
|
|
7
|
+
exports.getUserOpReceiptRaw = getUserOpReceiptRaw;
|
|
7
8
|
exports.getZkPaymasterData = getZkPaymasterData;
|
|
8
9
|
exports.broadcastZkTransaction = broadcastZkTransaction;
|
|
9
10
|
const viem_1 = require("viem");
|
|
@@ -12,6 +13,7 @@ const UserOperationRevertReason_js_1 = require("../../../extensions/erc4337/__ge
|
|
|
12
13
|
const hex_js_1 = require("../../../utils/encoding/hex.js");
|
|
13
14
|
const fetch_js_1 = require("../../../utils/fetch.js");
|
|
14
15
|
const json_js_1 = require("../../../utils/json.js");
|
|
16
|
+
const types_js_1 = require("../types.js");
|
|
15
17
|
const constants_js_1 = require("./constants.js");
|
|
16
18
|
const utils_js_1 = require("./utils.js");
|
|
17
19
|
/**
|
|
@@ -113,11 +115,7 @@ async function getUserOpGasFees(args) {
|
|
|
113
115
|
* @walletUtils
|
|
114
116
|
*/
|
|
115
117
|
async function getUserOpReceipt(args) {
|
|
116
|
-
const res = await
|
|
117
|
-
options: args,
|
|
118
|
-
operation: "eth_getUserOperationReceipt",
|
|
119
|
-
params: [args.userOpHash],
|
|
120
|
-
});
|
|
118
|
+
const res = await getUserOpReceiptRaw(args);
|
|
121
119
|
if (!res) {
|
|
122
120
|
return undefined;
|
|
123
121
|
}
|
|
@@ -129,15 +127,42 @@ async function getUserOpReceipt(args) {
|
|
|
129
127
|
});
|
|
130
128
|
const revertReason = logs[0]?.args?.revertReason;
|
|
131
129
|
if (!revertReason) {
|
|
132
|
-
throw new Error(`UserOp failed at txHash: ${res.transactionHash}`);
|
|
130
|
+
throw new Error(`UserOp failed at txHash: ${res.receipt.transactionHash}`);
|
|
133
131
|
}
|
|
134
132
|
const revertMsg = (0, viem_1.decodeErrorResult)({
|
|
135
133
|
data: revertReason,
|
|
136
134
|
});
|
|
137
|
-
throw new Error(`UserOp failed with reason: '${revertMsg.args.join(",")}' at txHash: ${res.transactionHash}`);
|
|
135
|
+
throw new Error(`UserOp failed with reason: '${revertMsg.args.join(",")}' at txHash: ${res.receipt.transactionHash}`);
|
|
138
136
|
}
|
|
139
137
|
return res.receipt;
|
|
140
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Get the receipt of a user operation.
|
|
141
|
+
* @param args - The options for getting the receipt of a user operation.
|
|
142
|
+
* @returns The raw receipt of the user operation.
|
|
143
|
+
* @example
|
|
144
|
+
* ```ts
|
|
145
|
+
* import { getUserOpReceiptRaw } from "thirdweb/wallets/smart";
|
|
146
|
+
*
|
|
147
|
+
* const receipt = await getUserOpReceiptRaw({
|
|
148
|
+
* client,
|
|
149
|
+
* chain,
|
|
150
|
+
* userOpHash,
|
|
151
|
+
* });
|
|
152
|
+
* ```
|
|
153
|
+
* @walletUtils
|
|
154
|
+
*/
|
|
155
|
+
async function getUserOpReceiptRaw(args) {
|
|
156
|
+
const res = await sendBundlerRequest({
|
|
157
|
+
options: args,
|
|
158
|
+
operation: "eth_getUserOperationReceipt",
|
|
159
|
+
params: [args.userOpHash],
|
|
160
|
+
});
|
|
161
|
+
if (!res) {
|
|
162
|
+
return undefined;
|
|
163
|
+
}
|
|
164
|
+
return (0, types_js_1.formatUserOperationReceipt)(res);
|
|
165
|
+
}
|
|
141
166
|
/**
|
|
142
167
|
* @internal
|
|
143
168
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":";;AAuCA,oCAYC;AAiBD,8CAoBC;AAgBD,4CAaC;AAkBD,4CAiCC;AAkBD,kDAcC;AAKD,gDAcC;AAED,wDAmBC;AAhPD,+BAAuE;AACvE,wEAAsE;AACtE,4IAA2I;AAE3I,2DAAuE;AACvE,sDAAyD;AACzD,oDAAmD;AACnD,0CAQqB;AACrB,iDAKwB;AACxB,yCAA2C;AAE3C;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,YAAY,CAAC,IAGlC;IACC,OAAO,kBAAkB,CAAC;QACxB,GAAG,IAAI;QACP,SAAS,EAAE,uBAAuB;QAClC,MAAM,EAAE;YACN,IAAA,wBAAa,EAAC,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,sCAAuB;SAC1D;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,iBAAiB,CAAC,IAGvC;IACC,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC;QACnC,GAAG,IAAI;QACP,SAAS,EAAE,8BAA8B;QACzC,MAAM,EAAE;YACN,IAAA,wBAAa,EAAC,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,sCAAuB;SAC1D;KACF,CAAC,CAAC;IAEH,4DAA4D;IAC5D,OAAO;QACL,kBAAkB,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,kBAAkB,CAAC;QACvD,eAAe,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,eAAe,CAAC;QACjD,oBAAoB,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,oBAAoB,CAAC;QAC3D,YAAY,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,YAAY,CAAC,GAAG,yCAA0B;KACzE,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;GAaG;AACI,KAAK,UAAU,gBAAgB,CAAC,IAEtC;IACC,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC;QACnC,GAAG,IAAI;QACP,SAAS,EAAE,mCAAmC;QAC9C,MAAM,EAAE,EAAE;KACX,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,oBAAoB,CAAC;QAC3D,YAAY,EAAE,IAAA,oBAAW,EAAC,GAAG,CAAC,YAAY,CAAC;KAC5C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACI,KAAK,UAAU,gBAAgB,CACpC,IAEC;IAED,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE5C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC1B,sBAAsB;QACtB,MAAM,IAAI,GAAG,IAAA,8BAAc,EAAC;YAC1B,MAAM,EAAE,CAAC,IAAA,6DAA8B,GAAE,CAAC;YAC1C,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC;QACjD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,4BAA4B,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAC1D,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,wBAAiB,EAAC;YAClC,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CACb,+BAA+B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBACrD,GAAG,CAAC,OAAO,CAAC,eACd,EAAE,CACH,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC,OAAO,CAAC;AACrB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACI,KAAK,UAAU,mBAAmB,CACvC,IAEC;IAED,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC;QACnC,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,6BAA6B;QACxC,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;KAC1B,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,IAAA,qCAA0B,EAAC,GAA2B,CAAC,CAAC;AACjE,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CAAC,IAGxC;IACC,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC;QACnC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,kBAAkB;QAC7B,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;KAC3B,CAAC,CAAC;IAEH,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAAC,IAI5C;IACC,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC;QACnC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,yBAAyB;QACpC,MAAM,EAAE;YACN;gBACE,GAAG,IAAI,CAAC,WAAW;gBACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C;SACF;KACF,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,GAAG,CAAC,eAAe;KACrC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAWjC;IACC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE5C,IAAI,oBAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,eAAe,SAAS,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,mCAAoB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,gBAAgB,GAAG,IAAA,yBAAc,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE;QAClD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAA,mBAAS,EAAC;YACd,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,SAAS;YACjB,MAAM;SACP,CAAC;KACH,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC;QAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;QAEnC,MAAM,IAAI,KAAK,CACb,GAAG,SAAS,WAAW,KAAK;UACxB,QAAQ,CAAC,MAAM;QACjB,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,IAAI,oBAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,OAAO,SAAS,UAAU,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC"}
|
|
@@ -6,8 +6,22 @@ const fetch_js_1 = require("../../../utils/fetch.js");
|
|
|
6
6
|
const constants_js_1 = require("./constants.js");
|
|
7
7
|
const utils_js_1 = require("./utils.js");
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
* @
|
|
9
|
+
* Get paymaster and data details for a user operation.
|
|
10
|
+
* @param args - The userOp and options
|
|
11
|
+
* @returns - The paymaster and data details for the user operation.
|
|
12
|
+
* @example
|
|
13
|
+
* ```ts
|
|
14
|
+
* import { getPaymasterAndData } from "thirdweb/wallets/smart";
|
|
15
|
+
*
|
|
16
|
+
* const userOp = createUnsignedUserOp(...);
|
|
17
|
+
*
|
|
18
|
+
* const paymasterAndData = await getPaymasterAndData({
|
|
19
|
+
* userOp,
|
|
20
|
+
* client,
|
|
21
|
+
* chain,
|
|
22
|
+
* });
|
|
23
|
+
* ```
|
|
24
|
+
* @walletUtils
|
|
11
25
|
*/
|
|
12
26
|
async function getPaymasterAndData(args) {
|
|
13
27
|
const { userOp, paymasterOverride, client, chain, entrypointAddress } = args;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":";;AA8BA,kDAwEC;AApGD,2DAA6D;AAC7D,sDAAyD;AAEzD,iDAIwB;AACxB,yCAA2C;AAE3C;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,mBAAmB,CAAC,IAMzC;IACC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAE7E,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,qCAAsB,EAAC,KAAK,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,iBAAiB,IAAI,sCAAuB,CAAC;IAEhE,uFAAuF;IACvF,MAAM,gBAAgB,GAAG,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE,UAAU,CAAC;SAC5C,CAAC;KACH,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC;QAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;QAEnC,MAAM,IAAI,KAAK,CACb,oBAAoB,KAAK;UACrB,QAAQ,CAAC,MAAM;QACjB,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,IAAI,oBAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,wEAAwE;QACxE,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;gBACL,gBAAgB,EAAE,GAAG,CAAC,MAAM;aAC7B,CAAC;QACJ,CAAC;QACD,OAAO;YACL,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC7C,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBACnD,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC;gBAC9C,CAAC,CAAC,SAAS;YACb,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB;gBAC/C,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBAC5C,CAAC,CAAC,SAAS;YACb,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY;gBACnC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtC,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GACT,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,IAAI,eAAe,CAAC;IAC5E,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -59,7 +59,9 @@ async function waitForUserOpReceipt(args) {
|
|
|
59
59
|
*
|
|
60
60
|
* const userOp = await createUnsignedUserOp({
|
|
61
61
|
* transaction,
|
|
62
|
+
* factoryContract,
|
|
62
63
|
* accountContract,
|
|
64
|
+
* adminAddress,
|
|
63
65
|
* sponsorGas,
|
|
64
66
|
* overrides,
|
|
65
67
|
* });
|
|
@@ -202,7 +204,8 @@ async function createUnsignedUserOp(args) {
|
|
|
202
204
|
*
|
|
203
205
|
* const signedUserOp = await signUserOp({
|
|
204
206
|
* userOp,
|
|
205
|
-
*
|
|
207
|
+
* chain,
|
|
208
|
+
* adminAccount,
|
|
206
209
|
* });
|
|
207
210
|
* ```
|
|
208
211
|
* @walletUtils
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":";;AAmDA,oDAkBC;
|
|
1
|
+
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatUserOperationReceipt = formatUserOperationReceipt;
|
|
4
|
+
function formatUserOperationReceipt(userOpReceiptRaw) {
|
|
5
|
+
const { receipt: transactionReceipt } = userOpReceiptRaw;
|
|
6
|
+
const receipt = {
|
|
7
|
+
...transactionReceipt,
|
|
8
|
+
transactionHash: transactionReceipt.transactionHash,
|
|
9
|
+
blockNumber: transactionReceipt.blockNumber
|
|
10
|
+
? BigInt(transactionReceipt.blockNumber)
|
|
11
|
+
: null,
|
|
12
|
+
contractAddress: transactionReceipt.contractAddress
|
|
13
|
+
? transactionReceipt.contractAddress
|
|
14
|
+
: null,
|
|
15
|
+
cumulativeGasUsed: transactionReceipt.cumulativeGasUsed
|
|
16
|
+
? BigInt(transactionReceipt.cumulativeGasUsed)
|
|
17
|
+
: null,
|
|
18
|
+
effectiveGasPrice: transactionReceipt.effectiveGasPrice
|
|
19
|
+
? BigInt(transactionReceipt.effectiveGasPrice)
|
|
20
|
+
: null,
|
|
21
|
+
gasUsed: transactionReceipt.gasUsed
|
|
22
|
+
? BigInt(transactionReceipt.gasUsed)
|
|
23
|
+
: null,
|
|
24
|
+
logs: transactionReceipt.logs,
|
|
25
|
+
to: transactionReceipt.to ? transactionReceipt.to : null,
|
|
26
|
+
transactionIndex: transactionReceipt.transactionIndex,
|
|
27
|
+
status: transactionReceipt.status,
|
|
28
|
+
type: transactionReceipt.type,
|
|
29
|
+
};
|
|
30
|
+
if (transactionReceipt.blobGasPrice)
|
|
31
|
+
receipt.blobGasPrice = BigInt(transactionReceipt.blobGasPrice);
|
|
32
|
+
if (transactionReceipt.blobGasUsed)
|
|
33
|
+
receipt.blobGasUsed = BigInt(transactionReceipt.blobGasUsed);
|
|
34
|
+
const userOpReceipt = {
|
|
35
|
+
...userOpReceiptRaw,
|
|
36
|
+
receipt,
|
|
37
|
+
userOpHash: userOpReceiptRaw.userOpHash,
|
|
38
|
+
actualGasCost: BigInt(userOpReceiptRaw.actualGasCost),
|
|
39
|
+
actualGasUsed: BigInt(userOpReceiptRaw.actualGasUsed),
|
|
40
|
+
nonce: BigInt(userOpReceiptRaw.nonce),
|
|
41
|
+
};
|
|
42
|
+
return userOpReceipt;
|
|
43
|
+
}
|
|
3
44
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":";;AAwIA,gEA4CC;AA5CD,SAAgB,0BAA0B,CACxC,gBAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG;QACd,GAAG,kBAAkB;QACrB,eAAe,EAAE,kBAAkB,CAAC,eAAe;QACnD,WAAW,EAAE,kBAAkB,CAAC,WAAW;YACzC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACxC,CAAC,CAAC,IAAI;QACR,eAAe,EAAE,kBAAkB,CAAC,eAAe;YACjD,CAAC,CAAC,kBAAkB,CAAC,eAAe;YACpC,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACjC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,IAAI;QACR,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QACxD,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,MAAM,EAAE,kBAAkB,CAAC,MAAM;QACjC,IAAI,EAAE,kBAAkB,CAAC,IAAI;KACR,CAAC;IAExB,IAAI,kBAAkB,CAAC,YAAY;QACjC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,CAAC,WAAW;QAChC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG;QACpB,GAAG,gBAAgB;QACnB,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;KACd,CAAC;IAC1B,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { smartWallet } from "../../wallets/smart/smart-wallet.js";
|
|
2
2
|
export { waitForUserOpReceipt, createUnsignedUserOp, signUserOp, } from "../../wallets/smart/lib/userop.js";
|
|
3
|
-
export { getUserOpReceipt, bundleUserOp, getUserOpGasFees, estimateUserOpGas, } from "../../wallets/smart/lib/bundler.js";
|
|
3
|
+
export { getUserOpReceipt, getUserOpReceiptRaw, bundleUserOp, getUserOpGasFees, estimateUserOpGas, } from "../../wallets/smart/lib/bundler.js";
|
|
4
4
|
export { predictAddress } from "../../wallets/smart/lib/calls.js";
|
|
5
|
+
export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
|
|
5
6
|
export { ENTRYPOINT_ADDRESS_v0_6, DEFAULT_ACCOUNT_FACTORY, } from "../../wallets/smart/lib/constants.js";
|
|
6
7
|
//# sourceMappingURL=smart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAS3E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.35.0
|
|
1
|
+
export const version = "5.35.0";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { userOperationRevertReasonEvent } from "../../../extensions/erc4337/__ge
|
|
|
4
4
|
import { hexToBigInt } from "../../../utils/encoding/hex.js";
|
|
5
5
|
import { getClientFetch } from "../../../utils/fetch.js";
|
|
6
6
|
import { stringify } from "../../../utils/json.js";
|
|
7
|
+
import { formatUserOperationReceipt, } from "../types.js";
|
|
7
8
|
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, MANAGED_ACCOUNT_GAS_BUFFER, getDefaultBundlerUrl, } from "./constants.js";
|
|
8
9
|
import { hexlifyUserOp } from "./utils.js";
|
|
9
10
|
/**
|
|
@@ -105,11 +106,7 @@ export async function getUserOpGasFees(args) {
|
|
|
105
106
|
* @walletUtils
|
|
106
107
|
*/
|
|
107
108
|
export async function getUserOpReceipt(args) {
|
|
108
|
-
const res = await
|
|
109
|
-
options: args,
|
|
110
|
-
operation: "eth_getUserOperationReceipt",
|
|
111
|
-
params: [args.userOpHash],
|
|
112
|
-
});
|
|
109
|
+
const res = await getUserOpReceiptRaw(args);
|
|
113
110
|
if (!res) {
|
|
114
111
|
return undefined;
|
|
115
112
|
}
|
|
@@ -121,15 +118,42 @@ export async function getUserOpReceipt(args) {
|
|
|
121
118
|
});
|
|
122
119
|
const revertReason = logs[0]?.args?.revertReason;
|
|
123
120
|
if (!revertReason) {
|
|
124
|
-
throw new Error(`UserOp failed at txHash: ${res.transactionHash}`);
|
|
121
|
+
throw new Error(`UserOp failed at txHash: ${res.receipt.transactionHash}`);
|
|
125
122
|
}
|
|
126
123
|
const revertMsg = decodeErrorResult({
|
|
127
124
|
data: revertReason,
|
|
128
125
|
});
|
|
129
|
-
throw new Error(`UserOp failed with reason: '${revertMsg.args.join(",")}' at txHash: ${res.transactionHash}`);
|
|
126
|
+
throw new Error(`UserOp failed with reason: '${revertMsg.args.join(",")}' at txHash: ${res.receipt.transactionHash}`);
|
|
130
127
|
}
|
|
131
128
|
return res.receipt;
|
|
132
129
|
}
|
|
130
|
+
/**
|
|
131
|
+
* Get the receipt of a user operation.
|
|
132
|
+
* @param args - The options for getting the receipt of a user operation.
|
|
133
|
+
* @returns The raw receipt of the user operation.
|
|
134
|
+
* @example
|
|
135
|
+
* ```ts
|
|
136
|
+
* import { getUserOpReceiptRaw } from "thirdweb/wallets/smart";
|
|
137
|
+
*
|
|
138
|
+
* const receipt = await getUserOpReceiptRaw({
|
|
139
|
+
* client,
|
|
140
|
+
* chain,
|
|
141
|
+
* userOpHash,
|
|
142
|
+
* });
|
|
143
|
+
* ```
|
|
144
|
+
* @walletUtils
|
|
145
|
+
*/
|
|
146
|
+
export async function getUserOpReceiptRaw(args) {
|
|
147
|
+
const res = await sendBundlerRequest({
|
|
148
|
+
options: args,
|
|
149
|
+
operation: "eth_getUserOperationReceipt",
|
|
150
|
+
params: [args.userOpHash],
|
|
151
|
+
});
|
|
152
|
+
if (!res) {
|
|
153
|
+
return undefined;
|
|
154
|
+
}
|
|
155
|
+
return formatUserOperationReceipt(res);
|
|
156
|
+
}
|
|
133
157
|
/**
|
|
134
158
|
* @internal
|
|
135
159
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAE,MAAM,2FAA2F,CAAC;AAE3I,OAAO,EAAY,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,22 @@ import { getClientFetch } from "../../../utils/fetch.js";
|
|
|
3
3
|
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, getDefaultPaymasterUrl, } from "./constants.js";
|
|
4
4
|
import { hexlifyUserOp } from "./utils.js";
|
|
5
5
|
/**
|
|
6
|
-
*
|
|
7
|
-
* @
|
|
6
|
+
* Get paymaster and data details for a user operation.
|
|
7
|
+
* @param args - The userOp and options
|
|
8
|
+
* @returns - The paymaster and data details for the user operation.
|
|
9
|
+
* @example
|
|
10
|
+
* ```ts
|
|
11
|
+
* import { getPaymasterAndData } from "thirdweb/wallets/smart";
|
|
12
|
+
*
|
|
13
|
+
* const userOp = createUnsignedUserOp(...);
|
|
14
|
+
*
|
|
15
|
+
* const paymasterAndData = await getPaymasterAndData({
|
|
16
|
+
* userOp,
|
|
17
|
+
* client,
|
|
18
|
+
* chain,
|
|
19
|
+
* });
|
|
20
|
+
* ```
|
|
21
|
+
* @walletUtils
|
|
8
22
|
*/
|
|
9
23
|
export async function getPaymasterAndData(args) {
|
|
10
24
|
const { userOp, paymasterOverride, client, chain, entrypointAddress } = args;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,KAAK,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C
|
|
1
|
+
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EACL,KAAK,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAMzC;IACC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAE7E,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IAEF,MAAM,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,iBAAiB,IAAI,uBAAuB,CAAC;IAEhE,uFAAuF;IACvF,MAAM,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;SAC5C,CAAC;KACH,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC;QAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;QAEnC,MAAM,IAAI,KAAK,CACb,oBAAoB,KAAK;UACrB,QAAQ,CAAC,MAAM;QACjB,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,wEAAwE;QACxE,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;gBACL,gBAAgB,EAAE,GAAG,CAAC,MAAM;aAC7B,CAAC;QACJ,CAAC;QACD,OAAO;YACL,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC7C,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBACnD,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC;gBAC9C,CAAC,CAAC,SAAS;YACb,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB;gBAC/C,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBAC5C,CAAC,CAAC,SAAS;YACb,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY;gBACnC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtC,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GACT,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,IAAI,eAAe,CAAC;IAC5E,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -54,7 +54,9 @@ export async function waitForUserOpReceipt(args) {
|
|
|
54
54
|
*
|
|
55
55
|
* const userOp = await createUnsignedUserOp({
|
|
56
56
|
* transaction,
|
|
57
|
+
* factoryContract,
|
|
57
58
|
* accountContract,
|
|
59
|
+
* adminAddress,
|
|
58
60
|
* sponsorGas,
|
|
59
61
|
* overrides,
|
|
60
62
|
* });
|
|
@@ -197,7 +199,8 @@ export async function createUnsignedUserOp(args) {
|
|
|
197
199
|
*
|
|
198
200
|
* const signedUserOp = await signUserOp({
|
|
199
201
|
* userOp,
|
|
200
|
-
*
|
|
202
|
+
* chain,
|
|
203
|
+
* adminAccount,
|
|
201
204
|
* });
|
|
202
205
|
* ```
|
|
203
206
|
* @walletUtils
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAG9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AAGhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAOxF,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAIC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC,QAAQ;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,KAAK;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IACrC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC5D,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,41 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export function formatUserOperationReceipt(userOpReceiptRaw) {
|
|
2
|
+
const { receipt: transactionReceipt } = userOpReceiptRaw;
|
|
3
|
+
const receipt = {
|
|
4
|
+
...transactionReceipt,
|
|
5
|
+
transactionHash: transactionReceipt.transactionHash,
|
|
6
|
+
blockNumber: transactionReceipt.blockNumber
|
|
7
|
+
? BigInt(transactionReceipt.blockNumber)
|
|
8
|
+
: null,
|
|
9
|
+
contractAddress: transactionReceipt.contractAddress
|
|
10
|
+
? transactionReceipt.contractAddress
|
|
11
|
+
: null,
|
|
12
|
+
cumulativeGasUsed: transactionReceipt.cumulativeGasUsed
|
|
13
|
+
? BigInt(transactionReceipt.cumulativeGasUsed)
|
|
14
|
+
: null,
|
|
15
|
+
effectiveGasPrice: transactionReceipt.effectiveGasPrice
|
|
16
|
+
? BigInt(transactionReceipt.effectiveGasPrice)
|
|
17
|
+
: null,
|
|
18
|
+
gasUsed: transactionReceipt.gasUsed
|
|
19
|
+
? BigInt(transactionReceipt.gasUsed)
|
|
20
|
+
: null,
|
|
21
|
+
logs: transactionReceipt.logs,
|
|
22
|
+
to: transactionReceipt.to ? transactionReceipt.to : null,
|
|
23
|
+
transactionIndex: transactionReceipt.transactionIndex,
|
|
24
|
+
status: transactionReceipt.status,
|
|
25
|
+
type: transactionReceipt.type,
|
|
26
|
+
};
|
|
27
|
+
if (transactionReceipt.blobGasPrice)
|
|
28
|
+
receipt.blobGasPrice = BigInt(transactionReceipt.blobGasPrice);
|
|
29
|
+
if (transactionReceipt.blobGasUsed)
|
|
30
|
+
receipt.blobGasUsed = BigInt(transactionReceipt.blobGasUsed);
|
|
31
|
+
const userOpReceipt = {
|
|
32
|
+
...userOpReceiptRaw,
|
|
33
|
+
receipt,
|
|
34
|
+
userOpHash: userOpReceiptRaw.userOpHash,
|
|
35
|
+
actualGasCost: BigInt(userOpReceiptRaw.actualGasCost),
|
|
36
|
+
actualGasUsed: BigInt(userOpReceiptRaw.actualGasUsed),
|
|
37
|
+
nonce: BigInt(userOpReceiptRaw.nonce),
|
|
38
|
+
};
|
|
39
|
+
return userOpReceipt;
|
|
40
|
+
}
|
|
2
41
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":"AAwIA,MAAM,UAAU,0BAA0B,CACxC,gBAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG;QACd,GAAG,kBAAkB;QACrB,eAAe,EAAE,kBAAkB,CAAC,eAAe;QACnD,WAAW,EAAE,kBAAkB,CAAC,WAAW;YACzC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACxC,CAAC,CAAC,IAAI;QACR,eAAe,EAAE,kBAAkB,CAAC,eAAe;YACjD,CAAC,CAAC,kBAAkB,CAAC,eAAe;YACpC,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACjC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,IAAI;QACR,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QACxD,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,MAAM,EAAE,kBAAkB,CAAC,MAAM;QACjC,IAAI,EAAE,kBAAkB,CAAC,IAAI;KACR,CAAC;IAExB,IAAI,kBAAkB,CAAC,YAAY;QACjC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,CAAC,WAAW;QAChC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG;QACpB,GAAG,gBAAgB;QACnB,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;KACd,CAAC;IAC1B,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export { smartWallet } from "../../wallets/smart/smart-wallet.js";
|
|
2
2
|
export { waitForUserOpReceipt, createUnsignedUserOp, signUserOp, } from "../../wallets/smart/lib/userop.js";
|
|
3
|
-
export { getUserOpReceipt, bundleUserOp, getUserOpGasFees, estimateUserOpGas, } from "../../wallets/smart/lib/bundler.js";
|
|
3
|
+
export { getUserOpReceipt, getUserOpReceiptRaw, bundleUserOp, getUserOpGasFees, estimateUserOpGas, } from "../../wallets/smart/lib/bundler.js";
|
|
4
4
|
export { predictAddress } from "../../wallets/smart/lib/calls.js";
|
|
5
|
+
export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
|
|
5
6
|
export type { SmartWalletConnectionOptions, SmartWalletOptions, UserOperation, PaymasterResult, } from "../../wallets/smart/types.js";
|
|
6
7
|
export { ENTRYPOINT_ADDRESS_v0_6, DEFAULT_ACCOUNT_FACTORY, } from "../../wallets/smart/lib/constants.js";
|
|
7
8
|
//# sourceMappingURL=smart.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smart.d.ts","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,YAAY,EACV,4BAA4B,EAC5B,kBAAkB,EAClB,aAAa,EACb,eAAe,GAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC"}
|
|
1
|
+
{"version":3,"file":"smart.d.ts","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,YAAY,EACV,4BAA4B,EAC5B,kBAAkB,EAClB,aAAa,EACb,eAAe,GAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.35.0
|
|
1
|
+
export declare const version = "5.35.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type TransactionSerializable } from "viem";
|
|
2
2
|
import type { TransactionReceipt } from "../../../transaction/types.js";
|
|
3
3
|
import { type Hex } from "../../../utils/encoding/hex.js";
|
|
4
|
-
import type
|
|
4
|
+
import { type BundlerOptions, type EstimationResult, type GasPriceResult, type PmTransactionData, type UserOperation, type UserOperationReceipt } from "../types.js";
|
|
5
5
|
/**
|
|
6
6
|
* Bundle a user operation.
|
|
7
7
|
* @param args - The options for bundling a user operation.
|
|
@@ -76,6 +76,25 @@ export declare function getUserOpGasFees(args: {
|
|
|
76
76
|
export declare function getUserOpReceipt(args: BundlerOptions & {
|
|
77
77
|
userOpHash: Hex;
|
|
78
78
|
}): Promise<TransactionReceipt | undefined>;
|
|
79
|
+
/**
|
|
80
|
+
* Get the receipt of a user operation.
|
|
81
|
+
* @param args - The options for getting the receipt of a user operation.
|
|
82
|
+
* @returns The raw receipt of the user operation.
|
|
83
|
+
* @example
|
|
84
|
+
* ```ts
|
|
85
|
+
* import { getUserOpReceiptRaw } from "thirdweb/wallets/smart";
|
|
86
|
+
*
|
|
87
|
+
* const receipt = await getUserOpReceiptRaw({
|
|
88
|
+
* client,
|
|
89
|
+
* chain,
|
|
90
|
+
* userOpHash,
|
|
91
|
+
* });
|
|
92
|
+
* ```
|
|
93
|
+
* @walletUtils
|
|
94
|
+
*/
|
|
95
|
+
export declare function getUserOpReceiptRaw(args: BundlerOptions & {
|
|
96
|
+
userOpHash: Hex;
|
|
97
|
+
}): Promise<UserOperationReceipt | undefined>;
|
|
79
98
|
/**
|
|
80
99
|
* @internal
|
|
81
100
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAqB,MAAM,MAAM,CAAC;AAGvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,gCAAgC,CAAC;AAGvE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAqB,MAAM,MAAM,CAAC;AAGvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAE1B,MAAM,aAAa,CAAC;AASrB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,GAAG,CAAC,CASf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB5B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,cAAc,CAAC,CAW1B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA6BzC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAU3C;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAW7B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,GAAG,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,GAAG,CAAA;CAAE,CAAC,CAepC"}
|
|
@@ -2,8 +2,22 @@ import type { Chain } from "../../../chains/types.js";
|
|
|
2
2
|
import type { ThirdwebClient } from "../../../client/client.js";
|
|
3
3
|
import type { PaymasterResult, UserOperation } from "../types.js";
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
6
|
-
* @
|
|
5
|
+
* Get paymaster and data details for a user operation.
|
|
6
|
+
* @param args - The userOp and options
|
|
7
|
+
* @returns - The paymaster and data details for the user operation.
|
|
8
|
+
* @example
|
|
9
|
+
* ```ts
|
|
10
|
+
* import { getPaymasterAndData } from "thirdweb/wallets/smart";
|
|
11
|
+
*
|
|
12
|
+
* const userOp = createUnsignedUserOp(...);
|
|
13
|
+
*
|
|
14
|
+
* const paymasterAndData = await getPaymasterAndData({
|
|
15
|
+
* userOp,
|
|
16
|
+
* client,
|
|
17
|
+
* chain,
|
|
18
|
+
* });
|
|
19
|
+
* ```
|
|
20
|
+
* @walletUtils
|
|
7
21
|
*/
|
|
8
22
|
export declare function getPaymasterAndData(args: {
|
|
9
23
|
userOp: UserOperation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQlE
|
|
1
|
+
{"version":3,"file":"paymaster.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGhE,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQlE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;CACzE,GAAG,OAAO,CAAC,eAAe,CAAC,CAkE3B"}
|
|
@@ -39,7 +39,9 @@ export declare function waitForUserOpReceipt(args: BundlerOptions & {
|
|
|
39
39
|
*
|
|
40
40
|
* const userOp = await createUnsignedUserOp({
|
|
41
41
|
* transaction,
|
|
42
|
+
* factoryContract,
|
|
42
43
|
* accountContract,
|
|
44
|
+
* adminAddress,
|
|
43
45
|
* sponsorGas,
|
|
44
46
|
* overrides,
|
|
45
47
|
* });
|
|
@@ -66,7 +68,8 @@ export declare function createUnsignedUserOp(args: {
|
|
|
66
68
|
*
|
|
67
69
|
* const signedUserOp = await signUserOp({
|
|
68
70
|
* userOp,
|
|
69
|
-
*
|
|
71
|
+
* chain,
|
|
72
|
+
* adminAccount,
|
|
70
73
|
* });
|
|
71
74
|
* ```
|
|
72
75
|
* @walletUtils
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAK1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,aAAa,EACd,MAAM,aAAa,CAAC;AAerB;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED
|
|
1
|
+
{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAK1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,aAAa,EACd,MAAM,aAAa,CAAC;AAerB;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;CAC7C,GAAG,OAAO,CAAC,aAAa,CAAC,CAyIzB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,aAAa,CAAC,CAmBzB"}
|
|
@@ -3,6 +3,7 @@ import type { Chain } from "../../chains/types.js";
|
|
|
3
3
|
import type { ThirdwebClient } from "../../client/client.js";
|
|
4
4
|
import type { ThirdwebContract } from "../../contract/contract.js";
|
|
5
5
|
import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
|
|
6
|
+
import type { TransactionReceipt } from "../../transaction/types.js";
|
|
6
7
|
import type { Hex } from "../../utils/encoding/hex.js";
|
|
7
8
|
import type { Prettify } from "../../utils/type-utils.js";
|
|
8
9
|
import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
|
|
@@ -93,4 +94,17 @@ export type PmTransactionData = {
|
|
|
93
94
|
paymaster: Address;
|
|
94
95
|
paymasterInput: Hex;
|
|
95
96
|
};
|
|
97
|
+
export type UserOperationReceipt = {
|
|
98
|
+
receipt: TransactionReceipt;
|
|
99
|
+
logs: TransactionReceipt["logs"];
|
|
100
|
+
userOpHash: Hex;
|
|
101
|
+
entryPoint: Address;
|
|
102
|
+
sender: Address;
|
|
103
|
+
nonce: bigint;
|
|
104
|
+
paymaster: Address;
|
|
105
|
+
actualGasUsed: bigint;
|
|
106
|
+
actualGasCost: bigint;
|
|
107
|
+
success: boolean;
|
|
108
|
+
};
|
|
109
|
+
export declare function formatUserOperationReceipt(userOpReceiptRaw: UserOperationReceipt): UserOperationReceipt;
|
|
96
110
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,6 +8,7 @@ export {
|
|
|
8
8
|
|
|
9
9
|
export {
|
|
10
10
|
getUserOpReceipt,
|
|
11
|
+
getUserOpReceiptRaw,
|
|
11
12
|
bundleUserOp,
|
|
12
13
|
getUserOpGasFees,
|
|
13
14
|
estimateUserOpGas,
|
|
@@ -15,6 +16,8 @@ export {
|
|
|
15
16
|
|
|
16
17
|
export { predictAddress } from "../../wallets/smart/lib/calls.js";
|
|
17
18
|
|
|
19
|
+
export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
|
|
20
|
+
|
|
18
21
|
export type {
|
|
19
22
|
SmartWalletConnectionOptions,
|
|
20
23
|
SmartWalletOptions,
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.35.0
|
|
1
|
+
export const version = "5.35.0";
|
|
@@ -5,12 +5,14 @@ import type { TransactionReceipt } from "../../../transaction/types.js";
|
|
|
5
5
|
import { type Hex, hexToBigInt } from "../../../utils/encoding/hex.js";
|
|
6
6
|
import { getClientFetch } from "../../../utils/fetch.js";
|
|
7
7
|
import { stringify } from "../../../utils/json.js";
|
|
8
|
-
import
|
|
9
|
-
BundlerOptions,
|
|
10
|
-
EstimationResult,
|
|
11
|
-
GasPriceResult,
|
|
12
|
-
PmTransactionData,
|
|
13
|
-
UserOperation,
|
|
8
|
+
import {
|
|
9
|
+
type BundlerOptions,
|
|
10
|
+
type EstimationResult,
|
|
11
|
+
type GasPriceResult,
|
|
12
|
+
type PmTransactionData,
|
|
13
|
+
type UserOperation,
|
|
14
|
+
type UserOperationReceipt,
|
|
15
|
+
formatUserOperationReceipt,
|
|
14
16
|
} from "../types.js";
|
|
15
17
|
import {
|
|
16
18
|
DEBUG,
|
|
@@ -136,14 +138,12 @@ export async function getUserOpReceipt(
|
|
|
136
138
|
userOpHash: Hex;
|
|
137
139
|
},
|
|
138
140
|
): Promise<TransactionReceipt | undefined> {
|
|
139
|
-
const res = await
|
|
140
|
-
|
|
141
|
-
operation: "eth_getUserOperationReceipt",
|
|
142
|
-
params: [args.userOpHash],
|
|
143
|
-
});
|
|
141
|
+
const res = await getUserOpReceiptRaw(args);
|
|
142
|
+
|
|
144
143
|
if (!res) {
|
|
145
144
|
return undefined;
|
|
146
145
|
}
|
|
146
|
+
|
|
147
147
|
if (res.success === false) {
|
|
148
148
|
// parse revert reason
|
|
149
149
|
const logs = parseEventLogs({
|
|
@@ -152,20 +152,54 @@ export async function getUserOpReceipt(
|
|
|
152
152
|
});
|
|
153
153
|
const revertReason = logs[0]?.args?.revertReason;
|
|
154
154
|
if (!revertReason) {
|
|
155
|
-
throw new Error(
|
|
155
|
+
throw new Error(
|
|
156
|
+
`UserOp failed at txHash: ${res.receipt.transactionHash}`,
|
|
157
|
+
);
|
|
156
158
|
}
|
|
157
159
|
const revertMsg = decodeErrorResult({
|
|
158
160
|
data: revertReason,
|
|
159
161
|
});
|
|
160
162
|
throw new Error(
|
|
161
163
|
`UserOp failed with reason: '${revertMsg.args.join(",")}' at txHash: ${
|
|
162
|
-
res.transactionHash
|
|
164
|
+
res.receipt.transactionHash
|
|
163
165
|
}`,
|
|
164
166
|
);
|
|
165
167
|
}
|
|
166
168
|
return res.receipt;
|
|
167
169
|
}
|
|
168
170
|
|
|
171
|
+
/**
|
|
172
|
+
* Get the receipt of a user operation.
|
|
173
|
+
* @param args - The options for getting the receipt of a user operation.
|
|
174
|
+
* @returns The raw receipt of the user operation.
|
|
175
|
+
* @example
|
|
176
|
+
* ```ts
|
|
177
|
+
* import { getUserOpReceiptRaw } from "thirdweb/wallets/smart";
|
|
178
|
+
*
|
|
179
|
+
* const receipt = await getUserOpReceiptRaw({
|
|
180
|
+
* client,
|
|
181
|
+
* chain,
|
|
182
|
+
* userOpHash,
|
|
183
|
+
* });
|
|
184
|
+
* ```
|
|
185
|
+
* @walletUtils
|
|
186
|
+
*/
|
|
187
|
+
export async function getUserOpReceiptRaw(
|
|
188
|
+
args: BundlerOptions & {
|
|
189
|
+
userOpHash: Hex;
|
|
190
|
+
},
|
|
191
|
+
): Promise<UserOperationReceipt | undefined> {
|
|
192
|
+
const res = await sendBundlerRequest({
|
|
193
|
+
options: args,
|
|
194
|
+
operation: "eth_getUserOperationReceipt",
|
|
195
|
+
params: [args.userOpHash],
|
|
196
|
+
});
|
|
197
|
+
if (!res) {
|
|
198
|
+
return undefined;
|
|
199
|
+
}
|
|
200
|
+
return formatUserOperationReceipt(res as UserOperationReceipt);
|
|
201
|
+
}
|
|
202
|
+
|
|
169
203
|
/**
|
|
170
204
|
* @internal
|
|
171
205
|
*/
|
|
@@ -11,8 +11,22 @@ import {
|
|
|
11
11
|
import { hexlifyUserOp } from "./utils.js";
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
|
-
*
|
|
15
|
-
* @
|
|
14
|
+
* Get paymaster and data details for a user operation.
|
|
15
|
+
* @param args - The userOp and options
|
|
16
|
+
* @returns - The paymaster and data details for the user operation.
|
|
17
|
+
* @example
|
|
18
|
+
* ```ts
|
|
19
|
+
* import { getPaymasterAndData } from "thirdweb/wallets/smart";
|
|
20
|
+
*
|
|
21
|
+
* const userOp = createUnsignedUserOp(...);
|
|
22
|
+
*
|
|
23
|
+
* const paymasterAndData = await getPaymasterAndData({
|
|
24
|
+
* userOp,
|
|
25
|
+
* client,
|
|
26
|
+
* chain,
|
|
27
|
+
* });
|
|
28
|
+
* ```
|
|
29
|
+
* @walletUtils
|
|
16
30
|
*/
|
|
17
31
|
export async function getPaymasterAndData(args: {
|
|
18
32
|
userOp: UserOperation;
|
|
@@ -81,7 +81,9 @@ export async function waitForUserOpReceipt(
|
|
|
81
81
|
*
|
|
82
82
|
* const userOp = await createUnsignedUserOp({
|
|
83
83
|
* transaction,
|
|
84
|
+
* factoryContract,
|
|
84
85
|
* accountContract,
|
|
86
|
+
* adminAddress,
|
|
85
87
|
* sponsorGas,
|
|
86
88
|
* overrides,
|
|
87
89
|
* });
|
|
@@ -246,7 +248,8 @@ export async function createUnsignedUserOp(args: {
|
|
|
246
248
|
*
|
|
247
249
|
* const signedUserOp = await signUserOp({
|
|
248
250
|
* userOp,
|
|
249
|
-
*
|
|
251
|
+
* chain,
|
|
252
|
+
* adminAccount,
|
|
250
253
|
* });
|
|
251
254
|
* ```
|
|
252
255
|
* @walletUtils
|
|
@@ -3,6 +3,7 @@ import type { Chain } from "../../chains/types.js";
|
|
|
3
3
|
import type { ThirdwebClient } from "../../client/client.js";
|
|
4
4
|
import type { ThirdwebContract } from "../../contract/contract.js";
|
|
5
5
|
import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
|
|
6
|
+
import type { TransactionReceipt } from "../../transaction/types.js";
|
|
6
7
|
import type { Hex } from "../../utils/encoding/hex.js";
|
|
7
8
|
import type { Prettify } from "../../utils/type-utils.js";
|
|
8
9
|
import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
|
|
@@ -119,3 +120,62 @@ export type PmTransactionData = {
|
|
|
119
120
|
paymaster: Address;
|
|
120
121
|
paymasterInput: Hex;
|
|
121
122
|
};
|
|
123
|
+
|
|
124
|
+
export type UserOperationReceipt = {
|
|
125
|
+
receipt: TransactionReceipt;
|
|
126
|
+
logs: TransactionReceipt["logs"];
|
|
127
|
+
userOpHash: Hex;
|
|
128
|
+
entryPoint: Address;
|
|
129
|
+
sender: Address;
|
|
130
|
+
nonce: bigint;
|
|
131
|
+
paymaster: Address;
|
|
132
|
+
actualGasUsed: bigint;
|
|
133
|
+
actualGasCost: bigint;
|
|
134
|
+
success: boolean;
|
|
135
|
+
};
|
|
136
|
+
|
|
137
|
+
export function formatUserOperationReceipt(
|
|
138
|
+
userOpReceiptRaw: UserOperationReceipt,
|
|
139
|
+
) {
|
|
140
|
+
const { receipt: transactionReceipt } = userOpReceiptRaw;
|
|
141
|
+
|
|
142
|
+
const receipt = {
|
|
143
|
+
...transactionReceipt,
|
|
144
|
+
transactionHash: transactionReceipt.transactionHash,
|
|
145
|
+
blockNumber: transactionReceipt.blockNumber
|
|
146
|
+
? BigInt(transactionReceipt.blockNumber)
|
|
147
|
+
: null,
|
|
148
|
+
contractAddress: transactionReceipt.contractAddress
|
|
149
|
+
? transactionReceipt.contractAddress
|
|
150
|
+
: null,
|
|
151
|
+
cumulativeGasUsed: transactionReceipt.cumulativeGasUsed
|
|
152
|
+
? BigInt(transactionReceipt.cumulativeGasUsed)
|
|
153
|
+
: null,
|
|
154
|
+
effectiveGasPrice: transactionReceipt.effectiveGasPrice
|
|
155
|
+
? BigInt(transactionReceipt.effectiveGasPrice)
|
|
156
|
+
: null,
|
|
157
|
+
gasUsed: transactionReceipt.gasUsed
|
|
158
|
+
? BigInt(transactionReceipt.gasUsed)
|
|
159
|
+
: null,
|
|
160
|
+
logs: transactionReceipt.logs,
|
|
161
|
+
to: transactionReceipt.to ? transactionReceipt.to : null,
|
|
162
|
+
transactionIndex: transactionReceipt.transactionIndex,
|
|
163
|
+
status: transactionReceipt.status,
|
|
164
|
+
type: transactionReceipt.type,
|
|
165
|
+
} as TransactionReceipt;
|
|
166
|
+
|
|
167
|
+
if (transactionReceipt.blobGasPrice)
|
|
168
|
+
receipt.blobGasPrice = BigInt(transactionReceipt.blobGasPrice);
|
|
169
|
+
if (transactionReceipt.blobGasUsed)
|
|
170
|
+
receipt.blobGasUsed = BigInt(transactionReceipt.blobGasUsed);
|
|
171
|
+
|
|
172
|
+
const userOpReceipt = {
|
|
173
|
+
...userOpReceiptRaw,
|
|
174
|
+
receipt,
|
|
175
|
+
userOpHash: userOpReceiptRaw.userOpHash,
|
|
176
|
+
actualGasCost: BigInt(userOpReceiptRaw.actualGasCost),
|
|
177
|
+
actualGasUsed: BigInt(userOpReceiptRaw.actualGasUsed),
|
|
178
|
+
nonce: BigInt(userOpReceiptRaw.nonce),
|
|
179
|
+
} as UserOperationReceipt;
|
|
180
|
+
return userOpReceipt;
|
|
181
|
+
}
|