Package.json updates

package.json

@@ -22,47 +22,47 @@
         "postinstall": "husky install"
     },
     "devDependencies": {
-        "@ethersproject/providers": "^5.6.2",
-        "@nomiclabs/hardhat-ethers": "^2.0.5",
+        "@ethersproject/providers": "^5.6.8",
+        "@nomiclabs/hardhat-ethers": "^2.0.6",
         "@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",
+        "@truffle/hdwallet-provider": "^2.0.10",
+        "@typechain/ethers-v5": "^10.1.0",
+        "@typechain/hardhat": "^6.1.2",
+        "@types/chai": "^4.3.1",
+        "@types/lodash": "^4.14.182",
+        "@types/mocha": "^9.1.1 ",
+        "@types/node": "^18.0.1",
+        "@typescript-eslint/eslint-plugin": "^5.30.4",
+        "@typescript-eslint/parser": "^5.30.4",
         "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",
+        "dotenv": "^16.0.1",
+        "eslint": "^8.19.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",
+        "eslint-plugin-prettier": "^4.2.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",
+        "hardhat": "^2.9.9",
+        "husky": "^8.0.1",
+        "lerna": "^5.1.6",
+        "node-jq": "^2.3.3",
+        "nodemon": "^2.0.18",
         "npm-run-all": "^4.1.5",
         "nyc": "^15.1.0",
-        "prettier": "^2.6.2",
-        "prettier-eslint": "^12.0.0",
-        "syncpack": "^6.2.0",
-        "truffle": "^5.5.10",
-        "ts-node": "^10.7.0",
-        "typechain": "^6.1.0",
-        "typedoc": "^0.22.15",
-        "typescript": "^4.6.3",
-        "web3": "^1.7.3"
+        "prettier": "^2.7.1",
+        "prettier-eslint": "^15.0.1",
+        "syncpack": "^8.2.4",
+        "truffle": "^5.5.20",
+        "ts-node": "^10.8.2",
+        "typechain": "^8.1.0",
+        "typedoc": "^0.23.5",
+        "typescript": "^4.7.4",
+        "web3": "^1.7.4"
     },
     "workspaces": {
         "packages": [

packages/ethereum-contracts/foundry.toml

@@ -4,6 +4,7 @@ libs = ['lib']
 src = 'packages/ethereum-contracts'
 remappings = [
     '@superfluid-finance/ethereum-contracts/contracts/=packages/ethereum-contracts/contracts/',
+    'hardhat=packages/ethereum-contracts/node_modules/hardhat/',
     '@openzeppelin/=node_modules/@openzeppelin/',
     'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/']

packages/ethereum-contracts/package.json

@@ -56,25 +56,25 @@
     },
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
-        "@openzeppelin/contracts": "4.5.0",
+        "@openzeppelin/contracts": "4.7.0",
         "@superfluid-finance/js-sdk": "0.6.2",
-        "@truffle/contract": "4.5.5",
+        "@truffle/contract": "4.5.15",
         "ethereumjs-tx": "2.1.2",
-        "ethereumjs-util": "7.1.4",
-        "hardhat": "^2.9.3",
+        "ethereumjs-util": "7.1.5",
+        "hardhat": "^2.9.9",
         "stack-trace": "0.0.10"
     },
     "devDependencies": {
-        "@nomiclabs/hardhat-truffle5": "^2.0.5",
-        "async": "^3.2.3",
+        "@nomiclabs/hardhat-truffle5": "^2.0.6",
+        "async": "^3.2.4",
         "csv-writer": "^1.6.0",
         "ganache-time-traveler": "1.0.16",
         "mochawesome": "^7.1.3",
         "readline": "1.3.0",
         "solhint": "3.3.7",
-        "solidity-coverage": "0.7.20",
-        "solidity-docgen": "^0.6.0-beta.10",
+        "solidity-coverage": "0.7.21",
+        "solidity-docgen": "^0.6.0-beta.17",
         "truffle-flattener": "^1.6.0",
-        "truffle-plugin-verify": "^0.5.25"
+        "truffle-plugin-verify": "^0.5.26"
     }
 }

packages/hot-fuzz/package.json

@@ -18,7 +18,7 @@
         "directory": "packages/hot-fuzz"
     },
     "dependencies": {
-        "@openzeppelin/contracts": "4.5.0"
+        "@openzeppelin/contracts": "4.7.0"
     },
     "peerDependencies": {
         "@superfluid-finance/ethereum-contracts": "1.2.2"

packages/js-sdk/package.json

@@ -43,7 +43,7 @@
         "cloc": "sh tasks/cloc.sh"
     },
     "dependencies": {
-        "@truffle/contract": "4.5.5",
+        "@truffle/contract": "4.5.15",
         "auto-bind": "^4.0.0",
         "node-fetch": "^2.6.7"
     },
@@ -53,8 +53,8 @@
     "devDependencies": {
         "@superfluid-finance/ethereum-contracts": "1.3.0",
         "chai-as-promised": "^7.1.1",
-        "webpack": "^5.72.0",
+        "webpack": "^5.73.0",
         "webpack-bundle-analyzer": "^4.5.0",
-        "webpack-cli": "^4.9.2"
+        "webpack-cli": "^4.10.0"
     }
 }

packages/sdk-core/package.json

