thirdweb 5.98.0 → 5.98.1
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/storage/upload/web-node.js +2 -0
- package/dist/cjs/storage/upload/web-node.js.map +1 -1
- package/dist/cjs/utils/fetch.js +10 -7
- package/dist/cjs/utils/fetch.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/engine/index.js +2 -1
- package/dist/cjs/wallets/engine/index.js.map +1 -1
- package/dist/esm/storage/upload/web-node.js +2 -0
- package/dist/esm/storage/upload/web-node.js.map +1 -1
- package/dist/esm/utils/fetch.js +10 -7
- package/dist/esm/utils/fetch.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/engine/index.js +2 -1
- package/dist/esm/wallets/engine/index.js.map +1 -1
- package/dist/types/storage/upload/web-node.d.ts.map +1 -1
- package/dist/types/utils/fetch.d.ts +1 -0
- package/dist/types/utils/fetch.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/engine/index.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/auth/verify-typed-data.test.ts +4 -3
- package/src/storage/upload/web-node.ts +2 -0
- package/src/utils/fetch.test.ts +23 -1
- package/src/utils/fetch.ts +18 -11
- package/src/version.ts +1 -1
- package/src/wallets/engine/index.ts +2 -1
|
@@ -15,6 +15,8 @@ async function uploadBatch(client, form, fileNames, options) {
|
|
|
15
15
|
headers,
|
|
16
16
|
body: form,
|
|
17
17
|
requestTimeoutMs: client.config?.storage?.fetch?.requestTimeoutMs || 120000,
|
|
18
|
+
// force auth token usage for storage uploads
|
|
19
|
+
useAuthToken: true,
|
|
18
20
|
});
|
|
19
21
|
if (!res.ok) {
|
|
20
22
|
if (res.status === 401) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-node.js","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"web-node.js","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":";;AAOA,kCAyDC;AA/DD,uDAA4D;AAC5D,mDAAsD;AACtD,uDAAiD;AACjD,wCAA8C;AAGvC,KAAK,UAAU,WAAW,CAC/B,MAAsB,EACtB,IAAc,EACd,SAAmB,EACnB,OAA+B;IAE/B,IAAI,oBAAO,EAAE,CAAC;QACZ,OAAO,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAgB,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAc,EAAC,MAAM,CAAC,CACtC,WAAW,IAAA,+BAAkB,GAAE,CAAC,OAAO,cAAc,EACrD;QACE,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI;QACV,gBAAgB,EACd,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,IAAI,MAAM;QAC3D,6CAA6C;QAC7C,YAAY,EAAE,IAAI;KACnB,CACF,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,KAAK,CACb,oCAAoC,GAAG,CAAC,MAAM,MAAM,GAAG,CAAC,UAAU,EAAE,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC1B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACpC,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/cjs/utils/fetch.js
CHANGED
|
@@ -19,7 +19,7 @@ function getClientFetch(client, ecosystem) {
|
|
|
19
19
|
* @internal
|
|
20
20
|
*/
|
|
21
21
|
async function fetchWithHeaders(url, init) {
|
|
22
|
-
const { requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT, ...restInit } = init || {};
|
|
22
|
+
const { requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT, useAuthToken, ...restInit } = init || {};
|
|
23
23
|
let headers = restInit.headers
|
|
24
24
|
? new Headers(restInit.headers)
|
|
25
25
|
: typeof url === "object"
|
|
@@ -32,7 +32,7 @@ function getClientFetch(client, ecosystem) {
|
|
|
32
32
|
headers = new Headers();
|
|
33
33
|
}
|
|
34
34
|
// auth token if secret key === jwt
|
|
35
|
-
const authToken = client.secretKey && (0, is_jwt_js_1.isJWT)(client.secretKey)
|
|
35
|
+
const authToken = useAuthToken && client.secretKey && (0, is_jwt_js_1.isJWT)(client.secretKey)
|
|
36
36
|
? client.secretKey
|
|
37
37
|
: undefined;
|
|
38
38
|
// secret key if secret key !== jwt
|
|
@@ -52,11 +52,14 @@ function getClientFetch(client, ecosystem) {
|
|
|
52
52
|
headers.set("x-team-id", client.teamId);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
else {
|
|
56
|
+
// only set secret key or client id if we are NOT using the auth token!
|
|
57
|
+
if (secretKey) {
|
|
58
|
+
headers.set("x-secret-key", secretKey);
|
|
59
|
+
}
|
|
60
|
+
if (clientId) {
|
|
61
|
+
headers.set("x-client-id", clientId);
|
|
62
|
+
}
|
|
60
63
|
}
|
|
61
64
|
if (ecosystem) {
|
|
62
65
|
headers.set("x-ecosystem-id", ecosystem.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":";;;AAkBA,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":";;;AAkBA,wCAsGC;AAgBD,sCAyBC;AA2CD,gDA0BC;AArOD,8CAAwC;AAExC,6CAA0C;AAC1C,6DAI8B;AAC9B,6CAA6C;AAC7C,+CAAwC;AACxC,6CAAsC;AAEtC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAEtC;;GAEG;AACH,SAAgB,cAAc,CAAC,MAAsB,EAAE,SAAqB;IAC1E;;OAEG;IACH,KAAK,UAAU,gBAAgB,CAC7B,GAAqB,EACrB,IAGC;QAED,MAAM,EACJ,gBAAgB,GAAG,uBAAuB,EAC1C,YAAY,EACZ,GAAG,QAAQ,EACZ,GAAG,IAAI,IAAI,EAAE,CAAC;QAEf,IAAI,OAAO,GAAG,QAAQ,CAAC,OAAO;YAC5B,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC/B,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ;gBACvB,CAAC,CAAC,GAAG,CAAC,OAAO;gBACb,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QAE1D,sHAAsH;QACtH,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,CAAC;YACD,mCAAmC;YACnC,MAAM,SAAS,GACb,YAAY,IAAI,MAAM,CAAC,SAAS,IAAI,IAAA,iBAAK,EAAC,MAAM,CAAC,SAAS,CAAC;gBACzD,CAAC,CAAC,MAAM,CAAC,SAAS;gBAClB,CAAC,CAAC,SAAS,CAAC;YAChB,mCAAmC;YACnC,MAAM,SAAS,GACb,MAAM,CAAC,SAAS,IAAI,CAAC,IAAA,iBAAK,EAAC,MAAM,CAAC,SAAS,CAAC;gBAC1C,CAAC,CAAC,MAAM,CAAC,SAAS;gBAClB,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,qFAAqF;YACrF,yIAAyI;YACzI,IACE,SAAS;gBACT,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACpB,CAAC,gBAAgB,CAAC,SAAS,CAAC;gBAC5B,CAAC,YAAY,CAAC,SAAS,CAAC,EACxB,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,SAAS,EAAE,CAAC,CAAC;gBACpD,kEAAkE;gBAClE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,uEAAuE;gBACvE,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;gBACzC,CAAC;gBAED,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;oBACxB,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YACD,iCAAiC;YACjC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,kBAAkB,EAAE,EAAE,CAAC;gBAC/C,OAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACvC,CAAC;YAED,MAAM,UAAU,GAAG,IAAA,0BAAa,GAAE,CAAC;YACnC,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,UAAuC,CAAC;QAC5C,IAAI,YAAuD,CAAC;QAC5D,IAAI,gBAAgB,EAAE,CAAC;YACrB,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACnC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,KAAK,CAAC,GAAG,EAAE;YAChB,GAAG,QAAQ;YACX,OAAO;YACP,MAAM,EAAE,UAAU,EAAE,MAAM;SAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YACd,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,+GAA+G;AAC/G,MAAM,gBAAgB,GAAG;IACvB,eAAe;IACf,aAAa;IACb,cAAc;IACd,eAAe;IACf,mBAAmB;CACX,CAAC;AAEE,QAAA,qBAAqB,GAAG,IAAI,eAAM,CAAU,IAAI,CAAC,CAAC;AAE/D;;GAEG;AACH,SAAgB,aAAa,CAAC,GAAW;IACvC,IAAI,6BAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,mGAAmG;QACnG,OAAO,6BAAqB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzC,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC;YACH,iDAAiD;YACjD,IAAI,mBAAM,EAAE,CAAC;gBACX,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;oBAC7B,6BAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACrC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,6BAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,6BAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,iDAAiD;QACjD,OAAO,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,2FAA2F;QAC3F,OAAO,CACL,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;YACrC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CACxC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC1C,QAAQ,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAC/C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,QAAQ,GAAG,aAAa,CAAC;AAE/B,IAAI,gBAAgD,CAAC;AACrD;;GAEG;AACH,SAAgB,kBAAkB;IAChC,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,IAAI,EAAE,GAA2B,IAAI,CAAC;IACtC,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;QACrC,EAAE,GAAG,IAAA,6BAAQ,EAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,QAAQ,GAAuB,SAAS,CAAC;IAC7C,IAAI,OAAO,UAAU,KAAK,WAAW,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;QACrE,kFAAkF;QAClF,2EAA2E;QAC3E,QAAQ,GAAI,UAAkB,CAAC,WAAW,CAAC,aAAa,CAAC;IAC3D,CAAC;IAED,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,gBAAgB,EAAE,IAAA,mCAAc,GAAE;QAClC,eAAe,EAAE,oBAAO;QACxB,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QACxC,YAAY,EAAE,QAAQ;QACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,OAAO,CAAC,EAAqC;IACpD,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;IACtC,IAAI,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,mCAAmC;IACnC,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;QACnB;YACE,wFAAwF;YACxF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -61,11 +61,12 @@ function engineAccount(options) {
|
|
|
61
61
|
// engine wants a hex string here so we serialize it
|
|
62
62
|
data: transaction.data || "0x",
|
|
63
63
|
// value is always required
|
|
64
|
-
value:
|
|
64
|
+
value: transaction.value ?? 0n,
|
|
65
65
|
// optional authorization list
|
|
66
66
|
authorizationList: transaction.authorizationList,
|
|
67
67
|
txOverrides: {
|
|
68
68
|
gas: transaction.gas,
|
|
69
|
+
value: transaction.value,
|
|
69
70
|
},
|
|
70
71
|
};
|
|
71
72
|
// TODO: gas overrides etc?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":";;AAwEA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export async function uploadBatch(client, form, fileNames, options) {
|
|
|
12
12
|
headers,
|
|
13
13
|
body: form,
|
|
14
14
|
requestTimeoutMs: client.config?.storage?.fetch?.requestTimeoutMs || 120000,
|
|
15
|
+
// force auth token usage for storage uploads
|
|
16
|
+
useAuthToken: true,
|
|
15
17
|
});
|
|
16
18
|
if (!res.ok) {
|
|
17
19
|
if (res.status === 401) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-node.js","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAsB,EACtB,IAAc,EACd,SAAmB,EACnB,OAA+B;IAE/B,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAgB,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CACtC,WAAW,kBAAkB,EAAE,CAAC,OAAO,cAAc,EACrD;QACE,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI;QACV,gBAAgB,EACd,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"web-node.js","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAsB,EACtB,IAAc,EACd,SAAmB,EACnB,OAA+B;IAE/B,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,OAAO,GAAgB,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CACtC,WAAW,kBAAkB,EAAE,CAAC,OAAO,cAAc,EACrD;QACE,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI;QACV,gBAAgB,EACd,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,IAAI,MAAM;QAC3D,6CAA6C;QAC7C,YAAY,EAAE,IAAI;KACnB,CACF,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,KAAK,CACb,oCAAoC,GAAG,CAAC,MAAM,MAAM,GAAG,CAAC,UAAU,EAAE,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC1B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACpC,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/esm/utils/fetch.js
CHANGED
|
@@ -13,7 +13,7 @@ export function getClientFetch(client, ecosystem) {
|
|
|
13
13
|
* @internal
|
|
14
14
|
*/
|
|
15
15
|
async function fetchWithHeaders(url, init) {
|
|
16
|
-
const { requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT, ...restInit } = init || {};
|
|
16
|
+
const { requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT, useAuthToken, ...restInit } = init || {};
|
|
17
17
|
let headers = restInit.headers
|
|
18
18
|
? new Headers(restInit.headers)
|
|
19
19
|
: typeof url === "object"
|
|
@@ -26,7 +26,7 @@ export function getClientFetch(client, ecosystem) {
|
|
|
26
26
|
headers = new Headers();
|
|
27
27
|
}
|
|
28
28
|
// auth token if secret key === jwt
|
|
29
|
-
const authToken = client.secretKey && isJWT(client.secretKey)
|
|
29
|
+
const authToken = useAuthToken && client.secretKey && isJWT(client.secretKey)
|
|
30
30
|
? client.secretKey
|
|
31
31
|
: undefined;
|
|
32
32
|
// secret key if secret key !== jwt
|
|
@@ -46,11 +46,14 @@ export function getClientFetch(client, ecosystem) {
|
|
|
46
46
|
headers.set("x-team-id", client.teamId);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
else {
|
|
50
|
+
// only set secret key or client id if we are NOT using the auth token!
|
|
51
|
+
if (secretKey) {
|
|
52
|
+
headers.set("x-secret-key", secretKey);
|
|
53
|
+
}
|
|
54
|
+
if (clientId) {
|
|
55
|
+
headers.set("x-client-id", clientId);
|
|
56
|
+
}
|
|
54
57
|
}
|
|
55
58
|
if (ecosystem) {
|
|
56
59
|
headers.set("x-ecosystem-id", ecosystem.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAEL,QAAQ,EACR,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAEtC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAAsB,EAAE,SAAqB;IAC1E;;OAEG;IACH,KAAK,UAAU,gBAAgB,CAC7B,GAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAEL,QAAQ,EACR,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAEtC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,MAAsB,EAAE,SAAqB;IAC1E;;OAEG;IACH,KAAK,UAAU,gBAAgB,CAC7B,GAAqB,EACrB,IAGC;QAED,MAAM,EACJ,gBAAgB,GAAG,uBAAuB,EAC1C,YAAY,EACZ,GAAG,QAAQ,EACZ,GAAG,IAAI,IAAI,EAAE,CAAC;QAEf,IAAI,OAAO,GAAG,QAAQ,CAAC,OAAO;YAC5B,CAAC,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC/B,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ;gBACvB,CAAC,CAAC,GAAG,CAAC,OAAO;gBACb,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QAE1D,sHAAsH;QACtH,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,CAAC;YACD,mCAAmC;YACnC,MAAM,SAAS,GACb,YAAY,IAAI,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;gBACzD,CAAC,CAAC,MAAM,CAAC,SAAS;gBAClB,CAAC,CAAC,SAAS,CAAC;YAChB,mCAAmC;YACnC,MAAM,SAAS,GACb,MAAM,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC1C,CAAC,CAAC,MAAM,CAAC,SAAS;gBAClB,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,qFAAqF;YACrF,yIAAyI;YACzI,IACE,SAAS;gBACT,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACpB,CAAC,gBAAgB,CAAC,SAAS,CAAC;gBAC5B,CAAC,YAAY,CAAC,SAAS,CAAC,EACxB,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,UAAU,SAAS,EAAE,CAAC,CAAC;gBACpD,kEAAkE;gBAClE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,uEAAuE;gBACvE,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;gBACzC,CAAC;gBAED,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;oBACxB,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YACD,iCAAiC;YACjC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,kBAAkB,EAAE,EAAE,CAAC;gBAC/C,OAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACvC,CAAC;YAED,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;YACnC,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,UAAuC,CAAC;QAC5C,IAAI,YAAuD,CAAC;QAC5D,IAAI,gBAAgB,EAAE,CAAC;YACrB,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACnC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,KAAK,CAAC,GAAG,EAAE;YAChB,GAAG,QAAQ;YACX,OAAO;YACP,MAAM,EAAE,UAAU,EAAE,MAAM;SAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YACd,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,YAAY,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,+GAA+G;AAC/G,MAAM,gBAAgB,GAAG;IACvB,eAAe;IACf,aAAa;IACb,cAAc;IACd,eAAe;IACf,mBAAmB;CACX,CAAC;AAEX,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAU,IAAI,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IAAI,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,mGAAmG;QACnG,OAAO,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACzC,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC;YACH,iDAAiD;YACjD,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;oBAC7B,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBACrC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,iDAAiD;QACjD,OAAO,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW;IACnC,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,2FAA2F;QAC3F,OAAO,CACL,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;YACrC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CACxC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC1C,QAAQ,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAC/C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,QAAQ,GAAG,aAAa,CAAC;AAE/B,IAAI,gBAAgD,CAAC;AACrD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,IAAI,EAAE,GAA2B,IAAI,CAAC;IACtC,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE,CAAC;QACrC,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,QAAQ,GAAuB,SAAS,CAAC;IAC7C,IAAI,OAAO,UAAU,KAAK,WAAW,IAAI,aAAa,IAAI,UAAU,EAAE,CAAC;QACrE,kFAAkF;QAClF,2EAA2E;QAC3E,QAAQ,GAAI,UAAkB,CAAC,WAAW,CAAC,aAAa,CAAC;IAC3D,CAAC;IAED,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,gBAAgB,EAAE,cAAc,EAAE;QAClC,eAAe,EAAE,OAAO;QACxB,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QACxC,YAAY,EAAE,QAAQ;QACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,OAAO,CAAC,EAAqC;IACpD,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;IACtC,IAAI,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,mCAAmC;IACnC,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;QACnB;YACE,wFAAwF;YACxF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.98.
|
|
1
|
+
export const version = "5.98.1";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -58,11 +58,12 @@ export function engineAccount(options) {
|
|
|
58
58
|
// engine wants a hex string here so we serialize it
|
|
59
59
|
data: transaction.data || "0x",
|
|
60
60
|
// value is always required
|
|
61
|
-
value:
|
|
61
|
+
value: transaction.value ?? 0n,
|
|
62
62
|
// optional authorization list
|
|
63
63
|
authorizationList: transaction.authorizationList,
|
|
64
64
|
txOverrides: {
|
|
65
65
|
gas: transaction.gas,
|
|
66
|
+
value: transaction.value,
|
|
66
67
|
},
|
|
67
68
|
};
|
|
68
69
|
// TODO: gas overrides etc?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAuChD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,aAAa,CAAC,OAA6B;IACzD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE1E,sCAAsC;IACtC,MAAM,OAAO,GAAgB;QAC3B,0BAA0B,EAAE,aAAa;QACzC,aAAa,EAAE,UAAU,SAAS,EAAE;QACpC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IAEF,IAAI,SAAS,EAAE,cAAc,EAAE,CAAC;QAC9B,OAAO,CAAC,mBAAmB,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC;IAC1D,CAAC;IACD,IAAI,SAAS,EAAE,qBAAqB,EAAE,CAAC;QACrC,OAAO,CAAC,2BAA2B,CAAC,GAAG,SAAS,CAAC,qBAAqB,CAAC;IACzE,CAAC;IACD,IAAI,SAAS,EAAE,WAAW,EAAE,CAAC;QAC3B,OAAO,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC;IACpD,CAAC;IAED,OAAO;QACL,OAAO,EAAE,aAAa;QACtB,eAAe,EAAE,KAAK,EAAE,WAAkC,EAAE,EAAE;YAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;YACtC,UAAU,CAAC,QAAQ,GAAG,mBAAmB,WAAW,CAAC,OAAO,mBAAmB,CAAC;YAEhF,MAAM,UAAU,GAA4B;gBAC1C,+DAA+D;gBAC/D,SAAS,EAAE,WAAW,CAAC,EAAE,IAAI,SAAS;gBACtC,oDAAoD;gBACpD,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;gBAC9B,2BAA2B;gBAC3B,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-node.d.ts","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,wBAAsB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,cAAc,EAAE,EACrE,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"web-node.d.ts","sourceRoot":"","sources":["../../../../src/storage/upload/web-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAK7D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,wBAAsB,WAAW,CAAC,KAAK,CAAC,MAAM,SAAS,cAAc,EAAE,EACrE,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,qBAqDhC"}
|
|
@@ -6,6 +6,7 @@ import { LruMap } from "./caching/lru.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export declare function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem): (url: string | Request, init?: Omit<RequestInit, "signal"> & {
|
|
8
8
|
requestTimeoutMs?: number;
|
|
9
|
+
useAuthToken?: boolean;
|
|
9
10
|
}) => Promise<Response>;
|
|
10
11
|
export declare const IS_THIRDWEB_URL_CACHE: LruMap<boolean>;
|
|
11
12
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAY1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,SAAS,SAKnE,MAAM,GAAG,OAAO,SACd,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAY1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,SAAS,SAKnE,MAAM,GAAG,OAAO,SACd,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,KACA,OAAO,CAAC,QAAQ,CAAC,CA4FrB;AAWD,eAAO,MAAM,qBAAqB,iBAA4B,CAAC;AAE/D;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAyBlD;AAwCD;;GAEG;AACH,wBAAgB,kBAAkB,uBA0BjC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.98.
|
|
1
|
+
export declare const version = "5.98.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;WAEG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/engine/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;WAEG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAgKpE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "thirdweb",
|
|
3
|
-
"version": "5.98.
|
|
3
|
+
"version": "5.98.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
|
@@ -260,7 +260,7 @@
|
|
|
260
260
|
"@mobile-wallet-protocol/client": "^1",
|
|
261
261
|
"@react-native-async-storage/async-storage": "^1 || ^2",
|
|
262
262
|
"ethers": "^5 || ^6",
|
|
263
|
-
"expo-linking": "^6",
|
|
263
|
+
"expo-linking": "^6 || ^7",
|
|
264
264
|
"expo-web-browser": "^13 || ^14",
|
|
265
265
|
"react": "^18 || ^19",
|
|
266
266
|
"react-native": "*",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { describe, expect, test } from "vitest";
|
|
2
|
+
import { ANVIL_CHAIN } from "../../test/src/chains.js";
|
|
2
3
|
import { TEST_CLIENT } from "../../test/src/test-clients.js";
|
|
3
4
|
import { ANVIL_PKEY_A, TEST_ACCOUNT_A } from "../../test/src/test-wallets.js";
|
|
4
5
|
import { typedData } from "../../test/src/typed-data.js";
|
|
@@ -20,7 +21,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
20
21
|
primaryType: "Mail",
|
|
21
22
|
address: TEST_ACCOUNT_A.address,
|
|
22
23
|
signature,
|
|
23
|
-
chain:
|
|
24
|
+
chain: ANVIL_CHAIN,
|
|
24
25
|
client: TEST_CLIENT,
|
|
25
26
|
}),
|
|
26
27
|
).toBe(true);
|
|
@@ -33,7 +34,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
33
34
|
primaryType: "Mail",
|
|
34
35
|
address: TEST_ACCOUNT_A.address,
|
|
35
36
|
signature: "0xdead",
|
|
36
|
-
chain:
|
|
37
|
+
chain: ANVIL_CHAIN,
|
|
37
38
|
client: TEST_CLIENT,
|
|
38
39
|
}),
|
|
39
40
|
).toBe(false);
|
|
@@ -74,7 +75,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
|
|
|
74
75
|
address: "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
|
|
75
76
|
signature:
|
|
76
77
|
"0x79d756d805073dc97b7bc885b0d56ddf319a2599530fe1e178c2a7de5be88980068d24f20a79b318ea0a84d33ae06f93db77e4235e5d9eeb8b1d7a63922ada3e1c",
|
|
77
|
-
chain:
|
|
78
|
+
chain: ANVIL_CHAIN,
|
|
78
79
|
client: TEST_CLIENT,
|
|
79
80
|
}),
|
|
80
81
|
).toBe(false);
|
package/src/utils/fetch.test.ts
CHANGED
|
@@ -52,7 +52,7 @@ describe("getClientFetch", () => {
|
|
|
52
52
|
);
|
|
53
53
|
});
|
|
54
54
|
|
|
55
|
-
it("should send a bearer token if secret key is a JWT", () => {
|
|
55
|
+
it("should NOT send a bearer token if secret key is a JWT", () => {
|
|
56
56
|
vi.spyOn(global, "fetch").mockResolvedValue(new Response());
|
|
57
57
|
const clientFetch = getClientFetch({
|
|
58
58
|
clientId: "test-client-id",
|
|
@@ -67,6 +67,28 @@ describe("getClientFetch", () => {
|
|
|
67
67
|
}),
|
|
68
68
|
);
|
|
69
69
|
|
|
70
|
+
// biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
|
|
71
|
+
const headers = (global.fetch as any).mock.calls[0][1].headers;
|
|
72
|
+
expect(headers.get("authorization")).toBe(null);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("should send a bearer token if secret key is a JWT and useAuthToken is true", () => {
|
|
76
|
+
vi.spyOn(global, "fetch").mockResolvedValue(new Response());
|
|
77
|
+
const clientFetch = getClientFetch({
|
|
78
|
+
clientId: "test-client-id",
|
|
79
|
+
secretKey: "foo.bar.baz",
|
|
80
|
+
});
|
|
81
|
+
clientFetch("https://api.thirdweb.com/test", {
|
|
82
|
+
useAuthToken: true,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
expect(global.fetch).toHaveBeenCalledWith(
|
|
86
|
+
"https://api.thirdweb.com/test",
|
|
87
|
+
expect.objectContaining({
|
|
88
|
+
headers: expect.any(Headers),
|
|
89
|
+
}),
|
|
90
|
+
);
|
|
91
|
+
|
|
70
92
|
// biome-ignore lint/suspicious/noExplicitAny: `any` type ok for tests
|
|
71
93
|
const headers = (global.fetch as any).mock.calls[0][1].headers;
|
|
72
94
|
expect(headers.get("authorization")).toBe("Bearer foo.bar.baz");
|
package/src/utils/fetch.ts
CHANGED
|
@@ -22,10 +22,16 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
22
22
|
*/
|
|
23
23
|
async function fetchWithHeaders(
|
|
24
24
|
url: string | Request,
|
|
25
|
-
init?: Omit<RequestInit, "signal"> & {
|
|
25
|
+
init?: Omit<RequestInit, "signal"> & {
|
|
26
|
+
requestTimeoutMs?: number;
|
|
27
|
+
useAuthToken?: boolean;
|
|
28
|
+
},
|
|
26
29
|
): Promise<Response> {
|
|
27
|
-
const {
|
|
28
|
-
|
|
30
|
+
const {
|
|
31
|
+
requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT,
|
|
32
|
+
useAuthToken,
|
|
33
|
+
...restInit
|
|
34
|
+
} = init || {};
|
|
29
35
|
|
|
30
36
|
let headers = restInit.headers
|
|
31
37
|
? new Headers(restInit.headers)
|
|
@@ -41,7 +47,7 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
41
47
|
}
|
|
42
48
|
// auth token if secret key === jwt
|
|
43
49
|
const authToken =
|
|
44
|
-
client.secretKey && isJWT(client.secretKey)
|
|
50
|
+
useAuthToken && client.secretKey && isJWT(client.secretKey)
|
|
45
51
|
? client.secretKey
|
|
46
52
|
: undefined;
|
|
47
53
|
// secret key if secret key !== jwt
|
|
@@ -64,14 +70,15 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
|
|
|
64
70
|
if (client.teamId) {
|
|
65
71
|
headers.set("x-team-id", client.teamId);
|
|
66
72
|
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
73
|
+
} else {
|
|
74
|
+
// only set secret key or client id if we are NOT using the auth token!
|
|
75
|
+
if (secretKey) {
|
|
76
|
+
headers.set("x-secret-key", secretKey);
|
|
77
|
+
}
|
|
72
78
|
|
|
73
|
-
|
|
74
|
-
|
|
79
|
+
if (clientId) {
|
|
80
|
+
headers.set("x-client-id", clientId);
|
|
81
|
+
}
|
|
75
82
|
}
|
|
76
83
|
|
|
77
84
|
if (ecosystem) {
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.98.
|
|
1
|
+
export const version = "5.98.1";
|
|
@@ -102,12 +102,13 @@ export function engineAccount(options: EngineAccountOptions): Account {
|
|
|
102
102
|
// engine wants a hex string here so we serialize it
|
|
103
103
|
data: transaction.data || "0x",
|
|
104
104
|
// value is always required
|
|
105
|
-
value:
|
|
105
|
+
value: transaction.value ?? 0n,
|
|
106
106
|
// optional authorization list
|
|
107
107
|
authorizationList: transaction.authorizationList,
|
|
108
108
|
|
|
109
109
|
txOverrides: {
|
|
110
110
|
gas: transaction.gas,
|
|
111
|
+
value: transaction.value,
|
|
111
112
|
},
|
|
112
113
|
};
|
|
113
114
|
|