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

chore: tagging registries, updating solidity version in test contracts #24

Merged
merged 1 commit into from
Jul 29, 2024
Merged

chore: tagging registries, updating solidity version in test contracts #24

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 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions contracts/test/ABICreator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
// 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";

Check warning on line 5 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path @gnosis.pm/safe-contracts/contracts/GnosisSafe.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxyFactory.sol";

Check warning on line 6 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path @gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxyFactory.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "@gnosis.pm/safe-contracts/contracts/libraries/MultiSendCallOnly.sol";

Check warning on line 7 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path @gnosis.pm/safe-contracts/contracts/libraries/MultiSendCallOnly.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)

// Getting ABIs for registry contracts
import "../../lib/autonolas-registries/contracts/ComponentRegistry.sol";

Check warning on line 10 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path ../../lib/autonolas-registries/contracts/ComponentRegistry.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "../../lib/autonolas-registries/contracts/AgentRegistry.sol";

Check warning on line 11 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path ../../lib/autonolas-registries/contracts/AgentRegistry.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "../../lib/autonolas-registries/contracts/ServiceRegistry.sol";

Check warning on line 12 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path ../../lib/autonolas-registries/contracts/ServiceRegistry.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "../../lib/autonolas-registries/contracts/ServiceRegistryTokenUtility.sol";

Check warning on line 13 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path ../../lib/autonolas-registries/contracts/ServiceRegistryTokenUtility.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import "../../lib/autonolas-registries/contracts/multisigs/GnosisSafeMultisig.sol";

Check warning on line 14 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

global import of path ../../lib/autonolas-registries/contracts/multisigs/GnosisSafeMultisig.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)
import {StakingFactory} from "../../lib/autonolas-registries/contracts/staking/StakingFactory.sol";

Check warning on line 15 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

imported name StakingFactory is not used
import {StakingToken} from "../../lib/autonolas-registries/contracts/staking/StakingToken.sol";

Check warning on line 16 in contracts/test/ABICreator.sol

View workflow job for this annotation

GitHub Actions / build 

imported name StakingToken is not used
import {StakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/StakingNativeToken.sol";
import {StakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/StakingNativeToken.sol";
import {StakingActivityChecker} from "../../lib/autonolas-registries/contracts/staking/StakingActivityChecker.sol";
2 changes: 1 addition & 1 deletion contracts/test/ERC20Token.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.25;

import {ERC20} from "../../lib/autonolas-registries/lib/solmate/src/tokens/ERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/MockAgentMech.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.25;

/// @title MockAgentMech - Smart contract for mocking AgentMech partial functionality.
contract MockAgentMech {
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/SafeNonceLib.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.25;

import {GnosisSafeStorage} from "@gnosis.pm/safe-contracts/contracts/examples/libraries/GnosisSafeStorage.sol";

Expand Down
2 changes: 1 addition & 1 deletion lib/autonolas-registries
Open in desktop
Submodule autonolas-registries updated 24 files
+18 −0 .gitleaksignore
+0 −87 scripts/deployment/l2/deploy_18_service_staking_activity_checker.js
+1 −1 scripts/deployment/l2/deploy_18_service_staking_verifier.js
+1 −1 scripts/deployment/l2/deploy_19_service_staking_factory.js
+1 −1 scripts/deployment/l2/deploy_20_hash_checkpoint_l2.js
+0 −89 scripts/deployment/l2/deploy_21_service_staking_token_instance.js
+0 −85 scripts/deployment/l2/deploy_22_service_staking_native_token_instance.js
+1 −1 scripts/deployment/l2/globals_arbitrum_one.json
+1 −1 scripts/deployment/l2/globals_arbitrum_sepolia.json
+1 −1 scripts/deployment/l2/globals_base_mainnet.json
+1 −1 scripts/deployment/l2/globals_celo_mainnet.json
+1 −21 scripts/deployment/l2/globals_ethereum_mainnet.json
+1 −1 scripts/deployment/l2/globals_gnosis_chiado.json
+0 −20 scripts/deployment/l2/globals_gnosis_mainnet.json
+1 −1 scripts/deployment/l2/globals_optimistic_mainnet.json
+1 −1 scripts/deployment/l2/globals_optimistic_sepolia.json
+1 −1 scripts/deployment/l2/globals_polygon_amoy.json
+1 −1 scripts/deployment/l2/globals_polygon_mainnet.json
+0 −9 scripts/deployment/l2/verify_18_service_staking_activity_checker.js
+0 −0 scripts/deployment/l2/verify_18_service_staking_verifier.js
+0 −0 scripts/deployment/l2/verify_19_service_staking_factory.js
+0 −0 scripts/deployment/l2/verify_20_hash_checkpoint.js
+0 −9 scripts/deployment/l2/verify_21_service_staking_token_instance.js
+0 −9 scripts/deployment/l2/verify_22_service_staking_native_token_instance.js
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 2 files
+3 −0 src/Vm.sol
+1 −1 test/Vm.t.sol
2 changes: 1 addition & 1 deletion scripts/deployment/deploy_00_basic_service_staking_activity_checker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" });
}
}

Expand Down
Loading