Compare commits

..
Author SHA1 Message Date
Jonas DanielsGitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>GitHub Action
7b52c6bba0 Version Packages (#2467)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action <[email protected]>
2024-03-13 11:56:41 -07:00
Edward SunandGitHub e024d78ed0 Add pay to usageEventSchema (#2465) 2024-03-13 05:02:40 +00:00
Joaquim VergesandGitHub a2002d1637 [SDK] Better return type for getProofsForAllowListEntry (#2469) 2024-03-13 01:20:22 +00:00
FirekeeperandGitHub 607ab7e860 [Unity] Expose SW isDeployed (#2466) 2024-03-12 22:37:02 +00:00
Jonas DanielsGitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>GitHub Action
f27989741a Version Packages (#2461)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Action <[email protected]>
2024-03-12 12:55:05 -07:00
Joaquim VergesandGitHub b2be63ada4 handle l2 estimations when forcing gasLimit (#2457) 2024-03-12 19:37:02 +00:00
Winston YeoandGitHub eee200f8d4 chore: whitelist embedded-wallet.thirdweb.com in service utils (#2453) 2024-03-12 15:45:09 +00:00
Jonas DanielsGitHubgithub-actions[bot] <github-actions[bot]@users.noreply.github.com>
817ab2249f Version Packages (#2446)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-03-11 17:22:24 -07:00
Joaquim VergesandGitHub 173777ade4 [SDK] update OP SDK to fix pnpm preinstall script issue (#2455) 2024-03-11 23:53:16 +00:00
Manan TankandGitHub 838233075a [react] Fix onConnect called multiple times in EmbeddedWalletSocialLogin (#2447) 2024-03-11 19:03:32 +00:00
FirekeeperandGitHub cabfc29119 [Smart Wallet] Use bundler eth_getUserOperationReceipt instead of rpc eth_getLogs (#2443) 2024-03-11 17:12:35 +00:00
38 changed files with 363 additions and 122 deletions
+21
View File
@@ -1,5 +1,26 @@
# @thirdweb-dev/auth
## 4.1.42
### Patch Changes
- Updated dependencies []:
- @thirdweb-dev/wallets@2.4.20
## 4.1.41
### Patch Changes
- Updated dependencies []:
- @thirdweb-dev/wallets@2.4.19
## 4.1.40
### Patch Changes
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d)]:
- @thirdweb-dev/wallets@2.4.18
## 4.1.39
### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/auth",
"version": "4.1.39",
"version": "4.1.42",
"main": "dist/thirdweb-dev-auth.cjs.js",
"module": "dist/thirdweb-dev-auth.esm.js",
"browser": {
@@ -61,7 +61,7 @@
"lint": "eslint src/ && bunx publint --strict --level warning",
"fix": "eslint src/ --fix",
"clean": "rm -rf dist/ && rm -rf node_modules/",
"test": "mocha --config './test/.mocharc.json' --timeout 30000 --parallel './test/**/*.test.ts'",
"test": "mocha --config './test/.mocharc.json' --timeout 240000 --parallel './test/**/*.test.ts'",
"push": "yalc push"
},
"preconstruct": {
+27
View File
@@ -1,5 +1,32 @@
# thirdweb
## 0.13.50
### Patch Changes
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
- @thirdweb-dev/wallets@2.4.20
- @thirdweb-dev/auth@4.1.42
## 0.13.49
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
- @thirdweb-dev/wallets@2.4.19
- @thirdweb-dev/auth@4.1.41
## 0.13.48
### Patch Changes
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/wallets@2.4.18
- @thirdweb-dev/sdk@4.0.43
- @thirdweb-dev/auth@4.1.40
## 0.13.47
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "thirdweb",
"main": "dist/cli/index.js",
"version": "0.13.47",
"version": "0.13.50",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
+27
View File
@@ -1,5 +1,32 @@
# @thirdweb-dev/react-core
## 4.4.18
### Patch Changes
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
- @thirdweb-dev/wallets@2.4.20
- @thirdweb-dev/auth@4.1.42
## 4.4.17
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
- @thirdweb-dev/wallets@2.4.19
- @thirdweb-dev/auth@4.1.41
## 4.4.16
### Patch Changes
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/wallets@2.4.18
- @thirdweb-dev/sdk@4.0.43
- @thirdweb-dev/auth@4.1.40
## 4.4.15
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react-core",
"version": "4.4.15",
"version": "4.4.18",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-core",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
Binary file not shown.
@@ -1,5 +1,11 @@
# @thirdweb-dev/react-native-compat
## 0.7.15
## 0.7.14
## 0.7.13
## 0.7.12
## 0.7.11
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@thirdweb-dev/react-native-compat",
"description": "Shims for Thirdweb in React Native Projects",
"version": "0.7.12",
"version": "0.7.15",
"author": "thirdweb eng <[email protected]>",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native-compat",
"license": "Apache-2.0",
+27
View File
@@ -1,5 +1,32 @@
# @thirdweb-dev/react-native
## 0.7.15
### Patch Changes
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
- @thirdweb-dev/react-core@4.4.18
- @thirdweb-dev/wallets@2.4.20
## 0.7.14
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
- @thirdweb-dev/react-core@4.4.17
- @thirdweb-dev/wallets@2.4.19
## 0.7.13
### Patch Changes
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/wallets@2.4.18
- @thirdweb-dev/sdk@4.0.43
- @thirdweb-dev/react-core@4.4.16
## 0.7.12
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react-native",
"version": "0.7.12",
"version": "0.7.15",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
Binary file not shown.
+29
View File
@@ -1,5 +1,34 @@
# @thirdweb-dev/react
## 4.4.18
### Patch Changes
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
- @thirdweb-dev/react-core@4.4.18
- @thirdweb-dev/wallets@2.4.20
## 4.4.17
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
- @thirdweb-dev/react-core@4.4.17
- @thirdweb-dev/wallets@2.4.19
## 4.4.16
### Patch Changes
- [#2447](https://github.com/thirdweb-dev/js/pull/2447) [`8382330`](https://github.com/thirdweb-dev/js/commit/838233075a4d0897f57570f0f5eb041464838973) Thanks [@MananTank](https://github.com/MananTank)! - Fix multiple renders of EmbeddedWallet social Login screen after connection
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/wallets@2.4.18
- @thirdweb-dev/sdk@4.0.43
- @thirdweb-dev/react-core@4.4.16
## 4.4.15
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react",
"version": "4.4.15",
"version": "4.4.18",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
"author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0",
@@ -3,7 +3,7 @@ import {
EmbeddedWallet,
EmbeddedWalletOauthStrategy,
} from "@thirdweb-dev/wallets";
import { useEffect, useState } from "react";
import { useEffect, useRef, useState } from "react";
import { Spacer } from "../../../components/Spacer";
import { Spinner } from "../../../components/Spinner";
import { Container, ModalHeader } from "../../../components/basic";
@@ -33,7 +33,6 @@ export const EmbeddedWalletSocialLogin = (
const socialLogin = async () => {
try {
console.log("socialLogin");
const embeddedWallet = createWalletInstance();
setConnectionStatus("connecting");
const socialWindow = openOauthSignInWindow(props.strategy, themeObj);
@@ -63,13 +62,19 @@ export const EmbeddedWalletSocialLogin = (
}
};
const closeModal = props.connected;
const onConnect = props.connected;
const onConnectCalled = useRef(false);
useEffect(() => {
if (connectionStatus === "connected") {
closeModal();
if (onConnectCalled.current) {
return;
}
}, [connectionStatus, closeModal]);
if (connectionStatus === "connected") {
onConnect();
onConnectCalled.current = true;
}
}, [connectionStatus, onConnect]);
return (
<Container animate="fadein" flex="column" fullHeight>
Binary file not shown.
+20
View File
@@ -1,5 +1,25 @@
# @thirdweb-dev/sdk
## 4.0.45
### Patch Changes
- [#2469](https://github.com/thirdweb-dev/js/pull/2469) [`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Better return type for getProofsForAllowListEntry
## 4.0.44
### Patch Changes
- [#2457](https://github.com/thirdweb-dev/js/pull/2457) [`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Handle l2 gas estimations when forcing gasLimit
## 4.0.43
### Patch Changes
- [#2443](https://github.com/thirdweb-dev/js/pull/2443) [`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - [Smart Wallet] Use bundler eth_getUserOperationReceipt instead of rpc eth_getLogs, remove polygon gas station error logs
- [#2455](https://github.com/thirdweb-dev/js/pull/2455) [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update optimism SDK to fix the pnpm preinstall issue
## 4.0.42
### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/sdk",
"version": "4.0.42",
"version": "4.0.45",
"description": "The main thirdweb SDK.",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
"license": "Apache-2.0",
@@ -134,7 +134,7 @@
}
},
"dependencies": {
"@eth-optimism/sdk": "^3.2.1",
"@eth-optimism/sdk": "3.2.2",
"@thirdweb-dev/chains": "workspace:*",
"@thirdweb-dev/contracts-js": "workspace:*",
"@thirdweb-dev/crypto": "workspace:*",
+8 -9
View File
@@ -115,17 +115,16 @@ export async function estimateTransactionCost(
tx: providers.TransactionRequest,
) {
const chainId = (await provider.getNetwork()).chainId;
let l1GasCost = BigNumber.from(0);
if (isOpStackChain(chainId)) {
const { asL2Provider } = await import("@eth-optimism/sdk");
const l2RpcProvider = asL2Provider(provider);
const l2GasCost = await l2RpcProvider.estimateTotalGasCost(tx);
return l2GasCost;
} else {
const gasLimit = tx.gasLimit || (await provider.estimateGas(tx));
const gasPrice = await getGasPrice(provider);
const gasCost = BigNumber.from(gasLimit).mul(gasPrice);
return gasCost;
l1GasCost = await l2RpcProvider.estimateL1GasCost(tx);
}
const gasLimit = tx.gasLimit || (await provider.estimateGas(tx));
const gasPrice = await getGasPrice(provider);
const gasCost = BigNumber.from(gasLimit).mul(gasPrice);
return gasCost.add(l1GasCost);
}
function isOpStackChain(chainId: number) {
@@ -188,8 +187,8 @@ export async function getPolygonGasPriorityFee(
const fixedFee = parseFloat(priorityFee).toFixed(9);
return utils.parseUnits(fixedFee, "gwei");
}
} catch (e) {
console.error("failed to fetch gas", e);
} catch {
// if the gas station is down, return the default gas fee
}
return getDefaultGasFee(chainId);
}
+3 -3
View File
@@ -91,9 +91,9 @@ export async function getProofsForAllowListEntry(
tokenDecimals: number = 18,
version: SnapshotFormatVersion = SnapshotFormatVersion.V1,
) {
return merkleTree.getProof(
hashAllowListEntry(snapshotEntry, tokenDecimals, version),
);
return merkleTree
.getProof(hashAllowListEntry(snapshotEntry, tokenDecimals, version))
.map((value) => "0x" + value.data.toString("hex"));
}
/**
@@ -8,8 +8,6 @@ import {
fetchContractMetadataFromAddress,
getContractMetadataFromCache,
} from "../../common/metadata-resolver";
import { fetchSourceFilesFromMetadata } from "../../common/fetchSourceFilesFromMetadata";
import { ContractSource } from "../../schema/contracts/custom";
import { SDKOptionsOutput } from "../../schema/sdk-options";
import type {
DeployTransactionOptions,
@@ -666,7 +664,6 @@ export class Transaction<
const reason = parseRevertReason(error);
// Get contract sources for stack trace
let sources: ContractSource[] | undefined = undefined;
let contractName: string | undefined = undefined;
try {
const chainId = (await provider.getNetwork()).chainId;
@@ -678,10 +675,6 @@ export class Transaction<
if (metadata?.name) {
contractName = metadata.name;
}
if (metadata?.metadata.sources) {
sources = await fetchSourceFilesFromMetadata(metadata, this.storage);
}
} catch (err) {
// no-op
}
@@ -698,7 +691,6 @@ export class Transaction<
value,
hash,
contractName,
sources,
},
error,
);
Binary file not shown.
+12
View File
@@ -1,5 +1,17 @@
# @thirdweb-dev/service-utils
## 0.4.21
### Patch Changes
- [#2465](https://github.com/thirdweb-dev/js/pull/2465) [`e024d78`](https://github.com/thirdweb-dev/js/commit/e024d78ed03fb2f2a618908e87af80799cb79298) Thanks [@edwardysun](https://github.com/edwardysun)! - Add pay to usageEventSchema
## 0.4.20
### Patch Changes
- [#2453](https://github.com/thirdweb-dev/js/pull/2453) [`eee200f`](https://github.com/thirdweb-dev/js/commit/eee200f8d4c4d4cb954b4a8dfcd5ac433f7d2988) Thanks [@ElasticBottle](https://github.com/ElasticBottle)! - chore: allow embedded-wallet.thirdweb.com to use a given client ID for rpc request
## 0.4.19
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/service-utils",
"version": "0.4.19",
"version": "0.4.21",
"main": "dist/thirdweb-dev-service-utils.cjs.js",
"module": "dist/thirdweb-dev-service-utils.esm.js",
"exports": {
@@ -24,6 +24,7 @@ const usageEventSchema = z.object({
"connectWallet",
"checkout",
"engine",
"pay",
]),
action: z.string(),
@@ -65,6 +66,10 @@ const usageEventSchema = z.object({
msSinceQueue: z.number().nonnegative().optional(),
msSinceSend: z.number().nonnegative().optional(),
msTotalDuration: z.number().nonnegative().optional(),
swapId: z.string().optional(),
tokenAddress: z.string().optional(),
amountWei: z.string().optional(),
amountUSDCents: z.number().nonnegative().optional(),
});
export type UsageEvent = z.infer<typeof usageEventSchema>;
@@ -52,7 +52,14 @@ export function authorizeClient(
if (origin) {
if (
// find matching domain, or if all domains allowed
domains.find((d) => {
// embedded-wallet.thirdweb(-dev).com is automatically allowed
// because the rpc is passed from user's domain to embedded-wallet.thirdweb.com iframe for use.
// Note this doesn't allow embedded-wallets from being used if it's disabled. The service check that runs after enforces that.
[
...domains,
"embedded-wallet.thirdweb.com",
"embedded-wallet.thirdweb-dev.com",
].find((d) => {
// if any domain is allowed, we'll return true
if (d === "*") {
return true;
Binary file not shown.
+31
View File
@@ -1,5 +1,36 @@
# @thirdweb-dev/unity-js-bridge
## 0.4.8
### Patch Changes
- [#2466](https://github.com/thirdweb-dev/js/pull/2466) [`607ab7e`](https://github.com/thirdweb-dev/js/commit/607ab7e8600f7637f7e74f0990ddd2f4fb9a2730) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - [unity] expose sw isdeployed
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
- @thirdweb-dev/wallets@2.4.20
- @thirdweb-dev/auth@4.1.42
## 0.4.7
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
- @thirdweb-dev/wallets@2.4.19
- @thirdweb-dev/auth@4.1.41
## 0.4.6
### Patch Changes
- [#2443](https://github.com/thirdweb-dev/js/pull/2443) [`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - [Smart Wallet] Use bundler eth_getUserOperationReceipt instead of rpc eth_getLogs, remove polygon gas station error logs
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/wallets@2.4.18
- @thirdweb-dev/sdk@4.0.43
- @thirdweb-dev/auth@4.1.40
## 0.4.5
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/unity-js-bridge",
"version": "0.4.5",
"version": "0.4.8",
"main": "dist/thirdweb-unity-bridge.js",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/unity-js-bridge",
"license": "Apache-2.0",
@@ -101,6 +101,7 @@ interface TWBridge {
getBlockWithTransactions: (blockNumber: string) => Promise<string>;
getEmail: () => Promise<string>;
getSignerAddress: () => Promise<string>;
smartWalletIsDeployed: () => Promise<string>;
}
const w = window;
@@ -144,7 +145,7 @@ class ThirdwebBridge implements TWBridge {
}
(globalThis as any).X_SDK_NAME = "UnitySDK_WebGL";
(globalThis as any).X_SDK_PLATFORM = "unity";
(globalThis as any).X_SDK_VERSION = "4.7.6";
(globalThis as any).X_SDK_VERSION = "4.7.8";
(globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
}
this.initializedChain = chain;
@@ -817,6 +818,15 @@ class ThirdwebBridge implements TWBridge {
}
}
public async smartWalletIsDeployed() {
if (!this.activeWallet) {
throw new Error("No wallet connected");
}
const smartWallet = this.activeWallet as SmartWallet;
const res = await smartWallet.isDeployed();
return JSON.stringify({ result: res }, bigNumberReplacer);
}
public openPopupWindow() {
const win = window.open("", undefined, "width=350, height=500");
if (win) {
+23
View File
@@ -1,5 +1,28 @@
# @thirdweb-dev/wallets
## 2.4.20
### Patch Changes
- Updated dependencies [[`a2002d1`](https://github.com/thirdweb-dev/js/commit/a2002d16376c41fffa59daccfd98856aba90a627)]:
- @thirdweb-dev/sdk@4.0.45
## 2.4.19
### Patch Changes
- Updated dependencies [[`b2be63a`](https://github.com/thirdweb-dev/js/commit/b2be63ada466ea1784d680ae6244ac047a190103)]:
- @thirdweb-dev/sdk@4.0.44
## 2.4.18
### Patch Changes
- [#2443](https://github.com/thirdweb-dev/js/pull/2443) [`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - [Smart Wallet] Use bundler eth_getUserOperationReceipt instead of rpc eth_getLogs, remove polygon gas station error logs
- Updated dependencies [[`cabfc29`](https://github.com/thirdweb-dev/js/commit/cabfc29119f25a78010f59f766bdcb8c392afa2d), [`173777a`](https://github.com/thirdweb-dev/js/commit/173777ade4ea59cde1c6f25a4654d48b277be9ad)]:
- @thirdweb-dev/sdk@4.0.43
## 2.4.17
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/wallets",
"version": "2.4.17",
"version": "2.4.20",
"main": "dist/thirdweb-dev-wallets.cjs.js",
"module": "dist/thirdweb-dev-wallets.esm.js",
"browser": {
@@ -342,28 +342,31 @@ export abstract class BaseAccountAPI {
}
/**
* get the transaction that has this userOpHash mined, or null if not found
* get the transaction that has this userOpHash mined, or throws if not found
* @param userOpHash - returned by sendUserOpToBundler (or by getUserOpHash..)
* @param timeout - stop waiting after this timeout
* @param interval - time to wait between polls.
* @returns The transactionHash this userOp was mined, or null if not found.
* @returns The transaction receipt, or an error if timed out.
*/
async getUserOpReceipt(
httpRpcClient: HttpRpcClient,
userOpHash: string,
timeout = 30000,
interval = 2000,
): Promise<string | null> {
timeout = 120000,
interval = 1000,
): Promise<providers.TransactionReceipt> {
const endtime = Date.now() + timeout;
while (Date.now() < endtime) {
const events = await this.entryPointView.queryFilter(
this.entryPointView.filters.UserOperationEvent(userOpHash),
);
if (events[0]) {
return events[0].transactionHash;
const userOpReceipt =
await httpRpcClient.getUserOperationReceipt(userOpHash);
if (userOpReceipt) {
// avoid desync with current provider state
return await this.provider.waitForTransaction(
userOpReceipt.receipt.transactionHash,
);
}
await new Promise((resolve) => setTimeout(resolve, interval));
}
return null;
throw new Error("Timeout waiting for userOp to be mined");
}
private unwrapBundlerError(error: any) {
@@ -110,17 +110,6 @@ export class ERC4337EthersProvider extends providers.BaseProvider {
): Promise<providers.TransactionResponse> {
const userOp = await utils.resolveProperties(userOp1);
const userOpHash = await this.smartAccountAPI.getUserOpHash(userOp);
const waitForUserOp = async (): Promise<providers.TransactionReceipt> =>
await new Promise((resolve, reject) => {
new UserOperationEventListener(
resolve,
reject,
this.entryPoint,
userOp.sender,
userOpHash,
userOp.nonce,
).start();
});
return {
hash: userOpHash,
confirmations: 0,
@@ -134,7 +123,7 @@ export class ERC4337EthersProvider extends providers.BaseProvider {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
confirmations?: number,
): Promise<providers.TransactionReceipt> => {
const transactionReceipt = await waitForUserOp();
const transactionReceipt = await this.smartAccountAPI.getUserOpReceipt(this.httpRpcClient, userOpHash)
if (userOp.initCode.length !== 0) {
// checking if the wallet has been deployed by the transaction; it must be if we are here
await this.smartAccountAPI.checkAccountPhantom();
@@ -134,6 +134,14 @@ export class HttpRpcClient {
);
}
async getUserOperationReceipt(userOpHash: string): Promise<any> {
await this.initializing;
return await this.userOpJsonRpcProvider.send(
"eth_getUserOperationReceipt",
[userOpHash],
);
}
private async printUserOperation(
method: string,
[userOp1, entryPointAddress]: [UserOperationStruct, string],
@@ -56,7 +56,7 @@ describeIf(!!SECRET_KEY)("SmartWallet core tests", () => {
it("can estimate a tx", async () => {
const preparedTx = await contract.erc1155.claim.prepare(0, 1);
const estimates = await smartWallet.estimate(preparedTx);
expect(estimates.wei.toNumber()).toBeGreaterThan(0);
expect(estimates.wei.toString()).not.toBe("0");
});
it("can execute a tx", async () => {
Binary file not shown.
+58 -58
View File
@@ -1091,8 +1091,8 @@ importers:
packages/sdk:
dependencies:
'@eth-optimism/sdk':
specifier: ^3.2.1
version: 3.2.1([email protected])
specifier: 3.2.2
version: 3.2.2([email protected])
'@thirdweb-dev/chains':
specifier: workspace:*
version: link:../chains
@@ -5092,7 +5092,7 @@ packages:
'@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
eslint: 8.56.0
eslint-visitor-keys: 2.1.0
semver: 7.5.4
semver: 7.6.0
/@babel/[email protected]:
resolution: {integrity: sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==}
@@ -5142,7 +5142,7 @@ packages:
'@babel/helper-validator-option': 7.23.5
browserslist: 4.22.2
lru-cache: 5.1.1
semver: 7.5.4
semver: 7.6.0
/@babel/[email protected](@babel/[email protected]):
resolution: {integrity: sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==}
@@ -5159,7 +5159,7 @@ packages:
'@babel/helper-replace-supers': 7.22.20(@babel/[email protected])
'@babel/helper-skip-transparent-expression-wrappers': 7.22.5
'@babel/helper-split-export-declaration': 7.22.6
semver: 7.5.4
semver: 7.6.0
/@babel/[email protected](@babel/[email protected]):
resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
@@ -5170,7 +5170,7 @@ packages:
'@babel/core': 7.23.7
'@babel/helper-annotate-as-pure': 7.22.5
regexpu-core: 5.3.2
semver: 7.5.4
semver: 7.6.0
/@babel/[email protected](@babel/[email protected]):
resolution: {integrity: sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==}
@@ -5181,7 +5181,7 @@ packages:
'@babel/core': 7.23.7
'@babel/helper-annotate-as-pure': 7.22.5
regexpu-core: 5.3.2
semver: 7.5.4
semver: 7.6.0
/@babel/[email protected](@babel/[email protected]):
resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
@@ -5194,7 +5194,7 @@ packages:
debug: 4.3.4([email protected])
lodash.debounce: 4.0.8
resolve: 1.22.8
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
@@ -6301,7 +6301,7 @@ packages:
babel-plugin-polyfill-corejs2: 0.3.3(@babel/[email protected])
babel-plugin-polyfill-corejs3: 0.6.0(@babel/[email protected])
babel-plugin-polyfill-regenerator: 0.4.1(@babel/[email protected])
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
@@ -7590,7 +7590,7 @@ packages:
'@ethersproject/transactions': 5.7.0
'@ethersproject/web': 5.7.1
bufio: 1.2.0
chai: 4.3.7
chai: 4.4.1
transitivePeerDependencies:
- bufferutil
- utf-8-validate
@@ -7620,9 +7620,8 @@ packages:
- utf-8-validate
dev: false
/@eth-optimism/[email protected].1([email protected]):
resolution: {integrity: sha512-COmnT2zRzFn2XhMW/OD1ML3gCrT6SO95YF3hV/Mx3G1G4Q6zOv09rwU1avH/OcqdDMBmZ/DTrZm+9OVmc+YPlQ==}
requiresBuild: true
/@eth-optimism/[email protected].2([email protected]):
resolution: {integrity: sha512-P8YXAlh2lun0KZlwrw4FqmK4kNIoOOzI816XXhfkW3nMVADGRAru3TKSM74MgmEuyGiHrA9EoPRq1WLqUX4B0w==}
peerDependencies:
ethers: ^5
dependencies:
@@ -8000,7 +7999,7 @@ packages:
qrcode-terminal: 0.11.0
requireg: 0.2.2
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
send: 0.18.0
slugify: 1.6.5
structured-headers: 0.4.1
@@ -8039,7 +8038,7 @@ packages:
getenv: 1.0.0
glob: 7.1.6
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
slash: 3.0.0
xcode: 3.0.1
xml2js: 0.6.0
@@ -8062,7 +8061,7 @@ packages:
glob: 7.1.6
require-from-string: 2.0.2
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
slugify: 1.6.5
sucrase: 3.29.0
transitivePeerDependencies:
@@ -8085,7 +8084,7 @@ packages:
node-fetch: 2.6.12
open: 8.4.2
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
serialize-error: 6.0.0
temp-dir: 2.0.0
transitivePeerDependencies:
@@ -8125,7 +8124,7 @@ packages:
node-fetch: 2.6.12
parse-png: 2.1.0
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
tempy: 0.3.0
transitivePeerDependencies:
- encoding
@@ -8207,7 +8206,7 @@ packages:
expo-modules-autolinking: 1.0.2
fs-extra: 9.1.0
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
xml2js: 0.6.0
transitivePeerDependencies:
- encoding
@@ -9137,7 +9136,7 @@ packages:
dependencies:
'@types/debug': 4.1.7
debug: 4.3.4([email protected])
semver: 7.5.4
semver: 7.6.0
superstruct: 1.0.3
transitivePeerDependencies:
- supports-color
@@ -9698,7 +9697,7 @@ packages:
resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
dependencies:
'@gar/promisify': 1.1.3
semver: 7.5.4
semver: 7.6.0
dev: false
/@npmcli/[email protected]:
@@ -10750,7 +10749,7 @@ packages:
node-stream-zip: 1.15.0
ora: 5.4.1
prompts: 2.4.2
semver: 7.5.4
semver: 7.6.0
strip-ansi: 5.2.0
sudo-prompt: 9.2.1
wcwidth: 1.0.1
@@ -10852,7 +10851,7 @@ packages:
node-fetch: 2.6.12
open: 6.4.0
ora: 5.4.1
semver: 7.5.4
semver: 7.6.0
shell-quote: 1.8.0
transitivePeerDependencies:
- encoding
@@ -10883,7 +10882,7 @@ packages:
fs-extra: 8.1.0
graceful-fs: 4.2.11
prompts: 2.4.2
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- '@babel/core'
- bufferutil
@@ -11099,7 +11098,7 @@ packages:
resolution: {integrity: sha512-ITocwSWlFUA1K9VMP/eJiMfgbP/I9qDxAaFz7ukj5N5NZD3ihVQZkmqML6hjse5UhrfjCnfIEcLkNZhtB2XC2Q==}
dependencies:
'@safe-global/safe-core-sdk-types': 1.9.2
semver: 7.5.4
semver: 7.6.0
web3-utils: 1.8.2
transitivePeerDependencies:
- encoding
@@ -11124,7 +11123,7 @@ packages:
/@safe-global/[email protected]:
resolution: {integrity: sha512-j7Ml1MVZw73XMTLbyIjo+Gvohwg5HYi8WM6b3vo+AkYEO/X4TNY8eJ0T0Awip5PO9MNyZymF3QY065uccQP53A==}
dependencies:
semver: 7.5.4
semver: 7.6.0
dev: false
/@safe-global/[email protected](@ethersproject/[email protected])(@ethersproject/[email protected])(@ethersproject/[email protected])(@ethersproject/[email protected]):
@@ -12962,7 +12961,7 @@ packages:
grapheme-splitter: 1.0.4
ignore: 5.3.0
natural-compare-lite: 1.4.0
semver: 7.5.4
semver: 7.6.0
tsutils: 3.21.0([email protected])
typescript: 5.3.3
transitivePeerDependencies:
@@ -13147,7 +13146,7 @@ packages:
debug: 4.3.4([email protected])
globby: 11.1.0
is-glob: 4.0.3
semver: 7.5.4
semver: 7.6.0
tsutils: 3.21.0([email protected])
typescript: 5.3.3
transitivePeerDependencies:
@@ -13168,7 +13167,7 @@ packages:
debug: 4.3.4([email protected])
globby: 11.1.0
is-glob: 4.0.3
semver: 7.5.4
semver: 7.6.0
tsutils: 3.21.0([email protected])
typescript: 5.3.3
transitivePeerDependencies:
@@ -13189,7 +13188,7 @@ packages:
globby: 11.1.0
is-glob: 4.0.3
minimatch: 9.0.3
semver: 7.5.4
semver: 7.6.0
ts-api-utils: 1.0.1([email protected])
typescript: 5.3.3
transitivePeerDependencies:
@@ -13209,7 +13208,7 @@ packages:
debug: 4.3.4([email protected])
globby: 11.1.0
is-glob: 4.0.3
semver: 7.5.4
semver: 7.6.0
ts-api-utils: 1.0.1([email protected])
typescript: 5.3.3
transitivePeerDependencies:
@@ -13229,7 +13228,7 @@ packages:
'@typescript-eslint/typescript-estree': 5.55.0([email protected])
eslint: 8.56.0
eslint-scope: 5.1.1
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
- typescript
@@ -13249,7 +13248,7 @@ packages:
'@typescript-eslint/typescript-estree': 5.60.1([email protected])
eslint: 8.56.0
eslint-scope: 5.1.1
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
- typescript
@@ -13267,7 +13266,7 @@ packages:
'@typescript-eslint/types': 6.2.0
'@typescript-eslint/typescript-estree': 6.2.0([email protected])
eslint: 8.56.0
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
- typescript
@@ -14846,7 +14845,7 @@ packages:
'@babel/compat-data': 7.23.5
'@babel/core': 7.23.7
'@babel/helper-define-polyfill-provider': 0.3.3(@babel/[email protected])
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
@@ -14858,7 +14857,7 @@ packages:
'@babel/compat-data': 7.23.5
'@babel/core': 7.23.7
'@babel/helper-define-polyfill-provider': 0.4.4(@babel/[email protected])
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
@@ -15146,7 +15145,7 @@ packages:
engines: {node: '>=12'}
dependencies:
bin-version: 6.0.0
semver: 7.5.4
semver: 7.6.0
semver-truncate: 3.0.0
dev: true
@@ -15604,7 +15603,7 @@ packages:
/[email protected]:
resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
dependencies:
semver: 7.5.4
semver: 7.6.0
dev: false
/[email protected]([email protected]):
@@ -15840,6 +15839,7 @@ packages:
loupe: 2.3.6
pathval: 1.1.1
type-detect: 4.0.8
dev: true
/[email protected]:
resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==}
@@ -15924,6 +15924,7 @@ packages:
/[email protected]:
resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==}
dev: true
/[email protected]:
resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
@@ -16528,7 +16529,7 @@ packages:
dependencies:
nice-try: 1.0.5
path-key: 2.0.1
semver: 7.5.4
semver: 7.6.0
shebang-command: 1.2.0
which: 1.3.1
@@ -16627,7 +16628,7 @@ packages:
postcss-modules-scope: 3.0.0([email protected])
postcss-modules-values: 4.0.0([email protected])
postcss-value-parser: 4.2.0
semver: 7.5.4
semver: 7.6.0
webpack: 5.76.2
dev: false
@@ -18289,7 +18290,7 @@ packages:
minimatch: 3.1.2
object.values: 1.1.6
resolve: 1.22.1
semver: 7.5.4
semver: 7.6.0
tsconfig-paths: 3.14.2
transitivePeerDependencies:
- eslint-import-resolver-typescript
@@ -18401,7 +18402,7 @@ packages:
minimatch: 3.1.2
object.entries: 1.1.6
object.fromentries: 2.0.6
semver: 7.5.4
semver: 7.6.0
/[email protected]([email protected])([email protected])([email protected]):
resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
@@ -19808,7 +19809,7 @@ packages:
memfs: 3.4.13
minimatch: 3.1.2
schema-utils: 2.7.0
semver: 7.5.4
semver: 7.6.0
tapable: 1.1.3
typescript: 5.3.3
webpack: 5.76.2
@@ -21605,7 +21606,7 @@ packages:
'@babel/core': 7.23.7
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.0
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
dev: true
@@ -21618,7 +21619,7 @@ packages:
'@babel/parser': 7.23.6
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.0
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
@@ -22423,7 +22424,7 @@ packages:
jest-util: 27.5.1
natural-compare: 1.4.0
pretty-format: 27.5.1
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
dev: false
@@ -22451,7 +22452,7 @@ packages:
jest-util: 29.6.2
natural-compare: 1.4.0
pretty-format: 29.6.2
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- supports-color
dev: true
@@ -23490,13 +23491,13 @@ packages:
engines: {node: '>=6'}
dependencies:
pify: 4.0.1
semver: 7.5.4
semver: 7.6.0
/[email protected]:
resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
engines: {node: '>=8'}
dependencies:
semver: 7.5.4
semver: 7.6.0
/[email protected]:
resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -24653,7 +24654,7 @@ packages:
dependencies:
hosted-git-info: 2.8.9
resolve: 1.22.8
semver: 7.5.4
semver: 7.6.0
validate-npm-package-license: 3.0.4
/[email protected]:
@@ -24687,7 +24688,7 @@ packages:
dependencies:
hosted-git-info: 3.0.8
osenv: 0.1.5
semver: 7.5.4
semver: 7.6.0
validate-npm-package-name: 3.0.0
dev: false
@@ -25229,7 +25230,7 @@ packages:
got: 12.6.1
registry-auth-token: 5.0.2
registry-url: 6.0.1
semver: 7.5.4
semver: 7.6.0
dev: false
/[email protected]:
@@ -25922,7 +25923,7 @@ packages:
cosmiconfig: 7.1.0
klona: 2.0.6
postcss: 8.4.21
semver: 7.5.4
semver: 7.6.0
webpack: 5.76.2
dev: false
@@ -26580,7 +26581,7 @@ packages:
jsdoc: 4.0.2
minimist: 1.2.8
protobufjs: 7.2.4
semver: 7.5.4
semver: 7.6.0
tmp: 0.2.1
uglify-js: 3.17.4
dev: false
@@ -28045,7 +28046,7 @@ packages:
resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==}
engines: {node: '>=12'}
dependencies:
semver: 7.5.4
semver: 7.6.0
dev: false
/[email protected]:
@@ -28057,7 +28058,7 @@ packages:
resolution: {integrity: sha512-LJWA9kSvMolR51oDE6PN3kALBNaUdkxzAGcexw8gjMA8xr5zUqK0JiR3CgARSqanYF3Z1YHvsErb1KDgh+v7Rg==}
engines: {node: '>=12'}
dependencies:
semver: 7.5.4
semver: 7.6.0
dev: true
/[email protected]:
@@ -28080,7 +28081,6 @@ packages:
hasBin: true
dependencies:
lru-cache: 6.0.0
dev: false
/[email protected]:
resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
@@ -28419,7 +28419,7 @@ packages:
js-sha3: 0.8.0
memorystream: 0.3.1
require-from-string: 2.0.2
semver: 7.5.4
semver: 7.6.0
tmp: 0.0.33
transitivePeerDependencies:
- debug