Merge branch 'main' into fix/changesets-crashing

reown-com · Oct 8, 2024 · 0df3063 · 0df3063
2 parents b7fd1ec + 2b1d72a
commit 0df3063
Show file tree

Hide file tree

Showing 55 changed files with 856 additions and 2,708 deletions.
diff --git a/.changeset/green-shoes-taste.md b/.changeset/green-shoes-taste.md
@@ -0,0 +1,27 @@
+---
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-utils': patch
+'@apps/laboratory': patch
+'@reown/appkit-solana': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+'@reown/appkit-wallet': patch
+---
+
+Upgrades solana/web3js deps
diff --git a/.changeset/selfish-mice-lay.md b/.changeset/selfish-mice-lay.md
@@ -0,0 +1,27 @@
+---
+'@reown/appkit': patch
+'@apps/demo': patch
+'@apps/gallery': patch
+'@apps/laboratory': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-adapter-polkadot': patch
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-common': patch
+'@reown/appkit-core': patch
+'@reown/appkit-ethers': patch
+'@reown/appkit-ethers5': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-solana': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wagmi': patch
+'@reown/appkit-wallet': patch
+---
+
+Exports util functions for networks path
diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -76,18 +76,14 @@
     "@sentry/browser": "7.119.1",
     "@sentry/react": "7.92.0",
     "@solana/wallet-adapter-wallets": "0.19.32",
-    "@solana/web3.js": "1.95.2",
+    "@solana/web3.js": "1.95.3",
     "@tanstack/react-query": "5.24.8",
     "@wagmi/connectors": "5.1.9",
     "@wagmi/core": "2.13.4",
     "@walletconnect/universal-provider": "2.17.0",
     "@walletconnect/utils": "2.17.0",
     "@reown/appkit": "workspace:*",
-    "@reown/appkit-ethers": "workspace:*",
-    "@reown/appkit-ethers5": "workspace:*",
     "@reown/appkit-siwe": "workspace:*",
-    "@reown/appkit-solana": "workspace:*",
-    "@reown/appkit-wagmi": "workspace:*",
     "@reown/appkit-wallet": "workspace:*",
     "@reown/appkit-experimental": "workspace:*",
     "@reown/appkit-adapter-solana": "workspace:*",

diff --git a/apps/laboratory/tests/shared/constants/index.ts b/apps/laboratory/tests/shared/constants/index.ts
@@ -8,5 +8,5 @@ export const DEFAULT_SESSION_PARAMS: SessionParams = {
   optAccounts: ['1', '2'],
   accept: true
 }
-export const SECURE_WEBSITE_URL = 'https://secure.reown.com'
+export const SECURE_WEBSITE_URL = 'https://secure.walletconnect.org'
 export const DEFAULT_CHAIN_NAME = process.env['DEFAULT_CHAIN_NAME'] || 'Ethereum'
diff --git a/examples/react-solana/package.json b/examples/react-solana/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@reown/appkit": "workspace:*",
-    "@reown/appkit-solana": "workspace:*",
+    "@reown/appkit-adapter-solana": "workspace:*",
     "@tanstack/react-query": "5.24.8",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/examples/react-solana/src/App.tsx b/examples/react-solana/src/App.tsx
