pshenmic-dpp 2.0.0-dev.1 → 2.0.0-dev.10

package/dist/src/dpp/utils.js

@@ -1,8 +1,9 @@
 import { dppProvider } from './provider.js';
 import { UINT32MAX } from './constants.js';
 import { IdentifierWASM } from './structs/Identifier.js';
+import { PlatformAddressWASM } from './structs/PlatformAddress/PlatformAddress.js';
 export function valueToDynamicValue(value) {
-    if (typeof value === 'bigint' || value > UINT32MAX) {
+    if (typeof value === 'bigint' || (value > UINT32MAX && typeof value !== 'string')) {
         return dppProvider.dpp.DynamicValue.fromBigIntString(BigInt(value.toString()).toString());
     }
     else if (value instanceof IdentifierWASM || value instanceof dppProvider.dpp.IdentifierNAPI) {
@@ -25,25 +26,45 @@ export function valueToDynamicValue(value) {
     else if (typeof value === 'function') {
         throw new Error('Cannot parse value from function');
     }
+    if (typeof value === 'number') {
+        // we cannot strongly pass uint or float without js layer check
+        if (Number.isInteger(value)) {
+            if (value > 4294967295 || value < 0) {
+                return dppProvider.dpp.DynamicValue.fromInt(value);
+            }
+            else {
+                return dppProvider.dpp.DynamicValue.fromUInt(value);
+            }
+        }
+        else {
+            return dppProvider.dpp.DynamicValue.fromFloat(value);
+        }
+    }
     else {
         return new dppProvider.dpp.DynamicValue(value);
     }
 }
-export function valueFromDynamicValue(dynamicValue) {
+export function valueFromDynamicValue(dynamicValue, jsonLike = false) {
     if (dynamicValue.value instanceof dppProvider.dpp.DynamicValue) {
-        return valueToDynamicValue(dynamicValue.value);
+        return valueFromDynamicValue(dynamicValue.value, jsonLike);
     }
     else if (dynamicValue.isBigInt()) {
-        return BigInt(dynamicValue.value);
+        const num = BigInt(dynamicValue.value);
+        if (jsonLike && num < BigInt(Number.MAX_SAFE_INTEGER) && num > BigInt(Number.MIN_SAFE_INTEGER)) {
+            return Number(dynamicValue.value);
+        }
+        else {
+            return num;
+        }
     }
     else if (Array.isArray(dynamicValue.value)) {
-        return dynamicValue.value.map(valueFromDynamicValue);
+        return dynamicValue.value.map(v => valueFromDynamicValue(v, jsonLike));
     }
     else if (typeof dynamicValue.value === 'object' && !(dynamicValue.value instanceof Uint8Array) && dynamicValue.value !== null) {
         const obj = {};
         const keys = Object.keys(dynamicValue.value);
         for (const key of keys) {
-            obj[key] = valueFromDynamicValue(dynamicValue.value[key]);
+            obj[key] = valueFromDynamicValue(dynamicValue.value[key], jsonLike);
         }
         return obj;
     }
@@ -62,3 +83,14 @@ export function prepareIdentifierValue(identifier) {
         return new dppProvider.dpp.DynamicValue(identifier);
     }
 }
+export function preparePlatformAddressValue(address) {
+    if (address instanceof PlatformAddressWASM) {
+        return address._rawPlatformAddress;
+    }
+    else if (address instanceof dppProvider.dpp.PlatformAddressNAPI) {
+        return address;
+    }
+    else {
+        return new dppProvider.dpp.DynamicValue(address);
+    }
+}

package/dist/src/dpp/verify/Contested/verifyVotePollVoteStateProof.d.ts

@@ -1,3 +1,3 @@
 import { PlatformVersionLike, StartAt, VerifiedVoteState, VoteStateResultTypeLike } from '../../types.js';
 import { DataContractWASM } from '../../structs/DataContract.js';
-export declare function verifyVotePollVoteStateProof(proof: Uint8Array, contract: DataContractWASM, documentTypeName: string, indexName: string, indexValues: string[], resultType: VoteStateResultTypeLike, allowIncludeLockedAndAbstainingVoteTally: boolean, count: number | undefined, startAt: StartAt | undefined, platformVersion: PlatformVersionLike): VerifiedVoteState;
+export declare function verifyVotePollVoteStateProof(proof: Uint8Array, contract: DataContractWASM, documentTypeName: string, indexName: string, indexValues: Uint8Array[], resultType: VoteStateResultTypeLike, allowIncludeLockedAndAbstainingVoteTally: boolean | undefined, count: number | undefined, startAt: StartAt | undefined, platformVersion: PlatformVersionLike): VerifiedVoteState;

package/dist/src/dpp/verify/Contested/verifyVotePollVoteStateProof.js

@@ -2,7 +2,7 @@ import { dppProvider } from '../../provider.js';
 import { valueFromDynamicValue, valueToDynamicValue } from '../../utils.js';
 import { IdentifierWASM } from '../../structs/Identifier.js';
 export function verifyVotePollVoteStateProof(proof, contract, documentTypeName, indexName, indexValues, resultType, allowIncludeLockedAndAbstainingVoteTally, count, startAt, platformVersion) {
-    const result = dppProvider.dpp.verifyVotePollVoteStateProof(proof, contract._rawDataContract, documentTypeName, indexName, valueToDynamicValue(indexValues), valueToDynamicValue(resultType), allowIncludeLockedAndAbstainingVoteTally, count, valueToDynamicValue(startAt), valueToDynamicValue(platformVersion));
+    const result = dppProvider.dpp.verifyVotePollVoteStateProof(proof, contract._rawDataContract, documentTypeName, indexName, indexValues, valueToDynamicValue(resultType), allowIncludeLockedAndAbstainingVoteTally ?? false, count, valueToDynamicValue(startAt), valueToDynamicValue(platformVersion));
     const winner = valueFromDynamicValue(result.result.winner);
     const winnerBlockInfo = winner?.blockInfo;
     const outWinner = winner != null

package/dist/src/dpp/verify/Document/verifyDocumentsProof.d.ts

@@ -1,3 +1,3 @@
 import { IdentifierLike, PlatformVersionLike, VerifiedDocuments, WhereClause } from '../../types.js';
 import { DataContractWASM } from '../../structs/DataContract.js';
-export declare function verifyDocumentsProof(proof: Uint8Array, contract: DataContractWASM, documentTypeName: string, whereClauses: WhereClause[], orderBy: string[][], limit: number | undefined | null, startAt: IdentifierLike | undefined | null, startAtIncluded: boolean, blockTimeMs: bigint | undefined | null, platformVersion: PlatformVersionLike): VerifiedDocuments;
+export declare function verifyDocumentsProof(proof: Uint8Array, contract: DataContractWASM, documentTypeName: string, whereClauses: WhereClause[] | undefined, orderBy: string[][] | undefined, limit: number | undefined | null, startAt: IdentifierLike | undefined | null, startAtIncluded: boolean, blockTimeMs: bigint | undefined | null, platformVersion: PlatformVersionLike): VerifiedDocuments;

package/dist/src/dpp/verify/Document/verifyDocumentsProof.js

@@ -2,7 +2,7 @@ import { dppProvider } from '../../provider.js';
 import { DocumentWASM } from '../../structs/Document.js';
 import { prepareIdentifierValue, valueToDynamicValue } from '../../utils.js';
 export function verifyDocumentsProof(proof, contract, documentTypeName, whereClauses, orderBy, limit, startAt, startAtIncluded, blockTimeMs, platformVersion) {
-    const result = dppProvider.dpp.verifyDocumentsProof(proof, contract._rawDataContract, documentTypeName, valueToDynamicValue(whereClauses), orderBy, limit, startAt != null ? prepareIdentifierValue(startAt) : undefined, startAtIncluded, blockTimeMs?.toString(), valueToDynamicValue(platformVersion));
+    const result = dppProvider.dpp.verifyDocumentsProof(proof, contract._rawDataContract, documentTypeName, valueToDynamicValue(whereClauses), orderBy ?? [], limit, startAt != null ? prepareIdentifierValue(startAt) : undefined, startAtIncluded, blockTimeMs?.toString(), valueToDynamicValue(platformVersion));
     return {
         rootHash: result.rootHash,
         documents: result.documents.map(DocumentWASM.createFromRawInstance)

package/dist/src/dpp/verify/PlatformAddress/verifyPlatformAddressInfo.d.ts

@@ -0,0 +1,2 @@
+import { PlatformAddressLike, PlatformVersionLike, VerifiedPlatformAddressInfoWithRootHash } from '../../types.js';
+export declare function verifyPlatformAddressInfo(proof: Uint8Array, platformAddress: PlatformAddressLike, verifySubsetOfProof: boolean, platformVersion: PlatformVersionLike): VerifiedPlatformAddressInfoWithRootHash;

package/dist/src/dpp/verify/PlatformAddress/verifyPlatformAddressInfo.js

@@ -0,0 +1,12 @@
+import { dppProvider } from '../../provider.js';
+import { preparePlatformAddressValue, valueToDynamicValue } from '../../utils.js';
+import { PlatformAddressWASM } from '../../structs/PlatformAddress/PlatformAddress.js';
+export function verifyPlatformAddressInfo(proof, platformAddress, verifySubsetOfProof, platformVersion) {
+    const result = dppProvider.dpp.verifyAddressInfo(proof, preparePlatformAddressValue(platformAddress), verifySubsetOfProof, valueToDynamicValue(platformVersion));
+    return {
+        rootHash: result.rootHash,
+        address: result.address != null ? PlatformAddressWASM.createFromRawInstance(result.address) : undefined,
+        balance: result.balance != null ? BigInt(result.balance) : undefined,
+        nonce: result.nonce
+    };
+}

package/dist/src/dpp/verify/PlatformAddress/verifyPlatformAddressesInfos.d.ts

@@ -0,0 +1,2 @@
+import { PlatformAddressLike, PlatformVersionLike, VerifiedPlatformAddressesInfosWithRootHash } from '../../types.js';
+export declare function verifyPlatformAddressesInfos(proof: Uint8Array, platformAddresses: PlatformAddressLike[], verifySubsetOfProof: boolean, platformVersion: PlatformVersionLike): VerifiedPlatformAddressesInfosWithRootHash;

package/dist/src/dpp/verify/PlatformAddress/verifyPlatformAddressesInfos.js

@@ -0,0 +1,14 @@
+import { dppProvider } from '../../provider.js';
+import { preparePlatformAddressValue, valueToDynamicValue } from '../../utils.js';
+import { PlatformAddressWASM } from '../../structs/PlatformAddress/PlatformAddress.js';
+export function verifyPlatformAddressesInfos(proof, platformAddresses, verifySubsetOfProof, platformVersion) {
+    const result = dppProvider.dpp.verifyAddressesInfos(proof, platformAddresses.map(preparePlatformAddressValue), verifySubsetOfProof, valueToDynamicValue(platformVersion));
+    return {
+        rootHash: result.rootHash,
+        infos: result.infos.map(({ nonce, credits, address }) => ({
+            nonce,
+            balance: credits != null ? BigInt(credits) : undefined,
+            address: PlatformAddressWASM.createFromRawInstance(address)
+        }))
+    };
+}

package/dist/src/dpp/verify/StateTransition/utils.js

@@ -5,7 +5,7 @@ import { TokenPricingScheduleWASM } from '../../structs/Batch/TokenPricingSchedu
 import { PartialIdentityWASM } from '../../structs/PartialIdentity.js';
 import { VoteWASM } from '../../structs/MasternodeVote/Vote.js';
 import { DocumentWASM } from '../../structs/Document.js';
-import { PlatformAddressWASM } from '../../structs/Address/PlatformAddress.js';
+import { PlatformAddressWASM } from '../../structs/PlatformAddress/PlatformAddress.js';
 import { dppProvider } from '../../provider.js';
 const converters = () => {
     return new Map([
@@ -15,18 +15,18 @@ const converters = () => {
         [dppProvider.dpp.PartialIdentityNAPI, v => PartialIdentityWASM.createFromRawInstance(v)],
         [dppProvider.dpp.DocumentNAPI, v => DocumentWASM.createFromRawInstance(v)],
         [dppProvider.dpp.VoteNAPI, v => VoteWASM.createFromRawInstance(v)],
-        [dppProvider.dpp.IdentityTokenBalanceNAPI, v => ({
+        [dppProvider.dpp.IdentityTokenBalanceNAPI, (v) => ({
                 id: IdentifierWASM.createFromRawInstance(v.id),
                 balance: BigInt(v.balance)
             })],
         [dppProvider.dpp.VerifiedIdentityTokenInfoNAPI, (v) => ({
-                id: IdentifierWASM.createFromRawInstance(v.id),
+                tokenId: IdentifierWASM.createFromRawInstance(v.id),
                 identityTokenInfo: {
                     frozen: v.identityTokenInfo.frozen
                 }
             })],
         [dppProvider.dpp.VerifiedTokenPricingScheduleNAPI, (v) => ({
-                id: IdentifierWASM.createFromRawInstance(v.id),
+                tokenId: IdentifierWASM.createFromRawInstance(v.id),
                 pricingSchedule: v.pricingSchedule != null
                     ? TokenPricingScheduleWASM.createFromRawInstance(v.pricingSchedule)
                     : undefined
@@ -62,7 +62,7 @@ const converters = () => {
                 infos: v.infos.map(info => ({
                     nonce: info.nonce,
                     address: PlatformAddressWASM.createFromRawInstance(info.address),
-                    credits: info.credits != null ? BigInt(info.credits) : undefined
+                    balance: info.credits != null ? BigInt(info.credits) : undefined
                 }))
             })],
         [dppProvider.dpp.VerifiedIdentityWithAddressInfosNAPI, (v) => ({
@@ -70,7 +70,7 @@ const converters = () => {
                 infos: v.infos.map(info => ({
                     nonce: info.nonce,
                     address: PlatformAddressWASM.createFromRawInstance(info.address),
-                    credits: info.credits != null ? BigInt(info.credits) : undefined
+                    balance: info.credits != null ? BigInt(info.credits) : undefined
                 }))
             })]
     ]);
@@ -93,11 +93,11 @@ function convertArray(result) {
                 : undefined
         }));
     }
-    if (first instanceof dppProvider.dpp.VerifiedAddressInfosNAPI) {
+    if (first instanceof dppProvider.dpp.PlatformAddressInfoNAPI) {
         return result.map(item => ({
             nonce: item.nonce,
             address: PlatformAddressWASM.createFromRawInstance(item.address),
-            credits: item.credits != null ? BigInt(item.credits) : undefined
+            balance: item.credits != null ? BigInt(item.credits) : undefined
         }));
     }
     throw new Error('Unknown array type');

package/dist/src/dpp/verify/System/verifyEpochsInfoProof.js

@@ -1,7 +1,7 @@
 import { dppProvider } from '../../provider.js';
 import { valueToDynamicValue } from '../../utils.js';
 export function verifyEpochsInfoProof(proof, currentEpoch, startEpoch, count, ascending, platformVersion) {
-    const result = dppProvider.dpp.verifyEpochsInfoProof(proof, currentEpoch, startEpoch, count, ascending, valueToDynamicValue(platformVersion));
+    const result = dppProvider.dpp.verifyEpochsInfoProof(proof, currentEpoch, startEpoch, count, ascending ?? false, valueToDynamicValue(platformVersion));
     return {
         rootHash: result.rootHash,
         epochsInfo: result.epochsInfo.map(info => ({

package/dist/src/dpp/verify/Tokens/verifyTokenBalancesForIdentitiesProof.js

@@ -6,7 +6,7 @@ export function verifyTokenBalancesForIdentitiesProof(proof, tokenId, isProofSub
     return {
         rootHash: result.rootHash,
         balances: result.balances.map(balance => ({
-            balance: BigInt(balance.balance),
+            balance: balance.balance != null ? BigInt(balance.balance) : undefined,
             id: IdentifierWASM.createFromRawInstance(balance.id)
         }))
     };

package/dist/src/dpp/verify/Tokens/verifyTokenDirectPurchasePrices.js

@@ -7,7 +7,7 @@ export function verifyTokenDirectPurchasePrices(proof, tokenIds, verifySubsetOfP
     return {
         rootHash: result.rootHash,
         prices: result.prices.map(price => ({
-            id: IdentifierWASM.createFromRawInstance(price.id),
+            tokenId: IdentifierWASM.createFromRawInstance(price.id),
             pricingSchedule: price.pricingSchedule != null ? TokenPricingScheduleWASM.createFromRawInstance(price.pricingSchedule) : undefined
         }))
     };

package/dist/src/dpp/verify/Tokens/verifyTokensBalancesForIdentityProof.js

@@ -6,7 +6,7 @@ export function verifyTokensBalancesForIdentityProof(proof, tokenIds, identityId
     return {
         rootHash: result.rootHash,
         balances: result.balances.map(balance => ({
-            balance: BigInt(balance.balance),
+            balance: balance.balance != null ? BigInt(balance.balance) : undefined,
             id: IdentifierWASM.createFromRawInstance(balance.id)
         }))
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pshenmic-dpp",
-  "version": "2.0.0-dev.1",
+  "version": "2.0.0-dev.10",
   "main": "dist/src/wasm.js",
   "types": "dist/src/wasm.d.ts",
   "react-native": "./dist/src/react-native.js",
@@ -52,8 +52,8 @@
     "ts-standard": "^12.0.2"
   },
   "dependencies": {
-    "@emnapi/core": "^1.7.0",
-    "@emnapi/runtime": "^1.7.0",
+    "@emnapi/core": "1.9.0",
+    "@emnapi/runtime": "1.9.0",
     "@tybys/wasm-util": "^0.10.1",
     "fflate": "^0.8.2"
   }

package/tests/unit/DynamicValue.spec.ts

@@ -83,4 +83,44 @@ describe('DynamicValue', () => {
       expect(valueFromDynamicValue(extendedArrayDynamicValue)).toStrictEqual(extendedArrayValue)
     })
   })
+
+  describe('number values in object', function () {
+    const mock = {
+      uint: 1999,
+      int: -293,
+      float: 2222.11231,
+      smallBigInt: BigInt(2),
+      bigBigInt: BigInt(2000000000000),
+      stringUint: '11',
+      stringInt: '-11',
+      stringFloat: '11.2',
+      bigStringNumber: '11111111111111111111111111111111'
+    }
+
+    const dynValue = valueToDynamicValue(mock)
+
+    const result = valueFromDynamicValue(dynValue)
+
+    expect(valueFromDynamicValue(dynValue)).toStrictEqual(mock)
+    expect(dynValue.value.uint.getType()).toStrictEqual('u32')
+    expect(dynValue.value.int.getType()).toStrictEqual('i64')
+    expect(dynValue.value.float.getType()).toStrictEqual('f64')
+    expect(dynValue.value.smallBigInt.getType()).toStrictEqual('BigIntString')
+    expect(dynValue.value.bigBigInt.getType()).toStrictEqual('BigIntString')
+    expect(dynValue.value.stringUint.getType()).toStrictEqual('String')
+    expect(dynValue.value.stringInt.getType()).toStrictEqual('String')
+    expect(dynValue.value.stringFloat.getType()).toStrictEqual('String')
+  })
+
+  describe('should decode document from state transition in jsonLike', function () {
+    const stateTransition = dpp.StateTransitionWASM.fromBase64('AgHv88sfWzscuW2Ob/0v5d+EgqmWG7ZIvlQG7mHWBH7z9gEAAAAB7JH7W+JkM0Vne2U1zlWYVeQNzRPTpdiWRfsgfwNS2UoCCGJsb2dQb3N0KBdMgeznVQ1smUXVFNPfE2PC379wpWVH8cdu2ilzeI0Ah/i2xfrKCm5ACQAbEQkSc+GRUkdLor4Eu7Vzf6oRc9UHBmJsb2dJZAogdhC4nVm3ufPCgdfoOKXtnhqwg7O3axyTS9WB3EFvNBYPY29tbWVudHNFbmFibGVkEwEHY29udGVudAr7AUh4nM2TTWrDMBCFrxK0jkCyJMvqLnRV6A1KFhpplJgotrEVaAi+e8clpdBuvCnNcn7ezPvQ6O3G2siemKgNSGETT8ZarhUm7hpX8yStEpVCk6xlW1auA1L34Ed/GP1wpNQw9sPEnm6s4Ht57nM/UkPE5C+5UBl8OB3G/tLF37VFscvtoTtjV6iSMRU2b1nou/KZIXf3jUvrXUHRrosbv8ltKRk30JbNl2LLpnLNuPiZ5z1NOrY5jtjRqP28vbM656zTleagJHCNXnIQiUIpgozGg2/0N2s4Yji9tlN5KXj+A97FJG1AcpZ8nnANv1wHGo22ASrFXQDJde0SBzDIdQBVRQEoDDw2aLUONPkKtfF0s9bR9bqGkJW3PNYCg/FOgIqPDarWgQrRxKapBXdCJ3pR7TjUVnJrpAo6yhSc/4dv+tPu/gNBt2qtC3B1Ymxpc2hlZEF0Av0AAAGcptJlIwRzbHVnEhV0aGlzLWlzLW15LWZpcnN0LXBvc3QIc3VidGl0bGUSD1dpdGggYSBzdWJ0aXRsZQV0aXRsZRIVVGhpcyBpcyBteSBmaXJzdCBwb3N0AAABQR+H40MbUEmFXQbTPcwy9vMD8EiTwDzMpW3YIkfSIDvHij5ZIAVvqm0ZJScJzKV7EnRUi/f1tZ/wFJfd1+LDtpps')
+
+    const batch = dpp.BatchTransitionWASM.fromStateTransition(stateTransition)
+
+    const transition = batch.transitions[0].toTransition() as dpp.DocumentTransitionWASM
+
+    const publishedAt = transition.createTransition.data.publishedAt
+
+    expect(typeof publishedAt).toEqual('number')
+  })
 })