Dynamic reward token: Finalized test cases

.gas-snapshot

@@ -0,0 +1,36 @@
+StakingRewardsTest:testCannotPassRequireChecksNotifyRewardAmount() (gas: 3015577)
+StakingRewardsTest:testCannotStakePermitWithZero() (gas: 3746883)
+StakingRewardsTest:testCannotStakeZero() (gas: 42111)
+StakingRewardsTest:testCannotWithdrawZero() (gas: 32514)
+StakingRewardsTest:testEarnedValue() (gas: 268493)
+StakingRewardsTest:testEarnedValueWithMultipleUsers() (gas: 491204)
+StakingRewardsTest:testExitFunction() (gas: 266016)
+StakingRewardsTest:testGetReward() (gas: 211491)
+StakingRewardsTest:testMultipleStake() (gas: 370690)
+StakingRewardsTest:testRewardPerTokenPaidAfterStakes() (gas: 261057)
+StakingRewardsTest:testStake() (gas: 212525)
+StakingRewardsTest:testStakeFuzz(uint128) (runs: 1000, μ: 112512, ~: 115061)
+StakingRewardsTest:testStakeWithPermit() (gas: 3846052)
+StakingRewardsTest:testTotalSupply() (gas: 353490)
+StakingRewardsTest:testValuesBeforeFirstStake() (gas: 22753)
+StakingRewardsTest:testValuesFirstAfterStake() (gas: 121683)
+StakingRewardsTest:testWithdraw() (gas: 120652)
+StakingRewardsFactoryTest:testCannotDeployWithInvalidAddress() (gas: 1330588)
+StakingRewardsFactoryTest:testCannotDeployWithSameAddresses() (gas: 16070)
+StakingRewardsFactoryTest:testCannotDeployWithZeroAddress() (gas: 1311838)
+StakingRewardsFactoryTest:testCannotDeployWithZeroAmount() (gas: 20296)
+StakingRewardsFactoryTest:testCannotNotifyRewardAmounts() (gas: 12994)
+StakingRewardsFactoryTest:testCannotTestNotifyRewardAmount() (gas: 1243472)
+StakingRewardsFactoryTest:testCannotTestNotifyRewardAmountWithZeroAddress() (gas: 1245704)
+StakingRewardsFactoryTest:testCannotUpdateStakingContract() (gas: 18119)
+StakingRewardsFactoryTest:testCannotUpdateStakingContractWithOwner() (gas: 18511)
+StakingRewardsFactoryTest:testDeployStakingRewardsContract() (gas: 1308783)
+StakingRewardsFactoryTest:testEmitDeploy() (gas: 1235487)
+StakingRewardsFactoryTest:testEmitUpdate() (gas: 1342066)
+StakingRewardsFactoryTest:testNotifyRewardAmount() (gas: 1896349)
+StakingRewardsFactoryTest:testNotifyRewardAmounts() (gas: 9284619)
+StakingRewardsFactoryTest:testPullErc20RandomToken() (gas: 1932168)
+StakingRewardsFactoryTest:testPullErc20RewardToken() (gas: 1315654)
+StakingRewardsFactoryTest:testStakingRewardsInfo() (gas: 1211665)
+StakingRewardsFactoryTest:testUpdateStakingContract() (gas: 1327606)
+StakingRewardsFactoryTest:testUpdatedNotifyRewardAmount() (gas: 1968825)

.gas-snapshot 1

