thirdweb 5.29.1-nightly-e7ba698f3e60e0749f8739ad1aec76a8ab2c2fb3-20240613235727 → 5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314
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/version.js +1 -1
- package/dist/cjs/wallets/eip5792/send-calls.js +13 -11
- package/dist/cjs/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-calls.js +1 -1
- package/dist/cjs/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/eip5792/send-calls.js +13 -11
- package/dist/esm/wallets/eip5792/send-calls.js.map +1 -1
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-calls.js +1 -1
- package/dist/esm/wallets/in-app/core/eip5972/in-app-wallet-calls.js.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/eip5792/send-calls.d.ts +1 -1
- package/dist/types/wallets/eip5792/send-calls.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/version.ts +1 -1
- package/src/wallets/eip5792/send-calls.ts +17 -13
- package/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts +1 -1
- package/src/wallets/smart/smart-wallet-zksync.test.ts +3 -3
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.29.1-nightly-
|
|
4
|
+
exports.version = "5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sendCalls = void 0;
|
|
4
|
-
const
|
|
4
|
+
const encode_js_1 = require("../../transaction/actions/encode.js");
|
|
5
5
|
const address_js_1 = require("../../utils/address.js");
|
|
6
6
|
const hex_js_1 = require("../../utils/encoding/hex.js");
|
|
7
|
+
const resolve_promised_value_js_1 = require("../../utils/promise/resolve-promised-value.js");
|
|
7
8
|
const coinbaseSDKWallet_js_1 = require("../coinbase/coinbaseSDKWallet.js");
|
|
8
9
|
const index_js_1 = require("../in-app/core/wallet/index.js");
|
|
9
10
|
const index_js_2 = require("../injected/index.js");
|
|
@@ -83,19 +84,20 @@ async function sendCalls(options) {
|
|
|
83
84
|
return inAppWalletSendCalls({ account, calls });
|
|
84
85
|
}
|
|
85
86
|
const preparedCalls = await Promise.all(calls.map(async (call) => {
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
from: account.address,
|
|
89
|
-
});
|
|
90
|
-
const { to, data, value } = serializableTransaction;
|
|
91
|
-
if (to === undefined && data === undefined) {
|
|
87
|
+
const { to, value } = call;
|
|
88
|
+
if (to === undefined && call.data === undefined) {
|
|
92
89
|
throw new Error("Cannot send call, `to` or `data` must be provided.");
|
|
93
90
|
}
|
|
91
|
+
const [_to, _data, _value] = await Promise.all([
|
|
92
|
+
(0, resolve_promised_value_js_1.resolvePromisedValue)(to),
|
|
93
|
+
(0, encode_js_1.encode)(call),
|
|
94
|
+
(0, resolve_promised_value_js_1.resolvePromisedValue)(value),
|
|
95
|
+
]);
|
|
94
96
|
return {
|
|
95
|
-
to:
|
|
96
|
-
data:
|
|
97
|
-
value: typeof
|
|
98
|
-
? (0, hex_js_1.numberToHex)(
|
|
97
|
+
to: _to,
|
|
98
|
+
data: _data,
|
|
99
|
+
value: typeof _value === "bigint" || typeof _value === "number"
|
|
100
|
+
? (0, hex_js_1.numberToHex)(_value)
|
|
99
101
|
: undefined,
|
|
100
102
|
};
|
|
101
103
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ function setBundleId(bundleId, hashes) {
|
|
|
24
24
|
async function inAppWalletSendCalls(args) {
|
|
25
25
|
const { account, calls } = args;
|
|
26
26
|
const hashes = [];
|
|
27
|
-
const bundleId =
|
|
27
|
+
const bundleId = (0, random_js_1.randomBytesHex)(65);
|
|
28
28
|
bundlesToTransactions.set(bundleId, hashes);
|
|
29
29
|
if (account.sendBatchTransaction) {
|
|
30
30
|
const receipt = await (0, send_batch_transaction_js_1.sendBatchTransaction)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":";;;AACA,uGAAiG;AACjG,mDAAsD;AACtD,qHAA4G;AAC5G,yGAAiG;AAEjG,2DAA6D;AAS7D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAiB,CAAC;AACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC;;GAEG;AACH,SAAS,WAAW,CAAC,QAAa,EAAE,MAAa;IAC/C,IAAI,qBAAqB,CAAC,IAAI,IAAI,kBAAkB,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;QACtD,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IACD,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAG1C;IACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEhC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.29.1-nightly-
|
|
1
|
+
export const version = "5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { encode } from "../../transaction/actions/encode.js";
|
|
2
2
|
import { getAddress } from "../../utils/address.js";
|
|
3
3
|
import { numberToHex } from "../../utils/encoding/hex.js";
|
|
4
|
+
import { resolvePromisedValue, } from "../../utils/promise/resolve-promised-value.js";
|
|
4
5
|
import { isCoinbaseSDKWallet } from "../coinbase/coinbaseSDKWallet.js";
|
|
5
6
|
import { isInAppWallet } from "../in-app/core/wallet/index.js";
|
|
6
7
|
import { getInjectedProvider } from "../injected/index.js";
|
|
@@ -80,19 +81,20 @@ export async function sendCalls(options) {
|
|
|
80
81
|
return inAppWalletSendCalls({ account, calls });
|
|
81
82
|
}
|
|
82
83
|
const preparedCalls = await Promise.all(calls.map(async (call) => {
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
from: account.address,
|
|
86
|
-
});
|
|
87
|
-
const { to, data, value } = serializableTransaction;
|
|
88
|
-
if (to === undefined && data === undefined) {
|
|
84
|
+
const { to, value } = call;
|
|
85
|
+
if (to === undefined && call.data === undefined) {
|
|
89
86
|
throw new Error("Cannot send call, `to` or `data` must be provided.");
|
|
90
87
|
}
|
|
88
|
+
const [_to, _data, _value] = await Promise.all([
|
|
89
|
+
resolvePromisedValue(to),
|
|
90
|
+
encode(call),
|
|
91
|
+
resolvePromisedValue(value),
|
|
92
|
+
]);
|
|
91
93
|
return {
|
|
92
|
-
to:
|
|
93
|
-
data:
|
|
94
|
-
value: typeof
|
|
95
|
-
? numberToHex(
|
|
94
|
+
to: _to,
|
|
95
|
+
data: _data,
|
|
96
|
+
value: typeof _value === "bigint" || typeof _value === "number"
|
|
97
|
+
? numberToHex(_value)
|
|
96
98
|
: undefined,
|
|
97
99
|
};
|
|
98
100
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"send-calls.js","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ function setBundleId(bundleId, hashes) {
|
|
|
21
21
|
export async function inAppWalletSendCalls(args) {
|
|
22
22
|
const { account, calls } = args;
|
|
23
23
|
const hashes = [];
|
|
24
|
-
const bundleId =
|
|
24
|
+
const bundleId = randomBytesHex(65);
|
|
25
25
|
bundlesToTransactions.set(bundleId, hashes);
|
|
26
26
|
if (account.sendBatchTransaction) {
|
|
27
27
|
const receipt = await sendBatchTransaction({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iEAAiE,CAAC;AAC5G,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAEjG,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAS7D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAiB,CAAC;AACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC;;GAEG;AACH,SAAS,WAAW,CAAC,QAAa,EAAE,MAAa;IAC/C,IAAI,qBAAqB,CAAC,IAAI,IAAI,kBAAkB,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;QACtD,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IACD,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,IAG1C;IACC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEhC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"in-app-wallet-calls.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts"],"names":[],"mappings":"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"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.29.1-nightly-
|
|
1
|
+
export declare const version = "5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -3,7 +3,7 @@ import type { Chain } from "../../chains/types.js";
|
|
|
3
3
|
import type { ThirdwebClient } from "../../client/client.js";
|
|
4
4
|
import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
|
|
5
5
|
import { type Hex } from "../../utils/encoding/hex.js";
|
|
6
|
-
import type
|
|
6
|
+
import { type PromisedObject } from "../../utils/promise/resolve-promised-value.js";
|
|
7
7
|
import type { OneOf } from "../../utils/type-utils.js";
|
|
8
8
|
import type { Wallet } from "../interfaces/wallet.js";
|
|
9
9
|
import type { WalletId } from "../wallet-types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-calls.d.ts","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"send-calls.d.ts","sourceRoot":"","sources":["../../../../src/wallets/eip5792/send-calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,6BAA6B,CAAC;AACpE,OAAO,EACL,KAAK,cAAc,EAEpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAIvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAEV,iBAAiB,EACjB,yBAAyB,EAC1B,MAAM,YAAY,CAAC;AAEpB,KAAK,UAAU,GAAG,KAAK,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B,CAAC,CAAC;AAEH,MAAM,MAAM,gBAAgB,CAC1B,GAAG,SAAS,GAAG,GAAG,EAAE,EACpB,WAAW,SAAS,WAAW,GAAG,WAAW,IAC3C,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;CACxB,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;AAE/B,MAAM,MAAM,gBAAgB,CAC1B,EAAE,SAAS,QAAQ,GAAG,QAAQ,EAC9B,GAAG,SAAS,GAAG,GAAG,EAAE,EACpB,WAAW,SAAS,WAAW,GAAG,WAAW,IAC3C;IACF,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,KAAK,EAAE,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,CAAC;IAC5C,YAAY,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IACvD,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,wBAAsB,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,QAAQ,EACvD,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAC5B,OAAO,CAAC,eAAe,CAAC,CA6F1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.29.1-nightly-
|
|
3
|
+
"version": "5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.29.1-nightly-
|
|
1
|
+
export const version = "5.29.1-nightly-1aaa63eec74cebb7edc3055625c64057c4ee9778-20240614062314";
|
|
@@ -2,11 +2,14 @@ import type { Abi, AbiFunction } from "abitype";
|
|
|
2
2
|
import type { WalletSendCallsParameters as ViemWalletSendCallsParameters } from "viem";
|
|
3
3
|
import type { Chain } from "../../chains/types.js";
|
|
4
4
|
import type { ThirdwebClient } from "../../client/client.js";
|
|
5
|
-
import {
|
|
5
|
+
import { encode } from "../../transaction/actions/encode.js";
|
|
6
6
|
import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
|
|
7
7
|
import { type Address, getAddress } from "../../utils/address.js";
|
|
8
8
|
import { type Hex, numberToHex } from "../../utils/encoding/hex.js";
|
|
9
|
-
import
|
|
9
|
+
import {
|
|
10
|
+
type PromisedObject,
|
|
11
|
+
resolvePromisedValue,
|
|
12
|
+
} from "../../utils/promise/resolve-promised-value.js";
|
|
10
13
|
import type { OneOf } from "../../utils/type-utils.js";
|
|
11
14
|
import { isCoinbaseSDKWallet } from "../coinbase/coinbaseSDKWallet.js";
|
|
12
15
|
import { isInAppWallet } from "../in-app/core/wallet/index.js";
|
|
@@ -144,22 +147,23 @@ export async function sendCalls<const ID extends WalletId>(
|
|
|
144
147
|
|
|
145
148
|
const preparedCalls: EIP5792Call[] = await Promise.all(
|
|
146
149
|
calls.map(async (call) => {
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
from: account.address,
|
|
150
|
-
});
|
|
151
|
-
|
|
152
|
-
const { to, data, value } = serializableTransaction;
|
|
153
|
-
if (to === undefined && data === undefined) {
|
|
150
|
+
const { to, value } = call;
|
|
151
|
+
if (to === undefined && call.data === undefined) {
|
|
154
152
|
throw new Error("Cannot send call, `to` or `data` must be provided.");
|
|
155
153
|
}
|
|
156
154
|
|
|
155
|
+
const [_to, _data, _value] = await Promise.all([
|
|
156
|
+
resolvePromisedValue(to),
|
|
157
|
+
encode(call),
|
|
158
|
+
resolvePromisedValue(value),
|
|
159
|
+
]);
|
|
160
|
+
|
|
157
161
|
return {
|
|
158
|
-
to:
|
|
159
|
-
data:
|
|
162
|
+
to: _to as Address,
|
|
163
|
+
data: _data as Hex,
|
|
160
164
|
value:
|
|
161
|
-
typeof
|
|
162
|
-
? numberToHex(
|
|
165
|
+
typeof _value === "bigint" || typeof _value === "number"
|
|
166
|
+
? numberToHex(_value)
|
|
163
167
|
: undefined,
|
|
164
168
|
};
|
|
165
169
|
}),
|
|
@@ -37,7 +37,7 @@ export async function inAppWalletSendCalls(args: {
|
|
|
37
37
|
const { account, calls } = args;
|
|
38
38
|
|
|
39
39
|
const hashes: Hex[] = [];
|
|
40
|
-
const bundleId =
|
|
40
|
+
const bundleId = randomBytesHex(65);
|
|
41
41
|
bundlesToTransactions.set(bundleId, hashes);
|
|
42
42
|
if (account.sendBatchTransaction) {
|
|
43
43
|
const receipt = await sendBatchTransaction({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { beforeAll, describe, expect, it } from "vitest";
|
|
2
2
|
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
|
3
|
-
import {
|
|
3
|
+
import { ANVIL_PKEY_B } from "../../../test/src/test-wallets.js";
|
|
4
4
|
import { zkSyncSepolia } from "../../chains/chain-definitions/zksync-sepolia.js";
|
|
5
5
|
import { defineChain } from "../../chains/utils.js";
|
|
6
6
|
import { getContract } from "../../contract/contract.js";
|
|
@@ -25,7 +25,7 @@ const contract = getContract({
|
|
|
25
25
|
client,
|
|
26
26
|
});
|
|
27
27
|
|
|
28
|
-
describe.runIf(process.env.TW_SECRET_KEY)(
|
|
28
|
+
describe.runIf(process.env.TW_SECRET_KEY).skip(
|
|
29
29
|
"SmartWallet zksync tests",
|
|
30
30
|
{
|
|
31
31
|
retry: 0,
|
|
@@ -35,7 +35,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
|
35
35
|
beforeAll(async () => {
|
|
36
36
|
personalAccount = privateKeyToAccount({
|
|
37
37
|
client,
|
|
38
|
-
privateKey:
|
|
38
|
+
privateKey: ANVIL_PKEY_B,
|
|
39
39
|
});
|
|
40
40
|
wallet = smartWallet({
|
|
41
41
|
chain,
|