Skip to content

Primata/contract pipeline #1285

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

Merged
0xmovses merged 10 commits into from
Aug 28, 2025
Merged

Primata/contract pipeline #1285

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a3ba71
fix: config and new timelock setup
Primata Jul 29, 2025
7e90e3a
remove foundry.lock
Primata Jul 29, 2025
ba58a46
Update protocol-units/settlement/mcr/contracts/script/helpers/Helper.sol
Primata Jul 29, 2025
5b2aab9
merge main, bring back contracts
Primata Jul 29, 2025
45f2cbc
Merge branch 'primata/contract-pipeline' of https://github.com/moveme…
Primata Jul 29, 2025
1307515
bring back latest changes
Primata Jul 29, 2025
b992010
fix: reinclude latest MCR
Primata Jul 29, 2025
24dd3d0
remove foundry.lock
Primata Jul 29, 2025
3709604
remove failing tests
Primata Aug 21, 2025
527cd94
remove v2 references
Primata Aug 27, 2025
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
2 changes: 2 additions & 0 deletions protocol-units/settlement/mcr/contracts/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ ffi = true
gas_limit = 9223372036854775807 # this is only needed for the multiround settlement test
build_info = true
extra_output = ["storageLayout"]
optimizer = true
optimizer_runs = 200

solc = "0.8.26"
evm_version = "cancun"
Expand Down
7 changes: 6 additions & 1 deletion protocol-units/settlement/mcr/contracts/script/helpers/Helper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,16 @@ contract Helper is Script {

function _deployTimelock() internal {
if (deployment.timelock == ZERO) {
timelock = new TimelockController(config.minDelay, config.signersLabs, config.signersFoundation, ZERO);
timelock = new TimelockController(config.minDelay, _arrayify(deployment.movementLabsSafe), _arrayify(deployment.movementFoundationSafe), ZERO);
deployment.timelock = address(timelock);
}
}

function _arrayify(address addr) internal pure returns (address[] memory arr) {
arr = new address[](1);
arr[0] = addr;
}

function _deployCreate3() internal {
if (address(create3).code.length == 0) {
console.log("CREATE3: deploying");
Expand Down
2 changes: 1 addition & 1 deletion protocol-units/settlement/mcr/contracts/script/helpers/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"minDelay": "172800",
"minDelay": 172800,
Comment thread
apenzk marked this conversation as resolved.
"signersDeployer": [
"0xB2105464215716e1445367BEA5668F581eF7d063",
"0x3eB69Ef2DbEDD5d58AA5E074131Cd22D5e87Ff53"
Expand Down
4 changes: 2 additions & 2 deletions protocol-units/settlement/mcr/contracts/script/helpers/deployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"moveAdmin": "0x8365AA031806A1ac2b31a5d3b8323020FC85DfEc",
"movementAnchorage": "0xe3e86E126fcCd071Af39a0899734Ca5C8E5F4F25",
"movementDeployerSafe": "0x7aE744e3b2816F660054EAbd1a1C4935DA34Ae28",
"movementFoundationSafe": "0x074C155f09cE5fC3B65b4a9Bbb01739459C7AD63",
"movementFoundationSafe": "0xB304C899EcB46DD91F31Ef0d177fF9dAf8C17edf",
"movementLabsSafe": "0xd7E22951DE7aF453aAc5400d6E072E3b63BeB7E2",
"staking": "0x0000000000000000000000000000000000000000",
"stakingAdmin": "0x0000000000000000000000000000000000000000",
"stlMove": "0x0000000000000000000000000000000000000000",
"stlMoveAdmin": "0x0000000000000000000000000000000000000000",
"timelock": "0xA649f6335828f070dDDd7A8c4F5bef2b6FF7Bd51"
"timelock": "0x25a5A3FA61cba5Fd5fb1D75D0AcfEB81370778Eb"
},
"11155111": {
"mcr": "0x0000000000000000000000000000000000000000",
Expand Down
3 changes: 1 addition & 2 deletions protocol-units/settlement/mcr/contracts/src/settlement/MCR.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,9 @@ contract MCR is Initializable, BaseSettlement, MCRStorage, IMCR {

// iterate over the attester set
for (uint256 i = 0; i < attesters.length; i++) {
address attester = attesters[i];

// get a commitment for the attester at the block height
BlockCommitment memory blockCommitment = commitments[blockHeight][attester];
BlockCommitment memory blockCommitment = commitments[blockHeight][attesters[i]];

// check the total stake on the commitment
uint256 totalStakeOnCommitment = commitmentStakes[blockCommitment.height][blockCommitment.commitment];
Expand Down
2 changes: 1 addition & 1 deletion protocol-units/settlement/mcr/contracts/src/staking/MovementStakingStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.13;
import "forge-std/console.sol";

import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/interfaces/IERC20.sol";
import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
Expand Down