@@ -13,7 +13,7 @@ task('task:deployAllHostContracts').setAction(async function (_, hre) {
1313 await hre . run ( 'clean' ) ;
1414 }
1515 await hre . run ( 'compile:specific' , { contract : 'examples/' } ) ;
16- await hre . run ( 'compile:specific' , { contract : 'fhevmTemp/contracts/emptyProxy ' } ) ;
16+ await hre . run ( 'compile:specific' , { contract : 'fhevmTemp/contracts/shared ' } ) ;
1717 await hre . run ( 'task:deployEmptyUUPSProxies' ) ;
1818 // It needs to recompile to account for the change in addresses.
1919 await hre . run ( 'compile:specific' , { contract : 'fhevmTemp/contracts/' } ) ;
@@ -80,7 +80,7 @@ task('task:deployDecryptionOracle').setAction(async function (_taskArguments: Ta
8080
8181 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
8282 const currentImplementation = await ethers . getContractFactory (
83- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
83+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
8484 deployer ,
8585 ) ;
8686 const newImplem = await ethers . getContractFactory ( 'DecryptionOracle' , deployer ) ;
@@ -95,7 +95,7 @@ task('task:deployACL').setAction(async function (_taskArguments: TaskArguments,
9595 const privateKey = getRequiredEnvVar ( 'DEPLOYER_PRIVATE_KEY' ) ;
9696 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
9797 const currentImplementation = await ethers . getContractFactory (
98- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
98+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
9999 deployer ,
100100 ) ;
101101 const newImplem = await ethers . getContractFactory ( 'ACL' , deployer ) ;
@@ -110,7 +110,7 @@ task('task:deployFHEVMExecutor').setAction(async function (_taskArguments: TaskA
110110 const privateKey = getRequiredEnvVar ( 'DEPLOYER_PRIVATE_KEY' ) ;
111111 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
112112 const currentImplementation = await ethers . getContractFactory (
113- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
113+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
114114 deployer ,
115115 ) ;
116116 let newImplem ;
@@ -126,7 +126,7 @@ task('task:deployKMSVerifier').setAction(async function (taskArguments: TaskArgu
126126 const privateKey = getRequiredEnvVar ( 'DEPLOYER_PRIVATE_KEY' ) ;
127127 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
128128 const currentImplementation = await ethers . getContractFactory (
129- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
129+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
130130 deployer ,
131131 ) ;
132132 const newImplem = await ethers . getContractFactory ( 'fhevmTemp/contracts/KMSVerifier.sol:KMSVerifier' , deployer ) ;
@@ -145,7 +145,10 @@ task('task:deployKMSVerifier').setAction(async function (taskArguments: TaskArgu
145145 initialSigners . push ( kmsSignerAddress ) ;
146146 }
147147 await upgrades . upgradeProxy ( proxy , newImplem , {
148- call : { fn : 'reinitialize' , args : [ verifyingContractSource , chainIDSource , initialSigners , initialThreshold ] } ,
148+ call : {
149+ fn : 'initializeFromEmptyProxy' ,
150+ args : [ verifyingContractSource , chainIDSource , initialSigners , initialThreshold ] ,
151+ } ,
149152 } ) ;
150153 console . info ( 'KMSVerifier code set successfully at address:' , proxyAddress ) ;
151154 console . info ( `${ numSigners } KMS signers were added to KMSVerifier at initialization` ) ;
@@ -162,7 +165,7 @@ task('task:deployInputVerifier')
162165 const privateKey = getRequiredEnvVar ( 'DEPLOYER_PRIVATE_KEY' ) ;
163166 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
164167 const currentImplementation = await ethers . getContractFactory (
165- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
168+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
166169 deployer ,
167170 ) ;
168171 const newImplem = await ethers . getContractFactory ( 'fhevmTemp/contracts/InputVerifier.sol:InputVerifier' , deployer ) ;
@@ -187,7 +190,7 @@ task('task:deployInputVerifier')
187190 }
188191
189192 await upgrades . upgradeProxy ( proxy , newImplem , {
190- call : { fn : 'reinitialize ' , args : [ verifyingContractSource , chainIDSource , initialSigners ] } ,
193+ call : { fn : 'initializeFromEmptyProxy ' , args : [ verifyingContractSource , chainIDSource , initialSigners ] } ,
191194 } ) ;
192195 console . info ( 'InputVerifier code set successfully at address:' , proxyAddress ) ;
193196 } ) ;
@@ -196,7 +199,7 @@ task('task:deployHCULimit').setAction(async function (_taskArguments: TaskArgume
196199 const privateKey = getRequiredEnvVar ( 'DEPLOYER_PRIVATE_KEY' ) ;
197200 const deployer = new ethers . Wallet ( privateKey ) . connect ( ethers . provider ) ;
198201 const currentImplementation = await ethers . getContractFactory (
199- 'fhevmTemp/contracts/emptyProxy /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
202+ 'fhevmTemp/contracts/shared /EmptyUUPSProxy.sol:EmptyUUPSProxy' ,
200203 deployer ,
201204 ) ;
202205 const newImplem = await ethers . getContractFactory ( 'HCULimit' , deployer ) ;
0 commit comments