@@ -57,21 +57,25 @@
     "dependencies": {
         "ajv": "^8.11.0",
         "browserify": "^17.0.0",
-        "ethers": "^5.6.2",
-        "graphql-request": "^3.7.0",
+        "graphql-request": "^4.3.0",
         "lodash": "^4.17.21",
         "tsify": "^5.0.4"
     },
     "devDependencies": {
-        "@graphql-codegen/cli": "^2.6.2",
+        "@graphql-codegen/cli": "^2.6.4",
         "@graphql-codegen/introspection": "^2.1.1",
-        "@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-codegen/near-operation-file-preset": "^2.2.14",
+        "@graphql-codegen/typed-document-node": "^2.2.13",
+        "@graphql-codegen/typescript": "^2.5.1",
+        "@graphql-codegen/typescript-operations": "^2.4.2",
         "@graphql-typed-document-node/core": "^3.1.1",
+        "ethers": "^5.6.9",
         "get-graphql-schema": "^2.1.2",
-        "mocha": "^9.2.2"
+        "mocha": "^10.0.0"
+    },
+    "peerDependencies": {
+        "ethers": "^5.6.9",
+        "graphql": "^16.0.0"
     },
     "resolutions": {
         "graphql": "^16.0.0"

packages/sdk-core/scripts/setup.ts

@@ -55,7 +55,7 @@ export const setup = async (props: ISetupProps) => {
         superTokenClass.underlyingToken.address,
         TestTokenABI,
         Deployer
-    ) as TestToken;
+    ) as unknown as TestToken;
     if (props.amount) {
         const initialAmount = ethers.utils.parseUnits(props.amount);
         for (let i = 0; i < signers.length; i++) {

packages/sdk-core/src/Framework.ts

@@ -35,7 +35,7 @@ import { isEthersProvider, isInjectedWeb3 } from "./utils";
 
 type SupportedProvider =
     | ethers.providers.Provider
-    | (typeof ethers & HardhatEthersHelpers)
+    | HardhatEthersHelpers
     | Web3;
 
 // TODO: add convenience function of utilizing provider (optional)

packages/sdk-core/src/subgraph/subgraphQueryHandler.ts

@@ -178,9 +178,9 @@ export abstract class SubgraphQueryHandler<
                 (key) =>
                     [
                         filter[key],
-                        filter[`${key}_in` as keyof TFilter],
-                        filter[`${key}_not` as keyof TFilter],
-                        filter[`${key}_not_in` as keyof TFilter],
+                        filter[`${String(key)}_in` as keyof TFilter],
+                        filter[`${String(key)}_not` as keyof TFilter],
+                        filter[`${String(key)}_not_in` as keyof TFilter],
                     ]
                         .filter((x) => typeof x !== "undefined")
                         .flat()

packages/sdk-redux/package.json

@@ -38,13 +38,13 @@
     },
     "dependencies": {
         "@types/promise-retry": "^1.1.3",
-        "ethers": "^5.5.4",
-        "graphql-request": "^3.7.0",
+        "ethers": "^5.6.9",
+        "graphql-request": "^4.3.0",
         "lodash": "^4.17.21",
         "promise-retry": "^2.0.1"
     },
     "devDependencies": {
-        "@reduxjs/toolkit": "^1.7.1"
+        "@reduxjs/toolkit": "^1.8.3"
     },
     "peerDependencies": {
         "@reduxjs/toolkit": "^1.6.0 || ^1.7.0",

packages/subgraph/package.json

@@ -52,15 +52,15 @@
     },
     "dependencies": {
         "@graphprotocol/graph-cli": "0.29.0",
-        "@graphprotocol/graph-ts": "0.26.0",
+        "@graphprotocol/graph-ts": "0.27.0",
         "@superfluid-finance/sdk-core": "0.4.4",
         "mustache": "^4.2.0"
     },
     "devDependencies": {
         "coingecko-api": "^1.0.10",
-        "ethers": "^5.6.2",
-        "graphql": "^16.3.0",
-        "graphql-request": "^3.7.0",
+        "ethers": "^5.6.9",
+        "graphql": "^16.5.0",
+        "graphql-request": "^4.3.0",
         "lodash": "^4.17.21"
     },
     "workspaces": {

packages/subgraph/src/mappingHelpers.ts

@@ -188,6 +188,9 @@ export function getOrInitStreamRevision(
 
 /**
  * Gets or initializes a Stream, always sets the updatedAt.
+ * NOTE: this is only called in one place in handleFlowUpdated
+ * and we always save the Stream entity OUTSIDE of this function
+ * after initializing it here.
  */
 export function getOrInitStream(event: FlowUpdated): Stream {
     // Create accounts if they do not exist
@@ -236,7 +239,6 @@ export function getOrInitStream(event: FlowUpdated): Stream {
         // also handles the fact that custom super tokens are
         // initialized after event is first initialized
         getOrInitSuperToken(event.params.token, event.block);
-        stream.save();
     }
     return stream as Stream;
 }
@@ -267,6 +269,7 @@ export function getOrInitFlowOperator(
             senderAddress,
             tokenAddress
         );
+        flowOperatorEntity.flowOperator = flowOperatorAddress;
         flowOperatorEntity.updatedAtBlockNumber = block.number;
         flowOperatorEntity.updatedAtTimestamp = currentTimestamp;
         flowOperatorEntity.save();

packages/subgraph/test/helpers/helpers.ts

@@ -56,7 +56,7 @@ export const beforeSetup = async (tokenAmount: number) => {
     const fDAI = new ethers.Contract(
         fDAIx.underlyingToken.address,
         TestTokenABI
-    ) as TestToken;
+    ) as unknown as TestToken;
 
     console.log(
         "Mint fDAI, approve fDAIx allowance and upgrade fDAI to fDAIx for users..."