Merge branch 'master' into request-currency-package

RequestNetwork · Dec 23, 2020 · 6416b72 · 6416b72
2 parents d0f14f3 + f75ebc0
commit 6416b72
Show file tree

Hide file tree

Showing 24 changed files with 52 additions and 57 deletions.
diff --git a/package.json b/package.json
@@ -34,6 +34,6 @@
     "npm-package-json-lint": "5.1.0",
     "nyc": "15.1.0",
     "remap-istanbul": "0.13.0",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/advanced-logic/package.json b/packages/advanced-logic/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@requestnetwork/types": "0.29.2",
     "@requestnetwork/utils": "0.28.2",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "lodash": "4.17.20",
     "wallet-address-validator": "0.2.4"
   },
@@ -60,7 +60,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/data-access/package.json b/packages/data-access/package.json
@@ -46,10 +46,10 @@
     "keyv": "4.0.3"
   },
   "devDependencies": {
-    "@types/bluebird": "3.5.32",
+    "@types/bluebird": "3.5.33",
     "@types/jest": "26.0.13",
     "@types/keyv": "3.1.1",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "@typescript-eslint/parser": "4.1.1",
     "eslint": "7.9.0",
     "eslint-plugin-spellcheck": "0.0.17",
@@ -63,7 +63,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/data-format/package.json b/packages/data-format/package.json
@@ -44,7 +44,7 @@
     "tslib": "2.0.1"
   },
   "devDependencies": {
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "eslint": "7.9.0",
     "eslint-plugin-spellcheck": "0.0.17",
     "eslint-plugin-typescript": "0.14.0",
@@ -55,7 +55,7 @@
     "shx": "0.3.2",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/epk-decryption/package.json b/packages/epk-decryption/package.json
@@ -65,7 +65,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/packages/epk-signature/package.json b/packages/epk-signature/package.json
@@ -64,7 +64,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/packages/ethereum-storage/package.json b/packages/ethereum-storage/package.json
@@ -57,11 +57,11 @@
   "devDependencies": {
     "@openzeppelin/test-helpers": "0.5.6",
     "@truffle/hdwallet-provider": "1.0.44",
-    "@types/bluebird": "3.5.32",
+    "@types/bluebird": "3.5.33",
     "@types/fetch-mock": "7.3.3",
     "@types/jest": "26.0.13",
     "@types/keyv": "3.1.1",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "@typescript-eslint/parser": "4.1.1",
     "eslint": "7.9.0",
     "eslint-plugin-spellcheck": "0.0.17",
@@ -77,7 +77,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "web3-providers-http": "1.3.0"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"

diff --git a/packages/ethereum-storage/src/ethereum-storage.ts b/packages/ethereum-storage/src/ethereum-storage.ts
@@ -456,7 +456,7 @@ export default class EthereumStorage implements StorageTypes.IStorage {
 
     // Iterate over the hashes list, slicing it at pinRequestMaxSize sizes and pinning it
     for (let i = 0; i < slices; i++) {
-      await new Promise((res): NodeJS.Timeout => setTimeout(() => res(), delayBetweenCalls));
+      await new Promise<void>((res): NodeJS.Timeout => setTimeout(() => res(), delayBetweenCalls));
       const slice = hashes.slice(i * maxSize, (i + 1) * maxSize);
       try {
         await this.ipfsManager.pin(slice, timeout);

diff --git a/packages/integration-test/package.json b/packages/integration-test/package.json
@@ -53,15 +53,15 @@
     "@requestnetwork/utils": "0.28.2",
     "@truffle/hdwallet-provider": "1.0.44",
     "@types/jest": "26.0.13",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "jest": "26.4.2",
     "lint-staged": "10.3.0",
     "npm-run-all": "4.1.5",
     "prettier": "2.1.1",
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "web3-eth": "1.3.0"
   }
 }
diff --git a/packages/multi-format/package.json b/packages/multi-format/package.json
@@ -57,6 +57,6 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/payment-detection/package.json b/packages/payment-detection/package.json
@@ -64,6 +64,6 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/payment-processor/package.json b/packages/payment-processor/package.json
@@ -59,6 +59,6 @@
     "source-map-support": "0.5.19",
     "ts-jest": "26.3.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/prototype-estimator/package.json b/packages/prototype-estimator/package.json
@@ -38,12 +38,12 @@
     "@requestnetwork/types": "0.29.2",
     "@requestnetwork/utils": "0.28.2",
     "benchmark": "2.1.4",
-    "simple-statistics": "7.0.2"
+    "simple-statistics": "7.4.0"
   },
   "devDependencies": {
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "prettier": "2.1.1",
     "ts-node": "9.0.0",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/request-client.js/package.json b/packages/request-client.js/package.json
@@ -83,7 +83,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/packages/request-logic/package.json b/packages/request-logic/package.json
@@ -62,7 +62,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/request-node/package.json b/packages/request-node/package.json
@@ -60,7 +60,7 @@
     "@types/cors": "2.8.7",
     "@types/express": "4.17.8",
     "@types/jest": "26.0.13",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "@types/supertest": "2.0.10",
     "@types/yargs": "15.0.5",
     "jest": "26.4.2",
@@ -73,7 +73,7 @@
     "ts-node": "9.0.0",
     "ts-node-dev": "1.0.0-pre.62",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/smart-contracts/package.json b/packages/smart-contracts/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@openzeppelin/contracts": "2.5.1",
     "@openzeppelin/test-helpers": "0.5.6",
-    "@types/node": "14.6.4",
+    "@types/node": "14.14.14",
     "chai-bn": "0.2.1",
     "ethers": "4.0.48",
     "ganache-cli": "6.11.0",

diff --git a/packages/toolbox/package.json b/packages/toolbox/package.json
@@ -56,6 +56,6 @@
     "shx": "0.3.2",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/transaction-manager/package.json b/packages/transaction-manager/package.json
@@ -58,7 +58,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -53,7 +53,7 @@
     "shx": "0.3.2",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/usage-examples/package.json b/packages/usage-examples/package.json
@@ -49,6 +49,6 @@
     "prettier": "2.1.1",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -61,7 +61,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2"
+    "typescript": "4.1.3"
   },
   "gitHead": "6155223cfce769e48ccae480c510b35b4f54b4d0"
 }
diff --git a/packages/web3-signature/package.json b/packages/web3-signature/package.json
@@ -65,7 +65,7 @@
     "ts-jest": "26.3.0",
     "ts-node": "9.0.0",
     "tslint": "6.1.3",
-    "typescript": "4.0.2",
+    "typescript": "4.1.3",
     "webpack": "4.44.2",
     "webpack-bundle-analyzer": "4.2.0",
     "webpack-cli": "3.3.12"

diff --git a/yarn.lock b/yarn.lock
@@ -3620,10 +3620,10 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/bluebird@3.5.32":
-  version "3.5.32"
-  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.32.tgz#381e7b59e39f010d20bbf7e044e48f5caf1ab620"
-  integrity sha512-dIOxFfI0C+jz89g6lQ+TqhGgPQ0MxSnh/E4xuC0blhFtyW269+mPG5QeLgbdwst/LvdP8o1y0o/Gz5EHXLec/g==
+"@types/bluebird@3.5.33":
+  version "3.5.33"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.33.tgz#d79c020f283bd50bd76101d7d300313c107325fc"
+  integrity sha512-ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ==
 
 "@types/bn.js@4.11.6", "@types/bn.js@^4.11.3", "@types/bn.js@^4.11.5":
   version "4.11.6"
@@ -3812,15 +3812,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@14.6.4":
-  version "14.6.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
-  integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
-
-"@types/node@>= 8":
-  version "14.0.27"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
-  integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
+"@types/node@*", "@types/node@14.14.14", "@types/node@>= 8":
+  version "14.14.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae"
+  integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==
 
 "@types/node@^10.3.2":
   version "10.17.29"
@@ -7699,9 +7694,9 @@ domhandler@^2.3.0:
     domelementtype "1"
 
 dompurify@^2.0.12:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.15.tgz#80e300fc3e89547bd0af1aff2eba88ce17fc9dea"
-  integrity sha512-8AnYW8iXOC7xC7K3FBvQ7+GdmtOsgDGZC5dDXaewCC674qcId7G5mhz5VIEnVShJVjQdlcaPjxpaOzaV9JC3Tg==
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz#54945dc5c0b45ce5ae228705777e8e59d7b2edc4"
+  integrity sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==
 
 domutils@1.5.1:
   version "1.5.1"
@@ -17895,10 +17890,10 @@ simple-get@^2.7.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-statistics@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/simple-statistics/-/simple-statistics-7.0.2.tgz#46671f45cb6f9b68207dccd6a3c4f7e745e6e638"
-  integrity sha512-wqTjlmbiaL6Fqaw28tSjQrthjxVV17MMfi/H/qvE0jAvtLspB2S7gEtcR27uvhSRAa64LhjhoO169rX8sFW3pg==
+simple-statistics@7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/simple-statistics/-/simple-statistics-7.4.0.tgz#4319348aff39d9cc3aababe02671568674807515"
+  integrity sha512-1mXlR6NEIwMsKWjD+exMd4vvRWmrrBk+MT1n3O5NBjbxjIh1E1YlQikwyNdQjPcq8E+EgUkFmj67gr2bfAIwGg==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -19506,10 +19501,10 @@ typescript@2.9.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961"
   integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==
 
-typescript@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
-  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
+typescript@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 typescript@^2.4.2:
   version "2.9.2"