diff --git a/scripts/deployments/core/deploy.ts b/scripts/deployments/core/deploy.ts index 108c2771..eb3bc268 100644 --- a/scripts/deployments/core/deploy.ts +++ b/scripts/deployments/core/deploy.ts @@ -10,8 +10,8 @@ const networkName = network.name; async function main() { if (!isProtocolNetworkName(networkName)) throw new Error("Invalid network name"); - // await deterministicDeployZetaToken(); - // await deterministicDeployZetaConnector(); + await deterministicDeployZetaToken(); + await deterministicDeployZetaConnector(); await deterministicDeployERC20Custody(); } diff --git a/scripts/deployments/core/deterministic-deploy-erc20-custody.ts b/scripts/deployments/core/deterministic-deploy-erc20-custody.ts index 98209e0d..370fc145 100644 --- a/scripts/deployments/core/deterministic-deploy-erc20-custody.ts +++ b/scripts/deployments/core/deterministic-deploy-erc20-custody.ts @@ -23,7 +23,7 @@ export const deterministicDeployERC20Custody = async () => { const zetaTokenAddress = getAddress("zetaToken", network.name); const tssAddress = getAddress("tss", network.name); const tssUpdaterAddress = getAddress("tssUpdater", network.name); - const immutableCreate2FactoryAddress = "0x095a03c6a68137fE9a566bBc3e552F299d8b886d"; //getAddress("immutableCreate2Factory", network.name); + const immutableCreate2FactoryAddress = getAddress("immutableCreate2Factory", network.name); const saltNumber = getSaltNumber("zetaERC20Custody", network.name); const saltStr = BigNumber.from(saltNumber).toHexString(); @@ -38,16 +38,6 @@ export const deterministicDeployERC20Custody = async () => { const constructorArgs = [tssAddress, tssUpdaterAddress, zetaFee.toString(), zetaMaxFee.toString(), zetaTokenAddress]; const contractBytecode = ERC20Custody__factory.bytecode; - // console.log("Deploying ERC20 Custody with the following parameters:"); - // console.log("tssAddress:", tssAddress); - // console.log("tssUpdaterAddress:", tssUpdaterAddress); - // console.log("zetaFee:", zetaFee.toString()); - // console.log("zetaMaxFee:", zetaMaxFee.toString()); - // console.log("zetaTokenAddress:", zetaTokenAddress); - // console.log("immutableCreate2FactoryAddress:", immutableCreate2FactoryAddress); - // console.log("salt:", salthex); - - // return; const { address } = await deployContractToAddress({ constructorArgs, constructorTypes, diff --git a/scripts/deployments/core/deterministic-deploy-zeta-connector.ts b/scripts/deployments/core/deterministic-deploy-zeta-connector.ts index 97ff60e5..dcb116db 100644 --- a/scripts/deployments/core/deterministic-deploy-zeta-connector.ts +++ b/scripts/deployments/core/deterministic-deploy-zeta-connector.ts @@ -24,7 +24,7 @@ export const deterministicDeployZetaConnector = async () => { const zetaTokenAddress = getAddress("zetaToken", network.name); const tssAddress = getAddress("tss", network.name); const tssUpdaterAddress = getAddress("tssUpdater", network.name); - const immutableCreate2FactoryAddress = "0x095a03c6a68137fE9a566bBc3e552F299d8b886d"; //getAddress("immutableCreate2Factory", network.name); + const immutableCreate2FactoryAddress = getAddress("immutableCreate2Factory", network.name); const saltNumber = getSaltNumber("zetaConnector", network.name); const saltStr = BigNumber.from(saltNumber).toHexString(); @@ -33,14 +33,6 @@ export const deterministicDeployZetaConnector = async () => { const constructorTypes = ["address", "address", "address", "address"]; const constructorArgs = [zetaTokenAddress, tssAddress, tssUpdaterAddress, tssUpdaterAddress]; - console.log("Deploying ZetaConnector with the following parameters:"); - console.log("zetaTokenAddress:", zetaTokenAddress); - console.log("tssAddress:", tssAddress); - console.log("tssUpdaterAddress:", tssUpdaterAddress); - console.log("immutableCreate2FactoryAddress:", immutableCreate2FactoryAddress); - console.log("salt:", salthex); - - // return; let contractBytecode; if (isEthNetworkName(network.name)) { contractBytecode = ZetaConnectorEth__factory.bytecode;