Update dev dependencies (#694)

superfluid-finance · Apr 14, 2022 · 76a7c68 · 76a7c68
1 parent 9dad1ad
commit 76a7c68
Show file tree

Hide file tree

Showing 11 changed files with 1,524 additions and 1,620 deletions.
diff --git a/package.json b/package.json
@@ -17,24 +17,51 @@
         "clean": "rm -rf node_modules; rm -rf packages/*/node_modules",
         "test": "set -e;for i in ethereum-contracts js-sdk sdk-core;do yarn workspace @superfluid-finance/$i test;done",
         "manage-versions": "lerna version --exact --no-git-tag-version --preid rc",
+        "check-updates": "ncu --target minor --dep dev",
         "show-versions": "lerna ls --long",
         "postinstall": "husky install"
     },
     "devDependencies": {
-        "@reduxjs/toolkit": "^1.7.1",
-        "eslint": "^8.4.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-prettier": "^3.3.1",
-        "husky": "^5.0.9",
+        "@ethersproject/providers": "^5.6.2",
+        "@nomiclabs/hardhat-ethers": "^2.0.5",
+        "@nomiclabs/hardhat-waffle": "^2.0.3",
+        "@nomiclabs/hardhat-web3": "^2.0.0",
+        "@openzeppelin/test-helpers": "^0.5.15",
+        "@truffle/hdwallet-provider": "^1.7.0",
+        "@typechain/ethers-v5": "^8.0.5",
+        "@typechain/hardhat": "^3.1.0",
+        "@types/chai": "^4.3.0",
+        "@types/lodash": "^4.14.181",
+        "@types/mocha": "^9.1.0",
+        "@types/node": "^17.0.23",
+        "@typescript-eslint/eslint-plugin": "^5.19.0",
+        "@typescript-eslint/parser": "^5.19.0",
+        "chai": "^4.3.6",
+        "chai-ethers": "^0.0.1",
+        "cloc": "^2.9.0",
+        "copyfiles": "^2.4.1",
+        "dotenv": "^10.0.0",
+        "eslint": "^8.13.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-prettier": "^3.4.1",
+        "ethereum-waffle": "^3.4.4",
+        "hardhat": "^2.9.3",
+        "husky": "^5.2.0",
         "lerna": "^3.22.1",
         "node-jq": "^1.12.0",
+        "nodemon": "^2.0.15",
         "npm-run-all": "^4.1.5",
-        "prettier": "^2.5.1",
+        "prettier": "^2.6.2",
         "prettier-eslint": "^12.0.0",
-        "truffle": "5.4.31",
-        "ts-node": "^10.4.0",
-        "typescript": "^4.5.2",
-        "cloc": "^2.9.0"
+        "syncpack": "^6.2.0",
+        "truffle": "^5.5.9",
+        "ts-node": "^10.7.0",
+        "typechain": "^6.1.0",
+        "typedoc": "^0.22.15",
+        "typescript": "^4.6.3",
+        "web3": "^1.7.3"
     },
     "workspaces": {
         "packages": [

diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json
@@ -46,35 +46,29 @@
         "pre-commit": "if [ ! -z \"$(git status -s .)\" ];then run-s pre-commit:*;else true;fi",
         "pre-commit:lint": "yarn lint",
         "check-updates": "ncu --target minor --dep prod,dev",
-        "cloc": "sh tasks/cloc.sh"
+        "cloc": "bash tasks/cloc.sh"
     },
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
         "@openzeppelin/contracts": "4.5.0",
         "@superfluid-finance/js-sdk": "0.5.12",
-        "@truffle/contract": "4.4.6",
+        "@truffle/contract": "4.5.5",
         "ethereumjs-tx": "2.1.2",
-        "ethereumjs-util": "7.1.3",
-        "hardhat": "^2.9.2",
+        "ethereumjs-util": "7.1.4",
+        "hardhat": "^2.9.3",
         "solidity-stringutils": "github:Arachnid/solidity-stringutils#46983c6d9462a80229cf0d5bab8ea3b3ee31066c",
         "stack-trace": "0.0.10"
     },
     "devDependencies": {
         "@nomiclabs/hardhat-truffle5": "^2.0.5",
-        "@openzeppelin/test-helpers": "0.5.15",
-        "@truffle/hdwallet-provider": "^1.7.0",
         "async": "^3.2.3",
-        "chai": "^4.3.6",
-        "chai-ethers": "^0.0.1",
         "csv-writer": "^1.6.0",
-        "dotenv": "10.0.0",
-        "ganache-cli": "^6.12.2",
         "ganache-time-traveler": "1.0.16",
-        "mochawesome": "^7.1.2",
+        "mochawesome": "^7.1.3",
         "readline": "1.3.0",
-        "solhint": "3.3.6",
+        "solhint": "3.3.7",
         "solidity-coverage": "0.7.20",
-        "truffle-flattener": "^1.5.0",
-        "truffle-plugin-verify": "^0.5.21"
+        "truffle-flattener": "^1.6.0",
+        "truffle-plugin-verify": "^0.5.25"
     }
 }
