@zerodev/sdk 5.2.12-alpha-3 → 5.2.13
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/_cjs/clients/kernelAccountClient.js +3 -2
- package/_cjs/clients/kernelAccountClient.js.map +1 -1
- package/_cjs/clients/paymasterClient.js +2 -1
- package/_cjs/clients/paymasterClient.js.map +1 -1
- package/_cjs/clients/utils.js +5 -5
- package/_cjs/clients/utils.js.map +1 -1
- package/_cjs/index.js +2 -2
- package/_cjs/index.js.map +1 -1
- package/_esm/clients/kernelAccountClient.js +4 -3
- package/_esm/clients/kernelAccountClient.js.map +1 -1
- package/_esm/clients/paymasterClient.js +3 -2
- package/_esm/clients/paymasterClient.js.map +1 -1
- package/_esm/clients/utils.js +3 -3
- package/_esm/clients/utils.js.map +1 -1
- package/_esm/index.js +1 -1
- package/_esm/index.js.map +1 -1
- package/_types/clients/kernelAccountClient.d.ts.map +1 -1
- package/_types/clients/paymasterClient.d.ts.map +1 -1
- package/_types/clients/utils.d.ts +1 -1
- package/_types/clients/utils.d.ts.map +1 -1
- package/_types/index.d.ts +1 -1
- package/_types/index.d.ts.map +1 -1
- package/clients/kernelAccountClient.ts +7 -3
- package/clients/paymasterClient.ts +6 -2
- package/clients/utils.ts +3 -3
- package/index.ts +1 -1
- package/package.json +1 -1
|
@@ -20,7 +20,8 @@ const createKernelAccountClient = (parameters) => {
|
|
|
20
20
|
...opts,
|
|
21
21
|
retryCount: 0
|
|
22
22
|
});
|
|
23
|
-
if (!shouldIncludePimlicoProvider
|
|
23
|
+
if (!shouldIncludePimlicoProvider ||
|
|
24
|
+
(0, utils_js_1.isProviderSet)(_bundlerTransport.value?.url, "ALCHEMY"))
|
|
24
25
|
return _bundlerTransport;
|
|
25
26
|
_bundlerTransport = (0, viem_1.http)((0, utils_js_1.setPimlicoAsProvider)(_bundlerTransport.value?.url))({ ...opts, retryCount: 0 });
|
|
26
27
|
return _bundlerTransport;
|
|
@@ -31,7 +32,7 @@ const createKernelAccountClient = (parameters) => {
|
|
|
31
32
|
if ((!middleware ||
|
|
32
33
|
(typeof middleware !== "function" && !middleware.gasPrice)) &&
|
|
33
34
|
client.transport?.url &&
|
|
34
|
-
(0, utils_js_1.
|
|
35
|
+
(0, utils_js_1.isProviderSet)(client.transport.url, "PIMLICO")) {
|
|
35
36
|
const gasPrice = () => (0, getUserOperationGasPrice_js_1.getUserOperationGasPrice)(client);
|
|
36
37
|
middleware = {
|
|
37
38
|
...middleware,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAKrD,+BAOa;AAEb,uGAAgG;AAChG,sDAG+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAKrD,+BAOa;AAEb,uGAAgG;AAChG,sDAG+B;AAC/B,yCAAgE;AAoCzD,MAAM,yBAAyB,GAAG,CAUrC,UAKC,EACkE,EAAE;IACrE,MAAM,EACF,GAAG,GAAG,SAAS,EACf,IAAI,GAAG,uBAAuB,EAC9B,gBAAgB,EAChB,UAAU,EACb,GAAG,UAAU,CAAA;IACd,MAAM,iBAAiB,GAAG,IAAA,qCAAoB,EAAC,UAAU,CAAC,CAAA;IAC1D,MAAM,4BAA4B,GAC9B,gBAAgB,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM;QAC1C,iBAAiB,KAAK,MAAM,CAAA;IAEhC,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC;QACxB,GAAG,UAAU;QACb,GAAG;QACH,IAAI;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,iBAAiB,GAAG,gBAAgB,CAAC;gBACrC,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,IACI,CAAC,4BAA4B;gBAC7B,IAAA,wBAAa,EAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC;gBAEtD,OAAO,iBAAiB,CAAA;YAC5B,iBAAiB,GAAG,IAAA,WAAI,EACpB,IAAA,+BAAoB,EAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CACrD,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAA;YAC7B,OAAO,iBAAiB,CAAA;QAC5B,CAAC;QACD,IAAI,EAAE,qBAAqB;KAC9B,CAAC,CAAA;IAEF,IAAI,UAAU,GAAG,UAAU,CAAC,UAAU,CAAA;IACtC,IACI,CAAC,CAAC,UAAU;QACR,CAAC,OAAO,UAAU,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,CAAC,SAAS,EAAE,GAAG;QACrB,IAAA,wBAAa,EAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,EAChD,CAAC;QACC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAA,sDAAwB,EAAC,MAAM,CAAC,CAAA;QACvD,UAAU,GAAG;YACT,GAAG,UAAU;YACb,QAAQ;SACX,CAAA;IACL,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAChB,IAAA,sCAA0B,EAAC;QACvB,UAAU;KACb,CAAC,CACkE,CAAA;AAC5E,CAAC,CAAA;AApEY,QAAA,yBAAyB,6BAoErC"}
|
|
@@ -16,7 +16,8 @@ const createZeroDevPaymasterClient = (parameters) => {
|
|
|
16
16
|
...opts,
|
|
17
17
|
retryCount: 0
|
|
18
18
|
});
|
|
19
|
-
if (!shouldIncludePimlicoProvider
|
|
19
|
+
if (!shouldIncludePimlicoProvider ||
|
|
20
|
+
(0, utils_js_1.isProviderSet)(_transport.value?.url, "ALCHEMY"))
|
|
20
21
|
return _transport;
|
|
21
22
|
_transport = (0, viem_1.http)((0, utils_js_1.setPimlicoAsProvider)(_transport.value?.url))({
|
|
22
23
|
...opts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymasterClient.js","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAErD,+BAQa;AAEb,sDAG+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"paymasterClient.js","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAErD,+BAQa;AAEb,sDAG+B;AAC/B,yCAAgE;AA0BzD,MAAM,4BAA4B,GAAG,CAKxC,UAEC,EACiC,EAAE;IACpC,MAAM,EACF,GAAG,GAAG,QAAQ,EACd,IAAI,GAAG,0BAA0B,EACjC,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EACZ,GAAG,UAAU,CAAA;IACd,MAAM,iBAAiB,GAAG,IAAA,qCAAoB,EAAC,iBAAiB,CAAC,CAAA;IACjE,MAAM,4BAA4B,GAC9B,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM,IAAI,iBAAiB,KAAK,MAAM,CAAA;IACvE,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC;QACxB,GAAG,UAAU;QACb,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,UAAU,GAAG,SAAS,CAAC;gBACvB,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,IACI,CAAC,4BAA4B;gBAC7B,IAAA,wBAAa,EAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC;gBAE/C,OAAO,UAAU,CAAA;YACrB,UAAU,GAAG,IAAA,WAAI,EAAC,IAAA,+BAAoB,EAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3D,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,OAAO,UAAU,CAAA;QACrB,CAAC;QACD,GAAG;QACH,IAAI;QACJ,IAAI,EAAE,wBAAwB;KACjC,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAA,mCAAuB,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;AACxE,CAAC,CAAA;AAzCY,QAAA,4BAA4B,gCAyCxC"}
|
package/_cjs/clients/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isProviderSet = exports.setPimlicoAsProvider = void 0;
|
|
4
4
|
const setPimlicoAsProvider = (urlString) => {
|
|
5
5
|
const url = new URL(urlString);
|
|
6
6
|
const params = url.searchParams;
|
|
@@ -17,15 +17,15 @@ const setPimlicoAsProvider = (urlString) => {
|
|
|
17
17
|
return url.toString();
|
|
18
18
|
};
|
|
19
19
|
exports.setPimlicoAsProvider = setPimlicoAsProvider;
|
|
20
|
-
const
|
|
20
|
+
const isProviderSet = (urlString, provider) => {
|
|
21
21
|
const url = new URL(urlString);
|
|
22
22
|
const params = url.searchParams;
|
|
23
|
-
const
|
|
23
|
+
const _provider = params.get("provider") ??
|
|
24
24
|
params.get("bundlerProvider") ??
|
|
25
25
|
params.get("paymasterProvider");
|
|
26
|
-
if (
|
|
26
|
+
if (_provider === provider)
|
|
27
27
|
return true;
|
|
28
28
|
return false;
|
|
29
29
|
};
|
|
30
|
-
exports.
|
|
30
|
+
exports.isProviderSet = isProviderSet;
|
|
31
31
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAE/B,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,IAAI,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACzB,CAAC,CAAA;AAhBY,QAAA,oBAAoB,wBAgBhC;AAEM,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAE/B,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,IAAI,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACzB,CAAC,CAAA;AAhBY,QAAA,oBAAoB,wBAgBhC;AAEM,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAW,EAAE;IAC1E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAC/B,MAAM,SAAS,GACX,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IACnC,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IACvC,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
|
package/_cjs/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getUserOperationGasPrice = exports.
|
|
3
|
+
exports.getUserOperationGasPrice = exports.isProviderSet = exports.getEncodedPluginsData = exports.KernelEIP1193Provider = exports.getCustomNonceKeyFromString = exports.verifyEIP6492Signature = exports.gasTokenAddresses = exports.constants = exports.TokenActionsAbi = exports.KernelFactoryStakerAbi = exports.KernelV3FactoryAbi = exports.KernelV3InitAbi = exports.KernelV3ExecuteAbi = exports.KernelV3AccountAbi = exports.KernelFactoryAbi = exports.KernelAccountAbi = exports.createFallbackKernelAccountClient = exports.createKernelAccountClient = exports.createZeroDevPaymasterClient = exports.kernelAccountClientActions = exports.zerodevPaymasterActions = exports.sponsorUserOperation = exports.EIP1271Abi = exports.addressToEmptyAccount = exports.KERNEL_ADDRESSES = exports.createKernelV2Account = exports.createKernelV1Account = exports.createKernelAccount = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
var index_js_1 = require("./accounts/index.js");
|
|
6
6
|
Object.defineProperty(exports, "createKernelAccount", { enumerable: true, get: function () { return index_js_1.createKernelAccount; } });
|
|
@@ -46,7 +46,7 @@ Object.defineProperty(exports, "KernelEIP1193Provider", { enumerable: true, get:
|
|
|
46
46
|
var getEncodedPluginsData_js_1 = require("./accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js");
|
|
47
47
|
Object.defineProperty(exports, "getEncodedPluginsData", { enumerable: true, get: function () { return getEncodedPluginsData_js_1.getEncodedPluginsData; } });
|
|
48
48
|
var utils_js_1 = require("./clients/utils.js");
|
|
49
|
-
Object.defineProperty(exports, "
|
|
49
|
+
Object.defineProperty(exports, "isProviderSet", { enumerable: true, get: function () { return utils_js_1.isProviderSet; } });
|
|
50
50
|
var getUserOperationGasPrice_js_1 = require("./actions/account-client/getUserOperationGasPrice.js");
|
|
51
51
|
Object.defineProperty(exports, "getUserOperationGasPrice", { enumerable: true, get: function () { return getUserOperationGasPrice_js_1.getUserOperationGasPrice; } });
|
|
52
52
|
//# sourceMappingURL=index.js.map
|
package/_cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;AAAA,gDAQ4B;AAPxB,+GAAA,mBAAmB,OAAA;AACnB,iHAAA,qBAAqB,OAAA;AACrB,iHAAA,qBAAqB,OAAA;AAErB,4GAAA,gBAAgB,OAAA;AAChB,iHAAA,qBAAqB,OAAA;AACrB,sGAAA,UAAU,OAAA;AAEd,uFAIoD;AAHhD,+HAAA,oBAAoB,OAAA;AAIxB,4DAKuC;AAJnC,oHAAA,uBAAuB,OAAA;AAEvB,uHAAA,0BAA0B,OAAA;AAG9B,mEAGqC;AAFjC,kIAAA,4BAA4B,OAAA;AAGhC,2EAGyC;AAFrC,mIAAA,yBAAyB,OAAA;AAG7B,2FAA4F;AAAnF,mJAAA,iCAAiC,OAAA;AAO1C,iFAA4E;AAAnE,uHAAA,gBAAgB,OAAA;AACzB,iFAA4E;AAAnE,uHAAA,gBAAgB,OAAA;AACzB,gGAIiE;AAH7D,yHAAA,kBAAkB,OAAA;AAClB,yHAAA,kBAAkB,OAAA;AAClB,sHAAA,eAAe,OAAA;AAEnB,gGAA6F;AAApF,yHAAA,kBAAkB,OAAA;AAC3B,4GAAuG;AAA9F,mIAAA,sBAAsB,OAAA;AAC/B,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,8CAA2C;AAC3C,qDAA0B;AAC1B,+DAAgF;AAAvE,yHAAA,iBAAiB,OAAA;AAC1B,sDAGkC;AAF9B,kHAAA,sBAAsB,OAAA;AACtB,uHAAA,2BAA2B,OAAA;AAE/B,iDAA4D;AAAnD,iHAAA,qBAAqB,OAAA;AAC9B,2GAAsG;AAA7F,iIAAA,qBAAqB,OAAA;AAC9B,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;AAAA,gDAQ4B;AAPxB,+GAAA,mBAAmB,OAAA;AACnB,iHAAA,qBAAqB,OAAA;AACrB,iHAAA,qBAAqB,OAAA;AAErB,4GAAA,gBAAgB,OAAA;AAChB,iHAAA,qBAAqB,OAAA;AACrB,sGAAA,UAAU,OAAA;AAEd,uFAIoD;AAHhD,+HAAA,oBAAoB,OAAA;AAIxB,4DAKuC;AAJnC,oHAAA,uBAAuB,OAAA;AAEvB,uHAAA,0BAA0B,OAAA;AAG9B,mEAGqC;AAFjC,kIAAA,4BAA4B,OAAA;AAGhC,2EAGyC;AAFrC,mIAAA,yBAAyB,OAAA;AAG7B,2FAA4F;AAAnF,mJAAA,iCAAiC,OAAA;AAO1C,iFAA4E;AAAnE,uHAAA,gBAAgB,OAAA;AACzB,iFAA4E;AAAnE,uHAAA,gBAAgB,OAAA;AACzB,gGAIiE;AAH7D,yHAAA,kBAAkB,OAAA;AAClB,yHAAA,kBAAkB,OAAA;AAClB,sHAAA,eAAe,OAAA;AAEnB,gGAA6F;AAApF,yHAAA,kBAAkB,OAAA;AAC3B,4GAAuG;AAA9F,mIAAA,sBAAsB,OAAA;AAC/B,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,8CAA2C;AAC3C,qDAA0B;AAC1B,+DAAgF;AAAvE,yHAAA,iBAAiB,OAAA;AAC1B,sDAGkC;AAF9B,kHAAA,sBAAsB,OAAA;AACtB,uHAAA,2BAA2B,OAAA;AAE/B,iDAA4D;AAAnD,iHAAA,qBAAqB,OAAA;AAC9B,2GAAsG;AAA7F,iIAAA,qBAAqB,OAAA;AAC9B,+CAAkD;AAAzC,yGAAA,aAAa,OAAA;AACtB,oGAA+F;AAAtF,uIAAA,wBAAwB,OAAA"}
|
|
@@ -2,7 +2,7 @@ import { getEntryPointVersion } from "permissionless";
|
|
|
2
2
|
import { http, createClient } from "viem";
|
|
3
3
|
import { getUserOperationGasPrice } from "../actions/account-client/getUserOperationGasPrice.js";
|
|
4
4
|
import { kernelAccountClientActions } from "./decorators/kernel.js";
|
|
5
|
-
import {
|
|
5
|
+
import { isProviderSet, setPimlicoAsProvider } from "./utils.js";
|
|
6
6
|
export const createKernelAccountClient = (parameters) => {
|
|
7
7
|
const { key = "Account", name = "Kernel Account Client", bundlerTransport, entryPoint } = parameters;
|
|
8
8
|
const entryPointVersion = getEntryPointVersion(entryPoint);
|
|
@@ -17,7 +17,8 @@ export const createKernelAccountClient = (parameters) => {
|
|
|
17
17
|
...opts,
|
|
18
18
|
retryCount: 0
|
|
19
19
|
});
|
|
20
|
-
if (!shouldIncludePimlicoProvider
|
|
20
|
+
if (!shouldIncludePimlicoProvider ||
|
|
21
|
+
isProviderSet(_bundlerTransport.value?.url, "ALCHEMY"))
|
|
21
22
|
return _bundlerTransport;
|
|
22
23
|
_bundlerTransport = http(setPimlicoAsProvider(_bundlerTransport.value?.url))({ ...opts, retryCount: 0 });
|
|
23
24
|
return _bundlerTransport;
|
|
@@ -28,7 +29,7 @@ export const createKernelAccountClient = (parameters) => {
|
|
|
28
29
|
if ((!middleware ||
|
|
29
30
|
(typeof middleware !== "function" && !middleware.gasPrice)) &&
|
|
30
31
|
client.transport?.url &&
|
|
31
|
-
|
|
32
|
+
isProviderSet(client.transport.url, "PIMLICO")) {
|
|
32
33
|
const gasPrice = () => getUserOperationGasPrice(client);
|
|
33
34
|
middleware = {
|
|
34
35
|
...middleware,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAKrD,OAAO,EACH,IAAI,EAKJ,YAAY,EACf,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAA;AAChG,OAAO,EAEH,0BAA0B,EAC7B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAKrD,OAAO,EACH,IAAI,EAKJ,YAAY,EACf,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAA;AAChG,OAAO,EAEH,0BAA0B,EAC7B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAoChE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAUrC,UAKC,EACkE,EAAE;IACrE,MAAM,EACF,GAAG,GAAG,SAAS,EACf,IAAI,GAAG,uBAAuB,EAC9B,gBAAgB,EAChB,UAAU,EACb,GAAG,UAAU,CAAA;IACd,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAA;IAC1D,MAAM,4BAA4B,GAC9B,gBAAgB,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM;QAC1C,iBAAiB,KAAK,MAAM,CAAA;IAEhC,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,GAAG,UAAU;QACb,GAAG;QACH,IAAI;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,iBAAiB,GAAG,gBAAgB,CAAC;gBACrC,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,IACI,CAAC,4BAA4B;gBAC7B,aAAa,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC;gBAEtD,OAAO,iBAAiB,CAAA;YAC5B,iBAAiB,GAAG,IAAI,CACpB,oBAAoB,CAAC,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,CACrD,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAA;YAC7B,OAAO,iBAAiB,CAAA;QAC5B,CAAC;QACD,IAAI,EAAE,qBAAqB;KAC9B,CAAC,CAAA;IAEF,IAAI,UAAU,GAAG,UAAU,CAAC,UAAU,CAAA;IACtC,IACI,CAAC,CAAC,UAAU;QACR,CAAC,OAAO,UAAU,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,CAAC,SAAS,EAAE,GAAG;QACrB,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,EAChD,CAAC;QACC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAA;QACvD,UAAU,GAAG;YACT,GAAG,UAAU;YACb,QAAQ;SACX,CAAA;IACL,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAChB,0BAA0B,CAAC;QACvB,UAAU;KACb,CAAC,CACkE,CAAA;AAC5E,CAAC,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getEntryPointVersion } from "permissionless";
|
|
2
2
|
import { http, createClient } from "viem";
|
|
3
3
|
import { zerodevPaymasterActions } from "./decorators/kernel.js";
|
|
4
|
-
import { setPimlicoAsProvider } from "./utils.js";
|
|
4
|
+
import { isProviderSet, setPimlicoAsProvider } from "./utils.js";
|
|
5
5
|
/**
|
|
6
6
|
* Creates a ZeroDev-specific Paymaster Client with a given [Transport](https://viem.sh/docs/clients/intro.html) configured for a [Chain](https://viem.sh/docs/clients/chains.html).
|
|
7
7
|
*
|
|
@@ -30,7 +30,8 @@ export const createZeroDevPaymasterClient = (parameters) => {
|
|
|
30
30
|
...opts,
|
|
31
31
|
retryCount: 0
|
|
32
32
|
});
|
|
33
|
-
if (!shouldIncludePimlicoProvider
|
|
33
|
+
if (!shouldIncludePimlicoProvider ||
|
|
34
|
+
isProviderSet(_transport.value?.url, "ALCHEMY"))
|
|
34
35
|
return _transport;
|
|
35
36
|
_transport = http(setPimlicoAsProvider(_transport.value?.url))({
|
|
36
37
|
...opts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymasterClient.js","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,EACH,IAAI,EAMJ,YAAY,EACf,MAAM,MAAM,CAAA;AAEb,OAAO,EAEH,uBAAuB,EAC1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"paymasterClient.js","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,EACH,IAAI,EAMJ,YAAY,EACf,MAAM,MAAM,CAAA;AAEb,OAAO,EAEH,uBAAuB,EAC1B,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAShE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAKxC,UAEC,EACiC,EAAE;IACpC,MAAM,EACF,GAAG,GAAG,QAAQ,EACd,IAAI,GAAG,0BAA0B,EACjC,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EACZ,GAAG,UAAU,CAAA;IACd,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IACjE,MAAM,4BAA4B,GAC9B,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,MAAM,IAAI,iBAAiB,KAAK,MAAM,CAAA;IACvE,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,GAAG,UAAU;QACb,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,UAAU,GAAG,SAAS,CAAC;gBACvB,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,IACI,CAAC,4BAA4B;gBAC7B,aAAa,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC;gBAE/C,OAAO,UAAU,CAAA;YACrB,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3D,GAAG,IAAI;gBACP,UAAU,EAAE,CAAC;aAChB,CAAC,CAAA;YACF,OAAO,UAAU,CAAA;QACrB,CAAC;QACD,GAAG;QACH,IAAI;QACJ,IAAI,EAAE,wBAAwB;KACjC,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAA;AACxE,CAAC,CAAA"}
|
package/_esm/clients/utils.js
CHANGED
|
@@ -13,13 +13,13 @@ export const setPimlicoAsProvider = (urlString) => {
|
|
|
13
13
|
url.search = params.toString();
|
|
14
14
|
return url.toString();
|
|
15
15
|
};
|
|
16
|
-
export const
|
|
16
|
+
export const isProviderSet = (urlString, provider) => {
|
|
17
17
|
const url = new URL(urlString);
|
|
18
18
|
const params = url.searchParams;
|
|
19
|
-
const
|
|
19
|
+
const _provider = params.get("provider") ??
|
|
20
20
|
params.get("bundlerProvider") ??
|
|
21
21
|
params.get("paymasterProvider");
|
|
22
|
-
if (
|
|
22
|
+
if (_provider === provider)
|
|
23
23
|
return true;
|
|
24
24
|
return false;
|
|
25
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAE/B,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,IAAI,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC9D,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAE9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAE/B,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAA;IAC5C,CAAC;SAAM,IAAI,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IACrC,CAAC;IAED,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAA;IAE9B,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAW,EAAE;IAC1E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAA;IAC9B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAC/B,MAAM,SAAS,GACX,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IACnC,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAA;IACvC,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA"}
|
package/_esm/index.js
CHANGED
|
@@ -18,6 +18,6 @@ export { gasTokenAddresses } from "./gasTokenAddresses.js";
|
|
|
18
18
|
export { verifyEIP6492Signature, getCustomNonceKeyFromString } from "./accounts/utils/index.js";
|
|
19
19
|
export { KernelEIP1193Provider } from "./providers/index.js";
|
|
20
20
|
export { getEncodedPluginsData } from "./accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js";
|
|
21
|
-
export {
|
|
21
|
+
export { isProviderSet } from "./clients/utils.js";
|
|
22
22
|
export { getUserOperationGasPrice } from "./actions/account-client/getUserOperationGasPrice.js";
|
|
23
23
|
//# sourceMappingURL=index.js.map
|
package/_esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EAErB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EAGvB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EAEvB,0BAA0B,EAE7B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAE/B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EAE5B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0CAA0C,CAAA;AAC5F,OAAO,EAKN,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAA;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;6BAC/C,gBAAgB;wBAA/B,SAAS;AACrB,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AACtG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EAErB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EAGvB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EAEvB,0BAA0B,EAE7B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAE/B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EAE5B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0CAA0C,CAAA;AAC5F,OAAO,EAKN,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAA;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;6BAC/C,gBAAgB;wBAA/B,SAAS;AACrB,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernelAccountClient.d.ts","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,SAAS,EAEjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EACH,KAAK,0BAA0B,EAElC,MAAM,wBAAwB,CAAA;AAG/B,MAAM,MAAM,mBAAmB,CAC3B,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,kBAAkB,CAAC,UAAU,CAAC,GAAG,SAAS,GACpD,kBAAkB,CAAC,UAAU,CAAC,GAC9B,SAAS,IACf,MAAM,CACN,SAAS,EACT,KAAK,EACL,OAAO,EACP,gBAAgB,CAAC,UAAU,CAAC,EAC5B,0BAA0B,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CACzD,CAAA;AAED,MAAM,MAAM,wBAAwB,CAChC,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,YAAY,CAAC,UAAU,CAAC,GAAG,SAAS,GAC9C,YAAY,CAAC,UAAU,CAAC,GACxB,SAAS,IACf,QAAQ,CACR,IAAI,CACA,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EACvC,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,iBAAiB,CAC7D,GAAG;IACA,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,gBAAgB,EAAE,SAAS,CAAA;CAC9B,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG;IACrB,UAAU,EAAE,UAAU,CAAA;CACzB,CACR,CAAA;AAED,eAAO,MAAM,yBAAyB;;;;;;;sBANZ,SAAS;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"kernelAccountClient.d.ts","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,SAAS,EAEjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EACH,KAAK,0BAA0B,EAElC,MAAM,wBAAwB,CAAA;AAG/B,MAAM,MAAM,mBAAmB,CAC3B,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,kBAAkB,CAAC,UAAU,CAAC,GAAG,SAAS,GACpD,kBAAkB,CAAC,UAAU,CAAC,GAC9B,SAAS,IACf,MAAM,CACN,SAAS,EACT,KAAK,EACL,OAAO,EACP,gBAAgB,CAAC,UAAU,CAAC,EAC5B,0BAA0B,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CACzD,CAAA;AAED,MAAM,MAAM,wBAAwB,CAChC,UAAU,SAAS,UAAU,EAC7B,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,YAAY,CAAC,UAAU,CAAC,GAAG,SAAS,GAC9C,YAAY,CAAC,UAAU,CAAC,GACxB,SAAS,IACf,QAAQ,CACR,IAAI,CACA,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,EACvC,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,iBAAiB,CAC7D,GAAG;IACA,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,gBAAgB,EAAE,SAAS,CAAA;CAC9B,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG;IACrB,UAAU,EAAE,UAAU,CAAA;CACzB,CACR,CAAA;AAED,eAAO,MAAM,yBAAyB;;;;;;;sBANZ,SAAS;;;;;;;;;;;;;;;yEA0ElC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymasterClient.d.ts","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAEH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,kBAAkB,EACvB,KAAK,SAAS,EAEjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EACH,KAAK,6BAA6B,EAErC,MAAM,wBAAwB,CAAA;AAG/B,MAAM,MAAM,sBAAsB,CAAC,UAAU,SAAS,UAAU,IAAI,MAAM,CACtE,SAAS,EACT,KAAK,GAAG,SAAS,EACjB,OAAO,GAAG,SAAS,EACnB,yBAAyB,CAAC,UAAU,CAAC,EACrC,6BAA6B,CAAC,UAAU,CAAC,CAC5C,CAAA;AACD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"paymasterClient.d.ts","sourceRoot":"","sources":["../../clients/paymasterClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAEH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,kBAAkB,EACvB,KAAK,SAAS,EAEjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EACH,KAAK,6BAA6B,EAErC,MAAM,wBAAwB,CAAA;AAG/B,MAAM,MAAM,sBAAsB,CAAC,UAAU,SAAS,UAAU,IAAI,MAAM,CACtE,SAAS,EACT,KAAK,GAAG,SAAS,EACjB,OAAO,GAAG,SAAS,EACnB,yBAAyB,CAAC,UAAU,CAAC,EACrC,6BAA6B,CAAC,UAAU,CAAC,CAC5C,CAAA;AACD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;wCAyCxC,CAAA"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare const setPimlicoAsProvider: (urlString: string) => string;
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const isProviderSet: (urlString: string, provider: string) => boolean;
|
|
3
3
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,cAAe,MAAM,KAAG,MAgBxD,CAAA;AAED,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../clients/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,cAAe,MAAM,KAAG,MAgBxD,CAAA;AAED,eAAO,MAAM,aAAa,cAAe,MAAM,YAAY,MAAM,KAAG,OASnE,CAAA"}
|
package/_types/index.d.ts
CHANGED
|
@@ -17,6 +17,6 @@ export { gasTokenAddresses, type TokenSymbolsMap } from "./gasTokenAddresses.js"
|
|
|
17
17
|
export { verifyEIP6492Signature, getCustomNonceKeyFromString } from "./accounts/utils/index.js";
|
|
18
18
|
export { KernelEIP1193Provider } from "./providers/index.js";
|
|
19
19
|
export { getEncodedPluginsData } from "./accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js";
|
|
20
|
-
export {
|
|
20
|
+
export { isProviderSet } from "./clients/utils.js";
|
|
21
21
|
export { getUserOperationGasPrice } from "./actions/account-client/getUserOperationGasPrice.js";
|
|
22
22
|
//# sourceMappingURL=index.d.ts.map
|
package/_types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,KAAK,kBAAkB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EACpB,KAAK,8BAA8B,EACnC,KAAK,8BAA8B,EACtC,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EACvB,KAAK,6BAA6B,EAClC,0BAA0B,EAC1B,KAAK,0BAA0B,EAClC,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAC5B,KAAK,sBAAsB,EAC9B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EACzB,KAAK,mBAAmB,EAC3B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0CAA0C,CAAA;AAC5F,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACxB,KAAK,MAAM,EACd,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAA;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;AAC1E,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AACtG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,KAAK,kBAAkB,EACvB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EACpB,KAAK,8BAA8B,EACnC,KAAK,8BAA8B,EACtC,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EACvB,KAAK,6BAA6B,EAClC,0BAA0B,EAC1B,KAAK,0BAA0B,EAClC,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAC5B,KAAK,sBAAsB,EAC9B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EACzB,KAAK,mBAAmB,EAC3B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0CAA0C,CAAA;AAC5F,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACxB,KAAK,MAAM,EACd,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAA;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;AAC1E,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AACtG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAA"}
|
|
@@ -17,7 +17,7 @@ import {
|
|
|
17
17
|
type KernelAccountClientActions,
|
|
18
18
|
kernelAccountClientActions
|
|
19
19
|
} from "./decorators/kernel.js"
|
|
20
|
-
import {
|
|
20
|
+
import { isProviderSet, setPimlicoAsProvider } from "./utils.js"
|
|
21
21
|
|
|
22
22
|
export type KernelAccountClient<
|
|
23
23
|
entryPoint extends EntryPoint,
|
|
@@ -90,7 +90,11 @@ export const createKernelAccountClient = <
|
|
|
90
90
|
...opts,
|
|
91
91
|
retryCount: 0
|
|
92
92
|
})
|
|
93
|
-
if (
|
|
93
|
+
if (
|
|
94
|
+
!shouldIncludePimlicoProvider ||
|
|
95
|
+
isProviderSet(_bundlerTransport.value?.url, "ALCHEMY")
|
|
96
|
+
)
|
|
97
|
+
return _bundlerTransport
|
|
94
98
|
_bundlerTransport = http(
|
|
95
99
|
setPimlicoAsProvider(_bundlerTransport.value?.url)
|
|
96
100
|
)({ ...opts, retryCount: 0 })
|
|
@@ -104,7 +108,7 @@ export const createKernelAccountClient = <
|
|
|
104
108
|
(!middleware ||
|
|
105
109
|
(typeof middleware !== "function" && !middleware.gasPrice)) &&
|
|
106
110
|
client.transport?.url &&
|
|
107
|
-
|
|
111
|
+
isProviderSet(client.transport.url, "PIMLICO")
|
|
108
112
|
) {
|
|
109
113
|
const gasPrice = () => getUserOperationGasPrice(client)
|
|
110
114
|
middleware = {
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
type ZeroDevPaymasterClientActions,
|
|
15
15
|
zerodevPaymasterActions
|
|
16
16
|
} from "./decorators/kernel.js"
|
|
17
|
-
import { setPimlicoAsProvider } from "./utils.js"
|
|
17
|
+
import { isProviderSet, setPimlicoAsProvider } from "./utils.js"
|
|
18
18
|
|
|
19
19
|
export type ZeroDevPaymasterClient<entryPoint extends EntryPoint> = Client<
|
|
20
20
|
Transport,
|
|
@@ -65,7 +65,11 @@ export const createZeroDevPaymasterClient = <
|
|
|
65
65
|
...opts,
|
|
66
66
|
retryCount: 0
|
|
67
67
|
})
|
|
68
|
-
if (
|
|
68
|
+
if (
|
|
69
|
+
!shouldIncludePimlicoProvider ||
|
|
70
|
+
isProviderSet(_transport.value?.url, "ALCHEMY")
|
|
71
|
+
)
|
|
72
|
+
return _transport
|
|
69
73
|
_transport = http(setPimlicoAsProvider(_transport.value?.url))({
|
|
70
74
|
...opts,
|
|
71
75
|
retryCount: 0
|
package/clients/utils.ts
CHANGED
|
@@ -16,13 +16,13 @@ export const setPimlicoAsProvider = (urlString: string): string => {
|
|
|
16
16
|
return url.toString()
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
export const
|
|
19
|
+
export const isProviderSet = (urlString: string, provider: string): boolean => {
|
|
20
20
|
const url = new URL(urlString)
|
|
21
21
|
const params = url.searchParams
|
|
22
|
-
const
|
|
22
|
+
const _provider =
|
|
23
23
|
params.get("provider") ??
|
|
24
24
|
params.get("bundlerProvider") ??
|
|
25
25
|
params.get("paymasterProvider")
|
|
26
|
-
if (
|
|
26
|
+
if (_provider === provider) return true
|
|
27
27
|
return false
|
|
28
28
|
}
|
package/index.ts
CHANGED
|
@@ -52,5 +52,5 @@ export {
|
|
|
52
52
|
} from "./accounts/utils/index.js"
|
|
53
53
|
export { KernelEIP1193Provider } from "./providers/index.js"
|
|
54
54
|
export { getEncodedPluginsData } from "./accounts/kernel/utils/plugins/ep0_7/getEncodedPluginsData.js"
|
|
55
|
-
export {
|
|
55
|
+
export { isProviderSet } from "./clients/utils.js"
|
|
56
56
|
export { getUserOperationGasPrice } from "./actions/account-client/getUserOperationGasPrice.js"
|