From dc226289db5b6550ae2eb281f30a21d99bbbc89f Mon Sep 17 00:00:00 2001 From: picodes Date: Thu, 20 Jun 2024 11:14:59 +0200 Subject: [PATCH] fix: renamings --- deploy/0_distributor.ts | 44 +++++++++---------- deploy/mtw.ts | 44 +++++++++++++++++++ deployments/{arbitrum => arbitrum}/.chainId | 0 .../DistributionCreator.json | 0 .../DistributionCreator_Implementation.json | 0 .../DistributionCreator_Implementation_4.json | 0 .../DistributionCreator_Implementation_7.json | 0 ...stributionCreator_Implementation_V2_0.json | 0 .../{arbitrum => arbitrum}/Distributor.json | 0 .../Distributor_Implementation.json | 0 .../Distributor_Implementation_V2_0.json | 0 .../Distributor_Implementation_V2_1.json | 0 .../Distributor_Implementation_V2_2.json | 0 .../RadiantCoupon_Implementation.json | 0 .../RadiantCoupon_Proxy.json | 0 ...diantMerklTokenWrapper_Implementation.json | 0 .../RadiantMerklTokenWrapper_Proxy.json | 0 .../0b2b365c94ac072ebb941fc3258de48b.json | 0 .../18ba2a96875d191146e8a662c0868b3d.json | 0 .../22583a31af5d3f75f85137458dec3eb0.json | 0 .../3c292224bd260bf4ec842dfc61f97b84.json | 0 .../597ceedd68352db42e5878f3688fa8ec.json | 0 .../6b2bfa347ec40b3a73eea8e762572891.json | 0 .../6b5d8c27d3bebb99524ab62f4ea75fe0.json | 0 .../7dd39f683f03344d969e082aaa8e3653.json | 0 .../7e5b03d7bafe4ba514dfbdc1741fa13c.json | 0 .../882cb4e953bf152c494cb8ed697ed076.json | 0 .../9f2010084a19cf3613abdca525415862.json | 0 .../cdf42875315e2a0e31436db18b44c4ce.json | 0 .../e8fd71048bf98a271cf4aa65de23d865.json | 0 30 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 deploy/mtw.ts rename deployments/{arbitrum => arbitrum}/.chainId (100%) rename deployments/{arbitrum => arbitrum}/DistributionCreator.json (100%) rename deployments/{arbitrum => arbitrum}/DistributionCreator_Implementation.json (100%) rename deployments/{arbitrum => arbitrum}/DistributionCreator_Implementation_4.json (100%) rename deployments/{arbitrum => arbitrum}/DistributionCreator_Implementation_7.json (100%) rename deployments/{arbitrum => arbitrum}/DistributionCreator_Implementation_V2_0.json (100%) rename deployments/{arbitrum => arbitrum}/Distributor.json (100%) rename deployments/{arbitrum => arbitrum}/Distributor_Implementation.json (100%) rename deployments/{arbitrum => arbitrum}/Distributor_Implementation_V2_0.json (100%) rename deployments/{arbitrum => arbitrum}/Distributor_Implementation_V2_1.json (100%) rename deployments/{arbitrum => arbitrum}/Distributor_Implementation_V2_2.json (100%) rename deployments/{arbitrum => arbitrum}/RadiantCoupon_Implementation.json (100%) rename deployments/{arbitrum => arbitrum}/RadiantCoupon_Proxy.json (100%) rename deployments/{arbitrum => arbitrum}/RadiantMerklTokenWrapper_Implementation.json (100%) rename deployments/{arbitrum => arbitrum}/RadiantMerklTokenWrapper_Proxy.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/0b2b365c94ac072ebb941fc3258de48b.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/18ba2a96875d191146e8a662c0868b3d.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/22583a31af5d3f75f85137458dec3eb0.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/3c292224bd260bf4ec842dfc61f97b84.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/597ceedd68352db42e5878f3688fa8ec.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/6b2bfa347ec40b3a73eea8e762572891.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/6b5d8c27d3bebb99524ab62f4ea75fe0.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/7dd39f683f03344d969e082aaa8e3653.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/7e5b03d7bafe4ba514dfbdc1741fa13c.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/882cb4e953bf152c494cb8ed697ed076.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/9f2010084a19cf3613abdca525415862.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/cdf42875315e2a0e31436db18b44c4ce.json (100%) rename deployments/{arbitrum => arbitrum}/solcInputs/e8fd71048bf98a271cf4aa65de23d865.json (100%) diff --git a/deploy/0_distributor.ts b/deploy/0_distributor.ts index 94ace55..66af7f6 100644 --- a/deploy/0_distributor.ts +++ b/deploy/0_distributor.ts @@ -18,11 +18,11 @@ const func: DeployFunction = async ({ deployments, ethers, network }) => { let core: string; // TODO: change the coreMerkl address to that of the desired chain - core = '0x1746f9bb465d3747fe9C2CfE7759F4B871a06d3C'; - const coreContract = new ethers.Contract(core, CoreBorrow__factory.createInterface(), deployer) as any; - if (await coreContract.GOVERNOR_ROLE()!= '0x7935bd0ae54bc31f548c14dba4d37c5c64b3f8ca900cb468fb8abd54d5894f55') throw 'Invalid Core Merkl' + // core = '0x1746f9bb465d3747fe9C2CfE7759F4B871a06d3C'; + // const coreContract = new ethers.Contract(core, CoreBorrow__factory.createInterface(), deployer) as any; + // if (await coreContract.GOVERNOR_ROLE()!= '0x7935bd0ae54bc31f548c14dba4d37c5c64b3f8ca900cb468fb8abd54d5894f55') throw 'Invalid Core Merkl' - if (deployer.address !== '0x9f76a95AA7535bb0893cf88A146396e00ed21A12') throw `Invalid deployer address: ${deployer.address}`; + // if (deployer.address !== '0x9f76a95AA7535bb0893cf88A146396e00ed21A12') throw `Invalid deployer address: ${deployer.address}`; /* if (!network.live) { // If we're in mainnet fork, we're using the `CoreBorrow` address from mainnet @@ -39,33 +39,33 @@ const func: DeployFunction = async ({ deployments, ethers, network }) => { console.log('Now deploying Distributor'); console.log('Starting with the implementation'); - await deploy('Distributor_Implementation_V2_1', { + await deploy('Distributor_Implementation_V2_2', { contract: 'Distributor', from: deployer.address, log: !argv.ci, }); - const implementationAddress = (await ethers.getContract('Distributor_Implementation_V2_1')).address; + const implementationAddress = (await ethers.getContract('Distributor_Implementation_V2_2')).address; - console.log(`Successfully deployed the implementation for Distributor at ${implementationAddress}`); - console.log(''); + // console.log(`Successfully deployed the implementation for Distributor at ${implementationAddress}`); + // console.log(''); - console.log('Now deploying the Proxy'); + // console.log('Now deploying the Proxy'); - await deploy('Distributor', { - contract: 'ERC1967Proxy', - from: deployer.address, - args: [implementationAddress, '0x'], - log: !argv.ci, - }); + // await deploy('Distributor', { + // contract: 'ERC1967Proxy', + // from: deployer.address, + // args: [implementationAddress, '0x'], + // log: !argv.ci, + // }); - const distributor = (await deployments.get('Distributor')).address; - console.log(`Successfully deployed contract at the address ${distributor}`); - console.log('Initializing the contract'); - const contract = new ethers.Contract(distributor, Distributor__factory.createInterface(), deployer) as Distributor; - await (await contract.connect(deployer).initialize(core)).wait(); - console.log('Contract successfully initialized'); - console.log(''); + // const distributor = (await deployments.get('Distributor')).address; + // console.log(`Successfully deployed contract at the address ${distributor}`); + // console.log('Initializing the contract'); + // const contract = new ethers.Contract(distributor, Distributor__factory.createInterface(), deployer) as Distributor; + // await (await contract.connect(deployer).initialize(core)).wait(); + // console.log('Contract successfully initialized'); + // console.log(''); }; func.tags = ['distributor']; diff --git a/deploy/mtw.ts b/deploy/mtw.ts new file mode 100644 index 0000000..5315140 --- /dev/null +++ b/deploy/mtw.ts @@ -0,0 +1,44 @@ +import { DistributionCreator__factory } from '@angleprotocol/sdk'; +import { DeployFunction } from 'hardhat-deploy/types'; +import yargs from 'yargs'; +import { Distributor__factory } from '../typechain'; + +const argv = yargs.env('').boolean('ci').parseSync(); + +const func: DeployFunction = async ({ deployments, ethers, network }) => { + const { deploy } = deployments; + const { deployer } = await ethers.getNamedSigners(); + + const couponName = 'RadiantMerklTokenWrapper'; + const distributionCreator = DistributionCreator__factory.connect('0x8BB4C975Ff3c250e0ceEA271728547f3802B36Fd', deployer) + const core = await distributionCreator.core() + + console.log(`Deploying Coupon`); + console.log('Starting with the implementation'); + + await deploy(`${couponName}_Implementation`, { + contract: couponName, + from: deployer.address, + args: [], + log: !argv.ci, + }); + + const implementationAddress = (await ethers.getContract(`${couponName}_Implementation`)).address; + + console.log('Starting with the implementation'); + + const distributorInterface = Distributor__factory.createInterface(); + + await deploy(`${couponName}_Proxy`, { + contract: 'ERC1967Proxy', + from: deployer.address, + args: [implementationAddress, distributorInterface.encodeFunctionData('initialize', [core])], + log: !argv.ci, + }); + + console.log(`Successfully deployed the contract ${couponName} at ${implementationAddress}`); + console.log(''); +}; + +func.tags = ['mtw']; +export default func; diff --git a/deployments/arbitrum /.chainId b/deployments/arbitrum/.chainId similarity index 100% rename from deployments/arbitrum /.chainId rename to deployments/arbitrum/.chainId diff --git a/deployments/arbitrum /DistributionCreator.json b/deployments/arbitrum/DistributionCreator.json similarity index 100% rename from deployments/arbitrum /DistributionCreator.json rename to deployments/arbitrum/DistributionCreator.json diff --git a/deployments/arbitrum /DistributionCreator_Implementation.json b/deployments/arbitrum/DistributionCreator_Implementation.json similarity index 100% rename from deployments/arbitrum /DistributionCreator_Implementation.json rename to deployments/arbitrum/DistributionCreator_Implementation.json diff --git a/deployments/arbitrum /DistributionCreator_Implementation_4.json b/deployments/arbitrum/DistributionCreator_Implementation_4.json similarity index 100% rename from deployments/arbitrum /DistributionCreator_Implementation_4.json rename to deployments/arbitrum/DistributionCreator_Implementation_4.json diff --git a/deployments/arbitrum /DistributionCreator_Implementation_7.json b/deployments/arbitrum/DistributionCreator_Implementation_7.json similarity index 100% rename from deployments/arbitrum /DistributionCreator_Implementation_7.json rename to deployments/arbitrum/DistributionCreator_Implementation_7.json diff --git a/deployments/arbitrum /DistributionCreator_Implementation_V2_0.json b/deployments/arbitrum/DistributionCreator_Implementation_V2_0.json similarity index 100% rename from deployments/arbitrum /DistributionCreator_Implementation_V2_0.json rename to deployments/arbitrum/DistributionCreator_Implementation_V2_0.json diff --git a/deployments/arbitrum /Distributor.json b/deployments/arbitrum/Distributor.json similarity index 100% rename from deployments/arbitrum /Distributor.json rename to deployments/arbitrum/Distributor.json diff --git a/deployments/arbitrum /Distributor_Implementation.json b/deployments/arbitrum/Distributor_Implementation.json similarity index 100% rename from deployments/arbitrum /Distributor_Implementation.json rename to deployments/arbitrum/Distributor_Implementation.json diff --git a/deployments/arbitrum /Distributor_Implementation_V2_0.json b/deployments/arbitrum/Distributor_Implementation_V2_0.json similarity index 100% rename from deployments/arbitrum /Distributor_Implementation_V2_0.json rename to deployments/arbitrum/Distributor_Implementation_V2_0.json diff --git a/deployments/arbitrum /Distributor_Implementation_V2_1.json b/deployments/arbitrum/Distributor_Implementation_V2_1.json similarity index 100% rename from deployments/arbitrum /Distributor_Implementation_V2_1.json rename to deployments/arbitrum/Distributor_Implementation_V2_1.json diff --git a/deployments/arbitrum /Distributor_Implementation_V2_2.json b/deployments/arbitrum/Distributor_Implementation_V2_2.json similarity index 100% rename from deployments/arbitrum /Distributor_Implementation_V2_2.json rename to deployments/arbitrum/Distributor_Implementation_V2_2.json diff --git a/deployments/arbitrum /RadiantCoupon_Implementation.json b/deployments/arbitrum/RadiantCoupon_Implementation.json similarity index 100% rename from deployments/arbitrum /RadiantCoupon_Implementation.json rename to deployments/arbitrum/RadiantCoupon_Implementation.json diff --git a/deployments/arbitrum /RadiantCoupon_Proxy.json b/deployments/arbitrum/RadiantCoupon_Proxy.json similarity index 100% rename from deployments/arbitrum /RadiantCoupon_Proxy.json rename to deployments/arbitrum/RadiantCoupon_Proxy.json diff --git a/deployments/arbitrum /RadiantMerklTokenWrapper_Implementation.json b/deployments/arbitrum/RadiantMerklTokenWrapper_Implementation.json similarity index 100% rename from deployments/arbitrum /RadiantMerklTokenWrapper_Implementation.json rename to deployments/arbitrum/RadiantMerklTokenWrapper_Implementation.json diff --git a/deployments/arbitrum /RadiantMerklTokenWrapper_Proxy.json b/deployments/arbitrum/RadiantMerklTokenWrapper_Proxy.json similarity index 100% rename from deployments/arbitrum /RadiantMerklTokenWrapper_Proxy.json rename to deployments/arbitrum/RadiantMerklTokenWrapper_Proxy.json diff --git a/deployments/arbitrum /solcInputs/0b2b365c94ac072ebb941fc3258de48b.json b/deployments/arbitrum/solcInputs/0b2b365c94ac072ebb941fc3258de48b.json similarity index 100% rename from deployments/arbitrum /solcInputs/0b2b365c94ac072ebb941fc3258de48b.json rename to deployments/arbitrum/solcInputs/0b2b365c94ac072ebb941fc3258de48b.json diff --git a/deployments/arbitrum /solcInputs/18ba2a96875d191146e8a662c0868b3d.json b/deployments/arbitrum/solcInputs/18ba2a96875d191146e8a662c0868b3d.json similarity index 100% rename from deployments/arbitrum /solcInputs/18ba2a96875d191146e8a662c0868b3d.json rename to deployments/arbitrum/solcInputs/18ba2a96875d191146e8a662c0868b3d.json diff --git a/deployments/arbitrum /solcInputs/22583a31af5d3f75f85137458dec3eb0.json b/deployments/arbitrum/solcInputs/22583a31af5d3f75f85137458dec3eb0.json similarity index 100% rename from deployments/arbitrum /solcInputs/22583a31af5d3f75f85137458dec3eb0.json rename to deployments/arbitrum/solcInputs/22583a31af5d3f75f85137458dec3eb0.json diff --git a/deployments/arbitrum /solcInputs/3c292224bd260bf4ec842dfc61f97b84.json b/deployments/arbitrum/solcInputs/3c292224bd260bf4ec842dfc61f97b84.json similarity index 100% rename from deployments/arbitrum /solcInputs/3c292224bd260bf4ec842dfc61f97b84.json rename to deployments/arbitrum/solcInputs/3c292224bd260bf4ec842dfc61f97b84.json diff --git a/deployments/arbitrum /solcInputs/597ceedd68352db42e5878f3688fa8ec.json b/deployments/arbitrum/solcInputs/597ceedd68352db42e5878f3688fa8ec.json similarity index 100% rename from deployments/arbitrum /solcInputs/597ceedd68352db42e5878f3688fa8ec.json rename to deployments/arbitrum/solcInputs/597ceedd68352db42e5878f3688fa8ec.json diff --git a/deployments/arbitrum /solcInputs/6b2bfa347ec40b3a73eea8e762572891.json b/deployments/arbitrum/solcInputs/6b2bfa347ec40b3a73eea8e762572891.json similarity index 100% rename from deployments/arbitrum /solcInputs/6b2bfa347ec40b3a73eea8e762572891.json rename to deployments/arbitrum/solcInputs/6b2bfa347ec40b3a73eea8e762572891.json diff --git a/deployments/arbitrum /solcInputs/6b5d8c27d3bebb99524ab62f4ea75fe0.json b/deployments/arbitrum/solcInputs/6b5d8c27d3bebb99524ab62f4ea75fe0.json similarity index 100% rename from deployments/arbitrum /solcInputs/6b5d8c27d3bebb99524ab62f4ea75fe0.json rename to deployments/arbitrum/solcInputs/6b5d8c27d3bebb99524ab62f4ea75fe0.json diff --git a/deployments/arbitrum /solcInputs/7dd39f683f03344d969e082aaa8e3653.json b/deployments/arbitrum/solcInputs/7dd39f683f03344d969e082aaa8e3653.json similarity index 100% rename from deployments/arbitrum /solcInputs/7dd39f683f03344d969e082aaa8e3653.json rename to deployments/arbitrum/solcInputs/7dd39f683f03344d969e082aaa8e3653.json diff --git a/deployments/arbitrum /solcInputs/7e5b03d7bafe4ba514dfbdc1741fa13c.json b/deployments/arbitrum/solcInputs/7e5b03d7bafe4ba514dfbdc1741fa13c.json similarity index 100% rename from deployments/arbitrum /solcInputs/7e5b03d7bafe4ba514dfbdc1741fa13c.json rename to deployments/arbitrum/solcInputs/7e5b03d7bafe4ba514dfbdc1741fa13c.json diff --git a/deployments/arbitrum /solcInputs/882cb4e953bf152c494cb8ed697ed076.json b/deployments/arbitrum/solcInputs/882cb4e953bf152c494cb8ed697ed076.json similarity index 100% rename from deployments/arbitrum /solcInputs/882cb4e953bf152c494cb8ed697ed076.json rename to deployments/arbitrum/solcInputs/882cb4e953bf152c494cb8ed697ed076.json diff --git a/deployments/arbitrum /solcInputs/9f2010084a19cf3613abdca525415862.json b/deployments/arbitrum/solcInputs/9f2010084a19cf3613abdca525415862.json similarity index 100% rename from deployments/arbitrum /solcInputs/9f2010084a19cf3613abdca525415862.json rename to deployments/arbitrum/solcInputs/9f2010084a19cf3613abdca525415862.json diff --git a/deployments/arbitrum /solcInputs/cdf42875315e2a0e31436db18b44c4ce.json b/deployments/arbitrum/solcInputs/cdf42875315e2a0e31436db18b44c4ce.json similarity index 100% rename from deployments/arbitrum /solcInputs/cdf42875315e2a0e31436db18b44c4ce.json rename to deployments/arbitrum/solcInputs/cdf42875315e2a0e31436db18b44c4ce.json diff --git a/deployments/arbitrum /solcInputs/e8fd71048bf98a271cf4aa65de23d865.json b/deployments/arbitrum/solcInputs/e8fd71048bf98a271cf4aa65de23d865.json similarity index 100% rename from deployments/arbitrum /solcInputs/e8fd71048bf98a271cf4aa65de23d865.json rename to deployments/arbitrum/solcInputs/e8fd71048bf98a271cf4aa65de23d865.json