@docknetwork/wallet-sdk-wasm 0.4.19 → 0.4.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@docknetwork/wallet-sdk-wasm",
-    "version": "0.4.19",
+    "version": "0.4.22",
     "license": "https://github.com/docknetwork/react-native-sdk/LICENSE",
     "repository": {
         "type": "git",
@@ -10,12 +10,12 @@
     "scripts": {
         "prepublishOnly": "npm run build",
         "build:babel": "rm -rf lib && NODE_ENV=production babel src/ --out-dir lib --copy-files",
-        "build": "rm -rf lib && rollup -c"
+        "build": "rm -rf lib && rollup -c && node ../../scripts/fix-build-imports.js ./lib"
     },
     "resolutions": {
         "@polkadot/wasm-crypto": "6.3.1",
         "@polkadot/rpc-core": "9.7.1",
-        "@docknetwork/sdk": "8.0.0",
+        "@docknetwork/sdk": "8.6.0",
         "@polkadot/api": "9.7.1",
         "@polkadot/keyring": "10.1.11",
         "@polkadot/rpc-provider": "9.7.1",
@@ -36,7 +36,9 @@
         "@polkadot/util": "10.1.11",
         "@polkadot/util-crypto": "10.1.11",
         "@polkadot/wasm-crypto": "6.3.1",
-        "@docknetwork/sdk": "8.0.0",
+        "@docknetwork/sdk": "8.6.0",
+        "@sphereon/oid4vci-client": "^0.16.0",
+        "@sphereon/oid4vci-common": "^0.16.0",
         "axios": "^0.25.0",
         "babel-node": "^0.0.1-security",
         "bignumber.js": "^9.0.1",

package/src/core/subscan.js

@@ -15,12 +15,11 @@ axiosRetry(axios, {
 });
 
 const SUBSCAN_URL = 'https://dock.api.subscan.io';
+export const SUBSCAN_TRANSFER_URL = `${SUBSCAN_URL}/api/v2/scan/transfers`;
 
 const queue = new TaskQueue(global.Promise, 1);
 
 function doFetchTransactions({address, page = 0, itemsPerPage = 50}) {
-  const url = `${SUBSCAN_URL}/api/scan/transfers`;
-
   assert(typeof address === 'string', 'address must be a string');
   assert(typeof page === 'number', 'page must be a number');
   assert(typeof itemsPerPage === 'number', 'itemsPerPage must be a number');
@@ -32,13 +31,13 @@ function doFetchTransactions({address, page = 0, itemsPerPage = 50}) {
   };
 
   Logger.info(
-    `Fetching transactions from subscan ${url} with body ${JSON.stringify(
+    `Fetching transactions from subscan ${SUBSCAN_TRANSFER_URL} with body ${JSON.stringify(
       body,
     )}`,
   );
 
   return axios
-    .post(url, body, {})
+    .post(SUBSCAN_TRANSFER_URL, body, {})
     .then(res => {
       const {data, message} = res.data;
 

package/src/modules/accounts.ts

@@ -26,13 +26,13 @@ export const AccountsEvents = {
 
 export type CreateAccountParams = {
   name: string,
-  type: KeypairType,
-  derivationPath: string,
-  mnemonic: string,
-  json: string,
-  password: string,
-  getIfExists: boolean,
-  hasBackup: boolean,
+  type?: KeypairType,
+  derivationPath?: string,
+  mnemonic?: string,
+  json?: string,
+  password?: string,
+  getIfExists?: boolean,
+  hasBackup?: boolean,
 };
 
 export class Accounts {

package/src/modules/network-manager.ts

@@ -3,16 +3,16 @@ import assert from 'assert';
 
 export type NetworkInfo = {
   name: string,
-  substrateUrl: string,
+  substrateUrl: string | string[],
   addressPrefix: number,
 };
 
 export type NetworkId = 'mainnet' | 'testnet' | 'local' | 'custom';
 
-export const SUBSTRATE_NETWORKS = {
+export const SUBSTRATE_NETWORKS : Record<NetworkId, NetworkInfo> = {
   mainnet: {
     name: 'Dock PoS Mainnet',
-    substrateUrl: 'wss://mainnet-node.dock.io',
+    substrateUrl: ['wss://mainnet-node.dock.io', 'wss://mainnet-node-2.dock.io'],
     addressPrefix: 22,
   },
   testnet: {

package/src/services/credential/bbs-revocation.ts

@@ -4,6 +4,7 @@ import {
   AccumulatorPublicKey,
   dockAccumulatorParams,
   VBMembershipWitness,
+  VBWitnessUpdateInfo,
   Encoder,
 } from '@docknetwork/crypto-wasm-ts';
 import dock from '@docknetwork/sdk';
@@ -18,10 +19,76 @@ const trimHexID = id => {
   return id.substr(2);
 };
 
-export const getWitnessDetails = async (
+// "-32000: Client error: UnknownBlock: State already discarded for BlockId::Hash(<hash>)"
+// This means that the node has discarded old blocks to preserve space. This should not happen with a full node
+const UnknownBlockErrorCode = -32000;
+
+async function updateMembershipWitness({
   credential,
-  _membershipWitness,
-) => {
+  membershipWitness,
+  registryId,
+  blockNo,
+}) {
+  const revocationId = credential.credentialStatus.revocationId;
+  const member = Accumulator.encodePositiveNumberAsAccumulatorMember(
+    Number(revocationId),
+  );
+
+  let updates = [];
+  try {
+    updates = await dock.accumulatorModule.getUpdatesFromBlock(
+      registryId,
+      blockNo,
+    );
+  } catch (err) {
+    if (err.code === UnknownBlockErrorCode) {
+      console.error(err);
+      updates = [];
+    } else {
+      throw err;
+    }
+  }
+
+  const additions = [];
+  const removals = [];
+
+  if (updates.length && updates[0].additions !== null) {
+    for (const a of updates[0].additions) {
+      additions.push(hexToU8a(a));
+    }
+  }
+
+  if (updates.length && updates[0].removals !== null) {
+    for (const a of updates[0].removals) {
+      removals.push(hexToU8a(a));
+    }
+  }
+
+  const queriedWitnessInfo = new VBWitnessUpdateInfo(
+    hexToU8a(updates[0].witnessUpdateInfo),
+  );
+  const witness = new VBMembershipWitness(hexToU8a(membershipWitness));
+
+  witness.updateUsingPublicInfoPostBatchUpdate(
+    member,
+    additions,
+    removals,
+    queriedWitnessInfo,
+  );
+
+  return witness;
+}
+
+export const getWitnessDetails = async (credential, _membershipWitness) => {
+  let witness = _membershipWitness;
+  let blockNo;
+
+  try {
+    ({blockNo, witness} = JSON.parse(_membershipWitness));
+  } catch (err) {
+    console.error(err);
+  }
+  
   const {credentialStatus} = credential;
   const registryId = credentialStatus?.id.replace('dock:accumulator:', '');
   const revocationIndex = credentialStatus.revocationId;
@@ -49,7 +116,24 @@ export const getWitnessDetails = async (
   const params = dockAccumulatorParams();
   const pk = new AccumulatorPublicKey(hexToU8a(publicKey.bytes));
 
-  const membershipWitness = new VBMembershipWitness(hexToU8a(_membershipWitness));
+  let membershipWitness = new VBMembershipWitness(
+    hexToU8a(witness),
+  );
+
+  if(blockNo){
+    try {
+      const updatedWitness = await updateMembershipWitness({
+        credential,
+        membershipWitness: witness,
+        registryId,
+        blockNo,
+      });
+      membershipWitness = updatedWitness;
+
+    } catch (err) {
+      console.error(err);
+    }
+  }
 
   return {
     encodedRevId,
@@ -60,14 +144,9 @@ export const getWitnessDetails = async (
   };
 };
 
-export const getIsRevoked = async (
-  credential,
-  _membershipWitness,
-) => {
-  const {encodedRevId, membershipWitness, pk, params, accumulator} = await getWitnessDetails(
-    credential,
-    _membershipWitness,
-  );
+export const getIsRevoked = async (credential, _membershipWitness) => {
+  const {encodedRevId, membershipWitness, pk, params, accumulator} =
+    await getWitnessDetails(credential, _membershipWitness);
 
   try {
     return !accumulator.verifyMembershipWitness(

package/src/services/credential/bound-check.test.ts

@@ -9,9 +9,13 @@ import {
 } from './bound-check';
 import {PresentationBuilder} from '@docknetwork/crypto-wasm-ts/lib';
 import proofRequest from './proof-request.json';
+import { replaceResponseURL } from '@docknetwork/wallet-sdk-core/src/helpers';
+import assert from 'assert';
+
+const testAPIURL = process.env.TESTING_API_URL || null;
 
 const createProofRequest = fields => ({
-  qr: 'https://creds-staging.dock.io/proof/7b66f17f-eac3-4d1f-9cee-40f2ab4baac8',
+  qr: 'https://creds-example.dock.io/proof/7b66f17f-eac3-4d1f-9cee-40f2ab4baac8',
   id: '7b66f17f-eac3-4d1f-9cee-40f2ab4baac8',
   name: 'Range Proofs',
   nonce: '73c8a958c389534236d572ab9401457d',
@@ -19,7 +23,7 @@ const createProofRequest = fields => ({
   updated: '2023-09-08T11:53:40.167Z',
   verified: false,
   response_url:
-    'https://api-staging.dock.io/proof-requests/7b66f17f-eac3-4d1f-9cee-40f2ab4baac8/send-presentation',
+    `${testAPIURL}/proof-requests/7b66f17f-eac3-4d1f-9cee-40f2ab4baac8/send-presentation`,
   request: {
     id: '7b66f17f-eac3-4d1f-9cee-40f2ab4baac8',
     input_descriptors: [
@@ -62,6 +66,8 @@ const expectEnforceBoundsToHaveBeenCalledWithDate = (
 
 
 describe('Bound check', () => {
+  assert(testAPIURL, "Please configure the TESTING_API_URL env var.");
+
   const provingKey = {} as any;
   const provingKeyId = 'provingKeyId';
   let builder: PresentationBuilder;
@@ -364,7 +370,8 @@ describe('Bound check', () => {
   });
 
   it('expect to fetch proving key', async () => {
-    const result = await fetchProvingKey(proofRequest);
+    const updatedRequest = replaceResponseURL(proofRequest);
+    const result = await fetchProvingKey(updatedRequest);
 
     console.log(result);
   });

package/src/services/credential/bound-check.ts

@@ -1,9 +1,4 @@
-import {BoundCheckSnarkSetup} from '@docknetwork/crypto-wasm-ts/lib/bound-check';
-import {
-  LegoProvingKeyUncompressed,
-  LegoVerifyingKeyUncompressed,
-  LegoProvingKey,
-} from '@docknetwork/crypto-wasm-ts/lib/legosnark';
+import {LegoProvingKey} from '@docknetwork/crypto-wasm-ts/lib/legosnark';
 import {PresentationBuilder} from '@docknetwork/crypto-wasm-ts/lib';
 import {isBase64} from '@polkadot/util-crypto';
 import base64url from 'base64url';
@@ -78,6 +73,9 @@ export function applyEnforceBounds({
   let skipProvingKey = false;
 
   descriptorBounds.forEach((items, credentialIdx) => {
+    if (!selectedCredentials[credentialIdx]) {
+      return;
+    }
     items.forEach((bound) => {
       builder.enforceBounds(
         credentialIdx,

package/src/services/credential/config.ts

@@ -19,7 +19,7 @@ export const validation = {
     assert(Array.isArray(credentials), 'invalid credentials');
     assert(credentials.length > 0, 'no credential found');
   },
-  deriveVCFromBBSPresentation: params => {
+  deriveVCFromPresentation: params => {
     const {credentials} = params;
     assert(Array.isArray(credentials), 'invalid credentials');
     assert(credentials.length > 0, 'no credential found');

package/src/services/credential/index.test.js

@@ -308,7 +308,7 @@ describe('Credential Service', () => {
   });
   it('expect to derive vc from bbs+ presentation', async () => {
     const error1 = await getPromiseError(() =>
-      service.deriveVCFromBBSPresentation({
+      service.deriveVCFromPresentation({
         credentials: [],
       }),
     );
@@ -362,7 +362,7 @@ describe('Credential Service', () => {
       {credential, attributesToReveal: ['credentialSubject.givenName']},
     ];
 
-    await service.deriveVCFromBBSPresentation({
+    await service.deriveVCFromPresentation({
       credentials,
     });
 
@@ -405,4 +405,26 @@ describe('Credential Service', () => {
       );
     });
   });
+
+  it('should check if a credential has KVAC support', () => {
+    expect(
+      service.isKvacCredential({
+        credential: {
+          proof: {
+            type: 'Bls12381BDDT16MACDock2024',
+          },
+        },
+      }),
+    ).toBe(false);
+
+    expect(
+      service.isKvacCredential({
+        credential: {
+          proof: {
+            type: 'Bls12381BBDT16MACDock2024',
+          },
+        },
+      }),
+    ).toBe(true);
+  });
 });

package/src/services/credential/pex-helpers.js

@@ -49,8 +49,18 @@ function getAttributeName({field, selectedCredentials, index}) {
   return attributeName;
 }
 
-export function pexToBounds(pexRequest, selectedCredentials = []) {
+export function pexToBounds(
+  pexRequest,
+  selectedCredentials = [],
+  isRawBoundies = false,
+) {
   const descriptorBounds = [];
+  const [MIN_DATE_ADJ, MAX_DATE_ADJ, MIN_NUMBER_ADJ, MAX_NUMBER_ADJ] = [
+    MIN_DATE_PLACEHOLDER,
+    MAX_DATE_PLACEHOLDER,
+    MIN_NUMBER,
+    MAX_NUMBER,
+  ].map(value => (isRawBoundies ? undefined : value));
 
   // One list of bounds per descriptor/credential
   pexRequest.input_descriptors.forEach((inputDescriptor, index) => {
@@ -87,32 +97,34 @@ export function pexToBounds(pexRequest, selectedCredentials = []) {
 
       // Get min/max bounds values, if using exclusive we must apply an epsilon so equality isnt true
       if (format === 'date-time' || format === 'date') {
-        max = new Date(max === undefined ? MAX_DATE_PLACEHOLDER : max);
-        min = new Date(min === undefined ? MIN_DATE_PLACEHOLDER : min);
+        max = max === undefined ? MAX_DATE_ADJ : max;
+        max = max ? new Date(max) : undefined;
+        min = min === undefined ? MIN_DATE_ADJ : min;
+        min = min ? new Date(min) : undefined;
       } else if (type === 'number') {
         max =
           max === undefined
-            ? MAX_NUMBER
-            : exclusiveMaximum === undefined
+            ? MAX_NUMBER_ADJ
+            : exclusiveMaximum === undefined || isRawBoundies
             ? max
             : max - EPSILON_NUMBER;
         min =
           min === undefined
-            ? MIN_NUMBER
-            : exclusiveMinimum === undefined
+            ? MIN_NUMBER_ADJ
+            : exclusiveMinimum === undefined || isRawBoundies
             ? min
             : min + EPSILON_NUMBER;
       } else if (type === 'integer') {
         max =
           max === undefined
-            ? MAX_NUMBER
-            : exclusiveMaximum === undefined
+            ? MAX_NUMBER_ADJ
+            : exclusiveMaximum === undefined || isRawBoundies
             ? max
             : max - EPSILON_INT;
         min =
           min === undefined
-            ? MIN_NUMBER
-            : exclusiveMinimum === undefined
+            ? MIN_NUMBER_ADJ
+            : exclusiveMinimum === undefined || isRawBoundies
             ? min
             : min + EPSILON_INT;
       } else {
@@ -131,6 +143,8 @@ export function pexToBounds(pexRequest, selectedCredentials = []) {
         attributeName,
         min,
         max,
+        type,
+        format,
       });
     });
 
@@ -152,22 +166,35 @@ const shouldSkipAttribute = attributeName =>
   attributesToSkip.some(regex => regex.test(attributeName));
 
 export function getPexRequiredAttributes(pexRequest, selectedCredentials = []) {
-  return pexRequest.input_descriptors.map((inputDescriptor, index) => {
-    return inputDescriptor.constraints.fields
-      .filter(field => {
-        if (field.filter) {
-          return false;
-        }
-
-        const paths = Array.isArray(field.path)
-          ? field.path.flatMap(singlePath =>
-              JSONPath.paths(selectedCredentials[index], singlePath),
-            )
-          : JSONPath.paths(selectedCredentials[index], field.path);
-
-        return paths.length !== 0;
-      })
-      .map(field => getAttributeName({field, selectedCredentials, index}))
-      .filter(attributeName => !shouldSkipAttribute(attributeName));
-  });
+  return pexRequest.input_descriptors
+    .map((inputDescriptor, index) => {
+      return inputDescriptor.constraints.fields
+        .filter(field => {
+          if (field.filter) {
+            return false;
+          }
+
+          try {
+            if (!selectedCredentials[index]) {
+              return false;
+            }
+
+            const paths = Array.isArray(field.path)
+              ? field.path.flatMap(singlePath =>
+                  JSONPath.paths(selectedCredentials[index], singlePath),
+                )
+              : JSONPath.paths(selectedCredentials[index], field.path);
+
+            return paths.length !== 0;
+          } catch (error) {
+            console.error(`Error in field ${field.path}: ${error.message}`);
+            return false;
+          }
+        })
+        .map(field => getAttributeName({field, selectedCredentials, index}))
+        .filter(attributeName => {
+          return !shouldSkipAttribute(attributeName);
+        });
+    })
+    .filter(requiredAttributes => requiredAttributes.length > 0);
 }