From 83c53590c0fc1095049c932ddf99fcd899afebee Mon Sep 17 00:00:00 2001 From: Aleksandr Kuperman Date: Mon, 29 Jul 2024 10:46:29 +0100 Subject: [PATCH] chore: tagging registries, updating solidity version in test contracts --- .gitmodules | 1 + contracts/test/ABICreator.sol | 5 +++-- contracts/test/ERC20Token.sol | 2 +- contracts/test/MockAgentMech.sol | 2 +- contracts/test/SafeNonceLib.sol | 2 +- lib/autonolas-registries | 2 +- lib/forge-std | 2 +- .../deploy_00_basic_service_staking_activity_checker.js | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdca907..87a2d5f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "lib/autonolas-registries"] path = lib/autonolas-registries url = https://github.com/valory-xyz/autonolas-registries.git + tag = v1.2.2 [submodule "lib/forge-std"] path = lib/forge-std url = https://github.com/foundry-rs/forge-std diff --git a/contracts/test/ABICreator.sol b/contracts/test/ABICreator.sol index 6a728b8..f08ba9d 100644 --- a/contracts/test/ABICreator.sol +++ b/contracts/test/ABICreator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.21; +pragma solidity ^0.8.25; // Getting ABIs for the Gnosis Safe master copy and proxy contracts import "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol"; @@ -14,4 +14,5 @@ import "../../lib/autonolas-registries/contracts/ServiceRegistryTokenUtility.sol import "../../lib/autonolas-registries/contracts/multisigs/GnosisSafeMultisig.sol"; import {StakingFactory} from "../../lib/autonolas-registries/contracts/staking/StakingFactory.sol"; import {StakingToken} from "../../lib/autonolas-registries/contracts/staking/StakingToken.sol"; -import {StakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/StakingNativeToken.sol"; \ No newline at end of file +import {StakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/StakingNativeToken.sol"; +import {StakingActivityChecker} from "../../lib/autonolas-registries/contracts/staking/StakingActivityChecker.sol"; \ No newline at end of file diff --git a/contracts/test/ERC20Token.sol b/contracts/test/ERC20Token.sol index 8482e12..2f7b7f1 100644 --- a/contracts/test/ERC20Token.sol +++ b/contracts/test/ERC20Token.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.21; +pragma solidity ^0.8.25; import {ERC20} from "../../lib/autonolas-registries/lib/solmate/src/tokens/ERC20.sol"; diff --git a/contracts/test/MockAgentMech.sol b/contracts/test/MockAgentMech.sol index ee76cf2..062f83a 100644 --- a/contracts/test/MockAgentMech.sol +++ b/contracts/test/MockAgentMech.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.21; +pragma solidity ^0.8.25; /// @title MockAgentMech - Smart contract for mocking AgentMech partial functionality. contract MockAgentMech { diff --git a/contracts/test/SafeNonceLib.sol b/contracts/test/SafeNonceLib.sol index db46778..4440c9c 100644 --- a/contracts/test/SafeNonceLib.sol +++ b/contracts/test/SafeNonceLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.21; +pragma solidity ^0.8.25; import {GnosisSafeStorage} from "@gnosis.pm/safe-contracts/contracts/examples/libraries/GnosisSafeStorage.sol"; diff --git a/lib/autonolas-registries b/lib/autonolas-registries index beebdc1..a85d0d8 160000 --- a/lib/autonolas-registries +++ b/lib/autonolas-registries @@ -1 +1 @@ -Subproject commit beebdc1c56eb19c8461d81ffca047a536ba6629e +Subproject commit a85d0d802c2127b01bc69194df8ef7921d365231 diff --git a/lib/forge-std b/lib/forge-std index c28115d..2cbff06 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit c28115db8d90ebffb41953cf83aac63130f4bd40 +Subproject commit 2cbff0602d340503dba9828ab6981053704d1384 diff --git a/scripts/deployment/deploy_00_basic_service_staking_activity_checker.js b/scripts/deployment/deploy_00_basic_service_staking_activity_checker.js index 054d68c..8321bf0 100644 --- a/scripts/deployment/deploy_00_basic_service_staking_activity_checker.js +++ b/scripts/deployment/deploy_00_basic_service_staking_activity_checker.js @@ -75,7 +75,7 @@ async function main() { // Contract verification if (parsedData.contractVerification) { const execSync = require("child_process").execSync; - execSync("npx hardhat verify --constructor-args scripts/deployment/l2/verify_18_service_staking_activity_checker.js --network " + providerName + " " + stakingActivityChecker.address, { encoding: "utf-8" }); + execSync("npx hardhat verify --constructor-args scripts/deployment/l2/verify_00_basic_service_staking_activity_checker.js --network " + providerName + " " + stakingActivityChecker.address, { encoding: "utf-8" }); } }