thirdweb 5.108.14-nightly-43b06801247372ef0ae6064b28ed9a91c0414c7d-20251014000325 → 5.108.14
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/version.js.map +1 -1
- package/dist/cjs/wallets/coinbase/coinbase-web.js +9 -1
- package/dist/cjs/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/cjs/x402/fetchWithPayment.js +3 -3
- package/dist/cjs/x402/fetchWithPayment.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/coinbase/coinbase-web.js +9 -1
- package/dist/esm/wallets/coinbase/coinbase-web.js.map +1 -1
- package/dist/esm/x402/fetchWithPayment.js +3 -3
- package/dist/esm/x402/fetchWithPayment.js.map +1 -1
- package/dist/scripts/bridge-widget.js +3 -3
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/coinbase/coinbase-web.d.ts.map +1 -1
- package/dist/types/x402/fetchWithPayment.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/version.ts +1 -1
- package/src/wallets/coinbase/coinbase-web.ts +11 -1
- package/src/x402/fetchWithPayment.ts +3 -1
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.108.14
|
|
4
|
+
exports.version = "5.108.14";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
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,UAAU,CAAC"}
|
|
@@ -65,7 +65,15 @@ function createAccount({ provider, address, client, }) {
|
|
|
65
65
|
onTransactionRequested: async () => {
|
|
66
66
|
// make sure to show the coinbase popup BEFORE doing any transaction preprocessing
|
|
67
67
|
// otherwise the popup might get blocked in safari
|
|
68
|
-
|
|
68
|
+
// but only if using cb smart wallet (web based)
|
|
69
|
+
if (window.localStorage) {
|
|
70
|
+
// this is the local storage key for the signer type in the cb web sdk
|
|
71
|
+
// value can be "scw" (web) or "walletlink" (mobile wallet)
|
|
72
|
+
const signerType = window.localStorage.getItem("-CBWSDK:SignerConfigurator:SignerType");
|
|
73
|
+
if (signerType === "scw") {
|
|
74
|
+
await (0, utils_js_2.showCoinbasePopup)(provider);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
69
77
|
},
|
|
70
78
|
async sendTransaction(tx) {
|
|
71
79
|
const transactionHash = (await provider.request({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coinbase-web.js","sourceRoot":"","sources":["../../../../src/wallets/coinbase/coinbase-web.ts"],"names":[],"mappings":";;AAkIA,wDAgCC;AAQD,kDAIC;
|
|
1
|
+
{"version":3,"file":"coinbase-web.js","sourceRoot":"","sources":["../../../../src/wallets/coinbase/coinbase-web.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1 * 10 **
|
|
|
59
59
|
if (!account || !chain) {
|
|
60
60
|
throw new Error("Wallet not connected. Please connect your wallet to continue.");
|
|
61
61
|
}
|
|
62
|
-
const selectedPaymentRequirements = defaultPaymentRequirementsSelector(parsedPaymentRequirements, chain.id, "exact");
|
|
62
|
+
const selectedPaymentRequirements = defaultPaymentRequirementsSelector(parsedPaymentRequirements, chain.id, "exact", error);
|
|
63
63
|
if (!selectedPaymentRequirements) {
|
|
64
64
|
throw new Error(`No suitable payment requirements found for chain ${chain.id}. ${error}`);
|
|
65
65
|
}
|
|
@@ -93,9 +93,9 @@ function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1 * 10 **
|
|
|
93
93
|
return secondResponse;
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
|
-
function defaultPaymentRequirementsSelector(paymentRequirements, chainId, scheme) {
|
|
96
|
+
function defaultPaymentRequirementsSelector(paymentRequirements, chainId, scheme, error) {
|
|
97
97
|
if (!paymentRequirements.length) {
|
|
98
|
-
throw new Error(
|
|
98
|
+
throw new Error(`No valid payment requirements found in server 402 response. ${error}`);
|
|
99
99
|
}
|
|
100
100
|
const currentWalletNetwork = types_1.ChainIdToNetwork[chainId] || `eip155:${chainId}`;
|
|
101
101
|
// find the payment requirements matching the connected wallet chain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":";;AAkDA,
|
|
1
|
+
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.108.14
|
|
1
|
+
export const version = "5.108.14";
|
|
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,UAAU,CAAC"}
|
|
@@ -59,7 +59,15 @@ function createAccount({ provider, address, client, }) {
|
|
|
59
59
|
onTransactionRequested: async () => {
|
|
60
60
|
// make sure to show the coinbase popup BEFORE doing any transaction preprocessing
|
|
61
61
|
// otherwise the popup might get blocked in safari
|
|
62
|
-
|
|
62
|
+
// but only if using cb smart wallet (web based)
|
|
63
|
+
if (window.localStorage) {
|
|
64
|
+
// this is the local storage key for the signer type in the cb web sdk
|
|
65
|
+
// value can be "scw" (web) or "walletlink" (mobile wallet)
|
|
66
|
+
const signerType = window.localStorage.getItem("-CBWSDK:SignerConfigurator:SignerType");
|
|
67
|
+
if (signerType === "scw") {
|
|
68
|
+
await showCoinbasePopup(provider);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
63
71
|
},
|
|
64
72
|
async sendTransaction(tx) {
|
|
65
73
|
const transactionHash = (await provider.request({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coinbase-web.js","sourceRoot":"","sources":["../../../../src/wallets/coinbase/coinbase-web.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,OAAO,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,aAAa,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAEL,WAAW,EACX,WAAW,EACX,eAAe,GAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAWhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAmF/C,uGAAuG;AACvG,8EAA8E;AAC9E,IAAI,SAAwC,CAAC;AAE7C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAA8C;IAE9C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,iBAAiB,GAAY,CAAC,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;aACpE,OAAO,CAAC;QACX,wCAAwC;QACxC,6CAA6C;QAC7C,IACE,OAAO,iBAAiB,KAAK,UAAU;YACvC,OAAQ,iBAA0C,CAAC,OAAO,KAAK,UAAU,EACzE,CAAC;YACD,iBAAiB,GACf,iBACD,CAAC,OAAO,CAAC;QACZ,CAAC;QAED,kEAAkE;QAClE,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC;YACnC,WAAW,EAAE,OAAO,EAAE,MAAM;gBAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjC,CAAC,CAAC,SAAS;YACb,UAAU,EACR,OAAO,EAAE,WAAW,EAAE,OAAO,IAAI,qBAAqB,EAAE,CAAC,OAAO;YAClE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,IAAI,qBAAqB,EAAE,CAAC,IAAI;SACpE,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAChE,SAAS,GAAG,QAAQ,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAc;IAEd,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,EACrB,QAAQ,EACR,OAAO,EACP,MAAM,GAKP;IACC,MAAM,OAAO,GAAY;QACvB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;QAC5B,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACjC,kFAAkF;YAClF,kDAAkD;YAClD,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"coinbase-web.js","sourceRoot":"","sources":["../../../../src/wallets/coinbase/coinbase-web.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ export function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1
|
|
|
56
56
|
if (!account || !chain) {
|
|
57
57
|
throw new Error("Wallet not connected. Please connect your wallet to continue.");
|
|
58
58
|
}
|
|
59
|
-
const selectedPaymentRequirements = defaultPaymentRequirementsSelector(parsedPaymentRequirements, chain.id, "exact");
|
|
59
|
+
const selectedPaymentRequirements = defaultPaymentRequirementsSelector(parsedPaymentRequirements, chain.id, "exact", error);
|
|
60
60
|
if (!selectedPaymentRequirements) {
|
|
61
61
|
throw new Error(`No suitable payment requirements found for chain ${chain.id}. ${error}`);
|
|
62
62
|
}
|
|
@@ -90,9 +90,9 @@ export function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1
|
|
|
90
90
|
return secondResponse;
|
|
91
91
|
};
|
|
92
92
|
}
|
|
93
|
-
function defaultPaymentRequirementsSelector(paymentRequirements, chainId, scheme) {
|
|
93
|
+
function defaultPaymentRequirementsSelector(paymentRequirements, chainId, scheme, error) {
|
|
94
94
|
if (!paymentRequirements.length) {
|
|
95
|
-
throw new Error(
|
|
95
|
+
throw new Error(`No valid payment requirements found in server 402 response. ${error}`);
|
|
96
96
|
}
|
|
97
97
|
const currentWalletNetwork = ChainIdToNetwork[chainId] || `eip155:${chainId}`;
|
|
98
98
|
// find the payment requirements matching the connected wallet chain
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EACL,gBAAgB,EAEhB,kCAAkC,GACnC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAA8B,EAC9B,MAAsB,EACtB,MAAc,EACd,WAAmB,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,OAAO,KAAK,EAAE,KAAkB,EAAE,IAAkB,EAAE,EAAE;QACtD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAI7D,CAAC;QACF,MAAM,yBAAyB,GAAG,OAAO;aACtC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kCAAkC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,mCAAmC;QAE3E,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAE9B,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;QACJ,CAAC;QACD,MAAM,2BAA2B,GAAG,kCAAkC,CACpE,yBAAyB,EACzB,KAAK,CAAC,EAAE,EACR,OAAO,
|
|
1
|
+
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":"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"}
|