@dashevo/dashpay-contract 0.3.0 → 0.21.5

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [0.4.0](https://github.com/dashevo/dashpay-contract/compare/v0.3.0...v0.4.0) (2021-08-17)
+
+
+### Features
+
+* update contract to work with DPP 0.20 ([#12](https://github.com/dashevo/dashpay-contract/issues/12))
+
+
+
 # [0.2.0](https://github.com/dashevo/dashpay-contract/compare/v0.1.0...v0.2.0) (2021-02-02)
 
 

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@dashevo/dashpay-contract",
-  "version": "0.3.0",
+  "version": "0.21.5",
   "description": "Reference contract of the DashPay DPA on Dash Evolution",
   "scripts": {
-    "check-package": "npm run check-package:name && npm run check-package:version",
-    "check-package:name": "test $(jq -r .name package.json) = $(jq -r .name package-lock.json)",
-    "check-package:version": "test $(jq -r .version package.json) = $(jq -r .version package-lock.json)",
     "lint": "eslint .",
     "test": "npm run test:unit",
     "test:unit": "mocha 'test/unit/*.spec.js'"
@@ -28,14 +25,14 @@
   },
   "homepage": "https://github.com/dashevo/dashpay-contract#readme",
   "devDependencies": {
-    "@dashevo/dpp": "^0.19.0-dev.4",
-    "chai": "^4.2.0",
+    "@dashevo/dpp": "~0.21.5",
+    "chai": "^4.3.4",
     "dirty-chai": "^2.0.1",
-    "eslint": "^7.7.0",
-    "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "mocha": "^8.1.1",
-    "sinon": "^9.0.3",
-    "sinon-chai": "^3.5.0"
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.24.2",
+    "mocha": "^9.1.2",
+    "sinon": "^11.1.2",
+    "sinon-chai": "^3.7.0"
   }
 }

package/schema/dashpay.schema.json

@@ -1,5 +1,6 @@
 {
   "profile": {
+    "type": "object",
     "indices": [
       {
         "properties": [
@@ -56,6 +57,7 @@
     "additionalProperties": false
   },
   "contactInfo": {
+    "type": "object",
     "indices": [
       {
         "properties": [
@@ -116,6 +118,7 @@
     "additionalProperties": false
   },
   "contactRequest": {
+    "type": "object",
     "indices": [
       {
         "properties": [

package/test/unit/schema.spec.js

@@ -12,7 +12,7 @@ describe('Dashpay Contract', () => {
   let contract;
   let identityId;
 
-  beforeEach(function beforeEach() {
+  beforeEach(async function beforeEach() {
     const fetchContractStub = this.sinon.stub();
 
     dpp = new DashPlatformProtocol({
@@ -21,6 +21,8 @@ describe('Dashpay Contract', () => {
       },
     });
 
+    await dpp.initialize();
+
     identityId = generateRandomIdentifier();
 
     contract = dpp.dataContract.create(identityId, schema);
@@ -28,7 +30,9 @@ describe('Dashpay Contract', () => {
     fetchContractStub.resolves(contract);
   });
 
-  it('should have a valid contract definition', async () => {
+  it('should have a valid contract definition', async function shouldHaveValidContract() {
+    this.timeout(5000);
+
     const validationResult = await dpp.dataContract.validate(contract);
 
     expect(validationResult.isValid()).to.be.true();
@@ -61,7 +65,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxLength');
-            expect(error.dataPath).to.equal('.displayName');
+            expect(error.instancePath).to.equal('/displayName');
           }
         });
       });
@@ -82,7 +86,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxLength');
-            expect(error.dataPath).to.equal('.publicMessage');
+            expect(error.instancePath).to.equal('/publicMessage');
           }
         });
       });
@@ -103,7 +107,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('format');
-            expect(error.dataPath).to.equal('.avatarUrl');
+            expect(error.instancePath).to.equal('/avatarUrl');
           }
         });
 
@@ -122,7 +126,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxLength');
-            expect(error.dataPath).to.equal('.avatarUrl');
+            expect(error.instancePath).to.equal('/avatarUrl');
           }
         });
 
@@ -141,7 +145,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('format');
-            expect(error.dataPath).to.equal('.avatarUrl');
+            expect(error.instancePath).to.equal('/avatarUrl');
           }
         });
       });
@@ -160,7 +164,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minItems');
-            expect(error.dataPath).to.equal('.avatarHash');
+            expect(error.instancePath).to.equal('/avatarHash');
           }
         });
 
@@ -177,7 +181,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxItems');
-            expect(error.dataPath).to.equal('.avatarHash');
+            expect(error.instancePath).to.equal('/avatarHash');
           }
         });
 
@@ -194,7 +198,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('type');
-            expect(error.dataPath).to.equal('.avatarHash');
+            expect(error.instancePath).to.equal('/avatarHash');
           }
         });
       });
@@ -213,7 +217,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minItems');
-            expect(error.dataPath).to.equal('.avatarFingerprint');
+            expect(error.instancePath).to.equal('/avatarFingerprint');
           }
         });
 
@@ -230,7 +234,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxItems');
-            expect(error.dataPath).to.equal('.avatarFingerprint');
+            expect(error.instancePath).to.equal('/avatarFingerprint');
           }
         });
 
@@ -247,7 +251,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('type');
-            expect(error.dataPath).to.equal('.avatarFingerprint');
+            expect(error.instancePath).to.equal('/avatarFingerprint');
           }
         });
       });
