Skip to content

Commit

Permalink
Merge pull request #167 from corpus-io/feature/useYulOptimizer
Browse files Browse the repository at this point in the history 
use yul pipeline for improved optimization
  • Loading branch information
@malteish
malteish authored Jul 12, 2023
2 parents 5922585 + 1910bb6 commit 9600dbb
Show file tree
Hide file tree
Showing 4 changed files with 175 additions and 65 deletions.
8 changes: 7 additions & 1 deletion foundry.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
fuzz-runs = 10_000

[profile.default]
# via-ir = true # Enable the IR-based optimizer (yul)
via-ir = true # Enable the IR-based optimizer (yul)
optimizer = true
bytecode_hash = "none" # prevents compiler from attaching bytecode hash to contract metadata

[profile.fastDev]
via-ir = false # Enable the IR-based optimizer (yul)
optimizer = true
optimizer_runs = 10_000

gas_reports = ["AllowList", "ContinuousFundraising", "FeeSettings", "PersonalInvite", "PersonalInviteFactory", "Token"]

[rpc_endpoints]
Expand Down
49 changes: 30 additions & 19 deletions hardhat.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { HardhatUserConfig, task } from "hardhat/config";
import { HardhatUserConfig, task } from 'hardhat/config';

import "dotenv/config";
import "hardhat-gas-reporter";
import "@nomiclabs/hardhat-etherscan";
import "@typechain/hardhat";
import "@nomiclabs/hardhat-ethers";
import "@nomiclabs/hardhat-waffle";
import 'dotenv/config';
import 'hardhat-gas-reporter';
import '@nomiclabs/hardhat-etherscan';
import '@typechain/hardhat';
import '@nomiclabs/hardhat-ethers';
import '@nomiclabs/hardhat-waffle';

// require("@nomiclabs/hardhat-waffle");
// require("hardhat-gas-reporter");
Expand All @@ -14,7 +14,7 @@ import "@nomiclabs/hardhat-waffle";

