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.

Sign up for GitHub

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

refactor and test: adjusting to the last version of registries #13

Merged
merged 1 commit into from
Jan 23, 2024
Merged

refactor and test: adjusting to the last version of registries #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1,113 changes: 0 additions & 1,113 deletions abis/0.8.21/ServiceStakingMechUsage.json
View file
Open in desktop

This file was deleted.

1,216 changes: 0 additions & 1,216 deletions abis/0.8.21/ServiceStakingTokenMechUsage.json
View file
Open in desktop

This file was deleted.

1,275 changes: 1,275 additions & 0 deletions abis/0.8.23/ServiceStakingMechUsage.json
View file
Open in desktop

Large diffs are not rendered by default.

1,378 changes: 1,378 additions & 0 deletions abis/0.8.23/ServiceStakingTokenMechUsage.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/mech_usage/ServiceStakingMechUsage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.21;
pragma solidity ^0.8.23;

import {MechAgentMod} from "./MechAgentMod.sol";
import {ServiceStakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/ServiceStakingNativeToken.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mech_usage/ServiceStakingTokenMechUsage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.21;
pragma solidity ^0.8.23;

import {MechAgentMod} from "./MechAgentMod.sol";
import {ServiceStakingToken} from "../../lib/autonolas-registries/contracts/staking/ServiceStakingToken.sol";
Expand Down
4 changes: 2 additions & 2 deletions hardhat.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ module.exports = {
solidity: {
compilers: [
{
version: "0.8.21",
version: "0.8.23",
settings: {
optimizer: {
enabled: true,
runs: 750,
runs: 1000000,
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion lib/autonolas-registries
Open in desktop
Submodule autonolas-registries updated 18 files
+241 −0 abis/0.8.21/HashCheckpoint.json
+0 −1,031 abis/0.8.21/ServiceStakingNativeToken.json
+0 −1,134 abis/0.8.21/ServiceStakingToken.json
+1,252 −0 abis/0.8.23/ServiceStakingNativeToken.json
+1,355 −0 abis/0.8.23/ServiceStakingToken.json
+64 −16 contracts/staking/ServiceStakingBase.sol
+1 −1 contracts/staking/ServiceStakingNativeToken.sol
+21 −4 contracts/staking/ServiceStakingToken.sol
+125 −0 contracts/utils/HashCheckpoint.sol
+ − docs/Vulnerabilities_list_registries.pdf
+1 −1 docs/configuration.json
+1 −1 hardhat.config.js
+86 −0 scripts/deployment/l2/deploy_18_hash_checkpoint_l2.js
+2 −1 scripts/deployment/l2/globals_gnosis_mainnet.json
+9 −0 scripts/deployment/l2/verify_18_hash_checkpoint.js
+52 −0 test/HashCheckpoint.js
+20 −6 test/ServiceStaking.js
+5 −3 test/ServiceStaking.t.sol
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 8 files
+1 −0 .gitattributes
+1 −1 package.json
+635 −0 scripts/vm.py
+5 −1 src/StdChains.sol
+757 −470 src/Vm.sol
+3 −1 test/StdError.t.sol
+2 −2 test/StdUtils.t.sol
+2 −2 test/Vm.t.sol
1 change: 1 addition & 0 deletions test/ServiceStakingMechUsage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe("ServiceStakingMechUsage", function () {
maxNumServices: 10,
rewardsPerSecond: "1" + "0".repeat(15),
minStakingDeposit: 10,
minNumStakingPeriods: 3,
maxNumInactivityPeriods: 3,
livenessPeriod: livenessPeriod, // Ten seconds
livenessRatio: "1" + "0".repeat(16), // 0.01 transaction per second (TPS)
Expand Down
16 changes: 9 additions & 7 deletions test/ServiceStakingMechUsages.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity =0.8.21;
pragma solidity =0.8.23;

import {IService} from "../lib/autonolas-registries/contracts/interfaces/IService.sol";
import "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol";
Expand Down Expand Up @@ -59,6 +59,8 @@ contract BaseSetup is Test {
uint256 internal rewardsPerSecond = 0.0001 ether;
// Minimum service staking deposit value required for staking
uint256 internal minStakingDeposit = regDeposit;
// Min number of staking periods before the service can be unstaked
uint256 internal minNumStakingPeriods = 3;
// Max number of accumulated inactivity periods after which the service is evicted
uint256 internal maxNumInactivityPeriods = 3;
// Liveness period
Expand Down Expand Up @@ -109,8 +111,8 @@ contract BaseSetup is Test {

// Deploy service staking native token and arbitrary ERC20 token
ServiceStakingBase.StakingParams memory stakingParams = ServiceStakingBase.StakingParams(maxNumServices,
rewardsPerSecond, minStakingDeposit, maxNumInactivityPeriods, livenessPeriod, livenessRatio,
numAgentInstances, emptyArray, 0, bytes32(0));
rewardsPerSecond, minStakingDeposit, minNumStakingPeriods, maxNumInactivityPeriods, livenessPeriod,
livenessRatio, numAgentInstances, emptyArray, 0, bytes32(0));
agentMech = new MockAgentMech();
serviceStakingMechUsage = new ServiceStakingMechUsage(stakingParams, address(serviceRegistry),
multisigProxyHash, address(agentMech));
Expand Down Expand Up @@ -239,7 +241,7 @@ contract ServiceStakingMechUsages is BaseSetup {
}

// Move one day ahead
vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);

// Call the checkpoint
serviceStakingMechUsage.checkpoint();
Expand Down Expand Up @@ -310,7 +312,7 @@ contract ServiceStakingMechUsages is BaseSetup {
}

// Move one day ahead
vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);

// Call the checkpoint
serviceStakingMechUsage.checkpoint();
Expand Down Expand Up @@ -390,7 +392,7 @@ contract ServiceStakingMechUsages is BaseSetup {
}

// Move one day ahead
vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);

// Call the checkpoint
serviceStakingMechUsage.checkpoint();
Expand Down Expand Up @@ -470,7 +472,7 @@ contract ServiceStakingMechUsages is BaseSetup {
}

// Move one day ahead
vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);

// Call the checkpoint
serviceStakingTokenMechUsage.checkpoint();
Expand Down
Loading