diff --git a/packages/ethereum-contracts/tasks/cloc.sh b/packages/ethereum-contracts/tasks/cloc.sh
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 cd "$(dirname "$0")"/..
 
 CLOC="cloc --by-file-by-lang"
 
+echo "========================================================="
 echo "# Interfaces"
 $CLOC contracts/interfaces
 
 echo "========================================================="
+echo "# Libs and Test Code"
+$CLOC \
+    contracts/{ux,apps}
 
-echo "# Excluding Interfaces and Test Code"
+echo "========================================================="
+echo "# Excluding Interfaces, Libs and Test Code"
 $CLOC \
-    --exclude-dir interfaces,test,mocks \
+    --exclude-dir interfaces,ux,apps,test,mocks \
     contracts
diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json
@@ -42,9 +42,9 @@
         "cloc": "sh tasks/cloc.sh"
     },
     "dependencies": {
-        "@ethersproject/abi": "^5.5.0",
-        "@ethersproject/hash": "^5.5.0",
-        "@truffle/contract": "4.4.6",
+        "@ethersproject/abi": "^5.6.0",
+        "@ethersproject/hash": "^5.6.0",
+        "@truffle/contract": "4.5.5",
         "auto-bind": "^4.0.0",
         "node-fetch": "^2.6.7"
     },
@@ -53,15 +53,10 @@
         "@truffle/contract": "^4.0.0"
     },
     "devDependencies": {
-        "@decentral.ee/web3-helpers": "^0.5.3",
-        "@ethersproject/contracts": "^5.5.0",
-        "@ethersproject/providers": "^5.5.3",
-        "@openzeppelin/test-helpers": "^0.5.15",
+        "@ethersproject/contracts": "^5.6.0",
         "@superfluid-finance/ethereum-contracts": "1.1.1",
-        "@truffle/hdwallet-provider": "^1.7.0",
         "chai-as-promised": "^7.1.1",
-        "web3": "^1.7.0",
-        "webpack": "^5.68.0",
+        "webpack": "^5.72.0",
         "webpack-bundle-analyzer": "^4.5.0",
         "webpack-cli": "^4.9.2"
     }

diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json
@@ -48,52 +48,25 @@
         "url": "https://github.com/superfluid-finance/protocol-monorepo/issues"
     },
     "dependencies": {
-        "ajv": "^8.9.0",
+        "ajv": "^8.11.0",
         "browserify": "^17.0.0",
-        "ethers": "^5.5.4",
+        "ethers": "^5.6.2",
         "graphql-request": "^3.7.0",
         "lodash": "^4.17.21",
         "tsify": "^5.0.4"
     },
     "devDependencies": {
-        "@graphql-codegen/cli": "^2.5.0",
+        "@graphql-codegen/cli": "^2.6.2",
         "@graphql-codegen/introspection": "^2.1.1",
-        "@graphql-codegen/near-operation-file-preset": "^2.2.4",
-        "@graphql-codegen/typed-document-node": "^2.2.3",
-        "@graphql-codegen/typescript": "^2.4.3",
-        "@graphql-codegen/typescript-operations": "^2.2.4",
+        "@graphql-codegen/near-operation-file-preset": "^2.2.9",
+        "@graphql-codegen/typed-document-node": "^2.2.8",
+        "@graphql-codegen/typescript": "^2.4.8",
+        "@graphql-codegen/typescript-operations": "^2.3.5",
         "@graphql-typed-document-node/core": "^3.1.1",
-        "@nomiclabs/hardhat-ethers": "2.0.5",
-        "@nomiclabs/hardhat-waffle": "^2.0.3",
-        "@nomiclabs/hardhat-web3": "^2.0.0",
-        "@typechain/ethers-v5": "^8.0.5",
-        "@typechain/hardhat": "^3.1.0",
-        "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.14",
-        "@typescript-eslint/eslint-plugin": "^5.10.2",
-        "@typescript-eslint/parser": "^5.10.2",
-        "chai": "^4.3.6",
-        "chai-ethers": "^0.0.1",
-        "copyfiles": "^2.4.1",
         "coveralls": "^3.1.1",
-        "dotenv": "^10.0.0",
-        "eslint": "^8.8.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-prettier": "^3.3.1",
-        "ethereum-waffle": "^3.4.4",
         "get-graphql-schema": "^2.1.2",
-        "hardhat": "^2.9.1",
         "mocha": "^9.2.2",
-        "npm-run-all": "^4.1.5",
-        "nyc": "^15.1.0",
-        "ts-node": "^10.7.0",
-        "typechain": "^6.1.0",
-        "typedoc": "^0.22.11",
-        "typescript": "^4.6.2",
-        "web3": "^1.7.1"
+        "nyc": "^15.1.0"
     },
     "resolutions": {
         "graphql": "^16.0.0"

diff --git a/packages/sdk-redux/package.json b/packages/sdk-redux/package.json
@@ -41,18 +41,7 @@
         "lodash": "^4.17.21"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.10.2",
-        "@typescript-eslint/parser": "^5.10.2",
-        "copyfiles": "^2.4.1",
-        "eslint": "^8.8.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-import": "^2.25.4",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.5.1",
-        "ts-node": "^10.4.0",
-        "typedoc": "^0.22.11",
-        "typescript": "^4.5.5"
+        "@reduxjs/toolkit": "^1.7.1"
     },
     "peerDependencies": {
         "@reduxjs/toolkit": "^1.6.0 || ^1.7.0",

diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json
@@ -49,31 +49,17 @@
         "cloc": "cloc src"
     },
     "dependencies": {
-        "@graphprotocol/graph-cli": "0.26.0",
-        "@graphprotocol/graph-ts": "0.24.1",
+        "@graphprotocol/graph-cli": "0.29.0",
+        "@graphprotocol/graph-ts": "0.26.0",
         "@superfluid-finance/sdk-core": "0.3.2",
         "mustache": "^4.2.0"
     },
     "devDependencies": {
-        "@ethersproject/providers": "^5.5.3",
-        "@nomiclabs/hardhat-ethers": "2.0.5",
-        "@nomiclabs/hardhat-waffle": "^2.0.3",
-        "@nomiclabs/hardhat-web3": "^2.0.0",
-        "@typechain/ethers-v5": "^9.0.0",
-        "@types/chai": "^4.3.0",
-        "@types/lodash": "^4.14.180",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^17.0.23",
-        "chai": "^4.3.6",
-        "chai-ethers": "^0.0.1",
         "coingecko-api": "^1.0.10",
-        "ethereum-waffle": "^3.4.4",
-        "ethers": "^5.5.4",
+        "ethers": "^5.6.2",
         "graphql": "^16.3.0",
         "graphql-request": "^3.7.0",
-        "hardhat": "^2.9.1",
-        "lodash": "^4.17.21",
-        "typechain": "^7.0.0"
+        "lodash": "^4.17.21"
     },
     "workspaces": {
         "nohoist": [

diff --git a/packages/subgraph/src/mappings/cfav1.ts b/packages/subgraph/src/mappings/cfav1.ts
@@ -219,6 +219,15 @@ function endStreamPeriod(
     incrementPeriodRevisionIndex(streamRevision);
 }
 
+function clipDepositNumber(deposit: BigInt, roundingDown: boolean): BigInt {
+    const rounding = roundingDown
+        ? 0
+        : deposit.bitAnd(BigInt.fromI32(0xffffffff)).isZero()
+        ? 0
+        : 1;
+    return deposit.rightShift(32).plus(BigInt.fromI32(rounding)).leftShift(32);
+}
+
 export function handleStreamUpdated(event: FlowUpdated): void {
     let senderAddress = event.params.sender;
     let receiverAddress = event.params.receiver;

diff --git a/packages/subgraph/test/helpers/testers.ts b/packages/subgraph/test/helpers/testers.ts
@@ -122,6 +122,8 @@ export async function testFlowUpdated(data: ITestModifyFlowData) {
         existingData: initData,
         depositDelta,
     });
+    console.log("initData.currentSenderATS.totalDeposit", initData.currentSenderATS.totalDeposit.toString());
+    console.log("expectedData.updatedSenderATS.totalDeposit", expectedData.updatedSenderATS.totalDeposit.toString());
 
     const streamedAmountSinceUpdatedAt = toBN(
         initData.pastStreamData.oldFlowRate

diff --git a/tasks/find-dup-devDependencies.sh b/tasks/find-dup-devDependencies.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+P=$(echo packages/*/package.json package.json)
+# find duplicated devDependencies in packages
+jq -r '.devDependencies | keys | .[]' $P | \
+    sort | uniq -c | \
+    grep -ve '^ *1' | awk '{print $2}' | while read i;do
+    echo $i
+    grep '"'$i'"' $P
+    echo
+done