thirdweb 5.88.2-nightly-0c1bb6ccaec9dc4edf596dac7f7623d0ad90f757-20250212000327 → 5.88.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/exports/extensions/erc1155.js +4 -2
- package/dist/cjs/exports/extensions/erc1155.js.map +1 -1
- package/dist/cjs/exports/extensions/erc20.js +3 -1
- package/dist/cjs/exports/extensions/erc20.js.map +1 -1
- package/dist/cjs/exports/extensions/erc721.js +4 -2
- package/dist/cjs/exports/extensions/erc721.js.map +1 -1
- package/dist/cjs/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.js +191 -0
- package/dist/cjs/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.js.map +1 -0
- package/dist/cjs/extensions/erc1155/drops/read/canClaim.js +63 -0
- package/dist/cjs/extensions/erc1155/drops/read/canClaim.js.map +1 -0
- package/dist/cjs/extensions/erc20/__generated__/DropERC20/read/verifyClaim.js +182 -0
- package/dist/cjs/extensions/erc20/__generated__/DropERC20/read/verifyClaim.js.map +1 -0
- package/dist/cjs/extensions/erc20/drops/read/canClaim.js +68 -0
- package/dist/cjs/extensions/erc20/drops/read/canClaim.js.map +1 -0
- package/dist/cjs/extensions/erc721/__generated__/DropERC721/read/verifyClaim.js +182 -0
- package/dist/cjs/extensions/erc721/__generated__/DropERC721/read/verifyClaim.js.map +1 -0
- package/dist/cjs/extensions/erc721/drops/read/canClaim.js +59 -0
- package/dist/cjs/extensions/erc721/drops/read/canClaim.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +12 -5
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.js +9 -4
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js +3 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js +1 -3
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.js +7 -3
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.js.map +1 -1
- package/dist/cjs/react/web/utils/errors.js +6 -1
- package/dist/cjs/react/web/utils/errors.js.map +1 -1
- package/dist/cjs/transaction/extract-error.js +11 -4
- package/dist/cjs/transaction/extract-error.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/esm/exports/extensions/erc1155.js +1 -0
- package/dist/esm/exports/extensions/erc1155.js.map +1 -1
- package/dist/esm/exports/extensions/erc20.js +1 -0
- package/dist/esm/exports/extensions/erc20.js.map +1 -1
- package/dist/esm/exports/extensions/erc721.js +1 -0
- package/dist/esm/exports/extensions/erc721.js.map +1 -1
- package/dist/esm/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.js +183 -0
- package/dist/esm/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.js.map +1 -0
- package/dist/esm/extensions/erc1155/drops/read/canClaim.js +60 -0
- package/dist/esm/extensions/erc1155/drops/read/canClaim.js.map +1 -0
- package/dist/esm/extensions/erc20/__generated__/DropERC20/read/verifyClaim.js +174 -0
- package/dist/esm/extensions/erc20/__generated__/DropERC20/read/verifyClaim.js.map +1 -0
- package/dist/esm/extensions/erc20/drops/read/canClaim.js +65 -0
- package/dist/esm/extensions/erc20/drops/read/canClaim.js.map +1 -0
- package/dist/esm/extensions/erc721/__generated__/DropERC721/read/verifyClaim.js +174 -0
- package/dist/esm/extensions/erc721/__generated__/DropERC721/read/verifyClaim.js.map +1 -0
- package/dist/esm/extensions/erc721/drops/read/canClaim.js +56 -0
- package/dist/esm/extensions/erc721/drops/read/canClaim.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +12 -5
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.js +9 -4
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js +3 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js +2 -4
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.js +7 -3
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.js.map +1 -1
- package/dist/esm/react/web/utils/errors.js +6 -1
- package/dist/esm/react/web/utils/errors.js.map +1 -1
- package/dist/esm/transaction/extract-error.js +11 -5
- package/dist/esm/transaction/extract-error.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/types/exports/extensions/erc1155.d.ts +1 -0
- package/dist/types/exports/extensions/erc1155.d.ts.map +1 -1
- package/dist/types/exports/extensions/erc20.d.ts +1 -0
- package/dist/types/exports/extensions/erc20.d.ts.map +1 -1
- package/dist/types/exports/extensions/erc721.d.ts +1 -0
- package/dist/types/exports/extensions/erc721.d.ts.map +1 -1
- package/dist/types/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.d.ts +143 -0
- package/dist/types/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.d.ts.map +1 -0
- package/dist/types/extensions/erc1155/drops/read/canClaim.d.ts +31 -0
- package/dist/types/extensions/erc1155/drops/read/canClaim.d.ts.map +1 -0
- package/dist/types/extensions/erc20/__generated__/DropERC20/read/verifyClaim.d.ts +136 -0
- package/dist/types/extensions/erc20/__generated__/DropERC20/read/verifyClaim.d.ts.map +1 -0
- package/dist/types/extensions/erc20/drops/read/canClaim.d.ts +32 -0
- package/dist/types/extensions/erc20/drops/read/canClaim.d.ts.map +1 -0
- package/dist/types/extensions/erc721/__generated__/DropERC721/read/verifyClaim.d.ts +136 -0
- package/dist/types/extensions/erc721/__generated__/DropERC721/read/verifyClaim.d.ts.map +1 -0
- package/dist/types/extensions/erc721/drops/read/canClaim.d.ts +29 -0
- package/dist/types/extensions/erc721/drops/read/canClaim.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.d.ts +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.d.ts.map +1 -1
- package/dist/types/react/web/utils/errors.d.ts.map +1 -1
- package/dist/types/transaction/extract-error.d.ts +4 -0
- package/dist/types/transaction/extract-error.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/exports/extensions/erc1155.ts +5 -0
- package/src/exports/extensions/erc20.ts +5 -0
- package/src/exports/extensions/erc721.ts +5 -0
- package/src/extensions/erc1155/__generated__/DropERC1155/read/verifyClaim.ts +223 -0
- package/src/extensions/erc1155/drop1155.test.ts +42 -0
- package/src/extensions/erc1155/drops/read/canClaim.ts +75 -0
- package/src/extensions/erc20/__generated__/DropERC20/read/verifyClaim.ts +213 -0
- package/src/extensions/erc20/drop20.test.ts +38 -0
- package/src/extensions/erc20/drops/read/canClaim.ts +82 -0
- package/src/extensions/erc721/__generated__/DropERC721/read/verifyClaim.ts +213 -0
- package/src/extensions/erc721/drop721.test.ts +39 -0
- package/src/extensions/erc721/drops/read/canClaim.ts +70 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +16 -3
- package/src/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.tsx +40 -19
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx +1 -2
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx +7 -1
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx +3 -7
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/PaymentSelectionScreen.tsx +28 -16
- package/src/react/web/utils/errors.ts +6 -1
- package/src/transaction/actions/gasless/providers/engine.test.ts +1 -1
- package/src/transaction/actions/gasless/providers/openzeppelin.test.ts +1 -1
- package/src/transaction/extract-error.ts +15 -13
- package/src/version.ts +1 -1
@@ -13,7 +13,12 @@ export const defaultMessage = "Unable to get price quote";
|
|
13
13
|
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
14
14
|
export function getErrorMessage(err: any): ApiError {
|
15
15
|
if (typeof err.error === "object" && err.error.code) {
|
16
|
-
|
16
|
+
if (err.error.code === "MINIMUM_PURCHASE_AMOUNT") {
|
17
|
+
return {
|
18
|
+
code: "MINIMUM_PURCHASE_AMOUNT",
|
19
|
+
message: "Purchase amount is too low",
|
20
|
+
};
|
21
|
+
}
|
17
22
|
}
|
18
23
|
return {
|
19
24
|
code: "UNABLE_TO_GET_PRICE_QUOTE",
|
@@ -78,7 +78,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareengineTransaction", () => {
|
|
78
78
|
{
|
79
79
|
"data": "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
|
80
80
|
"from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
81
|
-
"gas":
|
81
|
+
"gas": 64340n,
|
82
82
|
"nonce": 0n,
|
83
83
|
"to": "${erc20Contract.address}",
|
84
84
|
"value": 0n,
|
@@ -76,7 +76,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
76
76
|
{
|
77
77
|
"data": "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
|
78
78
|
"from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
79
|
-
"gas":
|
79
|
+
"gas": 64340n,
|
80
80
|
"nonce": 0n,
|
81
81
|
"to": "${erc20Contract.address}",
|
82
82
|
"value": 0n,
|
@@ -1,9 +1,8 @@
|
|
1
1
|
import type { Abi } from "abitype";
|
2
|
-
import { type Hex, decodeErrorResult } from "viem";
|
2
|
+
import { type Hex, decodeErrorResult, stringify } from "viem";
|
3
3
|
import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
|
4
4
|
import type { ThirdwebContract } from "../contract/contract.js";
|
5
5
|
import { isHex } from "../utils/encoding/hex.js";
|
6
|
-
import { stringify } from "../utils/json.js";
|
7
6
|
import { IS_DEV } from "../utils/process.js";
|
8
7
|
|
9
8
|
/**
|
@@ -13,6 +12,18 @@ export async function extractError<abi extends Abi>(args: {
|
|
13
12
|
error: unknown;
|
14
13
|
contract?: ThirdwebContract<abi>;
|
15
14
|
}) {
|
15
|
+
const { error, contract } = args;
|
16
|
+
const result = await extractErrorResult({ error, contract });
|
17
|
+
if (result) {
|
18
|
+
return new TransactionError(result, contract);
|
19
|
+
}
|
20
|
+
return error;
|
21
|
+
}
|
22
|
+
|
23
|
+
export async function extractErrorResult<abi extends Abi>(args: {
|
24
|
+
error: unknown;
|
25
|
+
contract?: ThirdwebContract<abi>;
|
26
|
+
}): Promise<string | undefined> {
|
16
27
|
const { error, contract } = args;
|
17
28
|
if (typeof error === "object") {
|
18
29
|
// try to parse RPC error
|
@@ -31,20 +42,11 @@ export async function extractError<abi extends Abi>(args: {
|
|
31
42
|
data: errorObj.data,
|
32
43
|
abi,
|
33
44
|
});
|
34
|
-
return
|
35
|
-
`${parsedError.errorName}${
|
36
|
-
parsedError.args ? ` - ${parsedError.args}` : ""
|
37
|
-
}`,
|
38
|
-
contract,
|
39
|
-
);
|
45
|
+
return `${parsedError.errorName}${parsedError.args ? ` - ${parsedError.args}` : ""}`;
|
40
46
|
}
|
41
|
-
return new TransactionError(
|
42
|
-
`Execution Reverted: ${stringify(errorObj)}`,
|
43
|
-
contract,
|
44
|
-
);
|
45
47
|
}
|
46
48
|
}
|
47
|
-
return error
|
49
|
+
return `Execution Reverted: ${stringify(error)}`;
|
48
50
|
}
|
49
51
|
|
50
52
|
class TransactionError<abi extends Abi> extends Error {
|
package/src/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = "5.88.
|
1
|
+
export const version = "5.88.3";
|