// This is a sample Hardhat task. To learn how to create your own go to
// https://hardhat.org/guides/create-task.html
task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
task('accounts', 'Prints the list of accounts', async (taskArgs, hre) => {
const accounts = await hre.ethers.getSigners();

for (const account of accounts) {
Expand All @@ -30,48 +30,59 @@ task("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
*/
const config: HardhatUserConfig = {
solidity: {
version: "0.8.17",
version: '0.8.17',
settings: {
// optimizer: {
// enabled: true,
// runs: 10000,
// },
metadata: {
bytecodeHash: 'none',
},
viaIR: true,
optimizer: {
enabled: true,
runs: 10000,
details: {
yulDetails: {
//optimizerSteps: 'u', // recommended by hh, but yields longer bytecode
},
},
},
// viaIR: true,
// outputSelection: { "*": { "*": ["storageLayout"] } },
},
},
networks: {
localhost: {
url: "http://localhost:8545",
url: 'http://localhost:8545',
},
ropsten: {
url: process.env.ROPSTEN_URL || "",
url: process.env.ROPSTEN_URL || '',
accounts:
process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [],
},
goerli: {
url: process.env.GOERLI_RPC_URL || "",
url: process.env.GOERLI_RPC_URL || '',
accounts:
process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [],
},
mainnet: {
url: process.env.MAINNET_RPC_URL || "",
url: process.env.MAINNET_RPC_URL || '',
accounts:
process.env.PRIVATE_KEY !== undefined ? [process.env.PRIVATE_KEY] : [],
},
},
gasReporter: {
enabled: process.env.REPORT_GAS !== undefined,
currency: "USD",
currency: 'USD',
},
etherscan: {
apiKey: process.env.ETHERSCAN_API_KEY,
},
typechain: {
outDir: "types",
target: "ethers-v5",
outDir: 'types',
target: 'ethers-v5',
alwaysGenerateOverloads: false, // should overloads with full signatures like deposit(uint256) be generated always, even if there are no overloads?
externalArtifacts: ["externalArtifacts/*.json"], // optional array of glob patterns with external artifacts to process (for example external libs from node_modules)
externalArtifacts: ['externalArtifacts/*.json'], // optional array of glob patterns with external artifacts to process (for example external libs from node_modules)
dontOverrideCompile: false, // defaults to false
},
};
Expand Down
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 21 files
+29 −0 .github/workflows/sync.yml
+1 −1 foundry.toml
+1 −1 lib/ds-test
+2 −2 package.json
+5 −3 src/Base.sol
+91 −40 src/StdAssertions.sol
+29 −21 src/StdChains.sol
+132 −28 src/StdCheats.sol
+5 −5 src/StdInvariant.sol
+28 −28 src/StdJson.sol
+333 −0 src/StdStyle.sol
+33 −3 src/StdUtils.sol
+5 −1 src/Test.sol
+108 −11 src/Vm.sol
+394 −382 src/console2.sol
+13,248 −0 src/safeconsole.sol
+176 −0 test/StdAssertions.t.sol
+33 −20 test/StdChains.t.sol
+181 −3 test/StdCheats.t.sol
+110 −0 test/StdStyle.t.sol
+23 −0 test/StdUtils.t.sol
181 changes: 137 additions & 44 deletions test/ContinuousFundraising.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,19 +732,32 @@ contract ContinuousFundraisingTest is Test {
/*
try to unpause too soon after setMaxAmountOfTokenToBeSold
*/
function testFailUnpauseTooSoonAfterSetMaxAmountOfTokenToBeSold() public {
uint256 time = block.timestamp;
vm.warp(time);
function testUnpauseTooSoonAfterSetMaxAmountOfTokenToBeSold(
uint128 startTime,
uint32 changeDelay,
uint32 attemptUnpauseDelay
) public {
uint256 unpauseDelay = raise.delay();
vm.assume(startTime < type(uint128).max / 2);
vm.assume(startTime > 0);
vm.assume(changeDelay > 0);
vm.assume(attemptUnpauseDelay > 0);
vm.assume(attemptUnpauseDelay < unpauseDelay + changeDelay);

vm.warp(startTime);
vm.prank(owner);
raise.pause();
assertTrue(raise.paused());
assertTrue(raise.coolDownStart() == time);
vm.warp(time + 2 hours);
assertTrue(raise.paused(), "raise should be paused");
assertTrue(raise.coolDownStart() == startTime, "coolDownStart should be startTime");
vm.warp(startTime + changeDelay);
vm.prank(owner);
raise.setMaxAmountOfTokenToBeSold(700);
assertTrue(raise.coolDownStart() == time + 2 hours);
vm.warp(time + raise.delay() + 1 seconds);
assertTrue(raise.coolDownStart() == startTime + changeDelay, "coolDownStart should be startTime + changeDelay");
vm.warp(startTime + attemptUnpauseDelay);
vm.prank(owner);
console.log("current time: ", block.timestamp);
console.log("unpause at: ", startTime + changeDelay + unpauseDelay);
vm.expectRevert("There needs to be at minimum one day to change parameters");
raise.unpause(); // must fail because of the parameter update
}

Expand All @@ -770,19 +783,34 @@ contract ContinuousFundraisingTest is Test {
/*
try to unpause too soon after setCurrencyReceiver
*/
function testFailUnpauseTooSoonAfterSetCurrencyReceiver() public {
uint256 time = block.timestamp;
vm.warp(time);
function testUnpauseTooSoonAfterSetCurrencyReceiver(
uint128 startTime,
uint32 changeDelay,
uint32 attemptUnpauseDelay,
address newCurrencyReceiver
) public {
uint256 unpauseDelay = raise.delay();
vm.assume(startTime < type(uint128).max / 2);
vm.assume(startTime > 0);
vm.assume(changeDelay > 0);
vm.assume(attemptUnpauseDelay > 0);
vm.assume(attemptUnpauseDelay < unpauseDelay + changeDelay);
vm.assume(newCurrencyReceiver != address(0));

vm.warp(startTime);
vm.prank(owner);
raise.pause();
assertTrue(raise.paused());
assertTrue(raise.coolDownStart() == time);
vm.warp(time + 2 hours);
assertTrue(raise.paused(), "raise should be paused");
assertTrue(raise.coolDownStart() == startTime, "coolDownStart should be startTime");
vm.warp(startTime + changeDelay);
vm.prank(owner);
raise.setCurrencyReceiver(payable(address(buyer)));
assertTrue(raise.coolDownStart() == time + 2 hours);
vm.warp(time + raise.delay() + 1 hours);
raise.setCurrencyReceiver(newCurrencyReceiver);
assertTrue(raise.coolDownStart() == startTime + changeDelay, "coolDownStart should be startTime + changeDelay");
vm.warp(startTime + attemptUnpauseDelay);
vm.prank(owner);
console.log("current time: ", block.timestamp);
console.log("unpause at: ", startTime + changeDelay + unpauseDelay);
vm.expectRevert("There needs to be at minimum one day to change parameters");
raise.unpause(); // must fail because of the parameter update
}

Expand All @@ -808,19 +836,35 @@ contract ContinuousFundraisingTest is Test {
/*
try to unpause too soon after setMinAmountPerBuyer
*/
function testFailUnpauseTooSoonAfterSetMinAmountPerBuyer() public {
uint256 time = block.timestamp;
vm.warp(time);
function testUnpauseTooSoonAfterSetMinAmountPerBuyer(
uint128 startTime,
uint32 changeDelay,
uint32 attemptUnpauseDelay,
uint256 newMinAmountPerBuyer
) public {
uint256 unpauseDelay = raise.delay();
vm.assume(startTime < type(uint128).max / 2);
vm.assume(startTime > 0);
vm.assume(changeDelay > 0);
vm.assume(attemptUnpauseDelay > 0);
vm.assume(attemptUnpauseDelay < unpauseDelay + changeDelay);
vm.assume(newMinAmountPerBuyer > 0);
vm.assume(newMinAmountPerBuyer <= raise.maxAmountPerBuyer());

vm.warp(startTime);
vm.prank(owner);
raise.pause();
assertTrue(raise.paused());
assertTrue(raise.coolDownStart() == time);
vm.warp(time + 2 hours);
assertTrue(raise.paused(), "raise should be paused");
assertTrue(raise.coolDownStart() == startTime, "coolDownStart should be startTime");
vm.warp(startTime + changeDelay);
vm.prank(owner);
raise.setMinAmountPerBuyer(700);
assertTrue(raise.coolDownStart() == time + 2 hours);
vm.warp(time + raise.delay() + 1 hours);
raise.setMinAmountPerBuyer(newMinAmountPerBuyer);
assertTrue(raise.coolDownStart() == startTime + changeDelay, "coolDownStart should be startTime + changeDelay");
vm.warp(startTime + attemptUnpauseDelay);
vm.prank(owner);
console.log("current time: ", block.timestamp);
console.log("unpause at: ", startTime + changeDelay + unpauseDelay);
vm.expectRevert("There needs to be at minimum one day to change parameters");
raise.unpause(); // must fail because of the parameter update
}

Expand All @@ -846,19 +890,34 @@ contract ContinuousFundraisingTest is Test {
/*
try to unpause too soon after setMaxAmountPerBuyer
*/
function testFailUnpauseTooSoonAfterSetMaxAmountPerBuyer() public {
uint256 time = block.timestamp;
vm.warp(time);
function testUnpauseTooSoonAfterSetMaxAmountPerBuyer(
uint128 startTime,
uint32 changeDelay,
uint32 attemptUnpauseDelay,
uint256 newMaxAmountPerBuyer
) public {
uint256 unpauseDelay = raise.delay();
vm.assume(startTime < type(uint128).max / 2);
vm.assume(startTime > 0);
vm.assume(changeDelay > 0);
vm.assume(attemptUnpauseDelay > 0);
vm.assume(attemptUnpauseDelay < unpauseDelay + changeDelay);
vm.assume(newMaxAmountPerBuyer >= raise.minAmountPerBuyer());

vm.warp(startTime);
vm.prank(owner);
raise.pause();
assertTrue(raise.paused());
assertTrue(raise.coolDownStart() == time);
vm.warp(time + 2 hours);
assertTrue(raise.paused(), "raise should be paused");
assertTrue(raise.coolDownStart() == startTime, "coolDownStart should be startTime");
vm.warp(startTime + changeDelay);
vm.prank(owner);
raise.setMaxAmountPerBuyer(700);
assertTrue(raise.coolDownStart() == time + 2 hours);
vm.warp(time + raise.delay() + 1 hours);
raise.setMaxAmountPerBuyer(newMaxAmountPerBuyer);
assertTrue(raise.coolDownStart() == startTime + changeDelay, "coolDownStart should be startTime + changeDelay");
vm.warp(startTime + attemptUnpauseDelay);
vm.prank(owner);
console.log("current time: ", block.timestamp);
console.log("unpause at: ", startTime + changeDelay + unpauseDelay);
vm.expectRevert("There needs to be at minimum one day to change parameters");
raise.unpause(); // must fail because of the parameter update
}

Expand All @@ -881,22 +940,56 @@ contract ContinuousFundraisingTest is Test {
raise.unpause();
}

// /*
// try to unpause too soon after setCurrencyAndTokenPrice
// */
// function testUnpauseTooSoonAfterSetCurrencyAndTokenPrice() public {
// uint256 time = block.timestamp;
// vm.warp(time);
// vm.prank(owner);
// raise.pause();
// assertTrue(raise.paused());
// assertTrue(raise.coolDownStart() == time);
// vm.warp(time + 2 hours);
// vm.prank(owner);
// raise.setCurrencyAndTokenPrice(paymentToken, 700);
// assertTrue(raise.coolDownStart() == time + 2 hours);
// vm.warp(time + raise.delay() + 1 hours);
// vm.prank(owner);
// vm.expectRevert("There needs to be at minimum one day to change parameters");
// raise.unpause(); // must fail because of the parameter update
// }

/*
try to unpause too soon after setCurrencyAndTokenPrice
*/
function testUnpauseTooSoonAfterSetCurrencyAndTokenPrice() public {
uint256 time = block.timestamp;
vm.warp(time);
function testUnpauseTooSoonAfterSetCurrencyAndTokenPrice(
uint128 startTime,
uint32 changeDelay,
uint32 attemptUnpauseDelay,
uint256 newTokenPrice
) public {
uint256 unpauseDelay = raise.delay();
vm.assume(startTime < type(uint128).max / 2);
vm.assume(startTime > 0);
vm.assume(changeDelay > 0);
vm.assume(attemptUnpauseDelay > 0);
vm.assume(attemptUnpauseDelay < unpauseDelay + changeDelay);
vm.assume(newTokenPrice > 0);

vm.warp(startTime);
vm.prank(owner);
raise.pause();
assertTrue(raise.paused());
assertTrue(raise.coolDownStart() == time);
vm.warp(time + 2 hours);
assertTrue(raise.paused(), "raise should be paused");
assertTrue(raise.coolDownStart() == startTime, "coolDownStart should be startTime");
vm.warp(startTime + changeDelay);
vm.prank(owner);
raise.setCurrencyAndTokenPrice(paymentToken, 700);
assertTrue(raise.coolDownStart() == time + 2 hours);
vm.warp(time + raise.delay() + 1 hours);
raise.setCurrencyAndTokenPrice(paymentToken, newTokenPrice);
assertTrue(raise.coolDownStart() == startTime + changeDelay, "coolDownStart should be startTime + changeDelay");
vm.warp(startTime + attemptUnpauseDelay);
vm.prank(owner);
console.log("current time: ", block.timestamp);
console.log("unpause at: ", startTime + changeDelay + unpauseDelay);
vm.expectRevert("There needs to be at minimum one day to change parameters");
raise.unpause(); // must fail because of the parameter update
}
Expand Down

0 comments on commit 9600dbb

Please sign in to comment.