Merge pull request #146 from valory-xyz/staking

test and chore: updating tests accounting for staking implementation
valory-xyz · Oct 31, 2024 · feddebf · feddebf
2 parents 0a4d9f2 + 7f0f5b1
commit feddebf
Show file tree

Hide file tree

Showing 15 changed files with 1,042 additions and 634 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -8,7 +8,10 @@ on:
 jobs:
   build:
     continue-on-error: False
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
+    concurrency: 1
+    env:
+      PROPTEST_MAX_SHRINK_ITERS: 1000
     steps:
       - name: Checkout repository and submodules
         uses: actions/checkout@v3
@@ -45,7 +48,7 @@ jobs:
 
       # Compile the code and run foundry tests
       - name: Run foundry tests
-        run: forge test --hh -vvv
+        run: forge test --hh -vv --match-test testTokenomicsBasic
 
   scan:
     name: gitleaks

diff --git a/contracts/AutonolasGovernance.sol b/contracts/AutonolasGovernance.sol
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.25;
 
 // Importing all the necessary Autonolas governance contracts
 import {buOLAS} from "../lib/autonolas-governance/contracts/buOLAS.sol";
-import "../lib/autonolas-governance/contracts/OLAS.sol";
-import "../lib/autonolas-governance/contracts/GovernorOLAS.sol";
-import "../lib/autonolas-governance/contracts/Timelock.sol";
-import "../lib/autonolas-governance/contracts/veOLAS.sol";
-import {wveOLAS} from "../lib/autonolas-governance/contracts/wveOLAS.sol";
+import {OLAS} from "../lib/autonolas-governance/contracts/OLAS.sol";
+import {GovernorOLAS} from "../lib/autonolas-governance/contracts/GovernorOLAS.sol";
+import {Timelock} from "../lib/autonolas-governance/contracts/Timelock.sol";
+import {veOLAS} from "../lib/autonolas-governance/contracts/veOLAS.sol";
+import {wveOLAS} from "../lib/autonolas-governance/contracts/wveOLAS.sol";
+import {VoteWeighting} from "../lib/autonolas-governance/contracts/VoteWeighting.sol";
diff --git a/contracts/AutonolasRegistries.sol b/contracts/AutonolasRegistries.sol
@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity ^0.8.25;
 
 // Importing all the necessary Autonolas registries contracts
-import "../lib/autonolas-registries/contracts/AgentRegistry.sol";
-import "../lib/autonolas-registries/contracts/ComponentRegistry.sol";
-import "../lib/autonolas-registries/contracts/RegistriesManager.sol";
-import "../lib/autonolas-registries/contracts/ServiceManager.sol";
-import "../lib/autonolas-registries/contracts/ServiceRegistry.sol";
+import {AgentRegistry} from "../lib/autonolas-registries/contracts/AgentRegistry.sol";
+import {ComponentRegistry} from "../lib/autonolas-registries/contracts/ComponentRegistry.sol";
+import {RegistriesManager} from "../lib/autonolas-registries/contracts/RegistriesManager.sol";
+import {ServiceManager} from "../lib/autonolas-registries/contracts/ServiceManager.sol";
+import {ServiceRegistry} from "../lib/autonolas-registries/contracts/ServiceRegistry.sol";
 import {GnosisSafeMultisig} from "../lib/autonolas-registries/contracts/multisigs/GnosisSafeMultisig.sol";
-import {GnosisSafeSameAddressMultisig} from "../lib/autonolas-registries/contracts/multisigs/GnosisSafeSameAddressMultisig.sol";
+import {GnosisSafeSameAddressMultisig} from "../lib/autonolas-registries/contracts/multisigs/GnosisSafeSameAddressMultisig.sol";
+import {StakingActivityChecker} from "../lib/autonolas-registries/contracts/staking/StakingActivityChecker.sol";
+import {StakingFactory} from "../lib/autonolas-registries/contracts/staking/StakingFactory.sol";
+import {StakingToken} from "../lib/autonolas-registries/contracts/staking/StakingToken.sol";
diff --git a/contracts/AutonolasTokenomics.sol b/contracts/AutonolasTokenomics.sol
@@ -1,11 +1,17 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.18;
+pragma solidity ^0.8.25;
 
 // Importing all the necessary Autonolas tokenomics contracts
