@0xsequence/provider 0.36.11 → 0.37.0

package/dist/0xsequence-provider.cjs.dev.js

@@ -1214,8 +1214,12 @@ class WalletRequestHandler {
     const n = networks || (await this.getNetworks(true));
     this.events.emit('networks', n);
 
-    if (n && n.length > 0) {
-      this.events.emit('chainChanged', ethers.ethers.utils.hexlify(n[0].chainId));
+    if (n.length > 0) {
+      const defaultNetwork = n.find(network => network.isDefaultChain);
+
+      if (defaultNetwork) {
+        this.events.emit('chainChanged', ethers.ethers.utils.hexlify(defaultNetwork.chainId));
+      }
     } else {
       this.events.emit('chainChanged', '0x0');
     }
@@ -2085,7 +2089,7 @@ class BaseWalletTransport {
       if (!networks || networks.length === 0) {
         this.notifyChainChanged('0x0');
       } else {
-        this.notifyChainChanged(ethers.ethers.utils.hexlify(networks[0].chainId));
+        this.notifyChainChanged(ethers.ethers.utils.hexlify(networks.find(network => network.isDefaultChain).chainId));
       }
     });
     this.walletRequestHandler.on('walletContext', walletContext => {
@@ -3265,7 +3269,7 @@ class Wallet {
         // return stub chainId of 0 when not connected to any
         if (!this.networks || this.networks.length === 0) return 0; // return the default chainId as we're connected
 
-        return this.networks[0].chainId;
+        return this.networks.find(network => network.isDefaultChain).chainId;
       }); // Provider proxy to support middleware stack of logging, caching and read-only rpc calls
 
       this.transport.cachedProvider = new network.CachedProvider();
@@ -3412,13 +3416,12 @@ class Wallet {
     this.getChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // default chain id is first one in the list, by design
-
+      }
 
-      const network = _this.networks[0];
+      const network = _this.networks.find(network => network.isDefaultChain);
 
-      if (!network.isDefaultChain) {
-        throw new Error('expecting first network in list to be default chain');
+      if (!network) {
+        throw new Error('networks must have a default chain specified');
       }
 
       return network.chainId;
@@ -3427,24 +3430,15 @@ class Wallet {
     this.getAuthChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // auth chain is first or second one in the list, by design
-
-
-      const network0 = _this.networks[0];
-
-      if (network0.isAuthChain) {
-        return network0.chainId;
       }
 
-      if (_this.networks.length > 1) {
-        const network1 = _this.networks[1];
+      const network = _this.networks.find(network => network.isAuthChain);
 
-        if (network1.isAuthChain) {
-          return network1.chainId;
-        }
+      if (!network) {
+        throw new Error('networks must have an auth chain specified');
       }
 
-      throw new Error('expecting first or second network in list to be the auth chain');
+      return network.chainId;
     };
 
     this.openWallet = async function (path, intent, networkId) {
@@ -3607,7 +3601,7 @@ class Wallet {
       }
     }
 
-    let network$1 = this.networks[0];
+    let network$1 = this.networks.find(network => network.isDefaultChain);
 
     if (chainId) {
       network$1 = network.findNetworkConfig(this.networks, chainId);
@@ -3728,7 +3722,7 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks[0].rpcUrl = this.config.networkRpcUrl;
+      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
     }
   }
 

package/dist/0xsequence-provider.cjs.prod.js

@@ -1214,8 +1214,12 @@ class WalletRequestHandler {
     const n = networks || (await this.getNetworks(true));
     this.events.emit('networks', n);
 
-    if (n && n.length > 0) {
-      this.events.emit('chainChanged', ethers.ethers.utils.hexlify(n[0].chainId));
+    if (n.length > 0) {
+      const defaultNetwork = n.find(network => network.isDefaultChain);
+
+      if (defaultNetwork) {
+        this.events.emit('chainChanged', ethers.ethers.utils.hexlify(defaultNetwork.chainId));
+      }
     } else {
       this.events.emit('chainChanged', '0x0');
     }
@@ -2085,7 +2089,7 @@ class BaseWalletTransport {
       if (!networks || networks.length === 0) {
         this.notifyChainChanged('0x0');
       } else {
-        this.notifyChainChanged(ethers.ethers.utils.hexlify(networks[0].chainId));
+        this.notifyChainChanged(ethers.ethers.utils.hexlify(networks.find(network => network.isDefaultChain).chainId));
       }
     });
     this.walletRequestHandler.on('walletContext', walletContext => {
@@ -3265,7 +3269,7 @@ class Wallet {
         // return stub chainId of 0 when not connected to any
         if (!this.networks || this.networks.length === 0) return 0; // return the default chainId as we're connected
 
-        return this.networks[0].chainId;
+        return this.networks.find(network => network.isDefaultChain).chainId;
       }); // Provider proxy to support middleware stack of logging, caching and read-only rpc calls
 
       this.transport.cachedProvider = new network.CachedProvider();
@@ -3412,13 +3416,12 @@ class Wallet {
     this.getChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // default chain id is first one in the list, by design
-
+      }
 
-      const network = _this.networks[0];
+      const network = _this.networks.find(network => network.isDefaultChain);
 
-      if (!network.isDefaultChain) {
-        throw new Error('expecting first network in list to be default chain');
+      if (!network) {
+        throw new Error('networks must have a default chain specified');
       }
 
       return network.chainId;
@@ -3427,24 +3430,15 @@ class Wallet {
     this.getAuthChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // auth chain is first or second one in the list, by design
-
-
-      const network0 = _this.networks[0];
-
-      if (network0.isAuthChain) {
-        return network0.chainId;
       }
 
-      if (_this.networks.length > 1) {
-        const network1 = _this.networks[1];
+      const network = _this.networks.find(network => network.isAuthChain);
 
-        if (network1.isAuthChain) {
-          return network1.chainId;
-        }
+      if (!network) {
+        throw new Error('networks must have an auth chain specified');
       }
 
-      throw new Error('expecting first or second network in list to be the auth chain');
+      return network.chainId;
     };
 
     this.openWallet = async function (path, intent, networkId) {
@@ -3607,7 +3601,7 @@ class Wallet {
       }
     }
 
-    let network$1 = this.networks[0];
+    let network$1 = this.networks.find(network => network.isDefaultChain);
 
     if (chainId) {
       network$1 = network.findNetworkConfig(this.networks, chainId);
@@ -3728,7 +3722,7 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks[0].rpcUrl = this.config.networkRpcUrl;
+      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
     }
   }
 

package/dist/0xsequence-provider.esm.js

@@ -1210,8 +1210,12 @@ class WalletRequestHandler {
     const n = networks || (await this.getNetworks(true));
     this.events.emit('networks', n);
 
-    if (n && n.length > 0) {
-      this.events.emit('chainChanged', ethers.utils.hexlify(n[0].chainId));
+    if (n.length > 0) {
+      const defaultNetwork = n.find(network => network.isDefaultChain);
+
+      if (defaultNetwork) {
+        this.events.emit('chainChanged', ethers.utils.hexlify(defaultNetwork.chainId));
+      }
     } else {
       this.events.emit('chainChanged', '0x0');
     }
@@ -2081,7 +2085,7 @@ class BaseWalletTransport {
       if (!networks || networks.length === 0) {
         this.notifyChainChanged('0x0');
       } else {
-        this.notifyChainChanged(ethers.utils.hexlify(networks[0].chainId));
+        this.notifyChainChanged(ethers.utils.hexlify(networks.find(network => network.isDefaultChain).chainId));
       }
     });
     this.walletRequestHandler.on('walletContext', walletContext => {
@@ -3261,7 +3265,7 @@ class Wallet {
         // return stub chainId of 0 when not connected to any
         if (!this.networks || this.networks.length === 0) return 0; // return the default chainId as we're connected
 
-        return this.networks[0].chainId;
+        return this.networks.find(network => network.isDefaultChain).chainId;
       }); // Provider proxy to support middleware stack of logging, caching and read-only rpc calls
 
       this.transport.cachedProvider = new CachedProvider();
@@ -3408,13 +3412,12 @@ class Wallet {
     this.getChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // default chain id is first one in the list, by design
-
+      }
 
-      const network = _this.networks[0];
+      const network = _this.networks.find(network => network.isDefaultChain);
 
-      if (!network.isDefaultChain) {
-        throw new Error('expecting first network in list to be default chain');
+      if (!network) {
+        throw new Error('networks must have a default chain specified');
       }
 
       return network.chainId;
@@ -3423,24 +3426,15 @@ class Wallet {
     this.getAuthChainId = async function () {
       if (!_this.networks || _this.networks.length < 1) {
         throw new Error('networks have not been set by session. connect first.');
-      } // auth chain is first or second one in the list, by design
-
-
-      const network0 = _this.networks[0];
-
-      if (network0.isAuthChain) {
-        return network0.chainId;
       }
 
-      if (_this.networks.length > 1) {
-        const network1 = _this.networks[1];
+      const network = _this.networks.find(network => network.isAuthChain);
 
-        if (network1.isAuthChain) {
-          return network1.chainId;
-        }
+      if (!network) {
+        throw new Error('networks must have an auth chain specified');
       }
 
-      throw new Error('expecting first or second network in list to be the auth chain');
+      return network.chainId;
     };
 
     this.openWallet = async function (path, intent, networkId) {
@@ -3603,7 +3597,7 @@ class Wallet {
       }
     }
 
-    let network = this.networks[0];
+    let network = this.networks.find(network => network.isDefaultChain);
 
     if (chainId) {
       network = findNetworkConfig(this.networks, chainId);
@@ -3724,7 +3718,7 @@ class Wallet {
 
 
     if (this.config.networkRpcUrl) {
-      this.networks[0].rpcUrl = this.config.networkRpcUrl;
+      this.networks.find(network => network.isDefaultChain).rpcUrl = this.config.networkRpcUrl;
     }
   }
 

package/dist/declarations/src/provider.d.ts

@@ -2,7 +2,7 @@ import { ethers } from 'ethers';
 import { BytesLike, Bytes } from '@ethersproject/bytes';
 import { Web3Provider as EthersWeb3Provider, JsonRpcProvider } from '@ethersproject/providers';
 import { TypedDataDomain, TypedDataField, TypedDataSigner } from '@ethersproject/abstract-signer';
-import { NetworkConfig, Networks, WalletContext, ChainIdLike, JsonRpcHandler, JsonRpcFetchFunc, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcSender } from '@0xsequence/network';
+import { NetworkConfig, WalletContext, ChainIdLike, JsonRpcHandler, JsonRpcFetchFunc, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcSender } from '@0xsequence/network';
 import { Signer } from '@0xsequence/wallet';
 import { WalletConfig, WalletState } from '@0xsequence/config';
 import { Relayer } from '@0xsequence/relayer';
@@ -21,7 +21,7 @@ export declare class Web3Provider extends EthersWeb3Provider implements JsonRpcH
 }
 export declare function isSequenceProvider(provider: any): provider is Web3Provider;
 export declare class LocalWeb3Provider extends Web3Provider {
-    constructor(signer: Signer, networks?: Networks);
+    constructor(signer: Signer, networks?: NetworkConfig[]);
 }
 export declare class Web3Signer extends Signer implements TypedDataSigner {
     readonly provider: Web3Provider;
@@ -46,7 +46,7 @@ export declare class Web3Signer extends Signer implements TypedDataSigner {
     signMessage(message: BytesLike, chainId?: ChainIdLike, allSigners?: boolean): Promise<string>;
     signTypedData(domain: TypedDataDomain, types: Record<string, Array<TypedDataField>>, message: Record<string, any>, chainId?: ChainIdLike, allSigners?: boolean): Promise<string>;
     sendTransaction(transaction: Deferrable<TransactionRequest>, chainId?: ChainIdLike, allSigners?: boolean): Promise<TransactionResponse>;
-    sendTransactionBatch(transactions: Deferrable<Forbid<TransactionRequest, "wait">[]>, chainId?: ChainIdLike, allSigners?: boolean): Promise<TransactionResponse>;
+    sendTransactionBatch(transactions: Deferrable<Forbid<TransactionRequest, 'wait'>[]>, chainId?: ChainIdLike, allSigners?: boolean): Promise<TransactionResponse>;
     signTransactions(transaction: Deferrable<TransactionRequest>, chainId?: ChainIdLike, allSigners?: boolean): Promise<SignedTransactions>;
     sendSignedTransactions(signedTxs: SignedTransactions, chainId?: ChainIdLike): Promise<TransactionResponse>;
     updateConfig(newConfig?: WalletConfig): Promise<[WalletConfig, TransactionResponse | undefined]>;

package/dist/declarations/src/transports/wallet-request-handler.d.ts

@@ -1,12 +1,12 @@
 import { ProviderMessageRequest, ProviderMessageResponse, ProviderMessageRequestHandler, MessageToSign, ProviderRpcError, ConnectOptions, ConnectDetails, PromptConnectDetails, WalletSession, OpenWalletIntent, ProviderEventTypes } from '../types';
 import { ExternalProvider } from '@ethersproject/providers';
-import { Networks, NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network';
+import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network';
 import { Signer } from '@0xsequence/wallet';
 import { TransactionRequest } from '@0xsequence/transactions';
 export interface WalletSignInOptions {
     connect?: boolean;
-    mainnetNetworks?: Networks;
-    testnetNetworks?: Networks;
+    mainnetNetworks?: NetworkConfig[];
+    testnetNetworks?: NetworkConfig[];
     defaultNetworkId?: string | number;
 }
 export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, ProviderMessageRequestHandler {
@@ -20,7 +20,7 @@ export declare class WalletRequestHandler implements ExternalProvider, JsonRpcHa
     private _defaultNetworkId?;
     private _chainId?;
     private events;
-    constructor(signer: Signer | null | undefined, prompter: WalletUserPrompter | null, mainnetNetworks: Networks, testnetNetworks?: Networks);
+    constructor(signer: Signer | null | undefined, prompter: WalletUserPrompter | null, mainnetNetworks: NetworkConfig[], testnetNetworks?: NetworkConfig[]);
     signIn(signer: Signer | null, options?: WalletSignInOptions): Promise<void>;
     signOut(): void;
     signerReset(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/provider",
-  "version": "0.36.11",
+  "version": "0.37.0",
   "description": "provider sub-package for Sequence",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/provider",
   "source": "src/index.ts",
@@ -13,13 +13,13 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@0xsequence/abi": "^0.36.11",
-    "@0xsequence/auth": "^0.36.11",
-    "@0xsequence/config": "^0.36.11",
-    "@0xsequence/network": "^0.36.11",
-    "@0xsequence/transactions": "^0.36.11",
-    "@0xsequence/utils": "^0.36.11",
-    "@0xsequence/wallet": "^0.36.11",
+    "@0xsequence/abi": "^0.37.0",
+    "@0xsequence/auth": "^0.37.0",
+    "@0xsequence/config": "^0.37.0",
+    "@0xsequence/network": "^0.37.0",
+    "@0xsequence/transactions": "^0.37.0",
+    "@0xsequence/utils": "^0.37.0",
+    "@0xsequence/wallet": "^0.37.0",
     "@ethersproject/abstract-signer": "^5.5.0",
     "@ethersproject/hash": "^5.5.0",
     "@ethersproject/providers": "^5.5.1",

package/src/provider.ts

@@ -4,7 +4,6 @@ import { Web3Provider as EthersWeb3Provider, ExternalProvider, JsonRpcProvider,
 import { TypedDataDomain, TypedDataField, TypedDataSigner } from '@ethersproject/abstract-signer'
 import {
   NetworkConfig,
-  Networks,
   WalletContext,
   ChainIdLike,
   JsonRpcHandler,
@@ -90,7 +89,7 @@ export function isSequenceProvider(provider: any): provider is Web3Provider {
 }
 
 export class LocalWeb3Provider extends Web3Provider {
-  constructor(signer: Signer, networks?: Networks) {
+  constructor(signer: Signer, networks?: NetworkConfig[]) {
     const walletRequestHandler = new WalletRequestHandler(signer, null, networks || [])
     super(walletRequestHandler)
   }
@@ -293,17 +292,17 @@ export class Web3Signer extends Signer implements TypedDataSigner {
   // sendTransactionBatch is a convenience method to call sendTransaction in a batch format, allowing you to
   // send multiple transaction as a single payload and just one on-chain transaction.
   async sendTransactionBatch(
-    transactions: Deferrable<Forbid<TransactionRequest, "wait">[]>,
+    transactions: Deferrable<Forbid<TransactionRequest, 'wait'>[]>,
     chainId?: ChainIdLike,
     allSigners?: boolean
   ): Promise<TransactionResponse> {
-    const batch = await resolveArrayProperties<Forbid<TransactionRequest, "wait">[]>(transactions)
+    const batch = await resolveArrayProperties<Forbid<TransactionRequest, 'wait'>[]>(transactions)
     if (!batch || batch.length === 0) {
       throw new Error('cannot send empty batch')
     }
 
     // sendTransactionBatch only accepts TransactionRequest, not TransactionResponses
-    if (batch.find((v) => v.wait !== undefined && v.wait !== null)) {
+    if (batch.find(v => v.wait !== undefined && v.wait !== null)) {
       throw new Error('transaction request expected for sendTransactionBatch, transaction response found')
     }
 

package/src/transports/base-wallet-transport.ts

@@ -66,7 +66,7 @@ export abstract class BaseWalletTransport implements WalletTransport {
       if (!networks || networks.length === 0) {
         this.notifyChainChanged('0x0')
       } else {
-        this.notifyChainChanged(ethers.utils.hexlify(networks[0].chainId))
+        this.notifyChainChanged(ethers.utils.hexlify(networks.find(network => network.isDefaultChain)!.chainId))
       }
     })
 

package/src/transports/wallet-request-handler.ts

@@ -19,14 +19,7 @@ import {
 import { BigNumber, ethers } from 'ethers'
 import { ExternalProvider } from '@ethersproject/providers'
 
-import {
-  Networks,
-  NetworkConfig,
-  JsonRpcHandler,
-  JsonRpcRequest,
-  JsonRpcResponseCallback,
-  JsonRpcResponse
-} from '@0xsequence/network'
+import { NetworkConfig, JsonRpcHandler, JsonRpcRequest, JsonRpcResponseCallback, JsonRpcResponse } from '@0xsequence/network'
 import { Signer } from '@0xsequence/wallet'
 import { isSignedTransactions, TransactionRequest } from '@0xsequence/transactions'
 import { signAuthorization, AuthorizationOptions } from '@0xsequence/auth'
@@ -38,8 +31,8 @@ const SIGNER_READY_TIMEOUT = 10000
 
 export interface WalletSignInOptions {
   connect?: boolean
-  mainnetNetworks?: Networks
-  testnetNetworks?: Networks
+  mainnetNetworks?: NetworkConfig[]
+  testnetNetworks?: NetworkConfig[]
   defaultNetworkId?: string | number
 }
 
@@ -64,8 +57,8 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
   constructor(
     signer: Signer | null | undefined,
     prompter: WalletUserPrompter | null,
-    mainnetNetworks: Networks,
-    testnetNetworks: Networks = []
+    mainnetNetworks: NetworkConfig[],
+    testnetNetworks: NetworkConfig[] = []
   ) {
     this.signer = signer
     this.prompter = prompter
@@ -725,8 +718,11 @@ export class WalletRequestHandler implements ExternalProvider, JsonRpcHandler, P
   async notifyNetworks(networks?: NetworkConfig[]) {
     const n = networks || (await this.getNetworks(true))
     this.events.emit('networks', n)
-    if (n && n.length > 0) {
-      this.events.emit('chainChanged', ethers.utils.hexlify(n[0].chainId))
+    if (n.length > 0) {
+      const defaultNetwork = n.find(network => network.isDefaultChain)
+      if (defaultNetwork) {
+        this.events.emit('chainChanged', ethers.utils.hexlify(defaultNetwork.chainId))
+      }
     } else {
       this.events.emit('chainChanged', '0x0')
     }

package/src/wallet.ts

@@ -1,5 +1,4 @@
 import {
-  Networks,
   NetworkConfig,
   WalletContext,
   sequenceContext,
@@ -143,7 +142,7 @@ export class Wallet implements WalletProvider {
       this.transport.extensionMessageProvider = new ExtensionMessageProvider(this.config.transports.extensionTransport.runtime)
       // this.transport.extensionMessageProvider.register()
       this.transport.messageProvider.add(this.transport.extensionMessageProvider)
-      
+
       // NOTE/REVIEW: see note in mux-message-provider
       //
       // We don't add the extensionMessageProvider here because we don't send requests to it anyways, we seem to
@@ -171,7 +170,7 @@ export class Wallet implements WalletProvider {
       if (!this.networks || this.networks.length === 0) return 0
 
       // return the default chainId as we're connected
-      return this.networks[0].chainId
+      return this.networks.find(network => network.isDefaultChain)!.chainId
     })
 
     // Provider proxy to support middleware stack of logging, caching and read-only rpc calls
@@ -379,11 +378,13 @@ export class Wallet implements WalletProvider {
     if (!this.networks || this.networks.length < 1) {
       throw new Error('networks have not been set by session. connect first.')
     }
-    // default chain id is first one in the list, by design
-    const network = this.networks[0]
-    if (!network.isDefaultChain) {
-      throw new Error('expecting first network in list to be default chain')
+
+    const network = this.networks.find(network => network.isDefaultChain)
+
+    if (!network) {
+      throw new Error('networks must have a default chain specified')
     }
+
     return network.chainId
   }
 
@@ -391,18 +392,14 @@ export class Wallet implements WalletProvider {
     if (!this.networks || this.networks.length < 1) {
       throw new Error('networks have not been set by session. connect first.')
     }
-    // auth chain is first or second one in the list, by design
-    const network0 = this.networks[0]
-    if (network0.isAuthChain) {
-      return network0.chainId
-    }
-    if (this.networks.length > 1) {
-      const network1 = this.networks[1]
-      if (network1.isAuthChain) {
-        return network1.chainId
-      }
+
+    const network = this.networks.find(network => network.isAuthChain)
+
+    if (!network) {
+      throw new Error('networks must have an auth chain specified')
     }
-    throw new Error('expecting first or second network in list to be the auth chain')
+
+    return network.chainId
   }
 
   openWallet = async (path?: string, intent?: OpenWalletIntent, networkId?: string | number): Promise<boolean> => {
@@ -439,7 +436,7 @@ export class Wallet implements WalletProvider {
       }
     }
 
-    let network: NetworkConfig | undefined = this.networks[0]
+    let network: NetworkConfig | undefined = this.networks.find(network => network.isDefaultChain)!
     if (chainId) {
       network = findNetworkConfig(this.networks, chainId)
       if (!network) {
@@ -628,7 +625,7 @@ export class Wallet implements WalletProvider {
 
     // an extra override for convenience
     if (this.config.networkRpcUrl) {
-      this.networks[0].rpcUrl = this.config.networkRpcUrl
+      this.networks.find(network => network.isDefaultChain)!.rpcUrl = this.config.networkRpcUrl
     }
   }