@docknetwork/wallet-sdk-wasm 0.4.19 → 0.4.21

package/lib/index.mjs

@@ -54,20 +54,24 @@ import '@polkadot/keyring/pair/decode';
 import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import '@docknetwork/universal-wallet/methods/keypairs';
+import 'base64url';
+import './services/credential/utils.mjs';
+import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
+import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
+import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
 import './services/credential/service.mjs';
 import './services/credential/config.mjs';
 import '@docknetwork/crypto-wasm-ts';
+import '@sphereon/oid4vci-client';
+import '@sphereon/oid4vci-common';
 import '@docknetwork/sdk/verifiable-credential';
 import '@docknetwork/sdk/utils/vc/helpers';
 import '@docknetwork/sdk/verifiable-presentation';
 import '@docknetwork/sdk/presentation';
 import '@docknetwork/sdk/utils/vc/credentials';
 import '@sphereon/pex';
-import './services/credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 import './services/credential/bound-check.mjs';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
-import 'base64url';
 import './services/credential/pex-helpers.mjs';
 import '@astronautlabs/jsonpath';
 import './services/credential/bbs-revocation.mjs';
@@ -79,6 +83,16 @@ import './services/pex/config.mjs';
 import './services/trust-registry/service.mjs';
 import './services/trust-registry/configs.mjs';
 import '@docknetwork/sdk/utils/did/typed-did/helpers';