-import "../lib/autonolas-tokenomics/contracts/DonatorBlacklist.sol";
+import {DonatorBlacklist} from "../lib/autonolas-tokenomics/contracts/DonatorBlacklist.sol";
 import {GenericBondCalculator} from "../lib/autonolas-tokenomics/contracts/GenericBondCalculator.sol";
-import "../lib/autonolas-tokenomics/contracts/Depository.sol";
-import "../lib/autonolas-tokenomics/contracts/Dispenser.sol";
-import "../lib/autonolas-tokenomics/contracts/Tokenomics.sol";
-import "../lib/autonolas-tokenomics/contracts/TokenomicsProxy.sol";
-import "../lib/autonolas-tokenomics/contracts/Treasury.sol";
+import {Depository} from "../lib/autonolas-tokenomics/contracts/Depository.sol";
+import {Dispenser} from "../lib/autonolas-tokenomics/contracts/Dispenser.sol";
+import {Tokenomics} from "../lib/autonolas-tokenomics/contracts/Tokenomics.sol";
+import {TokenomicsProxy} from "../lib/autonolas-tokenomics/contracts/TokenomicsProxy.sol";
+import {Treasury} from "../lib/autonolas-tokenomics/contracts/Treasury.sol";
+import {BridgeRelayer} from "../lib/autonolas-tokenomics/contracts/staking/test/BridgeRelayer.sol";
+import {EthereumDepositProcessor} from "../lib/autonolas-tokenomics/contracts/staking/EthereumDepositProcessor.sol";
+import {GnosisDepositProcessorL1} from "../lib/autonolas-tokenomics/contracts/staking/GnosisDepositProcessorL1.sol";
+import {GnosisTargetDispenserL2} from "../lib/autonolas-tokenomics/contracts/staking/GnosisTargetDispenserL2.sol";
+import {MockDepositProcessorL1} from "../lib/autonolas-tokenomics/contracts/staking/test/MockDepositProcessorL1.sol";
+import {MockStakingDispenser} from "../lib/autonolas-tokenomics/contracts/staking/test/MockStakingDispenser.sol";
diff --git a/hardhat.config.js b/hardhat.config.js
@@ -14,9 +14,6 @@ const accounts = {
 };
 
 module.exports = {
-    gasReporter: {
-        enabled: true
-    },
     networks: {
         local: {
             url: "http://localhost:8545",
@@ -29,13 +26,14 @@ module.exports = {
     solidity: {
         compilers: [
             {
-                version: "0.8.23",
+                version: "0.8.28",
                 settings: {
                     optimizer: {
                         enabled: true,
                         runs: 100,
                     },
                 },
+                evmVersion: "cancun"
             },
             {
                 version: "0.5.16", // uniswap
@@ -44,5 +42,8 @@ module.exports = {
                 version: "0.6.6", // uniswap
             }
         ]
+    },
+    gasReporter: {
+        enabled: true
     }
 };
diff --git a/lib/autonolas-governance b/lib/autonolas-governance
diff --git a/lib/autonolas-registries b/lib/autonolas-registries
diff --git a/lib/autonolas-tokenomics b/lib/autonolas-tokenomics
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -21,32 +21,32 @@
   "devDependencies": {
     "@gnosis.pm/safe-contracts": "^1.3.0",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
-    "@nomicfoundation/hardhat-toolbox": "^2.0.1",
-    "@nomiclabs/hardhat-ethers": "^2.2.2",
-    "@nomiclabs/hardhat-etherscan": "^3.1.6",
-    "@typechain/ethers-v5": "^10.2.0",
-    "@typechain/hardhat": "^6.1.5",
-    "@types/mocha": "^10.0.1",
-    "chai": "^4.3.7",
-    "eslint": "^8.34.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.9",
+    "@nomicfoundation/hardhat-toolbox": "^2.0.2",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@typechain/ethers-v5": "^11.1.2",
+    "@typechain/hardhat": "^9.1.0",
+    "@types/mocha": "^10.0.3",
+    "chai": "^4.3.10",
+    "eslint": "^8.52.0",
     "ethers": "^5.7.2",
-    "hardhat": "^2.14.0",
-    "hardhat-contract-sizer": "^2.8.0",
-    "hardhat-deploy": "^0.11.23",
+    "hardhat": "^2.22.15",
+    "hardhat-contract-sizer": "^2.10.0",
+    "hardhat-deploy": "^0.11.43",
     "hardhat-gas-reporter": "^1.0.9",
-    "solidity-coverage": "^0.8.2",
+    "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.1",
     "typescript": "^4.9.5"
   },
   "dependencies": {
     "@openzeppelin/contracts": "=4.8.3",
-    "@prb/math": "^4.0.0",
+    "@prb/math": "=4.0.2",
     "@uniswap/lib": "^4.0.1-alpha",
     "@uniswap/v2-core": "^1.0.1",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "canonical-weth": "^1.4.0",
-    "solhint": "^3.4.0"
+    "solhint": "^3.6.2"
   }
 }
diff --git a/test/NodeDeployment.js b/test/NodeDeployment.js
@@ -36,6 +36,11 @@ describe("Node deployment", function () {
         const epochLen = oneMonth;
         const supplyProductOLAS =  "20" + decimals;
         const vesting = oneWeek;
+        const maxNumClaimingEpochs = 10;
+        const maxNumStakingTargets = 100;
+        const defaultMinStakingWeight = 100;
+        const defaultMaxStakingIncentive = ethers.utils.parseEther("1");
+        const retainer = "0x" + "0".repeat(24) + "5".repeat(40);
 
         const signers = await ethers.getSigners();
         const deployer = signers[0];
@@ -271,7 +276,8 @@ describe("Node deployment", function () {
         await depository.deployed();
         // Deploy dispenser contract
         const Dispenser = await ethers.getContractFactory("Dispenser");
-        const dispenser = await Dispenser.deploy(tokenomics.address, treasury.address);
+        const dispenser = await Dispenser.deploy(olas.address, tokenomics.address, treasury.address, deployer.address,
+            retainer, maxNumClaimingEpochs, maxNumStakingTargets, defaultMinStakingWeight, defaultMaxStakingIncentive);
         await dispenser.deployed();
         // Change to the correct addresses
         await tokenomics.changeManagers(treasury.address, depository.address, dispenser.address);
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+193 −0		CONTRIBUTING.md
+18 −2		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+12 −1		scripts/vm.py
+518 −225		src/StdAssertions.sol
+24 −9		src/StdChains.sol
+3 −3		src/StdCheats.sol
+18 −3		src/StdInvariant.sol
+111 −11		src/StdJson.sol
+202 −107		src/StdStorage.sol
+283 −0		src/StdToml.sol
+1 −1		src/StdUtils.sol
+4 −4		src/Test.sol
+1,020 −59		src/Vm.sol
+635 −608		src/console.sol
+1 −1,555		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+51 −33		src/mocks/MockERC20.sol
+46 −36		src/mocks/MockERC721.sol
+693 −4		src/safeconsole.sol
+39 −909		test/StdAssertions.t.sol
+50 −38		test/StdChains.t.sol
+27 −19		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+12 −22		test/StdMath.t.sol
+170 −14		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+26 −26		test/StdUtils.t.sol
+9 −6		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol