fix/improve network mgmt

README.md

@@ -74,17 +74,16 @@ unicrowSdk.ui.release(escrowId)
 unicrowSdk.ui.claim(escrowId)
 ```
 
-### Change network
+### Default network and autoswitch
 
-The SDK is by default configured to interact with the Arbitrum One network and asks the user to switch to it automatically when any contract-interacting functions are called. We currently support also Ethereum Goerli* and Unicrow’s private RPC. The automated switch can also be turned off (in such a case, an error is thrown).
+To set a default network (for the supported networks, see `wallet/networks.ts`) and (optionally) request a switch when the wallet is connected to a different one:
 
-\*We chose to deploy on Ethereum Goerli instead of Arbitrum Goerli because of larger support for "stablecoins", DEXes, etc.
 
 ```js
-unicrowSdk.config({
-  defaultNetwork: “<arbitrum|goerli|development>”,
-  autoSwitchNetwork: <true|false> // optional, defaults to true
-})
+unicrowSdk.config(
+  defaultNetwork: “<chainId>”,
+  autoSwitchNetwork: <true|false> // optional, defaults to false
+)
 ```
 
 For more examples, check out the [SDK Tutorial](https://github.com/unicrowio/sdk-tutorial).

src/config/getContractsAddresses.ts

@@ -0,0 +1,14 @@
+import { networks, UnicrowNetwork } from "../wallet/networks";
+import { getNetwork } from "../wallet";
+
+export const getContractsAddresses = async (): Promise<
+  UnicrowNetwork["addresses"]
+> => {
+  let chainId = (await getNetwork())?.chainId;
+  if (chainId === null) throw new Error(`Wallet not connected.`);
+
+  let network = networks.find((network) => network.chainId === chainId);
+  if (!network) throw new Error(`Network ${chainId} is not supported yet.`);
+
+  return network.addresses;
+};

src/config/index.ts

@@ -1,3 +1,3 @@
 export { setupNetwork as config } from "./setup";
-export { getContractAddress } from "./getContractAddress";
+export { getContractsAddresses } from "./getContractsAddresses";
 export { MARKER } from "./marker";

src/config/setup.ts

@@ -1,23 +1,14 @@
-import { IConfig } from "../typing";
-import { networks as DefaultNetworks } from "../wallet/networks";
+import { networks } from "../wallet/networks";
 
-export const setupNetwork = ({
-  defaultNetwork = "arbitrum",
+export const setupNetwork = (
+  chainId = BigInt(42161),
   autoSwitchNetwork = false,
-}: IConfig) => {
-  globalThis.defaultNetwork = {
-    name:
-      defaultNetwork ||
-      DefaultNetworks[defaultNetwork]?.chainName ||
-      DefaultNetworks.arbitrum?.chainName,
-    displayName:
-      DefaultNetworks[defaultNetwork]?.displayName ||
-      DefaultNetworks.arbitrum?.displayName,
-    chainId: defaultNetwork
-      ? DefaultNetworks[defaultNetwork].chainId
-      : DefaultNetworks.arbitrum.chainId,
-  };
+) => {
+  let network = networks.find((network) => network.chainId === chainId);
+  if (!network) throw new Error(`Network ${chainId} is not supported yet.`);
+
+  globalThis.defaultNetwork = network;
   globalThis.autoSwitchNetwork = autoSwitchNetwork;
 };
 
-setupNetwork({});
+setupNetwork();

src/core/approveArbitrator.ts

@@ -1,6 +1,6 @@
 import { UnicrowArbitrator__factory } from "@unicrowio/ethers-types";
 
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ApproveArbitratorParsedPayload,
   IApproveArbitrationTransactionCallbacks,
@@ -31,7 +31,7 @@ export const approveArbitrator = async (
 ): Promise<ApproveArbitratorParsedPayload> => {
   try {
     callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-    const provider = await getWeb3Provider();
+    const provider = getWeb3Provider();
 
     if (!provider) {
       throw new Error("Error on Approving the Arbiter. Account not connected");
@@ -43,7 +43,7 @@ export const approveArbitrator = async (
     callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
     const crowArbitratorContract = UnicrowArbitrator__factory.connect(
-      getContractAddress("arbitrator"),
+      (await getContractsAddresses()).arbitrator,
       await provider.getSigner(),
     );
 

src/core/approveSettlement.ts

@@ -1,5 +1,5 @@
 import { UnicrowDispute__factory } from "@unicrowio/ethers-types";
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ApproveSettlementParsedPayload,
   ISettlementApproveTransactionCallbacks,
@@ -31,7 +31,7 @@ export const approveSettlement = async (
 ): Promise<ApproveSettlementParsedPayload> => {
   try {
     callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-    const provider = await getWeb3Provider();
+    const provider = getWeb3Provider();
 
     if (!provider) {
       throw new Error("Error on Approve Offer, Account Not connected");
@@ -43,7 +43,7 @@ export const approveSettlement = async (
     callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
     const CrowDisputeContract = UnicrowDispute__factory.connect(
-      getContractAddress("dispute"),
+      (await getContractsAddresses()).dispute,
       await provider.getSigner(),
     );
     const approveOfferTx = await CrowDisputeContract.approveSettlement(

src/core/arbitrate.ts

@@ -1,5 +1,5 @@
 import { UnicrowArbitrator__factory } from "@unicrowio/ethers-types";
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ArbitrateParsedPayload,
   IArbitrateTransactionCallbacks,
@@ -29,7 +29,7 @@ export const arbitrate = async (
 ): Promise<ArbitrateParsedPayload> => {
   try {
     callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-    const provider = await getWeb3Provider();
+    const provider = getWeb3Provider();
 
     if (!provider) {
       throw new Error("Error on Arbitrating. Account not connected");
@@ -41,7 +41,7 @@ export const arbitrate = async (
     callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
     const crowArbitratorContract = UnicrowArbitrator__factory.connect(
-      getContractAddress("arbitrator"),
+      (await getContractsAddresses()).arbitrator,
       await provider.getSigner(),
     );
 

src/core/challenge.ts

@@ -5,7 +5,7 @@ import {
   getCurrentWalletAddress,
   getWeb3Provider,
 } from "../wallet";
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ChallengeParsedPayload,
   IChallengeTransactionCallbacks,
@@ -24,7 +24,7 @@ export const challenge = async (
   callbacks?: IChallengeTransactionCallbacks,
 ): Promise<ChallengeParsedPayload> => {
   callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-  const provider = await getWeb3Provider();
+  const provider = getWeb3Provider();
 
   if (!provider) {
     throw new Error("Error on Challenge, Account Not connected");
@@ -36,7 +36,7 @@ export const challenge = async (
     const walletAddress = await getCurrentWalletAddress();
     callbacks && callbacks.connected && callbacks.connected(walletAddress);
     const smartContract = UnicrowDispute__factory.connect(
-      getContractAddress("dispute"),
+      (await getContractsAddresses()).dispute,
       await provider.getSigner(),
     );
 

src/core/claim.ts

@@ -1,4 +1,4 @@
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import { UnicrowClaim__factory } from "@unicrowio/ethers-types";
 import { IClaimTransactionCallbacks, ClaimParsedPayload } from "../typing";
 import {
@@ -21,7 +21,7 @@ export const claim = async (
   callbacks?: IClaimTransactionCallbacks,
 ): Promise<ClaimParsedPayload> => {
   callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-  const provider = await getWeb3Provider();
+  const provider = getWeb3Provider();
 
   if (!provider) {
     throw new Error("Error on Claiming, Account Not connected");
@@ -33,7 +33,7 @@ export const claim = async (
   callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
   const smartContract = UnicrowClaim__factory.connect(
-    getContractAddress("claim"),
+    (await getContractsAddresses()).claim,
     await provider.getSigner(),
   );
 

src/core/claimMultiple.ts

@@ -1,4 +1,4 @@
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import { UnicrowClaim__factory } from "@unicrowio/ethers-types";
 import {
   MultipleClaimParsedPayload,
@@ -27,7 +27,7 @@ export const claimMultiple = async (
   callbacks?: IClaimTransactionCallbacks,
 ): Promise<MultipleClaimParsedPayload> => {
   callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-  const provider = await getWeb3Provider();
+  const provider = getWeb3Provider();
 
   if (!provider) {
     throw new Error("Error on Claiming, Account Not connected");
@@ -39,7 +39,7 @@ export const claimMultiple = async (
   callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
   const smartContract = UnicrowClaim__factory.connect(
-    getContractAddress("claim"),
+    (await getContractsAddresses()).claim,
     await provider.getSigner(),
   );
 

src/core/getBalance.ts

@@ -15,14 +15,14 @@ import { ETH_ADDRESS } from "../helpers";
 export const getBalance = async (
   tokenAddress: string | null = ETH_ADDRESS,
 ): Promise<bigint> => {
-  const provider = await getWeb3Provider();
+  const provider = getWeb3Provider();
   const walletAddress = await getCurrentWalletAddress();
 
   if (!(provider && walletAddress)) {
     throw new Error("Error on Get Balance, Account Not connected");
   }
 
-  autoSwitchNetwork();
+  await autoSwitchNetwork();
 
   if (tokenAddress === ETH_ADDRESS) {
     return provider.getBalance(walletAddress);

src/core/getEscrowData.ts

@@ -1,4 +1,4 @@
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ADDRESS_ZERO,
   consensus,
@@ -271,7 +271,7 @@ const parse = (escrowId: number, data: DataStructOutput): any => {
 export const getEscrowData = async (
   escrowId: number,
 ): Promise<IGetEscrowData> => {
-  const provider = await getWeb3Provider();
+  const provider = getWeb3Provider();
 
   if (!provider) {
     throw new Error("Error on Getting Escrow Data, Account Not connected");
@@ -280,7 +280,7 @@ export const getEscrowData = async (
   await autoSwitchNetwork();
 
   const Unicrow = Unicrow__factory.connect(
-    getContractAddress("unicrow"),
+    (await getContractsAddresses()).unicrow,
     provider,
   );
 

src/core/getProtocolFee.ts

@@ -1,7 +1,7 @@
 import { Unicrow__factory } from "@unicrowio/ethers-types";
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import { bipsToPercentage } from "../helpers";
-import { getBrowserProvider } from "./internal/getBrowserProvider";
+import { getWeb3Provider } from "../wallet";
 
 /**
  * Retrieves information about the protocol fee and returns its percentage.
@@ -10,9 +10,11 @@ import { getBrowserProvider } from "./internal/getBrowserProvider";
  * @returns The protocol fee in percentage
  */
 export const getProtocolFee = async () => {
+  let provider = getWeb3Provider();
+
   const smartContract = Unicrow__factory.connect(
-    getContractAddress("unicrow"),
-    getBrowserProvider(),
+    (await getContractsAddresses()).unicrow,
+    provider,
   );
 
   const fee = await smartContract.protocolFee();

src/core/getTokenInfo.ts

@@ -1,11 +1,11 @@
 import { ERC20__factory } from "@unicrowio/ethers-types";
 import { ETH_ADDRESS, isSameAddress } from "../helpers";
 import { IToken } from "../typing";
-import { getBrowserProvider } from "./internal/getBrowserProvider";
+import { getWeb3Provider } from "../wallet";
 
 const fetchTokenInfo = async (tokenAddress: string) => {
   try {
-    const provider = getBrowserProvider();
+    const provider = getWeb3Provider();
     const token = ERC20__factory.connect(tokenAddress, provider);
     return Promise.all([token.symbol(), token.decimals()]).then((results) => ({
       address: tokenAddress,

src/core/offerSettlement.ts

@@ -1,6 +1,6 @@
 import { UnicrowDispute__factory } from "@unicrowio/ethers-types";
 
-import { getContractAddress } from "../config";
+import { getContractsAddresses } from "../config";
 import {
   ISettlementOfferTransactionCallbacks,
   OfferSettlementParsedPayload,
@@ -30,7 +30,7 @@ export const offerSettlement = async (
 ): Promise<OfferSettlementParsedPayload> => {
   try {
     callbacks && callbacks.connectingWallet && callbacks.connectingWallet();
-    const provider = await getWeb3Provider();
+    const provider = getWeb3Provider();
 
     if (!provider) {
       throw new Error("Error on Settlement, Account Not connected");
@@ -42,7 +42,7 @@ export const offerSettlement = async (
     callbacks && callbacks.connected && callbacks.connected(walletAddress);
 
     const crowDisputeContract = UnicrowDispute__factory.connect(
-      getContractAddress("dispute"),
+      (await getContractsAddresses()).dispute,
       await provider.getSigner(),
     );