Merge branch 'main' into greg/react-tests

thirdweb-dev · May 17, 2024 · 8898a67 · 8898a67
2 parents 677c30f + d874365
commit 8898a67
Show file tree

Hide file tree

Showing 17 changed files with 174 additions and 59 deletions.
diff --git a/.changeset/good-cobras-join.md b/.changeset/good-cobras-join.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+ethers6 adapter: allow optional account to be passed to `contract.toEthers` that will automatically hook up the contract with a signer instead of provider
diff --git a/.changeset/stupid-snails-tease.md b/.changeset/stupid-snails-tease.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/unity-js-bridge": patch
+---
+
+Unity 4.13.2
diff --git a/.changeset/sync-chains.md b/.changeset/sync-chains.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/chains": patch
+---
+
+Synced Chains Package
diff --git a/legacy_packages/chains/chains/10849.ts b/legacy_packages/chains/chains/10849.ts
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 10849,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "Lamina1",
+  "nativeCurrency": {
+    "name": "Lamina1 Token",
+    "symbol": "L",
+    "decimals": 18
+  },
+  "networkId": 10849,
+  "redFlags": [],
+  "rpc": [
+    "https://10849.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/lamina1/mainnet/rpc"
+  ],
+  "shortName": "Lamina1",
+  "slug": "lamina1",
+  "testnet": false
+} as const satisfies Chain;
diff --git a/legacy_packages/chains/chains/10850.ts b/legacy_packages/chains/chains/10850.ts
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 10850,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "Lamina1 Identity",
+  "nativeCurrency": {
+    "name": "Lamina1 Identity Token",
+    "symbol": "LID",
+    "decimals": 18
+  },
+  "networkId": 10850,
+  "redFlags": [],
+  "rpc": [
+    "https://10850.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/lamina1id/mainnet/rpc"
+  ],
+  "shortName": "Lamina1 Identity",
+  "slug": "lamina1-identity",
+  "testnet": false
+} as const satisfies Chain;
diff --git a/legacy_packages/chains/chains/1319.ts b/legacy_packages/chains/chains/1319.ts
@@ -10,12 +10,6 @@ export default {
     }
   ],
   "faucets": [],
-  "icon": {
-    "url": "ipfs://QmXbBMMhjTTGAGjmqMpJm3ufFrtdkfEXCFyXYgz7nnZzsy",
-    "width": 160,
-    "height": 160,
-    "format": "png"
-  },
   "infoURL": "https://aiachain.org/",
   "name": "AIA Mainnet",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/1320.ts b/legacy_packages/chains/chains/1320.ts
@@ -20,12 +20,6 @@ export default {
       "name": "EIP1559"
     }
   ],
-  "icon": {
-    "url": "ipfs://QmXbBMMhjTTGAGjmqMpJm3ufFrtdkfEXCFyXYgz7nnZzsy",
-    "width": 160,
-    "height": 160,
-    "format": "png"
-  },
   "infoURL": "https://aiachain.org",
   "name": "AIA Testnet",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/1482601649.ts b/legacy_packages/chains/chains/1482601649.ts