+import './services/edv/service.mjs';
+import './services/edv/configs.mjs';
+import '@docknetwork/universal-wallet/storage/edv-http-storage';
+import './services/edv/hmac.mjs';
+import 'base64url-universal';
+import '@docknetwork/universal-wallet/crypto';
+import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/x25519-key-agreement-key-2020';
+import '@docknetwork/wallet-sdk-data-store/src/logger';
+import '@docknetwork/wallet-sdk-wasm/src/services/keyring';
 import 'winston-transport';
 
 initRpcClient(jsonRPCRequest => {

package/lib/modules/account.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('assert');
 require('../core/validation.js');
-var modules_wallet = require('../account-22dc214b.js');
+var modules_wallet = require('../account-ee524484.js');
 require('bignumber.js');
 require('../types.js');
 require('../services/wallet/service.js');

package/lib/modules/account.mjs

@@ -1,6 +1,6 @@
 import 'assert';
 import '../core/validation.mjs';
-export { c as Account } from '../account-df68209b.js';
+export { c as Account } from '../account-614e6414.js';
 import 'bignumber.js';
 import '../types.mjs';
 import '../services/wallet/service.mjs';

package/lib/modules/accounts.js

@@ -8,7 +8,7 @@ require('../services/util-crypto/service.js');
 require('../services/keyring/service.js');
 require('../services/substrate/service.js');
 require('../services/polkadot/service.js');
-var modules_wallet = require('../account-22dc214b.js');
+var modules_wallet = require('../account-ee524484.js');
 require('../errors.js');
 require('../types.js');
 require('./event-manager.js');

package/lib/modules/accounts.mjs

@@ -4,7 +4,7 @@ import '../services/util-crypto/service.mjs';
 import '../services/keyring/service.mjs';
 import '../services/substrate/service.mjs';
 import '../services/polkadot/service.mjs';
-export { b as Accounts, A as AccountsEvents } from '../account-df68209b.js';
+export { b as Accounts, A as AccountsEvents } from '../account-614e6414.js';
 import '../errors.mjs';
 import '../types.mjs';
 import './event-manager.mjs';

package/lib/modules/network-manager.js

@@ -12,7 +12,7 @@ var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 const SUBSTRATE_NETWORKS = {
     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/lib/modules/network-manager.mjs

@@ -4,7 +4,7 @@ import assert from 'assert';
 const SUBSTRATE_NETWORKS = {
     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/lib/modules/wallet.js

@@ -9,7 +9,7 @@ require('../services/dock/service.js');
 require('../services/keyring/service.js');
 require('../services/util-crypto/service.js');
 require('../services/wallet/service.js');
-var modules_wallet = require('../account-22dc214b.js');
+var modules_wallet = require('../account-ee524484.js');
 require('./event-manager.js');
 require('./network-manager.js');
 require('./data-migration.js');

package/lib/modules/wallet.mjs

@@ -5,7 +5,7 @@ import '../services/dock/service.mjs';
 import '../services/keyring/service.mjs';
 import '../services/util-crypto/service.mjs';
 import '../services/wallet/service.mjs';
-export { W as Wallet, a as WalletEvents } from '../account-df68209b.js';
+export { W as Wallet, a as WalletEvents } from '../account-614e6414.js';
 import './event-manager.mjs';
 import './network-manager.mjs';
 import './data-migration.mjs';

package/lib/rpc-server.js

@@ -52,20 +52,24 @@ require('@polkadot/keyring/pair/decode');
 require('@docknetwork/sdk/utils/misc');
 require('base58-universal');
 require('@docknetwork/universal-wallet/methods/keypairs');
+require('base64url');
+require('./services/credential/utils.js');
+require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
+require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
+require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
 require('./services/credential/service.js');
 require('./services/credential/config.js');
 require('@docknetwork/crypto-wasm-ts');
+require('@sphereon/oid4vci-client');
+require('@sphereon/oid4vci-common');
 require('@docknetwork/sdk/verifiable-credential');
 require('@docknetwork/sdk/utils/vc/helpers');
 require('@docknetwork/sdk/verifiable-presentation');
 require('@docknetwork/sdk/presentation');
 require('@docknetwork/sdk/utils/vc/credentials');
 require('@sphereon/pex');
-require('./services/credential/utils.js');
-require('@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022');
 require('./services/credential/bound-check.js');
 require('@docknetwork/crypto-wasm-ts/lib/legosnark');
-require('base64url');
 require('./services/credential/pex-helpers.js');
 require('@astronautlabs/jsonpath');
 require('./services/credential/bbs-revocation.js');
@@ -77,6 +81,16 @@ require('./services/pex/config.js');
 require('./services/trust-registry/service.js');
 require('./services/trust-registry/configs.js');
 require('@docknetwork/sdk/utils/did/typed-did/helpers');
+require('./services/edv/service.js');
+require('./services/edv/configs.js');
+require('@docknetwork/universal-wallet/storage/edv-http-storage');
+require('./services/edv/hmac.js');
+require('base64url-universal');
+require('@docknetwork/universal-wallet/crypto');
+require('@digitalbazaar/ed25519-verification-key-2018');
+require('@digitalbazaar/x25519-key-agreement-key-2020');
+require('@docknetwork/wallet-sdk-data-store/src/logger');
+require('@docknetwork/wallet-sdk-wasm/src/services/keyring');
 
 const rpcServer = new jsonRpc2_0.JSONRPCServer();
 

package/lib/rpc-server.mjs

@@ -50,20 +50,24 @@ import '@polkadot/keyring/pair/decode';
 import '@docknetwork/sdk/utils/misc';
 import 'base58-universal';
 import '@docknetwork/universal-wallet/methods/keypairs';
+import 'base64url';
+import './services/credential/utils.mjs';
+import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
+import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
+import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
 import './services/credential/service.mjs';
 import './services/credential/config.mjs';
 import '@docknetwork/crypto-wasm-ts';
+import '@sphereon/oid4vci-client';
+import '@sphereon/oid4vci-common';
 import '@docknetwork/sdk/verifiable-credential';
 import '@docknetwork/sdk/utils/vc/helpers';
 import '@docknetwork/sdk/verifiable-presentation';
 import '@docknetwork/sdk/presentation';
 import '@docknetwork/sdk/utils/vc/credentials';
 import '@sphereon/pex';
-import './services/credential/utils.mjs';
-import '@docknetwork/sdk/utils/vc/crypto/Bls12381G2KeyPairDock2022';
 import './services/credential/bound-check.mjs';
 import '@docknetwork/crypto-wasm-ts/lib/legosnark';
-import 'base64url';
 import './services/credential/pex-helpers.mjs';
 import '@astronautlabs/jsonpath';
 import './services/credential/bbs-revocation.mjs';
@@ -75,6 +79,16 @@ import './services/pex/config.mjs';
 import './services/trust-registry/service.mjs';
 import './services/trust-registry/configs.mjs';
 import '@docknetwork/sdk/utils/did/typed-did/helpers';
+import './services/edv/service.mjs';
+import './services/edv/configs.mjs';
+import '@docknetwork/universal-wallet/storage/edv-http-storage';
+import './services/edv/hmac.mjs';
+import 'base64url-universal';
+import '@docknetwork/universal-wallet/crypto';
+import '@digitalbazaar/ed25519-verification-key-2018';
+import '@digitalbazaar/x25519-key-agreement-key-2020';
+import '@docknetwork/wallet-sdk-data-store/src/logger';
+import '@docknetwork/wallet-sdk-wasm/src/services/keyring';
 
 const rpcServer = new JSONRPCServer();
 

package/lib/services/credential/bbs-revocation.js

@@ -10,7 +10,51 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var dock__default = /*#__PURE__*/_interopDefaultLegacy(dock);
 
+// "-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, registryId, blockNo, }) {
+    const revocationId = credential.credentialStatus.revocationId;
+    const member = cryptoWasmTs.Accumulator.encodePositiveNumberAsAccumulatorMember(Number(revocationId));
+    let updates = [];
+    try {
+        updates = await dock__default["default"].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(util.hexToU8a(a));
+        }
+    }
+    if (updates.length && updates[0].removals !== null) {
+        for (const a of updates[0].removals) {
+            removals.push(util.hexToU8a(a));
+        }
+    }
+    const queriedWitnessInfo = new cryptoWasmTs.VBWitnessUpdateInfo(util.hexToU8a(updates[0].witnessUpdateInfo));
+    const witness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(membershipWitness));
+    witness.updateUsingPublicInfoPostBatchUpdate(member, additions, removals, queriedWitnessInfo);
+    return witness;
+}
 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;
@@ -23,7 +67,21 @@ const getWitnessDetails = async (credential, _membershipWitness) => {
     const publicKey = await dock__default["default"].accumulatorModule.getPublicKeyByHexDid(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
     const params = cryptoWasmTs.dockAccumulatorParams();
     const pk = new cryptoWasmTs.AccumulatorPublicKey(util.hexToU8a(publicKey.bytes));
-    const membershipWitness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(_membershipWitness));
+    let membershipWitness = new cryptoWasmTs.VBMembershipWitness(util.hexToU8a(witness));
+    if (blockNo) {
+        try {
+            const updatedWitness = await updateMembershipWitness({
+                credential,
+                membershipWitness: witness,
+                registryId,
+                blockNo,
+            });
+            membershipWitness = updatedWitness;
+        }
+        catch (err) {
+            console.error(err);
+        }
+    }
     return {
         encodedRevId,
         membershipWitness,

package/lib/services/credential/bbs-revocation.mjs

@@ -1,8 +1,52 @@
-import { PositiveAccumulator, Encoder, dockAccumulatorParams, AccumulatorPublicKey, VBMembershipWitness } from '@docknetwork/crypto-wasm-ts';
+import { PositiveAccumulator, Encoder, dockAccumulatorParams, AccumulatorPublicKey, VBMembershipWitness, Accumulator, VBWitnessUpdateInfo } from '@docknetwork/crypto-wasm-ts';
 import dock from '@docknetwork/sdk';
 import { hexToU8a } from '@polkadot/util';
 
+// "-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, 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;
+}
 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;
@@ -15,7 +59,21 @@ const getWitnessDetails = async (credential, _membershipWitness) => {
     const publicKey = await dock.accumulatorModule.getPublicKeyByHexDid(queriedAccumulator.keyRef[0], queriedAccumulator.keyRef[1]);
     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,
         membershipWitness,

package/lib/services/credential/bound-check.js

@@ -21,6 +21,9 @@ function applyEnforceBounds({ builder, proofRequest, provingKeyId, provingKey, s
     const descriptorBounds = services_credential_pexHelpers.pexToBounds(proofRequest.request, selectedCredentials);
     let skipProvingKey = false;
     descriptorBounds.forEach((items, credentialIdx) => {
+        if (!selectedCredentials[credentialIdx]) {
+            return;
+        }
         items.forEach((bound) => {
             builder.enforceBounds(credentialIdx, bound.attributeName, bound.min, bound.max, provingKeyId, skipProvingKey ? undefined : provingKey);
             skipProvingKey = true;

package/lib/services/credential/bound-check.mjs

@@ -13,6 +13,9 @@ function applyEnforceBounds({ builder, proofRequest, provingKeyId, provingKey, s
     const descriptorBounds = pexToBounds(proofRequest.request, selectedCredentials);
     let skipProvingKey = false;
     descriptorBounds.forEach((items, credentialIdx) => {
+        if (!selectedCredentials[credentialIdx]) {
+            return;
+        }
         items.forEach((bound) => {
             builder.enforceBounds(credentialIdx, bound.attributeName, bound.min, bound.max, provingKeyId, skipProvingKey ? undefined : provingKey);
             skipProvingKey = true;

package/lib/services/credential/config.js

@@ -27,7 +27,7 @@ const validation = {
         assert__default["default"](Array.isArray(credentials), 'invalid credentials');
         assert__default["default"](credentials.length > 0, 'no credential found');
     },
-    deriveVCFromBBSPresentation: params => {
+    deriveVCFromPresentation: params => {
         const { credentials } = params;
         assert__default["default"](Array.isArray(credentials), 'invalid credentials');
         assert__default["default"](credentials.length > 0, 'no credential found');

package/lib/services/credential/config.mjs

@@ -19,7 +19,7 @@ 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/lib/services/credential/index.js

@@ -6,6 +6,8 @@ var services_credential_service = require('./service.js');
 require('./config.js');
 require('assert');
 require('@docknetwork/crypto-wasm-ts');
+require('@sphereon/oid4vci-client');
+require('@sphereon/oid4vci-common');
 require('@docknetwork/sdk/verifiable-credential');
 require('@docknetwork/universal-wallet/methods/keypairs');
 require('@docknetwork/sdk/utils/vc/helpers');
@@ -33,6 +35,23 @@ require('base64url');
 require('./pex-helpers.js');
 require('@astronautlabs/jsonpath');
 require('./bbs-revocation.js');
+require('../dids/service.js');
+require('@docknetwork/wallet-sdk-dids/src');
+require('../dids/config.js');
+require('../keyring/service.js');
+require('@polkadot/keyring');
+require('../keyring/configs.js');
+require('../../core/validation.js');
+require('bignumber.js');
+require('../../types.js');
+require('../util-crypto/service.js');
+require('../util-crypto/configs.js');
+require('@docknetwork/sdk/utils/did');
+require('@docknetwork/sdk/public-keys');
+require('../../core/polkadot-utils.js');
+require('@polkadot/keyring/pair/decode');
+require('@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020');
+require('@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019');
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

package/lib/services/credential/index.mjs

@@ -2,6 +2,8 @@ import { credentialService } from './service.mjs';
 import './config.mjs';
 import 'assert';
 import '@docknetwork/crypto-wasm-ts';
+import '@sphereon/oid4vci-client';
+import '@sphereon/oid4vci-common';
 import '@docknetwork/sdk/verifiable-credential';
 import '@docknetwork/universal-wallet/methods/keypairs';
 import '@docknetwork/sdk/utils/vc/helpers';
@@ -29,6 +31,23 @@ import 'base64url';
 import './pex-helpers.mjs';
 import '@astronautlabs/jsonpath';
 import './bbs-revocation.mjs';
+import '../dids/service.mjs';
+import '@docknetwork/wallet-sdk-dids/src';
+import '../dids/config.mjs';
+import '../keyring/service.mjs';
+import '@polkadot/keyring';
+import '../keyring/configs.mjs';
+import '../../core/validation.mjs';
+import 'bignumber.js';
+import '../../types.mjs';
+import '../util-crypto/service.mjs';
+import '../util-crypto/configs.mjs';
+import '@docknetwork/sdk/utils/did';
+import '@docknetwork/sdk/public-keys';
+import '../../core/polkadot-utils.mjs';
+import '@polkadot/keyring/pair/decode';
+import '@docknetwork/sdk/utils/vc/crypto/Ed25519Signature2020';
+import '@docknetwork/sdk/utils/vc/crypto/EcdsaSecp256k1Signature2019';
 
 // @ts-nocheck
 // TODO: rename it to credentialService, will need to update dock-app

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

@@ -53,8 +53,18 @@ function getAttributeName({field, selectedCredentials, index}) {
   return attributeName;
 }
 
-function pexToBounds(pexRequest, selectedCredentials = []) {
+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) => {
@@ -91,32 +101,34 @@ 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 {
@@ -135,6 +147,8 @@ function pexToBounds(pexRequest, selectedCredentials = []) {
         attributeName,
         min,
         max,
+        type,
+        format,
       });
     });
 
@@ -156,24 +170,37 @@ const shouldSkipAttribute = attributeName =>
   attributesToSkip.some(regex => regex.test(attributeName));
 
 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.JSONPath.paths(selectedCredentials[index], singlePath),
-            )
-          : jsonpath.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.JSONPath.paths(selectedCredentials[index], singlePath),
+                )
+              : jsonpath.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);
 }
 
 exports.EPSILON_INT = EPSILON_INT;