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

Jump to bottom

Solidity Bridge Deployment Scripts #681

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Solidity Bridge Deployment Scripts #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7086853
feat: create delpoy script
0xmovses Oct 10, 2024
57adf9b
chore: fmt
0xmovses Oct 10, 2024
377eeb8
chore: remove unnneeded comments
0xmovses Oct 10, 2024
78f2901
update: add upgradable to deploy script
0xmovses Oct 10, 2024
289c083
update: MOVE counterparty update missing vars
0xmovses Oct 10, 2024
bcf1c00
Merge branch 'main' into 0xmovses/bridge-contract-deploy
0xmovses Oct 10, 2024
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
93 changes: 93 additions & 0 deletions protocol-units/bridge/contracts/script/DeployAtomicBridgeCounterpartyMOVE.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// To Deploy
// forge script AtomicBridgeCounterpartyMOVEDeployer --fork-url https://holesky.infura.io/v3/YOUR_INFURA_PROJECT_ID --broadcast --verify --etherscan-api-key YOUR_ETHERSCAN_API_KEY
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.22;

import "forge-std/Script.sol";
import {AtomicBridgeCounterpartyMOVE} from "../src/AtomicBridgeCounterpartyMOVE.sol";
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

contract AtomicBridgeCounterpartyMOVEDeployer is Script {
TransparentUpgradeableProxy public atomicBridgeCounterpartyProxy;
TimelockController public timelock;
string public atomicBridgeCounterpartySignature = "initialize(address,address,uint256)";
address public moveAdmin;

address public atomicBridgeInitiatorAddress = address(0x5FbDB2315678afecb367f032d93F642f64180aa3);
address public ownerAddress = address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
uint256 public timeLockDuration = 86400; // 24 hours in seconds (half that of the initiators)
uint256 public minDelay = 2 days; // 2-day delay for governance timelock

address public movementLabsSafe = address(0x493516F6dB02c9b7f649E650c5de244646022Aa0);
address public movementFoundationSafe = address(0x00db70A9e12537495C359581b7b3Bc3a69379A00);

bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00;

function run() external {
uint256 signer = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(signer);

address[] memory proposers = new address[](1);
address[] memory executors = new address[](1);

proposers[0] = movementLabsSafe;
executors[0] = movementFoundationSafe;

// Deploy TimelockController
timelock = new TimelockController(minDelay, proposers, executors, address(0));
console.log("Timelock deployed at:", address(timelock));

// Deploy AtomicBridgeCounterpartyMOVE contract
_deployAtomicBridgeCounterparty();

vm.stopBroadcast();
}

function _deployAtomicBridgeCounterparty() internal {
console.log("AtomicBridgeCounterpartyMOVE: deploying");

// Instantiate the implementation contract
AtomicBridgeCounterpartyMOVE atomicBridgeCounterpartyImplementation = new AtomicBridgeCounterpartyMOVE();

// Deploy the TransparentUpgradeableProxy
atomicBridgeCounterpartyProxy = new TransparentUpgradeableProxy(
address(atomicBridgeCounterpartyImplementation),
address(timelock), // Admin is the timelock
abi.encodeWithSignature(
atomicBridgeCounterpartySignature,
atomicBridgeInitiatorAddress, // AtomicBridgeInitiatorMOVE address
ownerAddress, // Owner of the contract
timeLockDuration // Timelock duration (48 hours)
)
);

console.log("AtomicBridgeCounterpartyMOVE deployed at proxy address:", address(atomicBridgeCounterpartyProxy));
console.log("Implementation address:", address(atomicBridgeCounterpartyImplementation));
}

function _upgradeAtomicBridgeCounterparty() internal {
console.log("AtomicBridgeCounterpartyMOVE: upgrading");
AtomicBridgeCounterpartyMOVE newCounterpartyImplementation = new AtomicBridgeCounterpartyMOVE();

timelock.schedule(
address(moveAdmin),
0,
abi.encodeWithSignature(
"upgradeAndCall(address,address,bytes)",
address(atomicBridgeCounterpartyProxy),
address(newCounterpartyImplementation),
abi.encodeWithSignature(
atomicBridgeCounterpartySignature,
atomicBridgeInitiatorAddress,
ownerAddress,
timeLockDuration
)
),
bytes32(0),
bytes32(0),
block.timestamp + minDelay
);
}
}
98 changes: 98 additions & 0 deletions protocol-units/bridge/contracts/script/DeployAtomicBridgeInitiatorMOVE.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
// To Deploy
// forge script AtomicBridgeInitiatorMOVEDeployer --fork-url https://holesky.infura.io/v3/YOUR_INFURA_PROJECT_ID --broadcast --verify --etherscan-api-key YOUR_ETHERSCAN_API_KEY
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.22;

