clean up contract move generated types

Author: tim-schultz

contracts/DIDStampVCVerifier.sol

@@ -5,8 +5,6 @@ import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { VcVerifier } from "./VCVerifier.sol";
 import { DIDpkhAdapter } from "./DIDpkhAdapter.sol";
 
-import "hardhat/console.sol";
-
 struct CredentialSubject {
     // underscored since hash is a reserved keyword
     string _hash;
@@ -111,12 +109,10 @@ contract DIDStampVcVerifier is VcVerifier, DIDpkhAdapter {
 
         address issuerAddress = DIDpkhAdapter.pseudoResolveDidIssuer(document.issuer);
 
-        // Here we could check the issuer's address against an on-chain registry.
-
         address recoveredAddress = ECDSA.recover(digest, v, r, s);
 
-        console.log("Recovered address: %s", recoveredAddress);
-        console.log("issuerAddress: %s", issuerAddress);
+        // Here we could check the issuer's address against an on-chain registry.
+        // We could provide a verifying contract address when signing the credential which could correspond to this contract
         require(recoveredAddress == issuerAddress, "VC verification failed issuer does not match signature");
 
         verifiedStamps[document.credentialSubject.id] = document.credentialSubject._hash;

test/DIDStampVCVerifier.ts

@@ -1,8 +1,8 @@
 // import { createCredential } from "../utils/didkitSign"
 import { ethers } from "hardhat";
 import { expect } from "chai";
-
-import { DIDStampVcVerifier, DIDStampVcVerifier__factory, DocumentStruct } from "../src/types";
+import { DocumentStruct } from "../types"
+import { DIDStampVcVerifier, DIDStampVcVerifier__factory } from "../src/types";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 
 const domainName = "Passport";
@@ -14,7 +14,6 @@ import { normalizeDIDCredential } from "../utils/normalizeDIDCredential";
 describe.only("DIDStampVCVerifier", function () {
   let signer: SignerWithAddress;
   let submitter: SignerWithAddress;
-  // let chainId: number;
   let didStampVCVerifier: DIDStampVcVerifier;
 
   beforeEach(async function () {
@@ -33,11 +32,9 @@ describe.only("DIDStampVCVerifier", function () {
 
     const normalizedDIDCredential = normalizeDIDCredential(DIDKitSignedCredential) as DocumentStruct;
 
-    console.log({ normalizedDIDCredential, v, r, s })
-
     await expect(await didStampVCVerifier.connect(submitter).verifyStampVc(normalizedDIDCredential, v, r, s)).to.emit(
       didStampVCVerifier,
       "Verified",
-    );;
+    );
   });
 })

types/index.ts

@@ -1,3 +1,5 @@
+import { PromiseOrValue } from "../src/types/common";
+
 export * from "./eip712Types";
 
 export type ExampleDocument = {
@@ -9,3 +11,27 @@ export type ExampleDocument = {
     provider: string;
   };
 };
+
+export type ProofStruct = {
+  _context: PromiseOrValue<string>;
+  created: PromiseOrValue<string>;
+  proofPurpose: PromiseOrValue<string>;
+  _type: PromiseOrValue<string>;
+  verificationMethod: PromiseOrValue<string>;
+};
+
+export type CredentialSubjectStruct = {
+  _hash: PromiseOrValue<string>;
+  id: PromiseOrValue<string>;
+  provider: PromiseOrValue<string>;
+};
+
+export type DocumentStruct = {
+  _context: PromiseOrValue<string>;
+  credentialSubject: CredentialSubjectStruct;
+  expirationDate: PromiseOrValue<string>;
+  issuanceDate: PromiseOrValue<string>;
+  issuer: PromiseOrValue<string>;
+  proof: ProofStruct;
+  _type: PromiseOrValue<string>[];
+};

utils/normalizeDIDCredential.ts

@@ -1,4 +1,4 @@
-import { DocumentStruct, CredentialSubjectStruct, ProofStruct } from "../src/types";
+import { DocumentStruct, CredentialSubjectStruct, ProofStruct } from "../types";
 export interface DIDCredential {
   '@context': string;
   type?: (string)[] | null;