Skip to content

Commit 674efe0

Browse files
isaacdecodedisaacdecoded
committed
refactor(gateway-contracts): rename initialize method for deployments from empty proxies
1 parent 8213faa commit 674efe0

8 files changed

Lines changed: 25 additions & 16 deletions

File tree

‎gateway-contracts/contracts/CiphertextCommits.sol‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ contract CiphertextCommits is
7676
* @notice Initializes the contract.
7777
* @dev This function needs to be public in order to be called by the UUPS proxy.
7878
*/
79-
function initialize() public virtual reinitializer(2) {
79+
/// @custom:oz-upgrades-validate-as-initializer
80+
function initializeFromEmptyProxy() public virtual reinitializer(2) {
8081
__Ownable_init(owner());
8182
__Pausable_init();
8283
}

‎gateway-contracts/contracts/Decryption.sol‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ contract Decryption is
199199
/// @notice Initializes the contract.
200200
/// @dev Contract name and version for EIP712 signature validation are defined here
201201
/// @dev This function needs to be public in order to be called by the UUPS proxy.
202-
function initialize() public virtual reinitializer(2) {
202+
/// @custom:oz-upgrades-validate-as-initializer
203+
function initializeFromEmptyProxy() public virtual reinitializer(2) {
203204
__EIP712_init(CONTRACT_NAME, "1");
204205
__Ownable_init(owner());
205206
__Pausable_init();

‎gateway-contracts/contracts/GatewayConfig.sol‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ contract GatewayConfig is IGatewayConfig, Ownable2StepUpgradeable, UUPSUpgradeab
8484
/// @param initialUserDecryptionThreshold The user decryption threshold
8585
/// @param initialKmsNodes List of KMS nodes
8686
/// @param initialCoprocessors List of coprocessors
87-
function initialize(
87+
/// @custom:oz-upgrades-validate-as-initializer
88+
function initializeFromEmptyProxy(
8889
address initialPauser,
8990
ProtocolMetadata memory initialMetadata,
9091
uint256 initialMpcThreshold,

‎gateway-contracts/contracts/InputVerification.sol‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ contract InputVerification is
103103
/// @notice Initializes the contract.
104104
/// @dev Contract name and version for EIP712 signature validation are defined here
105105
/// @dev This function needs to be public in order to be called by the UUPS proxy.
106-
function initialize() public virtual reinitializer(2) {
106+
/// @custom:oz-upgrades-validate-as-initializer
107+
function initializeFromEmptyProxy() public virtual reinitializer(2) {
107108
__EIP712_init(CONTRACT_NAME, "1");
108109
__Ownable_init(owner());
109110
__Pausable_init();

‎gateway-contracts/contracts/KmsManagement.sol‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ contract KmsManagement is IKmsManagement, Ownable2StepUpgradeable, UUPSUpgradeab
121121

122122
/// @notice Initializes the contract.
123123
/// @dev This function needs to be public in order to be called by the UUPS proxy.
124-
function initialize(string memory fheParamsName, bytes32 fheParamsDigest) public virtual reinitializer(2) {
124+
/// @custom:oz-upgrades-validate-as-initializer
125+
function initializeFromEmptyProxy(
126+
string memory fheParamsName,
127+
bytes32 fheParamsDigest
128+
) public virtual reinitializer(2) {
125129
__Ownable_init(owner());
126130
__Pausable_init();
127131

‎gateway-contracts/contracts/MultichainAcl.sol‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ contract MultichainAcl is IMultichainAcl, Ownable2StepUpgradeable, UUPSUpgradeab
7777

7878
/// @notice Initializes the contract.
7979
/// @dev This function needs to be public in order to be called by the UUPS proxy.
80-
function initialize() public virtual reinitializer(2) {
80+
/// @custom:oz-upgrades-validate-as-initializer
81+
function initializeFromEmptyProxy() public virtual reinitializer(2) {
8182
__Ownable_init(owner());
8283
__Pausable_init();
8384
}

‎gateway-contracts/tasks/deployment/contracts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async function deployContractImplementation(
4747
// Set the upgrade options
4848
const upgradeOptions = {
4949
call: {
50-
fn: "initialize",
50+
fn: "initializeFromEmptyProxy",
5151
args: [] as unknown[],
5252
},
5353
};

‎gateway-contracts/test/GatewayConfig.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ describe("GatewayConfig", function () {
106106
// Upgrade the proxy contract to the GatewayConfig contract
107107
const upgradeTx = await hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
108108
call: {
109-
fn: "initialize",
109+
fn: "initializeFromEmptyProxy",
110110
args: [
111111
pauser.address,
112112
protocolMetadata,
@@ -142,7 +142,7 @@ describe("GatewayConfig", function () {
142142
await expect(
143143
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
144144
call: {
145-
fn: "initialize",
145+
fn: "initializeFromEmptyProxy",
146146
args: [
147147
nullPauser,
148148
protocolMetadata,
@@ -163,7 +163,7 @@ describe("GatewayConfig", function () {
163163
await expect(
164164
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
165165
call: {
166-
fn: "initialize",
166+
fn: "initializeFromEmptyProxy",
167167
args: [
168168
pauser.address,
169169
protocolMetadata,
@@ -184,7 +184,7 @@ describe("GatewayConfig", function () {
184184
await expect(
185185
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
186186
call: {
187-
fn: "initialize",
187+
fn: "initializeFromEmptyProxy",
188188
args: [
189189
pauser.address,
190190
protocolMetadata,
@@ -206,7 +206,7 @@ describe("GatewayConfig", function () {
206206
await expect(
207207
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
208208
call: {
209-
fn: "initialize",
209+
fn: "initializeFromEmptyProxy",
210210
args: [
211211
pauser.address,
212212
protocolMetadata,
@@ -230,7 +230,7 @@ describe("GatewayConfig", function () {
230230
await expect(
231231
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
232232
call: {
233-
fn: "initialize",
233+
fn: "initializeFromEmptyProxy",
234234
args: [
235235
pauser.address,
236236
protocolMetadata,
@@ -252,7 +252,7 @@ describe("GatewayConfig", function () {
252252
await expect(
253253
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
254254
call: {
255-
fn: "initialize",
255+
fn: "initializeFromEmptyProxy",
256256
args: [
257257
pauser.address,
258258
protocolMetadata,
@@ -276,7 +276,7 @@ describe("GatewayConfig", function () {
276276
await expect(
277277
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
278278
call: {
279-
fn: "initialize",
279+
fn: "initializeFromEmptyProxy",
280280
args: [
281281
pauser.address,
282282
protocolMetadata,
@@ -298,7 +298,7 @@ describe("GatewayConfig", function () {
298298
await expect(
299299
hre.upgrades.upgradeProxy(proxyContract, newGatewayConfigFactory, {
300300
call: {
301-
fn: "initialize",
301+
fn: "initializeFromEmptyProxy",
302302
args: [
303303
pauser.address,
304304
protocolMetadata,

0 commit comments

Comments
 (0)