import "forge-std/Script.sol";
import {AtomicBridgeInitiatorMOVE} from "../src/AtomicBridgeInitiatorMOVE.sol";
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

contract AtomicBridgeInitiatorMOVEDeployer is Script {
TransparentUpgradeableProxy public atomicBridgeProxy;
TimelockController public timelock;
string public atomicBridgeSignature = "initialize(address,address,uint256,uint256)";
address public moveAdmin;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moveAdmin is never set, you need to find that address (emitted events from TransparentUpgradeableProxy is the best bet, see example on contract-pipeline branch). You are proposing an upgrade to address(0).


// Parameters
address public moveTokenAddress = address(0xC36ba8B8fD9EcbF36288b9B9B0ae9FC3E0645227);
address public ownerAddress = address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
uint256 public timeLockDuration = 172800; // 48 hours in seconds
uint256 public initialPoolBalance = 0 ether; // Initial pool balance
uint256 public minDelay = 2 days; // 2-day delay for governance timelock

// Safe addresses (replace these with actual safe addresses)
address public movementLabsSafe = address(0x493516F6dB02c9b7f649E650c5de244646022Aa0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These safes are not on Holesky and there is no Safe on Holesky, if our bridge was deployed, I suggest rerunning and using EOA addresses for upgradeability

address public movementFoundationSafe = address(0x00db70A9e12537495C359581b7b3Bc3a69379A00);

bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00;

function run() external {
uint256 signer = vm.envUint("PRIVATE_KEY");
vm.startBroadcast(signer);

address[] memory proposers = new address[](1);
address[] memory executors = new address[](1);

proposers[0] = movementLabsSafe;
executors[0] = movementFoundationSafe;

// Deploy TimelockController
timelock = new TimelockController(minDelay, proposers, executors, address(0));
console.log("Timelock deployed at:", address(timelock));

// Deploy AtomicBridgeInitiatorMOVE contract
_deployAtomicBridge();

vm.stopBroadcast();
}

function _deployAtomicBridge() internal {
console.log("AtomicBridgeInitiatorMOVE: deploying");

// Instantiate the implementation contract
AtomicBridgeInitiatorMOVE atomicBridgeImplementation = new AtomicBridgeInitiatorMOVE();

// Deploy the TransparentUpgradeableProxy
atomicBridgeProxy = new TransparentUpgradeableProxy(
address(atomicBridgeImplementation),
address(timelock), // Admin is the timelock
abi.encodeWithSignature(
atomicBridgeSignature,
moveTokenAddress, // MOVE token address
ownerAddress, // Owner of the contract
timeLockDuration, // Timelock duration (48 hours)
initialPoolBalance // Initial pool balance
)
);

console.log("AtomicBridgeInitiatorMOVE deployed at proxy address:", address(atomicBridgeProxy));
console.log("Implementation address:", address(atomicBridgeImplementation));
}

function _upgradeAtomicBridge() internal {
console.log("AtomicBridgeInitiatorMOVE: upgrading");
AtomicBridgeInitiatorMOVE newBridgeImplementation = new AtomicBridgeInitiatorMOVE();

timelock.schedule(
address(moveAdmin),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moveAdmin doesn't have to be wrapped in address here

0,
abi.encodeWithSignature(
"upgradeAndCall(address,address,bytes)",
address(atomicBridgeProxy),
address(newBridgeImplementation),
abi.encodeWithSignature(
atomicBridgeSignature,
moveTokenAddress,
ownerAddress,
timeLockDuration,
initialPoolBalance
)
),
bytes32(0),
bytes32(0),
block.timestamp + minDelay
);
}
}