Skip to content

Commit

Permalink
Merge pull request #23 from valory-xyz/chore/deploy
Browse files Browse the repository at this point in the history 
chore: bump to latest registries main
  • Loading branch information
@DavidMinarsch
DavidMinarsch authored Aug 6, 2024
2 parents 49c3749 + 7b14bfe commit 4d62541
Show file tree
Hide file tree
Showing 12 changed files with 124 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitmodules
View file
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
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;

// 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)
Expand All @@ -14,4 +14,5 @@ import "../../lib/autonolas-registries/contracts/ServiceRegistryTokenUtility.sol
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
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
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
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
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
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
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/verify_00_basic_service_staking_activity_checker.js --network " + providerName + " " + stakingActivityChecker.address, { encoding: "utf-8" });
}
}

Expand Down
1 change: 0 additions & 1 deletion scripts/deployment/globals_gnosis_mainnet.json
View file

This file was deleted.

38 changes: 38 additions & 0 deletions scripts/deployment/globals_gnosis_mainnet_pearl_beta.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"contractVerification":true,
"useLedger":true,
"derivationPath":"m/44'/60'/2'/0/0",
"providerName":"gnosis",
"networkURL":"https://rpc.gnosischain.com",
"gasPriceInGwei":"4",
"gnosisSafeAddress":"0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",
"gnosisSafeProxyFactoryAddress":"0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",
"serviceRegistryAddress":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"serviceRegistryTokenUtilityAddress":"0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8",
"olasAddress":"0xcE11e14225575945b8E6Dc0D4F2dD4C570f79d9f",
"multisigProxyHash130":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"stakingNativeTokenAddress":"",
"stakingTokenAddress":"0xEa00be6690a871827fAfD705440D20dd75e67AB1",
"agentMechAddress":"0x77af31De935740567Cf4fF1986D04B2c964A786a",
"livenessRatio":"46296296296296",
"mechActivityCheckerAddress":"0x980b47e2B78403fBeDd59fbd6C7f8bF93d2E6B10",
"stakingFactoryAddress":"0xb0228CA253A88Bc8eb4ca70BCAC8f87b381f4700",
"stakingParams":
{
"metadataHash":"0x888914090dd6dd2bc98e113d7558854e6be7ad06d1af180cac83aac61479059e",
"maxNumServices":"100",
"rewardsPerSecond":"1649305555557",
"minStakingDeposit":"20000000000000000000",
"minNumStakingPeriods":"3",
"maxNumInactivityPeriods":"2",
"livenessPeriod":"86400",
"timeForEmissions":"2592000",
"numAgentInstances":"1",
"agentIds":["25"],
"threshold":"0",
"configHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"proxyHash":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"serviceRegistry":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"activityChecker":"0x980b47e2B78403fBeDd59fbd6C7f8bF93d2E6B10"},
"stakingTokenInstanceAddress":"0xeF44Fb0842DDeF59D37f85D61A1eF492bbA6135d"
}
38 changes: 38 additions & 0 deletions scripts/deployment/globals_gnosis_mainnet_qs_beta_expert.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"contractVerification":true,
"useLedger":true,
"derivationPath":"m/44'/60'/2'/0/0",
"providerName":"gnosis",
"networkURL":"https://rpc.gnosischain.com",
"gasPriceInGwei":"4",
"gnosisSafeAddress":"0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",
"gnosisSafeProxyFactoryAddress":"0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",
"serviceRegistryAddress":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"serviceRegistryTokenUtilityAddress":"0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8",
"olasAddress":"0xcE11e14225575945b8E6Dc0D4F2dD4C570f79d9f",
"multisigProxyHash130":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"stakingNativeTokenAddress":"",
"stakingTokenAddress":"0xEa00be6690a871827fAfD705440D20dd75e67AB1",
"agentMechAddress":"0x77af31De935740567Cf4fF1986D04B2c964A786a",
"livenessRatio":"462962962962963",
"mechActivityCheckerAddress":"0x87E6a97bD97D41904B1125A014B16bec50C6A89D",
"stakingFactoryAddress":"0xb0228CA253A88Bc8eb4ca70BCAC8f87b381f4700",
"stakingParams":
{
"metadataHash":"0x888914090dd6dd2bc98e113d7558854e6be7ad06d1af180cac83aac61479059e",
"maxNumServices":"20",
"rewardsPerSecond":"43981481481520",
"minStakingDeposit":"500000000000000000000",
"minNumStakingPeriods":"3",
"maxNumInactivityPeriods":"2",
"livenessPeriod":"86400",
"timeForEmissions":"2592000",
"numAgentInstances":"1",
"agentIds":["25"],
"threshold":"0",
"configHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"proxyHash":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"serviceRegistry":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"activityChecker":"0x87E6a97bD97D41904B1125A014B16bec50C6A89D"},
"stakingTokenInstanceAddress":"0x5344B7DD311e5d3DdDd46A4f71481bD7b05AAA3e"
}
38 changes: 38 additions & 0 deletions scripts/deployment/globals_gnosis_mainnet_qs_beta_hobbyist.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"contractVerification":true,
"useLedger":true,
"derivationPath":"m/44'/60'/2'/0/0",
"providerName":"gnosis",
"networkURL":"https://rpc.gnosischain.com",
"gasPriceInGwei":"4",
"gnosisSafeAddress":"0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",
"gnosisSafeProxyFactoryAddress":"0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",
"serviceRegistryAddress":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"serviceRegistryTokenUtilityAddress":"0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8",
"olasAddress":"0xcE11e14225575945b8E6Dc0D4F2dD4C570f79d9f",
"multisigProxyHash130":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"stakingNativeTokenAddress":"",
"stakingTokenAddress":"0xEa00be6690a871827fAfD705440D20dd75e67AB1",
"agentMechAddress":"0x77af31De935740567Cf4fF1986D04B2c964A786a",
"livenessRatio":"462962962962963",
"mechActivityCheckerAddress":"0x87E6a97bD97D41904B1125A014B16bec50C6A89D",
"stakingFactoryAddress":"0xb0228CA253A88Bc8eb4ca70BCAC8f87b381f4700",
"stakingParams":
{
"metadataHash":"0x888914090dd6dd2bc98e113d7558854e6be7ad06d1af180cac83aac61479059e",
"maxNumServices":"100",
"rewardsPerSecond":"4398148148152",
"minStakingDeposit":"50000000000000000000",
"minNumStakingPeriods":"3",
"maxNumInactivityPeriods":"2",
"livenessPeriod":"86400",
"timeForEmissions":"2592000",
"numAgentInstances":"1",
"agentIds":["25"],
"threshold":"0",
"configHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"proxyHash":"0xb89c1b3bdf2cf8827818646bce9a8f6e372885f8c55e5c07acbd307cb133b000",
"serviceRegistry":"0x9338b5153AE39BB89f50468E608eD9d764B755fD",
"activityChecker":"0x87E6a97bD97D41904B1125A014B16bec50C6A89D"},
"stakingTokenInstanceAddress":"0x389B46c259631Acd6a69Bde8B6cEe218230bAE8C"
}

0 comments on commit 4d62541

Please sign in to comment.