types and name improves

.gitignore

@@ -17,6 +17,7 @@ test*.ts
 test*.js
 test*.cjs
 .env
+index.html
 
 # Editor directories and files
 .vscode/*

packages/networks/bitcoin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@multiplechain/bitcoin",
-    "version": "0.4.1",
+    "version": "0.4.2",
     "type": "module",
     "main": "dist/index.cjs",
     "module": "dist/index.es.js",
@@ -72,7 +72,7 @@
         "url": "https://github.com/MultipleChain/js/issues"
     },
     "dependencies": {
-        "@multiplechain/types": "^0.1.63",
+        "@multiplechain/types": "^0.1.64",
         "@multiplechain/utils": "^0.1.21",
         "axios": "^1.6.8",
         "bitcore-lib": "^10.0.28",

packages/networks/bitcoin/src/browser/Wallet.ts

@@ -12,7 +12,7 @@ import {
 import { Provider } from '../services/Provider.ts'
 import type { TransactionSigner } from '../services/TransactionSigner.ts'
 
-export interface BitcoinWalletAdapter {
+export interface WalletProvider {
     getAddress: () => Promise<string>
     signMessage: (message: string) => Promise<string>
     sendBitcoin: (to: string, amount: number) => Promise<string>
@@ -33,12 +33,12 @@ const rejectMap = (error: any, reject: (a: any) => any): any => {
     return reject(error)
 }
 
-type WalletAdapter = WalletAdapterInterface<Provider, BitcoinWalletAdapter>
+type WalletAdapter = WalletAdapterInterface<Provider, WalletProvider>
 
-export class Wallet implements WalletInterface<Provider, BitcoinWalletAdapter, TransactionSigner> {
+export class Wallet implements WalletInterface<Provider, WalletProvider, TransactionSigner> {
     adapter: WalletAdapter
 
-    walletProvider: BitcoinWalletAdapter
+    walletProvider: WalletProvider
 
     networkProvider: Provider
 

packages/networks/bitcoin/src/browser/adapters/Leather.ts

@@ -1,8 +1,8 @@
 import icons from './icons.ts'
+import type { WalletProvider } from '../Wallet.ts'
 import { WalletPlatformEnum } from '@multiplechain/types'
-import type { WalletAdapterInterface } from '@multiplechain/types'
-import type { BitcoinWalletAdapter } from '../Wallet.ts'
 import type { Provider } from '../../services/Provider.ts'
+import type { WalletAdapterInterface } from '@multiplechain/types'
 
 declare global {
     interface Window {
@@ -16,23 +16,24 @@ declare global {
 }
 
 let connected = false
+let walletProvider: WalletProvider | undefined
 
-const Leather: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
+const Leather: WalletAdapterInterface<Provider, WalletProvider> = {
     id: 'leather',
     name: 'Leather',
     icon: icons.Leather,
-    provider: window.LeatherProvider,
+    provider: walletProvider,
     platforms: [WalletPlatformEnum.BROWSER],
     downloadLink: 'https://leather.io/install-extension',
     isDetected: () => Boolean(window.LeatherProvider),
     isConnected: async () => connected,
-    connect: async (provider?: Provider): Promise<BitcoinWalletAdapter> => {
+    connect: async (provider?: Provider): Promise<WalletProvider> => {
         return await new Promise((resolve, reject) => {
             const leather = window.LeatherProvider
 
             const network = provider !== undefined && provider?.isTestnet() ? 'testnet' : 'mainnet'
 
-            const walletAdapter: BitcoinWalletAdapter = {
+            const _walletProvider: WalletProvider = {
                 on: (event, callback) => {
                     if (window.btc?.listen !== undefined) {
                         window.btc.listen(event, callback)
@@ -71,7 +72,7 @@ const Leather: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                 getAddress: async () => ''
             }
 
-            const connect = async (): Promise<BitcoinWalletAdapter> => {
+            const connect = async (): Promise<WalletProvider> => {
                 const addresses = (
                     await leather.request('getAddresses', {
                         network
@@ -83,18 +84,18 @@ const Leather: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                 // for ordinals & BRC-20 integrations
                 // const ordinals = addresses.find(address => address.type == 'p2tr');
 
-                walletAdapter.getAddress = async () => {
+                _walletProvider.getAddress = async () => {
                     return bitcoin.address
                 }
 
-                return walletAdapter
+                return _walletProvider
             }
 
             try {
                 connect()
-                    .then((walletAdapter) => {
+                    .then(() => {
                         connected = true
-                        resolve(walletAdapter)
+                        resolve((walletProvider = _walletProvider))
                     })
                     .catch(reject)
             } catch (error) {

packages/networks/bitcoin/src/browser/adapters/UniSat.ts

@@ -1,6 +1,6 @@
 import icons from './icons.ts'
+import type { WalletProvider } from '../Wallet.ts'
 import { WalletPlatformEnum } from '@multiplechain/types'
-import type { BitcoinWalletAdapter } from '../Wallet.ts'
 import type { Provider } from '../../services/Provider.ts'
 import type { WalletAdapterInterface } from '@multiplechain/types'
 
@@ -18,20 +18,22 @@ declare global {
     }
 }
 
-const UniSat: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
+let walletProvider: WalletProvider | undefined
+
+const UniSat: WalletAdapterInterface<Provider, WalletProvider> = {
     id: 'unisat',
     name: 'UniSat',
     icon: icons.UniSat,
-    provider: window.unisat,
+    provider: walletProvider,
     platforms: [WalletPlatformEnum.BROWSER],
     downloadLink: 'https://unisat.io/download',
     isDetected: () => Boolean(window.unisat?.requestAccounts),
     isConnected: async () => window?.unisat?._isConnected ?? false,
-    connect: async (provider?: Provider): Promise<BitcoinWalletAdapter> => {
+    connect: async (provider?: Provider): Promise<WalletProvider> => {
         return await new Promise((resolve, reject) => {
             const network = provider !== undefined && provider?.isTestnet() ? 'testnet' : 'livenet'
 
-            const walletAdapter: BitcoinWalletAdapter = {
+            const _walletProvider: WalletProvider = {
                 on: window.unisat.on,
                 signMessage: window.unisat.signMessage,
                 sendBitcoin: window.unisat.sendBitcoin,
@@ -47,7 +49,7 @@ const UniSat: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                         window.unisat
                             .switchNetwork(network)
                             .then(() => {
-                                resolve(walletAdapter)
+                                resolve((walletProvider = _walletProvider))
                             })
                             .catch(reject)
                     })

packages/networks/bitcoin/src/browser/adapters/Xverse.ts

@@ -1,5 +1,6 @@
 import icons from './icons.ts'
-import type { BitcoinWalletAdapter } from '../Wallet.ts'
+import type { WalletProvider } from '../Wallet.ts'
+import type { Provider } from '../../services/Provider.ts'
 import {
     ErrorTypeEnum,
     WalletPlatformEnum,
@@ -12,30 +13,30 @@ import {
     signMessage,
     AddressPurpose
 } from 'sats-connect'
-import type { Provider } from '../../services/Provider.ts'
 
 let connected = false
+let walletProvider: WalletProvider | undefined
 
-const Xverse: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
+const Xverse: WalletAdapterInterface<Provider, WalletProvider> = {
     id: 'xverse',
     name: 'Xverse',
     icon: icons.Xverse,
-    provider: window.XverseProviders?.BitcoinProvider,
+    provider: walletProvider,
     platforms: [WalletPlatformEnum.BROWSER, WalletPlatformEnum.MOBILE],
     downloadLink: 'https://www.xverse.app/download',
     isDetected: () => Boolean(window.XverseProviders?.BitcoinProvider),
     isConnected: async () => connected,
-    connect: async (provider?: Provider): Promise<BitcoinWalletAdapter> => {
+    connect: async (provider?: Provider): Promise<WalletProvider> => {
         return await new Promise((resolve, reject) => {
             const type =
                 provider !== undefined && provider?.isTestnet()
                     ? BitcoinNetworkType.Testnet
                     : BitcoinNetworkType.Mainnet
 
-            const walletAdapter: BitcoinWalletAdapter = {
+            const _walletProvider: WalletProvider = {
                 on: (_event: string, _callback: (data: any) => void) => {},
                 signMessage: async (message: string) => {
-                    const address = await walletAdapter.getAddress()
+                    const address = await _walletProvider.getAddress()
                     return await new Promise((resolve, reject) => {
                         signMessage({
                             payload: {
@@ -55,7 +56,7 @@ const Xverse: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                     })
                 },
                 sendBitcoin: async (to: string, amount: number) => {
-                    const senderAddress = await walletAdapter.getAddress()
+                    const senderAddress = await _walletProvider.getAddress()
                     return await new Promise((resolve, reject) => {
                         sendBtcTransaction({
                             payload: {
@@ -82,7 +83,7 @@ const Xverse: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                 getAddress: async () => ''
             }
 
-            const connect = async (): Promise<BitcoinWalletAdapter> => {
+            const connect = async (): Promise<WalletProvider> => {
                 return await new Promise((resolve, reject) => {
                     try {
                         getAddress({
@@ -107,11 +108,11 @@ const Xverse: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
                                     return
                                 }
 
-                                walletAdapter.getAddress = async () => {
+                                _walletProvider.getAddress = async () => {
                                     return bitcoin.address
                                 }
 
-                                resolve(walletAdapter)
+                                resolve(_walletProvider)
                             },
                             onCancel: () => {
                                 reject(ErrorTypeEnum.WALLET_REQUEST_REJECTED)
@@ -125,9 +126,9 @@ const Xverse: WalletAdapterInterface<Provider, BitcoinWalletAdapter> = {
 
             try {
                 connect()
-                    .then((walletAdapter) => {
+                    .then(() => {
                         connected = true
-                        resolve(walletAdapter)
+                        resolve((walletProvider = _walletProvider))
                     })
                     .catch(reject)
             } catch (error) {

packages/networks/bitcoin/src/browser/index.ts

@@ -1,16 +1,16 @@
 import type { Provider } from 'sats-connect'
-import { Wallet, type BitcoinWalletAdapter } from './Wallet.ts'
+import { Wallet, type WalletProvider } from './Wallet.ts'
 import * as adapterList from './adapters/index.ts'
 import type {
     WalletAdapterListType,
     WalletAdapterInterface,
     RegisterWalletAdapterType
 } from '@multiplechain/types'
 
-const adapters: WalletAdapterListType<Provider, BitcoinWalletAdapter> = {}
+const adapters: WalletAdapterListType<Provider, WalletProvider> = {}
 
-const registerAdapter: RegisterWalletAdapterType<Provider, BitcoinWalletAdapter> = (
-    adapter: WalletAdapterInterface<Provider, BitcoinWalletAdapter>
+const registerAdapter: RegisterWalletAdapterType<Provider, WalletProvider> = (
+    adapter: WalletAdapterInterface<Provider, WalletProvider>
 ): void => {
     if (Object.values(adapters).find((a) => a.id === adapter.id) !== undefined) {
         throw new Error(`Adapter with id ${adapter.id} already exists`)

packages/networks/boilerplate/package.json

@@ -72,7 +72,7 @@
         "url": "https://github.com/MultipleChain/js/issues"
     },
     "dependencies": {
-        "@multiplechain/types": "^0.1.63",
+        "@multiplechain/types": "^0.1.64",
         "@multiplechain/utils": "^0.1.21"
     }
 }

packages/networks/evm-chains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@multiplechain/evm-chains",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "type": "module",
     "main": "dist/index.cjs",
     "module": "dist/index.es.js",
@@ -75,7 +75,7 @@
         "url": "https://github.com/MultipleChain/js/issues"
     },
     "dependencies": {
-        "@multiplechain/types": "^0.1.63",
+        "@multiplechain/types": "^0.1.64",
         "@multiplechain/utils": "^0.1.21",
         "@wagmi/chains": "^1.8.0",
         "@walletconnect/ethereum-provider": "^2.12.2",

packages/networks/evm-chains/src/browser/adapters/MetaMask.ts

@@ -10,8 +10,8 @@ const MetaMask: WalletAdapterInterface<Provider, EIP1193Provider> = {
     id: 'metamask',
     name: 'MetaMask',
     icon: icons.metaMask,
-    provider: window.ethereum,
     downloadLink: 'https://metamask.io/download/',
+    provider: window.ethereum as unknown as WindowEthereum,
     platforms: [WalletPlatformEnum.BROWSER, WalletPlatformEnum.MOBILE],
     isDetected: () => Boolean((window?.ethereum as unknown as WindowEthereum).isMetaMask),
     createDeepLink: (url: string): string => `https://metamask.app.link/dapp/${url}`,

packages/networks/solana/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@multiplechain/solana",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "type": "module",
     "main": "dist/index.cjs",
     "module": "dist/index.es.js",
@@ -74,7 +74,7 @@
     "dependencies": {
         "@metaplex-foundation/js": "^0.20.1",
         "@multiplechain/solana-walletconnect": "^0.1.1",
-        "@multiplechain/types": "^0.1.63",
+        "@multiplechain/types": "^0.1.64",
         "@multiplechain/utils": "^0.1.21",
         "@solana/spl-token": "^0.4.6",
         "@solana/spl-token-metadata": "^0.1.4",