@@ -327,7 +331,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxItems');
-            expect(error.dataPath).to.equal('.encToUserId');
+            expect(error.instancePath).to.equal('/encToUserId');
           }
         });
 
@@ -346,7 +350,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minItems');
-            expect(error.dataPath).to.equal('.encToUserId');
+            expect(error.instancePath).to.equal('/encToUserId');
           }
         });
       });
@@ -386,7 +390,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minimum');
-            expect(error.dataPath).to.equal('.rootEncryptionKeyIndex');
+            expect(error.instancePath).to.equal('/rootEncryptionKeyIndex');
           }
         });
       });
@@ -522,7 +526,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minimum');
-            expect(error.dataPath).to.equal('.senderKeyIndex');
+            expect(error.instancePath).to.equal('/senderKeyIndex');
           }
         });
       });
@@ -562,7 +566,7 @@ describe('Dashpay Contract', () => {
 
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minimum');
-            expect(error.dataPath).to.equal('.recipientKeyIndex');
+            expect(error.instancePath).to.equal('/recipientKeyIndex');
           }
         });
       });
@@ -581,7 +585,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minItems');
-            expect(error.dataPath).to.equal('.encryptedAccountLabel');
+            expect(error.instancePath).to.equal('/encryptedAccountLabel');
           }
         });
 
@@ -598,7 +602,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxItems');
-            expect(error.dataPath).to.equal('.encryptedAccountLabel');
+            expect(error.instancePath).to.equal('/encryptedAccountLabel');
           }
         });
 
@@ -614,7 +618,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('type');
-            expect(error.dataPath).to.equal('.encryptedAccountLabel');
+            expect(error.instancePath).to.equal('/encryptedAccountLabel');
           }
         });
       });
@@ -633,7 +637,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minItems');
-            expect(error.dataPath).to.equal('.autoAcceptProof');
+            expect(error.instancePath).to.equal('/autoAcceptProof');
           }
         });
 
@@ -650,7 +654,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('maxItems');
-            expect(error.dataPath).to.equal('.autoAcceptProof');
+            expect(error.instancePath).to.equal('/autoAcceptProof');
           }
         });
 
@@ -667,7 +671,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('type');
-            expect(error.dataPath).to.equal('.autoAcceptProof');
+            expect(error.instancePath).to.equal('/autoAcceptProof');
           }
         });
       });
@@ -703,7 +707,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minimum');
-            expect(error.dataPath).to.equal('.accountReference');
+            expect(error.instancePath).to.equal('/accountReference');
           }
         });
       });
@@ -722,7 +726,7 @@ describe('Dashpay Contract', () => {
             const [error] = e.errors;
             expect(error.name).to.equal('JsonSchemaError');
             expect(error.keyword).to.equal('minimum');
-            expect(error.dataPath).to.equal('.coreHeightCreatedAt');
+            expect(error.instancePath).to.equal('/coreHeightCreatedAt');
           }
         });
       });

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop, server, or mobile):
-* Link to your project:

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-<!--- Provide a general summary of the feature request in the Title above -->
-
-## Expected Behavior
-<!--- A clear and concise description of what you want to happen -->
-
-## Current Behavior
-<!--- Explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Suggest ideas of how to implement the addition or change -->
-
-## Alternatives Considered
-<!--- A clear and concise description of any alternative solutions or features you've considered -->
-
-## Additional Context
-<!--- Add any other context or screenshots about the feature request here. -->
-

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,32 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-<!--- Pull request titles must use the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) format -->
-
-## Issue being fixed or feature implemented
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-
-## What was done?
-<!--- Describe your changes in detail -->
-
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-
-## Breaking Changes
-<!--- Please describe any breaking changes your code introduces and verify that -->
-<!--- the title includes "!" following the conventional commit type (e.g. "feat!: ..."-->
-
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have added or updated relevant unit/integration/functional/e2e tests
-- [ ] I have made corresponding changes to the documentation
-
-**For repository code-owners and collaborators only**
-- [ ] I have assigned this pull request to a milestone

package/.github/workflows/test_and_release.yml

@@ -1,83 +0,0 @@
-name: Test and Release
-
-on:
-  workflow_dispatch:
-  release:
-    types:
-      - published
-  pull_request:
-    branches:
-      - master
-      - v[0-9]+.[0-9]+-dev
-
-jobs:
-  test:
-    name: Run Dashpay Contract tests
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-
-      - name: Enable NPM cache
-        uses: actions/cache@v2
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install NPM dependencies
-        run: npm ci
-
-      - name: Check NPM package lock version is updated
-        run: npm run check-package # TODO: does this exist as an action already?
-
-      - name: Run ESLinter
-        run: npm run lint
-
-      - name: Run tests
-        run: npm run test
-
-  release:
-    name: Release NPM package
-    runs-on: ubuntu-20.04
-    needs: test
-    if: ${{ github.event_name == 'release' }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Check package version matches tag
-        uses: geritol/match-tag-to-package-version@0.1.0
-        env:
-          TAG_PREFIX: refs/tags/v
-
-      - name: Enable NPM cache
-        uses: actions/cache@v2
-        with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install NPM dependencies
-        run: npm ci
-
-      - name: Set release tag
-        uses: actions/github-script@v3
-        id: tag
-        with:
-          result-encoding: string
-          script: |
-            const tag = context.payload.release.tag_name;
-            const [, major, minor] = tag.match(/^v([0-9]+)\.([0-9]+)/);
-            return (tag.includes('dev') ? `${major}.${minor}-dev` : 'latest');
-
-      - name: Publish NPM package
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          tag: ${{ steps.tag.outputs.result }}