@@ -0,0 +1,36 @@
+StakingRewardsTest:testCannotPassRequireChecksNotifyRewardAmount() (gas: 2981890)
+StakingRewardsTest:testCannotStakePermitWithZero() (gas: 3713174)
+StakingRewardsTest:testCannotStakeZero() (gas: 42111)
+StakingRewardsTest:testCannotWithdrawZero() (gas: 32514)
+StakingRewardsTest:testEarnedValue() (gas: 250748)
+StakingRewardsTest:testEarnedValueWithMultipleUsers() (gas: 473460)
+StakingRewardsTest:testExitFunction() (gas: 248253)
+StakingRewardsTest:testGetReward() (gas: 189310)
+StakingRewardsTest:testMultipleStake() (gas: 370690)
+StakingRewardsTest:testRewardPerTokenPaidAfterStakes() (gas: 243312)
+StakingRewardsTest:testStake() (gas: 190344)
+StakingRewardsTest:testStakeFuzz(uint128) (runs: 1000, μ: 112512, ~: 115061)
+StakingRewardsTest:testStakeWithPermit() (gas: 3812343)
+StakingRewardsTest:testTotalSupply() (gas: 353490)
+StakingRewardsTest:testValuesBeforeFirstStake() (gas: 22731)
+StakingRewardsTest:testValuesFirstAfterStake() (gas: 121661)
+StakingRewardsTest:testWithdraw() (gas: 120652)
+StakingRewardsFactoryTest:testCannotDeployWithInvalidAddress() (gas: 1313743)
+StakingRewardsFactoryTest:testCannotDeployWithSameAddresses() (gas: 16070)
+StakingRewardsFactoryTest:testCannotDeployWithZeroAddress() (gas: 1294993)
+StakingRewardsFactoryTest:testCannotDeployWithZeroAmount() (gas: 20296)
+StakingRewardsFactoryTest:testCannotNotifyRewardAmounts() (gas: 12994)
+StakingRewardsFactoryTest:testCannotTestNotifyRewardAmount() (gas: 1226627)
+StakingRewardsFactoryTest:testCannotTestNotifyRewardAmountWithZeroAddress() (gas: 1228859)
+StakingRewardsFactoryTest:testCannotUpdateStakingContract() (gas: 18119)
+StakingRewardsFactoryTest:testCannotUpdateStakingContractWithOwner() (gas: 18511)
+StakingRewardsFactoryTest:testDeployStakingRewardsContract() (gas: 1291938)
+StakingRewardsFactoryTest:testEmitDeploy() (gas: 1218642)
+StakingRewardsFactoryTest:testEmitUpdate() (gas: 1325221)
+StakingRewardsFactoryTest:testNotifyRewardAmount() (gas: 1879504)
+StakingRewardsFactoryTest:testNotifyRewardAmounts() (gas: 9200394)
+StakingRewardsFactoryTest:testPullErc20RandomToken() (gas: 1915323)
+StakingRewardsFactoryTest:testPullErc20RewardToken() (gas: 1298809)
+StakingRewardsFactoryTest:testStakingRewardsInfo() (gas: 1194820)
+StakingRewardsFactoryTest:testUpdateStakingContract() (gas: 1310761)
+StakingRewardsFactoryTest:testUpdatedNotifyRewardAmount() (gas: 1951936)

.github/workflows/test.yml

@@ -1,19 +1,9 @@
-name: test
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
+on: [push]
 
-env:
-  FOUNDRY_PROFILE: ci
+name: test
 
 jobs:
-  foundry:
-    strategy:
-      fail-fast: true
-
+  check:
     name: Foundry project
     runs-on: ubuntu-latest
     steps:
@@ -26,39 +16,5 @@ jobs:
         with:
           version: nightly
 
-      - name: Run Forge build
-        run: |
-          forge --version
-          forge build --sizes
-        id: build
-
-      - name: Run Forge tests
-        run: |
-          forge test -vvv
-        id: forge-test
-
-  hardhat:
-    strategy:
-      fail-fast: true
-
-    name: Hardhat project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Setup Node 16
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
-          cache: 'npm'
-
-      - name: Install Node dependencies
-        run: |
-          npm ci
-
-      - name: Run Hardhat tests
-        run: |
-          npm run test
-        id: hardhat-test
+      - name: Run tests
+        run: forge test -vvv

.gitignore

@@ -3,6 +3,7 @@ cache/
 out/
 lib
 broadcast/
+bin/
 
 # JS
 node_modules/
@@ -14,4 +15,5 @@ artifacts/
 #Hardhat plugin files
 typechain-types/
 
-.env
+.env
+lcov.info

foundry.toml

@@ -3,6 +3,10 @@ src = 'src'
 solc = "0.7.6"
 out = 'out'
 libs = ['lib']
+[fuzz]
+runs = 1000
+gas_reports = ["StakingRewards", "StakingRewardsFactory"]
+
 
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config
 

hardhat.config.ts

@@ -4,7 +4,6 @@ import "@typechain/hardhat";
 import "hardhat-preprocessor";
 import { HardhatUserConfig, task } from "hardhat/config";
 
-import example from "./tasks/example";
 
 function getRemappings() {
   return fs
@@ -14,7 +13,6 @@ function getRemappings() {
     .map((line) => line.trim().split("="));
 }
 
-task("example", "Example task").setAction(example);
 
 const config: HardhatUserConfig = {
   solidity: {

package.json

@@ -7,8 +7,12 @@
     "test": "test"
   },
   "scripts": {
-    "test": "hardhat test",
-    "deploy-stakingRewardsFactory":"forge script script/StakingRewardsFactory.s.sol:StakingRewardsFactory --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv"
+    "test": "clear && forge test -vv",
+    "test-mainnet": "forge test --fork-url $ETH_RPC_URL -vv",
+    "logtest": "clear && forge test -vvvv",
+    "deploy-stakingRewardsFactory": "./bin/deployStakingRewardsFactory.sh",
+    "deploy-stakingDualRewardsFactory": "./bin/deployStakingDualRewardsFactory.sh"
+
   },
   "author": "Devan Non <[email protected]>",
   "license": "Apache-2.0",
@@ -22,7 +26,7 @@
     "@types/node": "^17.0.35",
     "chai": "^4.3.6",
     "ethereum-waffle": "^3.2.0",
-    "ethers": "^5.6.6",
+    "ethers": "^5.7.2",
     "hardhat": "^2.9.5",
     "hardhat-preprocessor": "^0.1.4",
     "ts-node": "^10.7.0",

remappings.txt

@@ -1,4 +1,4 @@
 forge-std/=lib/forge-std/src/
 solmate/=lib/solmate/src/
 ds-test/=lib/forge-std/lib/ds-test/src/
-openzeppelin/=lib/openzeppelin-contracts/
+openzeppelin-contracts/=lib/openzeppelin-contracts/

script/StakingDualRewardsFactory.s.sol

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.7.6;
+
+import "forge-std/Script.sol";
+import "../src/StakingDualRewardsFactory.sol";
+import "../src/interfaces/IERC20.sol";
+
+contract DeployStakingDualRewardsFactoryScript is Script {
+    // Vm hevm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
+    address rewardsTokenA = 0x1837d2285980853b0fe02AaD766a9403e311a4f4;
+    address rewardsTokenB = 0xd056Deaa25C6D5C7A93D5EAC37Bb78b5265D2e15;
+    address stakingToken = 0x0737593086022272629670bBd207918ea9189484;
+    uint256 stakingRewardsGenesis = block.timestamp + 1 minutes;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PKEY");
+        vm.startBroadcast(deployerPrivateKey);
+
+        StakingDualRewardsFactory stakingDualRewardsFactory = new StakingDualRewardsFactory(
+                stakingRewardsGenesis
+            );
+
+        IERC20(rewardsTokenA).transfer(
+            address(stakingDualRewardsFactory),
+            100e18
+        );
+        IERC20(rewardsTokenB).transfer(
+            address(stakingDualRewardsFactory),
+            100e18
+        );
+
+        vm.stopBroadcast();
+    }
+}

script/StakingRewardsFactory.s.sol

@@ -3,40 +3,35 @@ pragma solidity ^0.7.6;
 
 import "forge-std/Script.sol";
 import "../src/StakingRewardsFactory.sol";
+import "../src/interfaces/IERC20.sol";
 
 contract DeployStakingRewardsFactoryScript is Script {
+    // Vm hevm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
     address rewardsToken = 0x4fC1263815Ab1E8fD97EC5010A7B4694dA6F593F;
-    uint stakingRewardsGenesis = block.timestamp + 5 minutes;
+    address stakingToken = 0xfBB9a726ed78631b7766E02f84cf2e40345D8083;
+    uint256 stakingRewardsGenesis = block.timestamp + 1 minutes;
 
     function run() external {
-        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        uint256 deployerPrivateKey = vm.envUint("PKEY");
         vm.startBroadcast(deployerPrivateKey);
 
-        StakingRewardsFactory stakingRewardsFactory = new StakingRewardsFactory(rewardsToken, stakingRewardsGenesis);
+        StakingRewardsFactory stakingRewardsFactory = new StakingRewardsFactory(
+            stakingRewardsGenesis
+        );
 
-        vm.stopBroadcast();
-    }
-}
-
-// contract DeployStakingRewardsScript is Script {
-//     address rewardsToken = 0x4fC1263815Ab1E8fD97EC5010A7B4694dA6F593F;
-//     uint stakingRewardsGenesis = 0;
+        // IERC20(rewardsToken).transfer(address(stakingRewardsFactory), 100e18);
 
-//     function run() external {
-//         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
-//         vm.startBroadcast(deployerPrivateKey);
+        // vm.stopBroadcast();
 
-//         StakingRewardsFactory stakingRewardsFactory = new StakingRewardsFactory(rewardsToken, stakingRewardsGenesis);
+        // vm.startBroadcast(deployerPrivateKey);
+        // stakingRewardsFactory.deploy(
+        //     stakingToken,
+        //     rewardsToken,
+        //     100e18,
+        //     block.timestamp + 10 days
+        // );
 
-//         vm.stopBroadcast();
-//     }
-// }
-
-// forge create --rpc-url https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161
-// --private-key 4ef58c0f2dfe941a2c8c173ef3c98ea2f7575be2c7e67341e0e0b27464859dc7
-//  src/StakingRewardsFactory.sol:StakingRewards
-//   --constructor-args 0x97ff40b5678d2234b1e5c894b5f39b8ba8535431
-//   0x4fC1263815Ab1E8fD97EC5010A7B4694dA6F593F
-//   0xfBB9a726ed78631b7766E02f84cf2e40345D8083
-//   --etherscan-api-key GSWUYPSZGBKJ168A2M78TF7VUA97AP6G22
-//   --verify
+        // stakingRewardsFactory.notifyRewardAmounts();
+        vm.stopBroadcast();
+    }
+}