Skip to content

Commit

Permalink
Release v1.0.0 (#145)
Browse files Browse the repository at this point in the history
* empty commit

* Update README.md (#136)

* [FIX] script redeploy testnet (#144)

* fix script redeploy testnet

* fix get_updated_l1_block

---------

Co-authored-by: cool-developer <51834436+cool-develope@users.noreply.github.com>
  • Loading branch information
ChainDev931105 and cool-develope authored Jul 26, 2024
1 parent 89b7b9b commit 1d6cbd4
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Lagrange Contracts
# Lagrange State Committee Contracts

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ILagrangeCommittee.sol
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ interface ILagrangeCommittee is IBLSKeyChecker {
uint96 minWeight,
uint96 maxWeight
);

// Fired on BlsKeys are added/removed/updated
event BlsKeyUpdated(address indexed operator, uint256 orgLength, uint256 added, uint256 removed);

Expand Down
2 changes: 1 addition & 1 deletion contracts/protocol/testnet/LagrangeCommitteeTestnet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ contract LagrangeCommitteeTestnet is LagrangeCommittee {

function _getUpdatedL1Block(uint32 _chainID, uint256 _epochNumber) internal view returns (uint256) {
uint256 _stored = committees[_chainID][_epochNumber].updatedBlock;
return (_stored >> 112) != 0 ? (_stored >> 112) : uint256(int256(_stored) + committeeParams[_chainID].l1Bias);
return (_stored >> 112) != 0 ? (_stored >> 112) : uint256(int256(_stored) - committeeParams[_chainID].l1Bias);
}

function _setUpdatedBlock(uint32 _chainID, uint256 _epochNumber, uint256 _l1BlockNumber) internal override {
Expand Down
43 changes: 32 additions & 11 deletions script/update/BaseScript.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

import {LagrangeCommittee} from "../../contracts/protocol/LagrangeCommittee.sol";
import {LagrangeService} from "../../contracts/protocol/LagrangeService.sol";
import {LagrangeCommitteeTestnet} from "../../contracts/protocol/testnet/LagrangeCommitteeTestnet.sol";
import {LagrangeServiceTestnet} from "../../contracts/protocol/testnet/LagrangeServiceTestnet.sol";
import {VoteWeigher} from "../../contracts/protocol/VoteWeigher.sol";

import "forge-std/Script.sol";
Expand Down Expand Up @@ -43,24 +45,43 @@ abstract contract BaseScript is Script, Test {
function _redeployService() internal {
vm.startBroadcast(lagrangeService.owner());

LagrangeService lagrangeServiceImp = new LagrangeService(
lagrangeCommittee,
lagrangeService.stakeManager(),
address(lagrangeService.avsDirectory()),
lagrangeService.voteWeigher()
);
proxyAdmin.upgrade(TransparentUpgradeableProxy(payable(address(lagrangeService))), address(lagrangeServiceImp));
address _lagrangeServiceImp;
if (block.chainid == 17000 || block.chainid == 11155111) {
LagrangeServiceTestnet lagrangeServiceImp = new LagrangeServiceTestnet(
lagrangeCommittee,
lagrangeService.stakeManager(),
address(lagrangeService.avsDirectory()),
lagrangeService.voteWeigher()
);
_lagrangeServiceImp = address(lagrangeServiceImp);
} else {
LagrangeService lagrangeServiceImp = new LagrangeService(
lagrangeCommittee,
lagrangeService.stakeManager(),
address(lagrangeService.avsDirectory()),
lagrangeService.voteWeigher()
);
_lagrangeServiceImp = address(lagrangeServiceImp);
}
proxyAdmin.upgrade(TransparentUpgradeableProxy(payable(address(lagrangeService))), _lagrangeServiceImp);

vm.stopBroadcast();
}

function _redeployCommittee() internal {
vm.startBroadcast(lagrangeCommittee.owner());

LagrangeCommittee lagrangeCommitteeImp = new LagrangeCommittee(lagrangeService, lagrangeCommittee.voteWeigher());
proxyAdmin.upgrade(
TransparentUpgradeableProxy(payable(address(lagrangeCommittee))), address(lagrangeCommitteeImp)
);
address _lagrangeCommitteeImp;
if (block.chainid == 17000) {
LagrangeCommitteeTestnet lagrangeCommitteeImp =
new LagrangeCommitteeTestnet(lagrangeService, lagrangeCommittee.voteWeigher());
_lagrangeCommitteeImp = address(lagrangeCommitteeImp);
} else {
LagrangeCommittee lagrangeCommitteeImp =
new LagrangeCommittee(lagrangeService, lagrangeCommittee.voteWeigher());
_lagrangeCommitteeImp = address(lagrangeCommitteeImp);
}
proxyAdmin.upgrade(TransparentUpgradeableProxy(payable(address(lagrangeCommittee))), _lagrangeCommitteeImp);

vm.stopBroadcast();
}
Expand Down

0 comments on commit 1d6cbd4

Please sign in to comment.