@@ -12,12 +12,6 @@ export default {
   "faucets": [
     "https://sfuel.skale.network/"
   ],
-  "icon": {
-    "url": "ipfs://bafybeic5eexvd34wfy4kuebcyu73qpkv3x57s54ebzjyhyjsmeuni5jwcm",
-    "width": 500,
-    "height": 500,
-    "format": "png"
-  },
   "infoURL": "https://nebulachain.io/",
   "name": "SKALE Nebula Hub",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/21825.ts b/legacy_packages/chains/chains/21825.ts
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 21825,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QaUser6991",
+  "nativeCurrency": {
+    "name": "QaUser6991 Token",
+    "symbol": "HIO",
+    "decimals": 18
+  },
+  "networkId": 21825,
+  "redFlags": [],
+  "rpc": [
+    "https://21825.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QaUser6991",
+  "slug": "qauser6991",
+  "testnet": true
+} as const satisfies Chain;
diff --git a/legacy_packages/chains/chains/37084624.ts b/legacy_packages/chains/chains/37084624.ts
@@ -12,12 +12,6 @@ export default {
   "faucets": [
     "https://www.sfuelstation.com/"
   ],
-  "icon": {
-    "url": "ipfs://bafybeic5eexvd34wfy4kuebcyu73qpkv3x57s54ebzjyhyjsmeuni5jwcm",
-    "width": 500,
-    "height": 500,
-    "format": "png"
-  },
   "infoURL": "https://nebulachain.io/",
   "name": "SKALE Nebula Hub Testnet",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/503129905.ts b/legacy_packages/chains/chains/503129905.ts
@@ -12,12 +12,6 @@ export default {
   "faucets": [
     "https://sfuel.dirtroad.dev/staging"
   ],
-  "icon": {
-    "url": "ipfs://bafybeic5eexvd34wfy4kuebcyu73qpkv3x57s54ebzjyhyjsmeuni5jwcm",
-    "width": 500,
-    "height": 500,
-    "format": "png"
-  },
   "infoURL": "https://nebulachain.io/",
   "name": "Deprecated SKALE Nebula Hub Testnet",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/73927.ts b/legacy_packages/chains/chains/73927.ts
@@ -6,22 +6,10 @@ export default {
     {
       "name": "mvmscan",
       "url": "https://scan.mvm.dev",
-      "standard": "EIP3091",
-      "icon": {
-        "url": "ipfs://QmeuDgSprukzfV7fi9XYHYcfmT4aZZZU7idgShtRS8Vf6V",
-        "width": 471,
-        "height": 512,
-        "format": "png"
-      }
+      "standard": "EIP3091"
     }
   ],
   "faucets": [],
-  "icon": {
-    "url": "ipfs://QmeuDgSprukzfV7fi9XYHYcfmT4aZZZU7idgShtRS8Vf6V",
-    "width": 471,
-    "height": 512,
-    "format": "png"
-  },
   "infoURL": "https://mvm.dev",
   "name": "Mixin Virtual Machine",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/761412.ts b/legacy_packages/chains/chains/761412.ts
@@ -10,12 +10,6 @@ export default {
     }
   ],
   "faucets": [],
-  "icon": {
-    "url": "ipfs://bafkreic6tcc6swh5kzljwqnswj6rlemcm7n6ra7xkgttwv5v3fv7ozj5zu",
-    "width": 1500,
-    "height": 1500,
-    "format": "png"
-  },
   "infoURL": "https://miexs.com",
   "name": "Miexs Smartchain",
   "nativeCurrency": {

diff --git a/legacy_packages/chains/chains/77898.ts b/legacy_packages/chains/chains/77898.ts
@@ -0,0 +1,30 @@
+import type { Chain } from "../src/types";
+export default {
+  "chain": "Avalanche",
+  "chainId": 77898,
+  "explorers": [],
+  "faucets": [],
+  "features": [],
+  "icon": {
+    "url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "infoURL": "https://avacloud.io",
+  "name": "QI0517I1",
+  "nativeCurrency": {
+    "name": "QI0517I1 Token",
+    "symbol": "YGV",
+    "decimals": 18
+  },
+  "networkId": 77898,
+  "redFlags": [],
+  "rpc": [
+    "https://77898.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/defi-kingdoms/dfk-chain/rpc"
+  ],
+  "shortName": "QI0517I1",
+  "slug": "qi0517i1",
+  "testnet": true
+} as const satisfies Chain;
diff --git a/legacy_packages/chains/src/index.ts b/legacy_packages/chains/src/index.ts
diff --git a/legacy_packages/unity-js-bridge/src/thirdweb-bridge.ts b/legacy_packages/unity-js-bridge/src/thirdweb-bridge.ts
@@ -171,7 +171,7 @@ class ThirdwebBridge implements TWBridge {
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_PLATFORM = "unity";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
-      (globalThis as any).X_SDK_VERSION = "4.13.1";
+      (globalThis as any).X_SDK_VERSION = "4.13.2";
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix use of any
       (globalThis as any).X_SDK_OS = browser?.os ?? "unknown";
     }

diff --git a/packages/thirdweb/src/adapters/ethers6.ts b/packages/thirdweb/src/adapters/ethers6.ts
@@ -59,7 +59,7 @@ export const ethers6Adapter = /* @__PURE__ */ (() => {
        * @example
        * ```ts
        * import { ethers6Adapter } from "thirdweb/adapters/ethers6";
-       * const provider = ethers6Adapter.provider.toEthers({ client, chainId });
+       * const provider = ethers6Adapter.provider.toEthers({ client, chain });
        * ```
        */
       toEthers: (options: { client: ThirdwebClient; chain: Chain }) => {
@@ -79,9 +79,16 @@ export const ethers6Adapter = /* @__PURE__ */ (() => {
        * const ethersContract = await ethers6Adapter.contract.toEthers({ thirdwebContract });
        * ```
        */
-      toEthers: (options: { thirdwebContract: ThirdwebContract }) => {
+      toEthers: (options: {
+        thirdwebContract: ThirdwebContract;
+        account?: Account;
+      }) => {
         assertEthers6(ethers);
-        return toEthersContract(ethers, options.thirdwebContract);
+        return toEthersContract(
+          ethers,
+          options.thirdwebContract,
+          options.account,
+        );
       },
       /**
        * Creates a ThirdwebContract instance from an ethers.js contract.
@@ -186,12 +193,15 @@ function toEthersProvider(
 async function toEthersContract<abi extends Abi = []>(
   ethers: Ethers6,
   twContract: ThirdwebContract<abi>,
+  account?: Account,
 ): Promise<ethers6.Contract> {
   if (twContract.abi) {
     return new ethers.Contract(
       twContract.address,
       JSON.stringify(twContract.abi),
-      toEthersProvider(ethers, twContract.client, twContract.chain),
+      account
+        ? toEthersSigner(ethers, twContract.client, account, twContract.chain)
+        : toEthersProvider(ethers, twContract.client, twContract.chain),
     );
   }
 
@@ -204,7 +214,9 @@ async function toEthersContract<abi extends Abi = []>(
   return new ethers.Contract(
     twContract.address,
     JSON.stringify(abi),
-    toEthersProvider(ethers, twContract.client, twContract.chain),
+    account
+      ? toEthersSigner(ethers, twContract.client, account, twContract.chain)
+      : toEthersProvider(ethers, twContract.client, twContract.chain),
   );
 }
 
@@ -278,15 +290,15 @@ async function fromEthersSigner(signer: ethers6.Signer): Promise<Account> {
  * @param client - The Thirdweb client.
  * @param chain - The blockchain chain.
  * @param account - The Thirdweb account.
- * @returns A promise that resolves to an ethers.js signer.
+ * @returns An ethers.js signer.
  * @internal
  */
-export async function toEthersSigner(
+export function toEthersSigner(
   ethers: Ethers6,
   client: ThirdwebClient,
   account: Account,
   chain: Chain,
-): Promise<ethers6.Signer> {
+): ethers6.Signer {
   class ThirdwebAdapterSigner extends ethers.AbstractSigner<ethers6.JsonRpcProvider> {
     private address: string;
     override provider: ethers6.ethers.JsonRpcProvider;