Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump monorepo packages round 1 #1770

Merged
merged 9 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,37 @@
"@nomiclabs/hardhat-web3": "^2.0.0",
"@openzeppelin/test-helpers": "^0.5.16",
"@truffle/hdwallet-provider": "^2.1.15",
"@typechain/ethers-v5": "^11.1.1",
"@typechain/ethers-v5": "^11.1.2",
"@typechain/hardhat": "^8.0.3",
"@types/lodash": "^4.14.198",
"@types/mocha": "^10.0.1",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@types/lodash": "^4.14.202",
"@types/mocha": "^10.0.6",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"cloc": "^2.11.0",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.0",
"hardhat": "^2.17.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.2",
"hardhat": "^2.19.4",
"hardhat-deploy": "^0.11.37",
"husky": "^8.0.3",
"lerna": "^7.3.0",
"node-jq": "^4.0.1",
"nodemon": "^3.0.1",
"node-jq": "^4.2.2",
"nodemon": "^3.0.2",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"prettier": "^3.0.3",
"prettier": "^3.1.1",
"prettier-eslint": "^15.0.1",
"solhint": "3.6.2",
"syncpack": "^10.9.3",
"truffle": "^5.11.5",
"ts-node": "^10.9.1",
"typechain": "^8.3.1",
"typedoc": "^0.25.1",
"typescript": "^5.2.2",
"ts-node": "^10.9.2",
"typechain": "^8.3.2",
"typedoc": "^0.25.6",
"typescript": "^5.3.3",
"web3": "^1.10.2"
},
"resolutions": {
Expand Down
6 changes: 3 additions & 3 deletions packages/ethereum-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@truffle/contract": "4.6.29",
"ethereumjs-tx": "2.1.2",
"ethereumjs-util": "7.1.5",
"hardhat": "^2.17.3"
"hardhat": "^2.19.4"
},
"devDependencies": {
"@nomiclabs/hardhat-truffle5": "^2.0.7",
Expand All @@ -92,13 +92,13 @@
"@safe-global/safe-web3-lib": "^1.9.4",
"@superfluid-finance/js-sdk": "0.6.3",
"@superfluid-finance/metadata": "1.1.22",
"async": "^3.2.4",
"async": "^3.2.5",
"csv-writer": "^1.6.0",
"ethers": "^5.7.2",
"ganache-time-traveler": "1.0.16",
"mochawesome": "^7.1.3",
"readline": "1.3.0",
"solidity-coverage": "0.8.4",
"solidity-coverage": "0.8.5",
"solidity-docgen": "^0.6.0-beta.36",
"stack-trace": "0.0.10",
"truffle-flattener": "^1.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -905,13 +905,13 @@ export async function shouldUpdateFlowOperatorPermissionsAndValidateEvent({
const expectedPermissions = isFullControl
? 7 // 1 1 1
: isFullControlRevoke
? 0 // 0 0 0
: Number(permissions);
? 0 // 0 0 0
: Number(permissions);
const expectedFlowRateAllowance = isFullControl
? MAXIMUM_FLOW_RATE
: isFullControlRevoke
? "0"
: flowRateAllowance;
? "0"
: flowRateAllowance;

// updateFlowOperatorPermissions &&
// validate event was emitted with correct values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@ export default class CFADataModel {
const rounding = roundingDown
? 0
: deposit.and(toBN(0xffffffff)).isZero()
? 0
: 1;
? 0
: 1;
return deposit.shr(32).add(rounding).shl(32);
}

Expand Down
22 changes: 11 additions & 11 deletions packages/sdk-core/src/Framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ export default class Framework {
const provider = isEthersProvider(options.provider)
? options.provider
: isInjectedWeb3(options.provider)
? // must explicitly cast web3 provider type because
// ethers.providers.Web3Provider doesn't like
// the type passed.
new ethers.providers.Web3Provider(
options.provider.currentProvider as
| ethers.providers.ExternalProvider
| ethers.providers.JsonRpcFetchFunc
)
: options.provider.provider;
? // must explicitly cast web3 provider type because
// ethers.providers.Web3Provider doesn't like
// the type passed.
new ethers.providers.Web3Provider(
options.provider.currentProvider as
| ethers.providers.ExternalProvider
| ethers.providers.JsonRpcFetchFunc
)
: options.provider.provider;

const network = await provider.getNetwork();
if (network.chainId !== chainId && chainId != null) {
Expand All @@ -169,8 +169,8 @@ export default class Framework {
const resolverAddress = options.resolverAddress
? options.resolverAddress
: networkData
? networkData.addresses.resolver
: ethers.constants.AddressZero;
? networkData.addresses.resolver
: ethers.constants.AddressZero;
const resolver = Resolver__factory.connect(
resolverAddress,
provider
Expand Down
8 changes: 4 additions & 4 deletions packages/sdk-core/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ const getAddressesData = (chainId: number): NetworkData | null => {
networkData.subgraphV1.hostedEndpoint != null
? networkData.subgraphV1.hostedEndpoint
: networkData.subgraphV1.satsumaEndpoint != null
? networkData.subgraphV1.satsumaEndpoint
: // @note if an endpoint doesn't exist for either, we just use an empty string
// this should never happen and this endpoint is unused in initialization anyways
"";
? networkData.subgraphV1.satsumaEndpoint
: // @note if an endpoint doesn't exist for either, we just use an empty string
// this should never happen and this endpoint is unused in initialization anyways
"";

const subgraphAPIEndpoint = subgraphReleaseTag
? subgraphEndpoint.replace("v1", subgraphReleaseTag)
Expand Down
8 changes: 4 additions & 4 deletions packages/sdk-core/src/pagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ export const createPagedResult = <T extends ILightEntity>(
? isSkipPaging(paging)
? nextSkipPaging(paging)
: isLastIdPaging(paging)
? nextLastIdPaging(paging, lastId!)
: isPageNumberPaging(paging)
? nextPageNumberPaging(paging)
: undefined
? nextLastIdPaging(paging, lastId!)
: isPageNumberPaging(paging)
? nextPageNumberPaging(paging)
: undefined
: undefined,
data: data,
items: data,
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk-core/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ export const clipDepositNumber = (deposit: BigNumber, roundingDown = false) => {
const rounding = roundingDown
? 0
: deposit.and(toBN(0xffffffff)).isZero()
? 0
: 1;
? 0
: 1;
return deposit.shr(32).add(toBN(rounding)).shl(32);
};

Expand Down
8 changes: 4 additions & 4 deletions packages/subgraph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
"cloc": "cloc src"
},
"dependencies": {
"@graphprotocol/graph-cli": "0.57.0",
"@graphprotocol/graph-ts": "0.31.0",
"@graphprotocol/graph-cli": "0.64.1",
"@graphprotocol/graph-ts": "0.32.0",
"@superfluid-finance/sdk-core": "0.6.13",
"mustache": "^4.2.0"
},
"devDependencies": {
"@superfluid-finance/metadata": "1.1.22",
"coingecko-api": "^1.0.10",
"graphql": "^16.8.0",
"graphql": "^16.8.1",
"graphql-request": "^6.1.0",
"lodash": "^4.17.21",
"matchstick-as": "^0.5.2"
"matchstick-as": "^0.6.0"
}
}
Loading
Loading