Merge branch 'master' into dependabot/npm_and_yarn/babel/traverse-7.24.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poolzfinance/reacthelper",
-  "version": "1.12.11",
+  "version": "2.0.0",
   "description": "",
   "type": "module",
   "source": "src/index.ts",

src/components/Provider.tsx

@@ -2,8 +2,9 @@ import React from "react"
 import Web3 from "web3"
 import ThePoolzContext from "./Context"
 import ThePoolz from "../poolz/ThePoolz"
+import { TChainConfig } from "../types/IThePoolzInterface"
 
-const ThePoolzProvider = ({ children }: { children: React.ReactNode }) => {
+const ThePoolzProvider = ({ children, overrides }: { children: React.ReactNode, overrides?: TChainConfig }) => {
   const [thePoolzInstance, setThePoolzInstance] = React.useState(new ThePoolz(Web3.givenProvider))
   const [provider, setProvider] = React.useState(Web3.givenProvider)
 
@@ -13,7 +14,7 @@ const ThePoolzProvider = ({ children }: { children: React.ReactNode }) => {
     if (!provider) return
 
     const init = async () => {
-      const instance = new ThePoolz(provider)
+      const instance = new ThePoolz(provider, overrides)
       await instance.init()
       setThePoolzInstance(instance)
     }

src/poolz/ThePoolz.ts

@@ -1,7 +1,7 @@
 import Web3 from "web3"
 import type { Contract } from "web3-eth-contract"
 import type { AbiItem } from "web3-utils"
-import type { IThePoolzInterface, IERC20Info } from "../types/IThePoolzInterface"
+import type { IThePoolzInterface, IERC20Info, TChainConfig } from "../types/IThePoolzInterface"
 import { CUSTOMER_ACCOUNT_VARIABLE, DEFAULT_CHAIN_ID, AVAILABLE_CHAINS } from "../constants"
 import ERC20 from "../contracts/abi/ERC20.json"
 import POOLZ from "../contracts/abi/ThePoolz.json"
@@ -48,11 +48,13 @@ class ThePoolz implements IThePoolzInterface {
   #provider: typeof Web3.givenProvider
   #contracts = new Map<string, Contract>()
   #isTrustWallet = false
+  #overrides: TChainConfig | undefined = undefined
 
-  constructor(provider: typeof Web3.givenProvider) {
+  constructor(provider: typeof Web3.givenProvider, overrides?: TChainConfig) {
     this.#provider = provider
     this.web3 = new Web3(provider)
     this.#isTrustWallet = !!provider?.isTrustWallet
+    this.#overrides = overrides
   }
   async init() {
     await this.initTrust()
@@ -85,6 +87,7 @@ class ThePoolz implements IThePoolzInterface {
   private async initPoolzContracts() {
     const chainConfig = AVAILABLE_CHAINS.get(this.chainId)
     if (!chainConfig) return
+    if (this.#overrides) Object.assign(chainConfig, this.#overrides)
     const {
       poolzTokenAddress,
       poolzAddress,
@@ -316,7 +319,10 @@ class ThePoolz implements IThePoolzInterface {
       abifetchPromises.push(
         this.fetchContractAbi(tempMultiSender.nameVersion)
           .then((abi) => {
-            this.tempMultiSenderContract = { ...tempMultiSender, contract: new this.web3.eth.Contract(abi as AbiItem[], tempMultiSender.address) }
+            this.tempMultiSenderContract = {
+              ...tempMultiSender,
+              contract: new this.web3.eth.Contract(abi as AbiItem[], tempMultiSender.address)
+            }
           })
           .catch((e) => {
             console.error(e)

src/types/IThePoolzInterface.ts

@@ -9,9 +9,43 @@ export interface IChainInfo {
   chainId: number
 }
 
+export type AcceptableContractNames =
+  | "PoolzBack"
+  | "LockedDeal"
+  | "Whitelist"
+  | "SignUp"
+  | "EnvelopToken"
+  | "BeaconToken"
+  | "DelayVault"
+  | "TemporaryToken"
+  | "MultiWithdraw"
+  | "LockDealNFT"
+  | "VaultManager"
+  | "DealProvider"
+  | "LockDealProvider"
+  | "TimedDealProvider"
+  | "CollateralProvider"
+  | "RefundProvider"
+  | "SimpleBuilder"
+  | "SimpleRefundBuilder"
+  | "MultiSender"
+  | "DelayVaultProvider"
+  | "DelayVaultMigrator"
+  | "TokenNFTConnector"
+  | "MultiSenderV2"
+  | "TempMultiSender"
+
+export type VersionNumber = `${number}.${number}.${number}`
+
+export type NameVersion =
+  | `${AcceptableContractNames}@${VersionNumber}`
+  | `${AcceptableContractNames}@${VersionNumber}-${string}`
+  | "CPoolx"
+  | "CWhiteList"
+  | "CSignUp"
 export interface IContractInfo {
   address: string
-  nameVersion: string
+  nameVersion: NameVersion
   contract: Contract
   proxy?: string
   proxyContract?: Contract

tests/ThePoolz.test.ts

@@ -93,4 +93,10 @@ describe("ThePoolz", () => {
     const thePoolz = new ThePoolz("http://localhost:8545")
     await thePoolz.init()
   })
+
+  test("Overrides config", async () => {
+    const thePoolz = new ThePoolz("http://localhost:8545", { poolzAddress: "0x000" })
+    await thePoolz.init()
+    expect(thePoolz.CPoolx?.address).toEqual("0x000")
+  })
 })