Add Rarimo Beta network. Fix type errors (#29)

* Added Rarimo Beta network. Fixed type errors

* Fixed typo

* Added deployment script

Author: KyrylR

deploy/config/config.ts

@@ -13,5 +13,9 @@ export async function getConfig() {
     return await import("./rarimo-dev");
   }
 
+  if (hre.network.name == "rarimo-beta") {
+    return await import("./rarimo-beta");
+  }
+
   throw new Error(`Config for network ${hre.network.name} is not specified`);
 }

deploy/config/rarimo-beta.ts

@@ -0,0 +1,13 @@
+export const treeSize = 80;
+export const owner = "0xD2D15f650654d69F4dFd3aF41c49412c62BD616F";
+
+export const evidenceRegistry = "0x156C5fb747638F18264080e1f17A15B76E938e73";
+
+export const icaoMasterTreeMerkleRoot = "0x0eef24f25513eb3d3e13856805319553013158c347209287d090d3100e33c55b";
+
+export const registrationName = "SecondRegistration";
+export const simpleRegistrationName = "SimpleRegistration";
+export const simpleRegistrationSigners = ["0xD2D15f650654d69F4dFd3aF41c49412c62BD616F"];
+
+export const registration2 = "0x0000000000000000000000000000000000000000";
+export const stateKeeper = "0x0000000000000000000000000000000000000000";

hardhat.config.ts

@@ -61,6 +61,11 @@ const config: HardhatUserConfig = {
       url: "http://34.134.193.127:8545",
       gasMultiplier: 1.2,
     },
+    "rarimo-beta": {
+      url: "https://rpc.evm.mainnet.rarimo.com",
+      gasPrice: 0,
+      gasMultiplier: 1.2,
+    },
   },
   solidity: {
     version: "0.8.28",
@@ -75,8 +80,17 @@ const config: HardhatUserConfig = {
   etherscan: {
     apiKey: {
       "rarimo-l2": "abc",
+      "rarimo-beta": "abc",
     },
     customChains: [
+      {
+        network: "rarimo-beta",
+        chainId: 201411,
+        urls: {
+          apiURL: "https://api.evmscan.rarimo.com/api",
+          browserURL: "https://evmscan.rarimo.com",
+        },
+      },
       {
         network: "rarimo-l2",
         chainId: 7368,

package.json

@@ -32,12 +32,13 @@
     "private-network-fork": "npx hardhat node --fork https://mainnet.infura.io/v3/$(grep INFURA_KEY .env | cut -d '\"' -f2)",
     "deploy-rarimo-l2": "npx hardhat migrate --network rarimo-l2 --verify",
     "deploy-rarimo-dev": "npx hardhat migrate --network rarimo-dev --verify",
+    "deploy-rarimo-beta": "npx hardhat migrate --network rarimo-beta --verify",
     "generate-types": "TYPECHAIN_FORCE=true npx hardhat typechain && npx hardhat gobind",
     "generate-docs": "npx hardhat markup",
     "solhint-check": "solhint \"./contracts/**/*.sol\"",
     "lint-fix": "npm run lint-sol-fix && npm run lint-ts-fix && npm run lint-json-fix && npm run solhint-check",
     "lint-json-fix": "prettier --write \"./**/*.json\"",
-    "lint-ts-fix": "prettier --write \"./**/*.ts\"",
+    "lint-ts-fix": "prettier --write \"./**/*.ts\" --ignore-path .prettierignore",
     "lint-sol-fix": "prettier --write \"contracts/**/*.sol\"",
     "publish-to-npm": "npm run lint-fix && bash ./scripts/publish.sh --public"
   },

test/registration/Registration.test.ts

@@ -5,19 +5,10 @@ import { HDNodeWallet } from "ethers";
 import { time } from "@nomicfoundation/hardhat-network-helpers";
 import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
 
-import {
-  Z_UNIVERSAL_2048,
-  Z_UNIVERSAL_4096,
-  C_RSA_SHA2_4096,
-  P_ECDSA_SHA1_2704,
-  P_RSA_SHA1_2688,
-  P_NO_AA,
-} from "@/scripts/utils/types";
+import { Z_UNIVERSAL_4096, C_RSA_SHA2_4096, P_ECDSA_SHA1_2704, P_RSA_SHA1_2688, P_NO_AA } from "@/scripts/utils/types";
 
 import {
   StateKeeperMock,
-  PUniversal2048Verifier,
-  PUniversal4096Verifier,
   CRSADispatcher,
   PNOAADispatcher,
   PRSASHADispatcher,
@@ -26,7 +17,6 @@ import {
   Registration2Mock,
   Registration2,
 } from "@ethers-v6";
-
 import { Groth16VerifierHelper } from "@/generated-types/ethers/contracts/registration/Registration2";
 
 import { MerkleTreeHelper } from "@/test/helpers";
@@ -62,9 +52,6 @@ describe("Registration2", () => {
   let SECOND: SignerWithAddress;
   let SIGNER: HDNodeWallet;
 
-  let pUniversal2048Verifier: PUniversal2048Verifier;
-  let pUniversal4096Verifier: PUniversal4096Verifier;
-
   let pNoAaDispatcher: PNOAADispatcher;
   let pRsaSha1Dispatcher: PRSASHADispatcher;
   let pEcdsaSha1Dispatcher: PECDSASHA1Dispatcher;

test/registration/RegistrationSimple.test.ts

@@ -17,7 +17,7 @@ import {
   ProofRegisterIdentityLight256Groth16,
   RegisterIdentityLight256,
 } from "@/generated-types/zkit";
-import { VerifierHelper } from "@/generated-types/ethers/contracts/registration/Registration";
+import { Groth16VerifierHelper } from "@/generated-types/ethers/contracts/registration/Registration2";
 
 const treeSize = 80;
 
@@ -205,7 +205,7 @@ describe("RegistrationSimple", () => {
     });
 
     it("should revert if invalid proof is provided", async () => {
-      const localProof: VerifierHelper.ProofPointsStruct = JSON.parse(JSON.stringify(formatProof(proof.proof)));
+      const localProof: Groth16VerifierHelper.ProofPointsStruct = JSON.parse(JSON.stringify(formatProof(proof.proof)));
 
       localProof.a[0] = 0n;
 
@@ -281,7 +281,7 @@ describe("RegistrationSimple", () => {
     });
   });
 
-  function formatProof(data: Groth16Proof): VerifierHelper.ProofPointsStruct {
+  function formatProof(data: Groth16Proof): Groth16VerifierHelper.ProofPointsStruct {
     return {
       a: [data.pi_a[0], data.pi_a[1]],
       b: [