@@ -4,7 +4,8 @@ import {
   useAppKitEvents,
   useAppKitState,
   useAppKitTheme
-} from '@reown/appkit-solana/react'
+} from '@reown/appkit/react'
+import { SolanaAdapter } from '@reown/appkit-adapter-solana/react'
 import {
   PhantomWalletAdapter,
   HuobiWalletAdapter,
@@ -23,6 +24,16 @@ const networks = [solana, solanaTestnet, solanaDevnet]
 
 // 3. Create modal
 createAppKit({
+  adapters: [
+    new SolanaAdapter({
+      wallets: [
+        new HuobiWalletAdapter(),
+        new PhantomWalletAdapter(),
+        new SolflareWalletAdapter(),
+        new TrustWalletAdapter()
+      ]
+    })
+  ],
   networks,
   metadata: {
     name: 'AppKit React Example',
@@ -32,12 +43,6 @@ createAppKit({
   },
   projectId,
   themeMode: 'light',
-  wallets: [
-    new HuobiWalletAdapter(),
-    new PhantomWalletAdapter(),
-    new SolflareWalletAdapter(),
-    new TrustWalletAdapter()
-  ],
   themeVariables: {
     '--w3m-color-mix': '#00DCFF',
     '--w3m-color-mix-strength': 20

diff --git a/examples/vue-solana/package.json b/examples/vue-solana/package.json
@@ -9,7 +9,7 @@
     "@solana/wallet-adapter-backpack": "0.1.14",
     "@solana/wallet-adapter-wallets": "0.19.32",
     "@reown/appkit": "workspace:*",
-    "@reown/appkit-solana": "workspace:*",
+    "@reown/appkit-adapter-solana": "workspace:*",
     "vue": "3.4.3"
   },
   "devDependencies": {

diff --git a/examples/vue-solana/src/App.vue b/examples/vue-solana/src/App.vue
@@ -7,6 +7,13 @@ import {
   useAppKitState,
   useAppKitTheme
 } from '@reown/appkit/vue'
+import { SolanaAdapter } from '@reown/appkit-adapter-solana/react'
+import {
+  PhantomWalletAdapter,
+  HuobiWalletAdapter,
+  SolflareWalletAdapter,
+  TrustWalletAdapter
+} from '@solana/wallet-adapter-wallets'
 import { BackpackWalletAdapter } from '@solana/wallet-adapter-backpack'
 import {
   PhantomWalletAdapter,
@@ -26,6 +33,16 @@ const networks = [solana, solanaTestnet, solanaDevnet]
 
 // 3. Create modal
 createAppKit({
+  adapters: [
+    new SolanaAdapter({
+      wallets: [
+        new HuobiWalletAdapter(),
+        new PhantomWalletAdapter(),
+        new SolflareWalletAdapter(),
+        new TrustWalletAdapter()
+      ]
+    })
+  ],
   metadata: {
     name: 'AppKit React Example',
     description: 'AppKit React Example',
@@ -35,13 +52,6 @@ createAppKit({
   projectId,
   themeMode: 'light',
   networks,
-  wallets: [
-    new BackpackWalletAdapter(),
-    new HuobiWalletAdapter(),
-    new PhantomWalletAdapter(),
-    new SolflareWalletAdapter(),
-    new TrustWalletAdapter()
-  ],
   themeVariables: {
     '--w3m-color-mix': '#00DCFF',
     '--w3m-color-mix-strength': 20

diff --git a/packages/adapters/solana/package.json b/packages/adapters/solana/package.json
@@ -47,7 +47,7 @@
     "@solana/wallet-adapter-base": "0.9.23",
     "@solana/wallet-standard-features": "1.2.0",
     "@solana/wallet-standard-util": "1.1.1",
-    "@solana/web3.js": "1.95.2",
+    "@solana/web3.js": "1.95.3",
     "@walletconnect/utils": "2.17.0",
     "@walletconnect/types": "2.17.0",
     "@walletconnect/universal-provider": "2.17.0",

diff --git a/packages/appkit-utils/package.json b/packages/appkit-utils/package.json
@@ -55,7 +55,7 @@
   "devDependencies": {
     "@coinbase/wallet-sdk": "4.0.3",
     "@solana/wallet-adapter-base": "0.9.23",
-    "@solana/web3.js": "1.95.2",
+    "@solana/web3.js": "1.95.3",
     "@vitest/coverage-v8": "2.0.5",
     "vitest": "2.0.5"
   },

diff --git a/packages/appkit/src/networks/index.ts b/packages/appkit/src/networks/index.ts
@@ -2,5 +2,8 @@
 export * from 'viem/chains'
 export * from './solana/index.js'
 
+// -- Utils ------------------------------------------------------------------
+export * from './utils.js'
+
 // -- Types ---------------------------------------------------------------
 export type { AppKitNetwork } from '@reown/appkit-common'
diff --git a/packages/cdn/lib/ethers.ts b/packages/cdn/lib/ethers.ts
@@ -1,2 +1,3 @@
 import '@reown/appkit-polyfills'
-export * as AppKit from '@reown/appkit-ethers'
+export * as AppKit from '@reown/appkit'
+export * as AppKitEthers from '@reown/appkit-adapter-ethers'
diff --git a/packages/cdn/lib/ethers5.ts b/packages/cdn/lib/ethers5.ts
@@ -1,2 +1,3 @@
 import '@reown/appkit-polyfills'
-export * as AppKit from '@reown/appkit-ethers5'
+export * as AppKit from '@reown/appkit'
+export * as AppKitEthers5 from '@reown/appkit-adapter-ethers5'
diff --git a/packages/cdn/lib/solana.ts b/packages/cdn/lib/solana.ts
@@ -0,0 +1,3 @@
+import '@reown/appkit-polyfills'
+export * as AppKit from '@reown/appkit'
+export * as AppKitSolana from '@reown/appkit-adapter-solana'
diff --git a/packages/cdn/lib/wagmi.ts b/packages/cdn/lib/wagmi.ts
@@ -1,6 +1,6 @@
 import '@reown/appkit-polyfills'
-export * as AppKit from '@reown/appkit-wagmi'
+export * as AppKit from '@reown/appkit'
+export * as AppKitWagmi from '@reown/appkit-adapter-wagmi'
 export * as Viem from 'viem'
-export * as Chains from 'viem/chains'
 export * as Connectors from '@wagmi/connectors'
 export * as WagmiCore from '@wagmi/core'
diff --git a/packages/cdn/package.json b/packages/cdn/package.json
@@ -25,9 +25,11 @@
     }
   },
   "dependencies": {
-    "@reown/appkit-wagmi": "workspace:*",
-    "@reown/appkit-ethers": "workspace:*",
-    "@reown/appkit-ethers5": "workspace:*",
+    "@reown/appkit": "workspace:*",
+    "@reown/appkit-adapter-wagmi": "workspace:*",
+    "@reown/appkit-adapter-ethers": "workspace:*",
+    "@reown/appkit-adapter-ethers5": "workspace:*",
+    "@reown/appkit-adapter-solana": "workspace:*",
     "@reown/appkit-polyfills": "workspace:*",
     "@wagmi/connectors": "5.1.9",
     "@wagmi/core": "2.13.4",

diff --git a/packages/ethers/.eslintrc.json b/packages/ethers/.eslintrc.json
diff --git a/packages/ethers/.npmignore b/packages/ethers/.npmignore