Fixed DAO Creation

packages/govern-console/package.json

@@ -31,7 +31,7 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.23.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "ethers": "^5.4.1",
+    "ethers": "^5.5.0",
     "graphql": "^15.5.0",
     "immer": "^9.0.2",
     "ipfs-core": "^0.6.1",

packages/govern/internal/actions/RegisterToken.ts

@@ -1,6 +1,6 @@
-import { CensusErc20Api } from 'dvote-js'
+import { CensusErc20Api } from './lib/Token'
 import { getPool } from './lib/Gateway'
-import { ContractReceipt, Wallet, Signer } from 'ethers'
+import { ContractReceipt, Signer, Wallet } from 'ethers'
 
 /**
  *
@@ -13,7 +13,8 @@ export const isTokenRegistered = async (
   tokenAddress: string
 ): Promise<boolean> => {
   const pool = await getPool(signer.provider)
-  return await CensusErc20Api.isRegistered(tokenAddress, pool)
+  return CensusErc20Api.getTokenInfo(tokenAddress, pool)
+    .then(tokenInfo => tokenInfo.isRegistered)
 }
 
 /**
@@ -34,7 +35,5 @@ export const registerToken = async (
     return 'ALREADY_REGISTERED'
   }
 
-  const result = CensusErc20Api.registerTokenAuto(tokenAddress, signer, pool)
-
-  return result
+  return CensusErc20Api.registerTokenAuto(tokenAddress, signer, pool)
 }

packages/govern/internal/actions/lib/Gateway.ts

@@ -1,6 +1,6 @@
 import { providers } from 'ethers'
 import { BRIGE_CONFIG } from '../../configuration/ConfigDefaults'
-import { GatewayPool } from 'dvote-js'
+import { GatewayPool } from '@vocdoni/client'
 
 export async function getPool(
   provider?: providers.Provider

packages/govern/internal/actions/lib/Token.ts

@@ -0,0 +1,57 @@
+import { BigNumber } from "@ethersproject/bignumber"
+import { ContractReceipt } from "@ethersproject/contracts"
+import { Signer } from "@ethersproject/abstract-signer"
+import { Wallet } from "@ethersproject/wallet"
+import { GatewayPool } from '@vocdoni/client'
+import { ERC20Proof } from "@vocdoni/storage-proofs-eth"
+
+export namespace CensusErc20Api {
+  /** Finds the balance mapping position of the given ERC20 token address and attempts to register it on the blockchain */
+  export async function registerTokenAuto(tokenAddress: string, walletOrSigner: Wallet | Signer, gw: GatewayPool, customContractAddress?: string): Promise<ContractReceipt> {
+    const contractInstance = await gw.getTokenStorageProofInstance(walletOrSigner, customContractAddress)
+
+    const mapSlot = await CensusErc20Api.findBalanceMappingPosition(tokenAddress, await walletOrSigner.getAddress(), gw.provider)
+    if (mapSlot === null) throw new Error("The given token contract does not seem to have a defined mapping position for the holder balances")
+
+    const tx = await contractInstance.registerToken(tokenAddress, mapSlot)
+    // @ts-ignore
+    return tx.wait()
+  }
+
+  /** Associates the given balance mapping position to the given ERC20 token address  */
+  export function registerToken(tokenAddress: string, balanceMappingPosition: number | BigNumber, walletOrSigner: Wallet | Signer, gw: GatewayPool, customContractAddress?: string) {
+    return gw.getTokenStorageProofInstance(walletOrSigner, customContractAddress)
+      .then((contractInstance) =>
+        contractInstance.registerToken(tokenAddress,
+          balanceMappingPosition
+        )
+      )
+      .then(tx => tx.wait())
+  }
+
+  export function getTokenInfo(tokenAddress: string, gw: GatewayPool, customContractAddress?: string): Promise<{ isRegistered: boolean, isVerified: boolean, balanceMappingPosition: number }> {
+    return gw.getTokenStorageProofInstance(null, customContractAddress)
+      .then((contractInstance) => contractInstance.tokens(tokenAddress))
+      .then((tokenDataTuple) => {
+        const balanceMappingPosition = BigNumber.isBigNumber(tokenDataTuple[2]) ?
+          tokenDataTuple[2].toNumber() : tokenDataTuple[2]
+
+        return {
+          isRegistered: tokenDataTuple[0],
+          isVerified: tokenDataTuple[1],
+          balanceMappingPosition
+        }
+      })
+  }
+
+  // Helpers
+
+  /**
+   * Attempts to find the index at which the holder balances are stored within the token contract.
+   * If the position cannot be found among the 50 first ones, `null` is returned.
+   */
+  export function findBalanceMappingPosition(tokenAddress: string, holderAddress: string, provider) {
+    return ERC20Proof.findMapSlot(tokenAddress, holderAddress, provider)
+  }
+}
+

packages/govern/internal/configuration/ConfigDefaults.ts

@@ -1,4 +1,4 @@
-import { IGatewayDiscoveryParameters } from 'dvote-js'
+import { IGatewayDiscoveryParameters } from '@vocdoni/client'
 
 type BrigeConfig = {
   [key: string]: IGatewayDiscoveryParameters
@@ -14,10 +14,12 @@ export const BRIGE_CONFIG: BrigeConfig = {
     networkId: 'rinkeby',
     bootnodesContentUri: 'https://bootnodes.vocdoni.net/gateways.dev.json',
     environment: 'dev',
+    numberOfGateways: 1
   },
   mainnet: {
     networkId: 'mainnet',
     bootnodesContentUri: 'https://bootnodes.vocdoni.net/gateways.json',
     environment: 'prod',
+    numberOfGateways: 1
   },
 }

packages/govern/package.json

@@ -58,13 +58,14 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "ts-jest": "^26.4.2",
     "tslint": "^6.1.3",
-    "typescript": "^4.0.5",
+    "typescript": "^4.4.3",
     "uglify-es": "^3.3.9"
   },
   "dependencies": {
     "@urql/core": "^1.13.1",
-    "dvote-js": "^1.9.14",
-    "ethers": "^5.4.1",
+    "@vocdoni/client": "^1.16.7",
+    "@vocdoni/storage-proofs-eth": "^0.4.1",
+    "ethers": "^5.5.0",
     "graphql": "^15.4.0",
     "graphql-tag": "^2.11.0",
     "isomorphic-unfetch": "^3.1.0"

packages/govern/tsconfig.cjs.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "removeComments": true,
     "strictPropertyInitialization": false,
+    "allowSyntheticDefaultImports": true,
     "sourceRoot": "./",
     "outDir": "./dist/cjs",
     "strict": false,

packages/govern/tsconfig.esm.json

@@ -4,10 +4,10 @@
     "module": "es6",
     "target": "es2018",
     "removeComments": true,
+    "allowSyntheticDefaultImports": true,
     "strictPropertyInitialization": false,
     "strict": false,
     "outDir": "./dist/esm",
-    "strict": false,
     "sourceRoot": "./",
     "inlineSources": true,
     "types": ["jest"],