Merge pull request #269 from energywebfoundation/feature/MYEN-694_ass…

…et_contract

feature/offerable identity

.eslintrc.json

@@ -44,8 +44,9 @@
     "no-param-reassign": 0,
     "space-before-function-paren": 0,
     "no-unused-expressions": 0,
-    "import/no-extraneous-dependencies": "error",
-    "chai-friendly/no-unused-expressions": 2
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
+    "chai-friendly/no-unused-expressions": 2,
+    "func-names": "off"
   },
   "settings": {
     "import/resolver": {

package.json

@@ -5,8 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "lerna run test",
-    "test-integration": "mocha -r ts-node/register tests/integration/*.test.ts",
-    "test-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"lerna run test && npm run test-integration\" ",
+    "test-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"lerna run test\" ",
     "setup": "lerna bootstrap --hoist --no-ci",
     "build": "rm -rf build docs packages/*/dist && lerna run compile",
     "compile": "lerna run compile",
@@ -59,7 +58,7 @@
     "eslint-config-airbnb-base": "14.0.0",
     "eslint-import-resolver-typescript": "2.0.0",
     "eslint-plugin-chai-friendly": "0.5.0",
-    "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-import": "^2.22.0",
     "ethers": "4.0.45",
     "ganache-cli": "6.9.1",
     "gulp": "4.0.2",
@@ -88,7 +87,7 @@
     "prettier": "2.0.4",
     "prettier-plugin-solidity": "1.0.0-alpha.44",
     "run-with-testrpc": "0.3.1",
-    "truffle": "5.1.16",
+    "truffle": "^5.2.4",
     "ts-node": "8.6.2",
     "tsify": "4.0.1",
     "typedoc": "0.17.4",

packages/claims/package.json

@@ -9,7 +9,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "test": "../../node_modules/.bin/mocha -r ts-node/register test/**/*.test.ts",
-    "test-rpc": "../../node_modules/.bin/run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"npm run test \"",
+    "test-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"npm run test \"",
     "compile": "../../node_modules/.bin/tsc",
     "lint": "../../node_modules/.bin/eslint src/**/*.ts",
     "fix": "../../node_modules/.bin/eslint src/**/*.ts --fix"
@@ -41,6 +41,7 @@
     "sjcl": "npm:[email protected]"
   },
   "devDependencies": {
+    "run-with-testrpc": "0.3.1",
     "ganache-cli": "6.9.1"
   }
 }

packages/did-ethr-resolver/package.json

@@ -30,7 +30,10 @@
     "@ew-did-registry/did": "0.3.0",
     "@ew-did-registry/did-resolver-interface": "0.3.0",
     "@ew-did-registry/keys": "0.3.0",
-    "@ew-did-registry/proxyidentity": "0.3.0",
     "ethers": "4.0.45"
+  },
+  "devDependencies": {
+    "run-with-testrpc": "0.3.1",
+    "ganache-cli": "6.9.1"
   }
 }

packages/did-ethr-resolver/src/implementations/operator.ts

@@ -45,7 +45,7 @@ export class Operator extends Resolver implements IOperator {
 
   private address?: string;
 
-  private readonly _owner: IdentityOwner;
+  protected readonly _owner: IdentityOwner;
 
   /**
  * @param { IdentityOwner } owner - entity which controls document updatable by this operator
@@ -60,7 +60,7 @@ export class Operator extends Resolver implements IOperator {
     this._keys.publicKey = owner.publicKey;
   }
 
-  private async getAddress(): Promise<string> {
+  protected async getAddress(): Promise<string> {
     return this.address || (this.address = await this._owner.getAddress());
   }
 

packages/did-ipfs-store/package.json

@@ -28,5 +28,9 @@
     "@ew-did-registry/did-store-interface": "0.3.0",
     "bl": "^4.0.2",
     "ipfs-http-client": "^43.0.0"
+  },
+  "devDependencies": {
+    "run-with-testrpc": "0.3.1",
+    "ganache-cli": "6.9.1"    
   }
 }

packages/did-registry/package.json

@@ -9,7 +9,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "test": "../../node_modules/.bin/mocha -r ts-node/register test/**/*.test.ts",
-    "test-rpc": "../../node_modules/.bin/run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"npm run test \"",
+    "test-rpc": "run-with-testrpc -m \"candy maple cake sugar pudding cream honey rich smooth crumble sweet treat\" --port 8544 --accounts 20 --networkId=9 --gasLimit=10000000 \"npm run test \"",
     "compile": "../../node_modules/.bin/tsc",
     "lint": "../../node_modules/.bin/eslint src/**/*.ts",
     "fix": "../../node_modules/.bin/eslint src/**/*.ts --fix"

packages/did-resolver-interface/src/interface.ts

@@ -115,5 +115,9 @@ export interface IOperator extends IResolver {
 
   revokeDelegate(did: string, delegateType: PubKeyType, delegateDID: string): Promise<boolean>;
 
-  revokeAttribute(did: string, attributeType: DIDAttribute, updateData: IUpdateData): Promise<boolean>;
+  revokeAttribute(
+    did: string,
+    attributeType: DIDAttribute,
+    updateData: IUpdateData
+  ): Promise<boolean>;
 }