Skip to content

Commit 569f865

Browse files
committed
fix:
1 parent a819b83 commit 569f865

File tree

3 files changed

+2
-42
lines changed

3 files changed

+2
-42
lines changed

script/forge-scripts/Abstract.Deploy.Single.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ abstract contract AbstractDeploySingle is BatchScript {
360360
uint64 public constant BLAST = 81_457;
361361
uint64 public constant BARTIO = 80_084;
362362

363-
uint256[] public manualNonces = [21, 21, 21, 21, 20, 20, 19, 8, 2, 1, 0];
363+
uint256[] public manualNonces = [22, 22, 22, 22, 21, 21, 20, 9, 3, 2, 0];
364364
uint64[] public chainIds = [1, 56, 43_114, 137, 42_161, 10, 8453, 250, 59_144, 81_457, 80_084];
365365
string[] public chainNames = [
366366
"Ethereum",

script/forge-scripts/misc/Abstract.Configure.PreBeraLaunch.s.sol

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,6 @@ struct UpdateVars {
2828
}
2929

3030
abstract contract AbstractPreBeraLaunch is EnvironmentUtils {
31-
function _setBlastDelegate(
32-
uint256 env,
33-
uint256 srcChainIndex,
34-
Cycle cycle,
35-
uint64[] memory finalDeployedChains
36-
)
37-
internal
38-
setEnvDeploy(cycle)
39-
{
40-
assert(salt.length > 0);
41-
UpdateVars memory vars;
42-
43-
vars.chainId = finalDeployedChains[srcChainIndex];
44-
45-
vars.srcLzImpl = _readContractsV1(env, chainNames[srcChainIndex], vars.chainId, "LayerzeroImplementation");
46-
assert(vars.srcLzImpl != address(0));
47-
assert(PROTOCOL_ADMINS[srcChainIndex] == 0x95B5837CF46E6ab340fFf3844ca5e7d8ead5B8AF);
48-
bytes memory txn =
49-
abi.encodeWithSelector(LayerzeroV2Implementation.setDelegate.selector, PROTOCOL_ADMINS[srcChainIndex]);
50-
addToBatch(vars.srcLzImpl, 0, txn);
51-
52-
executeBatch(vars.chainId, PROTOCOL_ADMINS[srcChainIndex], manualNonces[srcChainIndex], true);
53-
}
54-
5531
function _configure(
5632
uint256 env,
5733
uint256 srcChainIndex,
@@ -75,14 +51,13 @@ abstract contract AbstractPreBeraLaunch is EnvironmentUtils {
7551
vars.superRegistryC =
7652
SuperRegistry(_readContractsV1(env, chainNames[srcChainIndex], vars.chainId, "SuperRegistry"));
7753
assert(address(vars.superRegistryC) != address(0));
54+
bytes memory txn;
7855

7956
txn = abi.encodeWithSelector(
8057
vars.superRegistryC.setAddress.selector, rewardsAdminRole, REWARDS_ADMIN, vars.chainId
8158
);
8259
addToBatch(address(vars.superRegistryC), 0, txn);
8360

84-
bytes memory txn;
85-
8661
console.log("Setting config");
8762
UlnConfig memory ulnConfig;
8863

script/forge-scripts/misc/Mainnet.Configure.PreBera.s.sol

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,6 @@ import { AbstractPreBeraLaunch } from "./Abstract.Configure.PreBeraLaunch.s.sol"
55
import "forge-std/console.sol";
66

77
contract MainnetConfigPreBeraDVN is AbstractPreBeraLaunch {
8-
function setBlastDelegate(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external {
9-
_setEnvironment(env, useNewSalt == 1 ? true : false);
10-
_preDeploymentSetup();
11-
12-
uint256 trueIndex;
13-
for (uint256 i = 0; i < chainIds.length; i++) {
14-
if (TARGET_CHAINS[selectedChainIndex] == chainIds[i]) {
15-
trueIndex = i;
16-
break;
17-
}
18-
}
19-
20-
_setBlastDelegate(env, trueIndex, Cycle.Prod, TARGET_CHAINS);
21-
}
22-
238
function configure(uint256 env, uint256 selectedChainIndex, uint256 useNewSalt) external {
249
_setEnvironment(env, useNewSalt == 1 ? true : false);
2510
_preDeploymentSetup();

0 commit comments

Comments
 (0)