Skip to content

Commit a1b8c46

Browse files
authored
chore(gateway-contracts): clean GatewayConfig reinitialize (#1376)
chore(gateway-contracts): clean GatewayConfig reinitialize (#1375)
1 parent d6ffb71 commit a1b8c46

File tree

4 files changed

+46
-104
lines changed

4 files changed

+46
-104
lines changed

gateway-contracts/contracts/GatewayConfig.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ contract GatewayConfig is IGatewayConfig, Ownable2StepUpgradeable, UUPSUpgradeab
196196
*/
197197
/// @custom:oz-upgrades-unsafe-allow missing-initializer-call
198198
/// @custom:oz-upgrades-validate-as-initializer
199-
function reinitializeV4(KmsNode[] calldata newKmsNodes) public virtual reinitializer(REINITIALIZER_VERSION) {}
199+
function reinitializeV4() public virtual reinitializer(REINITIALIZER_VERSION) {}
200200

201201
/**
202202
* @notice See {IGatewayConfig-isPauser}.

gateway-contracts/rust_bindings/src/gateway_config.rs

Lines changed: 42 additions & 86 deletions
Large diffs are not rendered by default.

gateway-contracts/selectors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ GatewayConfig
317317
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
318318
| Function | proxiableUUID() | 0x52d1902d |
319319
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
320-
| Function | reinitializeV4((address,address,string,string)[]) | 0xaae7e906 |
320+
| Function | reinitializeV4() | 0x123abb28 |
321321
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
322322
| Function | renounceOwnership() | 0x715018a6 |
323323
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
@@ -1298,7 +1298,7 @@ GatewayConfigV2Example
12981298
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
12991299
| Function | proxiableUUID() | 0x52d1902d |
13001300
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
1301-
| Function | reinitializeV4((address,address,string,string)[]) | 0xaae7e906 |
1301+
| Function | reinitializeV4() | 0x123abb28 |
13021302
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
13031303
| Function | renounceOwnership() | 0x715018a6 |
13041304
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|

gateway-contracts/tasks/upgradeContracts.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,21 +251,7 @@ task("task:upgradeGatewayConfig")
251251
}
252252
const proxyAddress = getRequiredEnvVar("GATEWAY_CONFIG_ADDRESS");
253253

254-
// Parse the KMS nodes
255-
const numKmsNodes = parseInt(getRequiredEnvVar("NUM_KMS_NODES"));
256-
const kmsNodes = [];
257-
for (let idx = 0; idx < numKmsNodes; idx++) {
258-
kmsNodes.push({
259-
txSenderAddress: getRequiredEnvVar(`KMS_TX_SENDER_ADDRESS_${idx}`),
260-
signerAddress: getRequiredEnvVar(`KMS_SIGNER_ADDRESS_${idx}`),
261-
ipAddress: getRequiredEnvVar(`KMS_NODE_IP_ADDRESS_${idx}`),
262-
storageUrl: getRequiredEnvVar(`KMS_NODE_STORAGE_URL_${idx}`),
263-
});
264-
}
265-
266-
console.log("New KMS nodes:", kmsNodes);
267-
268-
await upgradeCurrentToNew(proxyAddress, currentImplementation, newImplementation, verifyContract, hre, [kmsNodes]);
254+
await upgradeCurrentToNew(proxyAddress, currentImplementation, newImplementation, verifyContract, hre, []);
269255
});
270256

271257
task("task:upgradeKMSGeneration")

0 commit comments

Comments
 (0)