diff --git a/packages/contracts/.gitignore b/packages/contracts/.gitignore index fe62f0d..c353109 100644 --- a/packages/contracts/.gitignore +++ b/packages/contracts/.gitignore @@ -141,5 +141,4 @@ artifacts *.iml - -deploy/*/bosagora_devnet/deployed_contracts.json +/**/*/deployed_contracts.json diff --git a/packages/contracts/deploy/kios/bosagora_devnet/deploy.ts b/packages/contracts/deploy/main_chain_devnet/deploy.ts similarity index 96% rename from packages/contracts/deploy/kios/bosagora_devnet/deploy.ts rename to packages/contracts/deploy/main_chain_devnet/deploy.ts index a6a41eb..e477b90 100644 --- a/packages/contracts/deploy/kios/bosagora_devnet/deploy.ts +++ b/packages/contracts/deploy/main_chain_devnet/deploy.ts @@ -1,10 +1,10 @@ import "@nomiclabs/hardhat-ethers"; import { ethers } from "hardhat"; -import { HardhatAccount } from "../../../src/HardhatAccount"; -import { BOACoin } from "../../../src/utils/Amount"; -import { ContractUtils } from "../../../src/utils/ContractUtils"; -import { KIOS, MultiSigWallet, MultiSigWalletFactory } from "../../../typechain-types"; +import { HardhatAccount } from "../../src/HardhatAccount"; +import { BOACoin } from "../../src/utils/Amount"; +import { ContractUtils } from "../../src/utils/ContractUtils"; +import { KIOS, MultiSigWallet, MultiSigWalletFactory } from "../../typechain-types"; import { BaseContract, Contract, Wallet } from "ethers"; @@ -108,7 +108,7 @@ class Deployments { } } - static filename = "./deploy/kios/bosagora_devnet/deployed_contracts.json"; + static filename = "./deploy/main_chain_devnet/deployed_contracts.json"; public async loadContractInfo() { if (!fs.existsSync(Deployments.filename)) return; diff --git a/packages/contracts/deploy/pnb/bosagora_devnet/deploy.ts b/packages/contracts/deploy/side_chain_devnet/deploy.ts similarity index 94% rename from packages/contracts/deploy/pnb/bosagora_devnet/deploy.ts rename to packages/contracts/deploy/side_chain_devnet/deploy.ts index ca507d0..2981d61 100644 --- a/packages/contracts/deploy/pnb/bosagora_devnet/deploy.ts +++ b/packages/contracts/deploy/side_chain_devnet/deploy.ts @@ -1,10 +1,10 @@ import "@nomiclabs/hardhat-ethers"; import { ethers } from "hardhat"; -import { HardhatAccount } from "../../../src/HardhatAccount"; -import { BOACoin } from "../../../src/utils/Amount"; -import { ContractUtils } from "../../../src/utils/ContractUtils"; -import { MultiSigWallet, MultiSigWalletFactory, PNB } from "../../../typechain-types"; +import { HardhatAccount } from "../../src/HardhatAccount"; +import { BOACoin } from "../../src/utils/Amount"; +import { ContractUtils } from "../../src/utils/ContractUtils"; +import { KIOS, MultiSigWallet, MultiSigWalletFactory } from "../../typechain-types"; import { BaseContract, Contract, Wallet } from "ethers"; @@ -108,7 +108,7 @@ class Deployments { } } - static filename = "./deploy/pnb/bosagora_devnet/deployed_contracts.json"; + static filename = "./deploy/side_chain_devnet/deployed_contracts.json"; public async loadContractInfo() { if (!fs.existsSync(Deployments.filename)) return; @@ -186,17 +186,17 @@ async function deployMultiSigWallet(accounts: IAccount, deployment: Deployments) } async function deployToken(accounts: IAccount, deployment: Deployments) { - const contractName = "PNB"; + const contractName = "KIOS"; console.log(`Deploy ${contractName}...`); if (deployment.getContract("MultiSigWallet") === undefined) { console.error("Contract is not deployed!"); return; } - const factory = await ethers.getContractFactory(contractName); + const factory = await ethers.getContractFactory("KIOS"); const contract = (await factory .connect(accounts.deployer) - .deploy(deployment.getContractAddress("MultiSigWallet"))) as PNB; + .deploy(deployment.getContractAddress("MultiSigWallet"))) as KIOS; await contract.deployed(); await contract.deployTransaction.wait(); diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts index be7675a..2f21782 100644 --- a/packages/contracts/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -84,7 +84,12 @@ const config = { chainId: 2019, accounts: getAccounts(), }, - bosagora_devnet: { + main_chain_devnet: { + url: "http://localhost:8540", + chainId: 24600, + accounts: getAccounts(), + }, + side_chain_devnet: { url: "http://localhost:8545", chainId: 24680, accounts: getAccounts(), diff --git a/packages/contracts/package.json b/packages/contracts/package.json index f99d5c5..142f72a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -9,8 +9,8 @@ "test": "hardhat test", "clean": "hardhat clean", "build": "hardhat compile", - "deploy:kios:devnet": "hardhat run deploy/kios/bosagora_devnet/deploy.ts --network bosagora_devnet", - "deploy:pnb:devnet": "hardhat run deploy/pnb/bosagora_devnet/deploy.ts --network bosagora_devnet", + "deploy:main_chain_devnet": "hardhat run deploy/main_chain_devnet/deploy.ts --network main_chain_devnet", + "deploy:side_chain_devnet": "hardhat run deploy/side_chain_devnet/deploy.ts --network side_chain_devnet", "lint": "tslint --config tslint.json \\\"{src,test}/**/*.ts\\\"", "lint-fix": "tslint --fix --config tslint.json \\\"{src,test}/**/*.ts\\\"", "formatting:check": "prettier '**/*.{json,sol,ts,js,md}' -c",