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 solc version to 0.8.23, update nix flake and update dependencies #1783

Merged
merged 11 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from 8 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.

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
flake-utils.lib.eachDefaultSystem (system:
let
minDevSolcVer = "solc_0_8_11"; # minimum solidity version used for external development
solcVer = "solc_0_8_19";
solcVer = "solc_0_8_23";
ghcVer92 = "ghc928";
ghcVer94 = "ghc945";
ghcVer94 = "ghc948";

pkgs = import nixpkgs {
inherit system;
Expand Down Expand Up @@ -85,7 +85,7 @@
hlint
stylish-haskell
# sage math
# sage # TODO: https://github.com/NixOS/nixpkgs/issues/282383#issuecomment-1902660815
sage
# testing tooling
gnuplot
# yellowpaper pipeline tooling
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,34 @@
"@typechain/hardhat": "^8.0.3",
"@types/lodash": "^4.14.202",
"@types/mocha": "^10.0.6",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"cloc": "^2.11.0",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"dotenv": "^16.4.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.2",
"hardhat": "^2.19.4",
"hardhat-deploy": "^0.11.37",
"eslint-plugin-prettier": "^5.1.3",
"hardhat": "^2.19.5",
"hardhat-deploy": "^0.11.45",
"husky": "^8.0.3",
"lerna": "^7.3.0",
"node-jq": "^4.2.2",
"nodemon": "^3.0.2",
"lerna": "^7.4.2",
"node-jq": "^4.3.0",
"nodemon": "^3.0.3",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"prettier": "^3.1.1",
"prettier": "^3.2.5",
"prettier-eslint": "^15.0.1",
"solhint": "3.6.2",
"syncpack": "^10.9.3",
"truffle": "^5.11.5",
"ts-node": "^10.9.2",
"typechain": "^8.3.2",
"typedoc": "^0.25.6",
"typedoc": "^0.25.7",
"typescript": "^5.3.3",
"web3": "^1.10.2"
"web3": "^1.10.4"
},
"resolutions": {
"mocha": "^10.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/autowrap/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
root = '../../../'
libs = ['lib']
src = 'packages/automation-contracts/autowrap'
solc_version = "0.8.19"
solc_version = "0.8.23"
remappings = [
'@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
'@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/autowrap/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require("./script/addStrategy");
*/
module.exports = {
solidity: {
version: "0.8.19",
version: "0.8.23",
settings: {
optimizer: {
enabled: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/autowrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"check-updates": "ncu --target minor"
},
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@openzeppelin/contracts": "4.9.5",
"@superfluid-finance/ethereum-contracts": "1.9.0",
"@superfluid-finance/metadata": "1.1.27"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/scheduler/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
root = '../../../'
libs = ['lib']
src = 'packages/automation-contracts/scheduler'
solc_version = "0.8.19"
solc_version = "0.8.23"
remappings = [
'@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
'@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/scheduler/hardhat.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require("hardhat/config");
*/
module.exports = {
solidity: {
version: "0.8.19",
version: "0.8.23",
settings: {
optimizer: {
enabled: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/automation-contracts/scheduler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"check-updates": "ncu --target minor"
},
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@openzeppelin/contracts": "4.9.5",
"@superfluid-finance/ethereum-contracts": "1.9.0",
"@superfluid-finance/metadata": "1.1.27"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { UUPSProxiable } from "../upgradability/UUPSProxiable.sol";
import { ISuperAgreement } from "../interfaces/superfluid/ISuperAgreement.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {
ISuperfluid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {
ISuperfluid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPLv3
// solhint-disable not-rely-on-time
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
import { IPoolAdminNFT } from "../../interfaces/agreements/gdav1/IPoolAdminNFT.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
import { IPoolMemberNFT } from "../../interfaces/agreements/gdav1/IPoolMemberNFT.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

// Notes: We use reserved slots for upgradable contracts.
// solhint-disable max-states-count
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPLv3
// solhint-disable not-rely-on-time
pragma solidity 0.8.19;
pragma solidity 0.8.23;

// Notes: We use these interfaces in natspec documentation below, grep @inheritdoc
// solhint-disable-next-line no-unused-import
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { BeaconProxy } from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
import { ISuperfluidToken } from "../../interfaces/superfluid/ISuperfluidToken.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPLv3
// solhint-disable not-rely-on-time
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { BeaconProxiable } from "../../upgradability/BeaconProxiable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {
ISuperfluid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { UUPSProxy } from "../upgradability/UUPSProxy.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { IRelayRecipient } from "../interfaces/utils/IRelayRecipient.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/ethereum-contracts/contracts/libs/CallUtils.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

/**
* @title Call utilities library that is absent from the OpenZeppelin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPLv3
// solhint-disable const-name-snakecase
// solhint-disable max-line-length
pragma solidity 0.8.19;
pragma solidity 0.8.23;

/// @dev This is meant to be used by test framework to get the raw bytecode without compiling the origin contract
library ERC1820RegistryCompiled {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { IERC1820Registry } from "@openzeppelin/contracts/utils/introspection/IERC1820Registry.sol";

Expand Down
16 changes: 0 additions & 16 deletions packages/ethereum-contracts/contracts/libs/EventsEmitter.sol

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

/**
* @title Utilities for fixed size data in storage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

/// @title SafeGasLibrary
/// @author Superfluid
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {ISuperfluidToken} from "../interfaces/superfluid/ISuperfluidToken.sol";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
SuperfluidGovernanceConfigs
} from "../interfaces/superfluid/ISuperfluid.sol";

pragma solidity 0.8.19;
pragma solidity 0.8.23;

library SolvencyHelperLibrary {
function decode3PsData(ISuperfluid host, ISuperfluidToken token)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {
ISuperfluid,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import {
ISuperfluid, ISuperfluidToken, ISuperToken, IConstantFlowAgreementV1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPLv3
// solhint-disable reason-string
// solhint-disable not-rely-on-time
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { IConstantFlowAgreementV1, IGeneralDistributionAgreementV1, ISuperfluid }
from "../interfaces/superfluid/ISuperfluid.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { CallUtils } from "../libs/CallUtils.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { CallUtils } from "../libs/CallUtils.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: AGPLv3
pragma solidity 0.8.19;
pragma solidity 0.8.23;

import { ISuperfluid, ISuperToken } from "../interfaces/superfluid/ISuperfluid.sol";
import { SuperAppBaseFlow } from "../apps/SuperAppBaseFlow.sol";
Expand Down
Loading
Loading