From 0b3b1f8105502e2df5ca83c5c936b07dd51fc5f5 Mon Sep 17 00:00:00 2001 From: Heather S Date: Mon, 27 Sep 2021 14:24:29 +0200 Subject: [PATCH 1/2] Update deploy and verify scripts --- scripts/contracts-dev.json | 13 +++++---- scripts/deploy.ts | 55 +++++++++++++++++++++++++++++++++++++- scripts/verify.ts | 24 +++++++++++++++++ 3 files changed, 86 insertions(+), 6 deletions(-) diff --git a/scripts/contracts-dev.json b/scripts/contracts-dev.json index caca63cd..723780cb 100644 --- a/scripts/contracts-dev.json +++ b/scripts/contracts-dev.json @@ -1,8 +1,11 @@ { "network": "rinkeby", - "flo": "0xAC8Fc1dd2bB537684b431784c5E3Bf4354503866", - "erc1155erc721": "0xf80d208cb435FC23E00AA410A8A455b51dFAF2a0", - "voucherKernel": "0x1C7d963675064B4c0341d7536E319C728C40dB4f", - "cashier": "0x5f7047EAbeCD6042752591B126182E13B678e8df", - "br": "0xD9a3cFE2B85DE7d388Bcd2c412A5997f0F5BbB29" + "tokenRegistry": "0xc3e1DbFaeEd2575E0a8d63ADf837e7a98Eb698C1", + "erc1155erc721": "0x8409774D139729cd3A60D263D4b8E8e18cC27653", + "voucherKernel": "0xfdadAFbaD3E2C275EE0AF4bf10bf36BF38d7f7d5", + "cashier": "0x6127DF8ee4De80843DE45cc4176d0A5e487FA6D2", + "br": "0xFDbDE16F5631ee830aD314C744c68d07739E5665", + "daiTokenWrapper": "0x270469a882B92F27FEa37d3f3cf82756BD77D9c5", + "gate": "0x64Dc8C87afD21f0c0ba027772d89E78Eae9EE0C9", + "erc1155NonTransferable": "0x6762932CB1e7F6c745d14F5087E780Bc922C55Ba" } \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index fa5d17b4..215bea47 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -20,6 +20,10 @@ class DeploymentExecutor { br; boson_token; TOKEN_LIMIT; + daiTokenWrapper; + dai_token; + gate; + erc1155NonTransferable constructor() { if (this.constructor == DeploymentExecutor) { @@ -39,6 +43,10 @@ class DeploymentExecutor { this.boson_token = process.env.BOSON_TOKEN; this.TOKEN_LIMIT = (1 * 10 ** 18).toString(); + this.daiTokenWrapper; + this.dai_token = process.env.DAI_TOKEN; + this.gate; + this.erc1155NonTransferable; } async setDefaults() { @@ -105,6 +113,22 @@ class DeploymentExecutor { txReceipt = await tx.wait(); event = txReceipt.events[0]; console.log('$ Cashier', event.event, 'at:', event.args._newTokenContract); + + tx = await this.tokenRegistry.setTokenWrapperAddress( + this.dai_token, + this.daiTokenWrapper.address + ); + + console.log( + '$ TokenRegistry', + event.event, + 'at:', + event.args._newWrapperAddress + ); + + tx = await this.gate.setNonTransferableTokenContract(this.erc1155NonTransferable.address); + + } async deployContracts() { @@ -113,6 +137,9 @@ class DeploymentExecutor { const Cashier = await ethers.getContractFactory('Cashier'); const BosonRouter = await ethers.getContractFactory('BosonRouter'); const TokenRegistry = await ethers.getContractFactory('TokenRegistry'); + const DAITokenWrapper = await ethers.getContractFactory('DAITokenWrapper'); + const Gate = await ethers.getContractFactory('Gate'); + const ERC1155NonTransferable = await ethers.getContractFactory('ERC1155NonTransferable'); this.tokenRegistry = await TokenRegistry.deploy(); this.erc1155erc721 = await ERC1155ERC721.deploy(); @@ -123,12 +150,18 @@ class DeploymentExecutor { this.tokenRegistry.address, this.cashier.address ); + this.daiTokenWrapper = await DAITokenWrapper.deploy(this.dai_token); + this.gate = await Gate.deploy(this.br.address); + this.erc1155NonTransferable = await ERC1155NonTransferable.deploy("http://dummyuri"); await this.tokenRegistry.deployed(); await this.erc1155erc721.deployed(); await this.voucherKernel.deployed(); await this.cashier.deployed(); await this.br.deployed(); + await this.daiTokenWrapper.deployed(); + await this.gate.deployed(); + await this. erc1155NonTransferable.deployed(); } logContracts() { @@ -140,6 +173,22 @@ class DeploymentExecutor { console.log('VoucherKernel Contract Address: ', this.voucherKernel.address); console.log('Cashier Contract Address: ', this.cashier.address); console.log('Boson Router Contract Address: ', this.br.address); + console.log( + 'Token Registry Contract Address: ', + this.tokenRegistry.address + ); + console.log( + 'DAI Token Wrapper Contract Address: ', + this.daiTokenWrapper.address + ); + console.log( + 'Gate Contract Address: ', + this.gate.address + ); + console.log( + 'ERC1155NonTransferable Contract Address: ', + this.erc1155NonTransferable.address + ); } writeContracts() { @@ -153,6 +202,9 @@ class DeploymentExecutor { voucherKernel: this.voucherKernel.address, cashier: this.cashier.address, br: this.br.address, + daiTokenWrapper: this.daiTokenWrapper.address, + gate: this.gate.address, + erc1155NonTransferable: this.erc1155NonTransferable.address }, null, 2 @@ -176,6 +228,7 @@ class ProdExecutor extends DeploymentExecutor { async setDefaults() { await super.setDefaults(); await this.tokenRegistry.setTokenLimit(this.boson_token, this.TOKEN_LIMIT); + await this.tokenRegistry.setTokenLimit(this.dai_token, this.TOKEN_LIMIT); } } @@ -194,10 +247,10 @@ class NonProdExecutor extends DeploymentExecutor { async setDefaults() { await super.setDefaults(); - await this.voucherKernel.setComplainPeriod(2 * this.SIXTY_SECONDS); await this.voucherKernel.setCancelFaultPeriod(2 * this.SIXTY_SECONDS); await this.tokenRegistry.setTokenLimit(this.boson_token, this.TOKEN_LIMIT); + await this.tokenRegistry.setTokenLimit(this.dai_token, this.TOKEN_LIMIT); } } diff --git a/scripts/verify.ts b/scripts/verify.ts index 15de8ebd..3b7d59cf 100644 --- a/scripts/verify.ts +++ b/scripts/verify.ts @@ -68,6 +68,30 @@ export async function verifyContracts(env: string): Promise { } catch (error) { logError('BosonRouter', error.message); } + + //verify Gate + try { + await hre.run('verify:verify', { + address: contracts.gate, + constructorArguments: [ + contracts.br + ], + }); + } catch (error) { + logError('Gate', error.message); + } + + //verify ERC1155NonTransferable + try { + await hre.run('verify:verify', { + address: contracts.erc1155NonTransferable, + constructorArguments: [ + "http://dummyuri" + ], + }); + } catch (error) { + logError('ERC1155NonTransferable', error.message); + } } function logError(contractName, msg) { From 3622b7c5ba2134d010a8d0e4cb9303be54ddf660 Mon Sep 17 00:00:00 2001 From: Heather S Date: Mon, 27 Sep 2021 14:31:45 +0200 Subject: [PATCH 2/2] Change formatting --- scripts/deploy.ts | 25 +++++++++++++------------ scripts/verify.ts | 24 ++++++++++-------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 215bea47..f3d2a4a3 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -23,7 +23,7 @@ class DeploymentExecutor { daiTokenWrapper; dai_token; gate; - erc1155NonTransferable + erc1155NonTransferable; constructor() { if (this.constructor == DeploymentExecutor) { @@ -126,9 +126,9 @@ class DeploymentExecutor { event.args._newWrapperAddress ); - tx = await this.gate.setNonTransferableTokenContract(this.erc1155NonTransferable.address); - - + tx = await this.gate.setNonTransferableTokenContract( + this.erc1155NonTransferable.address + ); } async deployContracts() { @@ -139,7 +139,9 @@ class DeploymentExecutor { const TokenRegistry = await ethers.getContractFactory('TokenRegistry'); const DAITokenWrapper = await ethers.getContractFactory('DAITokenWrapper'); const Gate = await ethers.getContractFactory('Gate'); - const ERC1155NonTransferable = await ethers.getContractFactory('ERC1155NonTransferable'); + const ERC1155NonTransferable = await ethers.getContractFactory( + 'ERC1155NonTransferable' + ); this.tokenRegistry = await TokenRegistry.deploy(); this.erc1155erc721 = await ERC1155ERC721.deploy(); @@ -152,7 +154,9 @@ class DeploymentExecutor { ); this.daiTokenWrapper = await DAITokenWrapper.deploy(this.dai_token); this.gate = await Gate.deploy(this.br.address); - this.erc1155NonTransferable = await ERC1155NonTransferable.deploy("http://dummyuri"); + this.erc1155NonTransferable = await ERC1155NonTransferable.deploy( + 'http://dummyuri' + ); await this.tokenRegistry.deployed(); await this.erc1155erc721.deployed(); @@ -161,7 +165,7 @@ class DeploymentExecutor { await this.br.deployed(); await this.daiTokenWrapper.deployed(); await this.gate.deployed(); - await this. erc1155NonTransferable.deployed(); + await this.erc1155NonTransferable.deployed(); } logContracts() { @@ -181,10 +185,7 @@ class DeploymentExecutor { 'DAI Token Wrapper Contract Address: ', this.daiTokenWrapper.address ); - console.log( - 'Gate Contract Address: ', - this.gate.address - ); + console.log('Gate Contract Address: ', this.gate.address); console.log( 'ERC1155NonTransferable Contract Address: ', this.erc1155NonTransferable.address @@ -204,7 +205,7 @@ class DeploymentExecutor { br: this.br.address, daiTokenWrapper: this.daiTokenWrapper.address, gate: this.gate.address, - erc1155NonTransferable: this.erc1155NonTransferable.address + erc1155NonTransferable: this.erc1155NonTransferable.address, }, null, 2 diff --git a/scripts/verify.ts b/scripts/verify.ts index 3b7d59cf..022329cb 100644 --- a/scripts/verify.ts +++ b/scripts/verify.ts @@ -73,25 +73,21 @@ export async function verifyContracts(env: string): Promise { try { await hre.run('verify:verify', { address: contracts.gate, - constructorArguments: [ - contracts.br - ], + constructorArguments: [contracts.br], }); } catch (error) { logError('Gate', error.message); } - //verify ERC1155NonTransferable - try { - await hre.run('verify:verify', { - address: contracts.erc1155NonTransferable, - constructorArguments: [ - "http://dummyuri" - ], - }); - } catch (error) { - logError('ERC1155NonTransferable', error.message); - } + //verify ERC1155NonTransferable + try { + await hre.run('verify:verify', { + address: contracts.erc1155NonTransferable, + constructorArguments: ['http://dummyuri'], + }); + } catch (error) { + logError('ERC1155NonTransferable', error.message); + } } function logError(contractName, msg) {