Added multipass dependency and made necessary changes (#29)

* WIP: added multipass dependecie and made few changes * init * add execute to artifact return type * applied formatting * Add multipass API support and update related types * Update dirty-pillows-hear.md --------- Co-authored-by: theKosmoss <[email protected]> Co-authored-by: Tim Pechersky <[email protected]> Co-authored-by: Peersky <[email protected]>
peeramid-labs · Nov 13, 2024 · 1270766 · 1270766
1 parent 410fb41
commit 1270766
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 20 deletions.
diff --git a/.changeset/dirty-pillows-hear.md b/.changeset/dirty-pillows-hear.md
@@ -0,0 +1,5 @@
+---
+"rankify-js": minor
+---
+
+Added changes needed to support multipass as stanadlone package
diff --git a/package.json b/package.json
@@ -26,9 +26,9 @@
     "lint": "eslint",
     "prebuild": "jq '.type = \"commonjs\"' package.json > temp.json && mv temp.json package.json",
     "build-esm": "tsc --project tsconfig.esm.json",
-    "build-all": "yarn run build-commonjs && yarn run build-esm",
+    "build-all": "pnpm run build-commonjs && pnpm run build-esm",
     "build-commonjs": "tsc --project tsconfig.commonjs.json",
-    "build": "yarn build-all && node ./copyPackageFile.js prod",
+    "build": "pnpm build-all && node ./copyPackageFile.js prod",
     "postbuild": "jq '.type = \"module\"' package.json > temp.json && mv temp.json package.json && cp README.md dist && cp -r .changeset ./dist/.changeset && prettier --write \"dist/**/*.{ts,js,json}\" &&  cd ./dist && pnpm install",
     "dist": "changeset && changeset version && pnpm build && cp -r .changeset ./dist && cd dist && pnpm changeset publish",
     "version": "changeset version",
@@ -37,6 +37,7 @@
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@peeramid-labs/multipass": "^0.2.0",
     "@peersky/eth-auth": "^2.0.0",
     "crypto-js": "^4.1.1",
     "ethers": "^5.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/multipass.ts b/src/multipass.ts
@@ -2,22 +2,20 @@ import { ethers, Wallet } from "ethers";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { LibMultipass } from "rankify-contracts/types/src/facets/DNSFacet";
 import { RegisterMessage } from "./types";
+import { chainIdMapping, getArtifact, SupportedChains } from "./utils";
 export default class Multipass {
-  // private JsonRpcProvider;
-  private chainId;
-  private name;
-  private version;
-  constructor({ chainId, contractName, version }: { chainId: any; contractName: string; version: string }) {
-    // if (!ProviderNetwork) throw new Error("Provider network not defined");
-    // this.JsonRpcProvider = new ethers.providers.BaseProvider(ProviderNetwork);
-    this.chainId = chainId;
-    this.name = contractName;
-    this.version = version;
+  private chainId: string;
+  private name: string;
+  private version: string;
+  constructor({ chainName }: { chainName: SupportedChains }) {
+    this.chainId = chainIdMapping[chainName];
+    const c = getArtifact(chainName, "Multipass");
+    this.name = c.execute.args[0];
+    this.version = c.execute.args[1];
   }
   public getDappURL(
     message: any,
     signature: string,
-    // type: string,
     basepath: string,
     contractAddress: string,
     domain: string,
@@ -34,6 +32,7 @@ export default class Multipass {
       this.chainId
     );
   }
+
   public signRegistrarMessage = async (
     message: RegisterMessage,
     verifierAddress: string,
@@ -64,15 +63,15 @@ export default class Multipass {
         },
         {
           type: "uint256",
-          name: "deadline",
+          name: "validUntil",
         },
         {
           type: "uint96",
           name: "nonce",
         },
       ],
     };
-
+    console.log("signing", domain, types, { ...message });
     const s = await signer._signTypedData(domain, types, { ...message });
     return s;
   };
@@ -92,7 +91,7 @@ export default class Multipass {
       name: ethers.utils.formatBytes32String(username),
       id: ethers.utils.formatBytes32String(id),
       domainName: ethers.utils.formatBytes32String(domainName),
-      deadline: ethers.BigNumber.from(validUntil),
+      validUntil: ethers.BigNumber.from(validUntil),
       nonce: ethers.BigNumber.from(0),
     };
 

diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,6 @@
 import { BigNumber, Wallet, BytesLike } from "ethers";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+export { LibMultipass } from "@peeramid-labs/multipass/types/src/Multipass";
 
 export enum SearchCriteria {
   id,
@@ -15,6 +16,6 @@ export interface RegisterMessage {
   name: BytesLike;
   id: BytesLike;
   domainName: BytesLike;
-  deadline: BigNumber;
+  validUntil: BigNumber;
   nonce: BigNumber;
 }
diff --git a/src/utils/artifacts.ts b/src/utils/artifacts.ts
@@ -4,6 +4,11 @@ import { Rankify } from "rankify-contracts/types";
 import { ethers } from "ethers";
 export type SupportedChains = "anvil" | "localhost";
 
+export const chainIdMapping: { [key in SupportedChains]: string } = {
+  anvil: "97113",
+  localhost: "42161",
+};
+
 export type ArtifactTypes = "Rankify" | "RankifyInstance" | "RankToken" | "Multipass";
 /**
  * Retrieves the Rankify artifact for the specified chain.
@@ -15,9 +20,11 @@ export type ArtifactTypes = "Rankify" | "RankifyInstance" | "RankToken" | "Multi
 export const getArtifact = (
   chain: SupportedChains,
   artifactName: ArtifactTypes,
-): { abi: JsonFragment[]; address: string } => {
-  const artifact = require(`rankify-contracts/deployments/${chain}/${artifactName}.json`);
-
+): { abi: JsonFragment[]; address: string; execute: { args: string[] } } => {
+  const artifact =
+    artifactName === "Multipass"
+      ? require(`@peeramid-labs/multipass/deployments/${chain}/${artifactName}.json`)
+      : require(`rankify-contracts/deployments/${chain}/${artifactName}.json`);
   if (!artifact) {
     throw new Error("Contract deployment not found");
   }