Feat/aadhaar sdk

sdk/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selfxyz/core",
-  "version": "1.0.8",
+  "version": "1.1.0-beta.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/selfxyz/self"

sdk/core/src/SelfBackendVerifier.ts

@@ -27,7 +27,7 @@ const CELO_MAINNET_RPC_URL = 'https://forno.celo.org';
 const CELO_TESTNET_RPC_URL = 'https://alfajores-forno.celo-testnet.org';
 
 const IDENTITY_VERIFICATION_HUB_ADDRESS = '0xe57F4773bd9c9d8b6Cd70431117d353298B9f5BF';
-const IDENTITY_VERIFICATION_HUB_ADDRESS_STAGING = '0x68c931C9a534D37aa78094877F46fE46a49F1A51';
+const IDENTITY_VERIFICATION_HUB_ADDRESS_STAGING = '0x16ECBA51e18a4a7e61fdC417f0d47AFEeDfbed74';
 
 export class SelfBackendVerifier {
   protected scope: string;
@@ -217,20 +217,40 @@ export class SelfBackendVerifier {
       });
     }
 
-    const circuitTimestampYy = [
-      2,
-      0,
-      publicSignals[discloseIndices[attestationId].currentDateIndex],
-      publicSignals[discloseIndices[attestationId].currentDateIndex + 1],
-    ];
-    const circuitTimestampMm = [
-      publicSignals[discloseIndices[attestationId].currentDateIndex + 2],
-      publicSignals[discloseIndices[attestationId].currentDateIndex + 3],
-    ];
-    const circuitTimestampDd = [
-      publicSignals[discloseIndices[attestationId].currentDateIndex + 4],
-      publicSignals[discloseIndices[attestationId].currentDateIndex + 5],
-    ];
+    let circuitTimestampYy: number[];
+    let circuitTimestampMm: number[];
+    let circuitTimestampDd: number[];
+    if (attestationId === 3) {
+      circuitTimestampYy = String(publicSignals[discloseIndices[attestationId].currentDateIndex])
+        .split('')
+        .map(Number);
+      circuitTimestampMm = String(
+        publicSignals[discloseIndices[attestationId].currentDateIndex + 1]
+      )
+        .split('')
+        .map(Number);
+      circuitTimestampDd = String(
+        publicSignals[discloseIndices[attestationId].currentDateIndex + 2]
+      )
+        .split('')
+        .map(Number);
+    } else {
+      circuitTimestampYy = [
+        2,
+        0,
+        +publicSignals[discloseIndices[attestationId].currentDateIndex],
+        +publicSignals[discloseIndices[attestationId].currentDateIndex + 1],
+      ];
+      circuitTimestampMm = [
+        +publicSignals[discloseIndices[attestationId].currentDateIndex + 2],
+        +publicSignals[discloseIndices[attestationId].currentDateIndex + 3],
+      ];
+      circuitTimestampDd = [
+        +publicSignals[discloseIndices[attestationId].currentDateIndex + 4],
+        +publicSignals[discloseIndices[attestationId].currentDateIndex + 5],
+      ];
+    }
+
     const circuitTimestamp = new Date(
       Number(circuitTimestampYy.join('')),
       Number(circuitTimestampMm.join('')) - 1,

sdk/core/src/utils/constants.ts

@@ -27,6 +27,19 @@ export const discloseIndices = {
     userIdentifierIndex: 20,
     passportNoSmtRootIndex: 99,
   },
+  3: {
+    revealedDataPackedIndex: 2,
+    forbiddenCountriesListPackedIndex: 6,
+    nullifierIndex: 0,
+    attestationIdIndex: 10,
+    merkleRootIndex: 16,
+    currentDateIndex: 11,
+    namedobSmtRootIndex: 14,
+    nameyobSmtRootIndex: 15,
+    scopeIndex: 17,
+    userIdentifierIndex: 18,
+    passportNoSmtRootIndex: 99,
+  },
 } as const;
 
 type RevealedDataFields =
@@ -84,6 +97,26 @@ export const revealedDataIndices: Record<
     ofacStart: 92,
     ofacEnd: 93,
   },
+  3: {
+    issuingStateStart: 81,
+    issuingStateEnd: 111,
+    nameStart: 9,
+    nameEnd: 70,
+    idNumberStart: 71,
+    idNumberEnd: 74,
+    nationalityStart: 999,
+    nationalityEnd: 999,
+    dateOfBirthStart: 1,
+    dateOfBirthEnd: 8,
+    genderStart: 0,
+    genderEnd: 0,
+    expiryDateStart: 999,
+    expiryDateEnd: 999,
+    olderThanStart: 118,
+    olderThanEnd: 118,
+    ofacStart: 116,
+    ofacEnd: 117,
+  },
 } as const;
 
 const allIdEntries = Object.keys(discloseIndices).map(

sdk/core/src/utils/id.ts

@@ -2,6 +2,15 @@ import { discloseIndices, revealedDataIndices } from './constants.js';
 import { AttestationId, GenericDiscloseOutput } from 'src/types/types.js';
 import { getRevealedDataBytes } from './proof.js';
 
+/**
+ * Removes null bytes (\x00) from a string
+ * @param str - The string to clean
+ * @returns The string with null bytes removed
+ */
+export const removeNullBytes = (str: string): string => {
+  return str.replace(/\x00/g, '');
+};
+
 export const formatRevealedDataPacked = (
   attestationId: AttestationId,
   publicSignals: string[]
@@ -12,7 +21,7 @@ export const formatRevealedDataPacked = (
   const nullifier = publicSignals[discloseIndices[attestationId].nullifierIndex];
   const forbiddenCountriesListPacked = publicSignals.slice(
     discloseIndices[attestationId].forbiddenCountriesListPackedIndex,
-    discloseIndices[attestationId].forbiddenCountriesListPackedIndex + 3
+    discloseIndices[attestationId].forbiddenCountriesListPackedIndex + 4
   );
   const issuingState = revealedDataPackedString
     .subarray(
@@ -35,48 +44,89 @@ export const formatRevealedDataPacked = (
       revealedDataIndices[attestationId].idNumberEnd + 1
     )
     .toString('utf-8');
-  const nationality = revealedDataPackedString
-    .subarray(
-      revealedDataIndices[attestationId].nationalityStart,
-      revealedDataIndices[attestationId].nationalityEnd + 1
-    )
-    .toString('utf-8');
-  const dateOfBirth = revealedDataPackedString
-    .subarray(
-      revealedDataIndices[attestationId].dateOfBirthStart,
-      revealedDataIndices[attestationId].dateOfBirthEnd + 1
+
+  let nationality: string;
+  if (attestationId === 3) {
+    nationality = 'IND';
+  } else {
+    nationality = revealedDataPackedString
+      .subarray(
+        revealedDataIndices[attestationId].nationalityStart,
+        revealedDataIndices[attestationId].nationalityEnd + 1
+      )
+      .toString('utf-8');
+  }
+  let dateOfBirth: string;
+  if (attestationId === 3) {
+    dateOfBirth = new Array(
+      revealedDataPackedString.subarray(
+        revealedDataIndices[attestationId].dateOfBirthStart,
+        revealedDataIndices[attestationId].dateOfBirthEnd + 1
+      )
     )
-    .toString('utf-8');
+      .map(Number)
+      .map(String)
+      .join('');
+  } else {
+    dateOfBirth = revealedDataPackedString
+      .subarray(
+        revealedDataIndices[attestationId].dateOfBirthStart,
+        revealedDataIndices[attestationId].dateOfBirthEnd + 1
+      )
+      .toString('utf-8');
+  }
   const gender = revealedDataPackedString
     .subarray(
       revealedDataIndices[attestationId].genderStart,
       revealedDataIndices[attestationId].genderEnd + 1
     )
     .toString('utf-8');
-  const expiryDate = revealedDataPackedString
-    .subarray(
-      revealedDataIndices[attestationId].expiryDateStart,
-      revealedDataIndices[attestationId].expiryDateEnd + 1
-    )
-    .toString('utf-8');
-  const olderThan = Buffer.from(
-    revealedDataPackedString.subarray(
-      revealedDataIndices[attestationId].olderThanStart,
-      revealedDataIndices[attestationId].olderThanEnd + 1
-    )
-  ).toString('utf-8');
+  let expiryDate: string;
+  if (attestationId === 3) {
+    expiryDate = 'UNAVAILABLE';
+  } else {
+    expiryDate = revealedDataPackedString
+      .subarray(
+        revealedDataIndices[attestationId].expiryDateStart,
+        revealedDataIndices[attestationId].expiryDateEnd + 1
+      )
+      .toString('utf-8');
+  }
+  let olderThan: string;
+  if (attestationId === 3) {
+    olderThan = revealedDataPackedString
+      .subarray(
+        revealedDataIndices[attestationId].olderThanStart,
+        revealedDataIndices[attestationId].olderThanEnd + 1
+      )
+      .toString('utf-8');
+  } else {
+    olderThan = revealedDataPackedString
+      .subarray(
+        revealedDataIndices[attestationId].olderThanStart,
+        revealedDataIndices[attestationId].olderThanEnd + 1
+      )[0]
+      .toString()
+      .padStart(2, '0');
+  }
   const ofac = Array.from(
     revealedDataPackedString.subarray(
       revealedDataIndices[attestationId].ofacStart,
       revealedDataIndices[attestationId].ofacEnd + 1
     )
-  ).map(Boolean);
+  )
+    .map(Boolean)
+    .map((x) => !x);
+
+  if (ofac.length < 3) {
+    ofac.unshift(false);
+  }
 
   return {
     nullifier: nullifier.toString(),
     forbiddenCountriesListPacked: forbiddenCountriesListPacked,
-    issuingState: issuingState,
-    name: name,
+    issuingState: removeNullBytes(issuingState),
+    name: removeNullBytes(name),
     idNumber: idNumber,
     nationality: nationality,
     dateOfBirth: dateOfBirth,

sdk/core/src/utils/proof.ts

@@ -17,6 +17,8 @@ export function getRevealedDataPublicSignalsLength(attestationId: AttestationId)
       return 93 / 31;
     case 2:
       return Math.ceil(94 / 31);
+    case 3:
+      return Math.ceil(119 / 31);
     default:
       throw new ProofError(`Invalid attestation ID: ${attestationId}`);
   }
@@ -25,6 +27,7 @@ export function getRevealedDataPublicSignalsLength(attestationId: AttestationId)
 export const bytesCount: Record<AttestationId, number[]> = {
   1: [31, 31, 31],
   2: [31, 31, 31, 1],
+  3: [31, 31, 31, 26],
 };
 
 /**

sdk/sdk-go/types.go

@@ -16,9 +16,9 @@ type VcAndDiscloseProof struct {
 
 // VerificationConfig represents the configuration for verification
 type VerificationConfig struct {
-	MinimumAge        int                        `json:"minimumAge,omitempty"`
+	MinimumAge        int                         `json:"minimumAge,omitempty"`
 	ExcludedCountries []common.Country3LetterCode `json:"excludedCountries,omitempty"`
-	Ofac              bool                       `json:"ofac,omitempty"`
+	Ofac              bool                        `json:"ofac,omitempty"`
 }
 
 // IsValidDetails contains the validation results