Merge pull request #61 from dev-protocol/polygon

Polygon

Author: Akira-Taniguchi

.eslintignore

@@ -1,3 +1,3 @@
 node_modules/
 types/
-typechain/
+typechain-types/

.gitignore

@@ -76,3 +76,4 @@ package-lock.json
 artifacts/
 cache/
 typechain/
+typechain-types/

hardhat.config.ts

@@ -27,6 +27,12 @@ const config: HardhatUserConfig = {
 				mnemonic: mnemnoc,
 			},
 		},
+		polygonMunbai: {
+			url: `https://polygon-mumbai.infura.io/v3/${process.env.INFURA_KEY!}`,
+			accounts: {
+				mnemonic: mnemnoc,
+			},
+		},
 	},
 }
 

package.json

@@ -21,6 +21,8 @@
 	"devDependencies": {
 		"@nomiclabs/hardhat-ethers": "2.0.3",
 		"@nomiclabs/hardhat-waffle": "2.0.1",
+		"@typechain/ethers-v5": "8.0.5",
+		"@typechain/hardhat": "3.1.0",
 		"@types/chai": "4.3.0",
 		"@types/dotenv": "8.2.0",
 		"@types/mocha": "9.0.0",
@@ -41,12 +43,10 @@
 		"prettier": "2.5.1",
 		"prettier-plugin-solidity": "1.0.0-beta.19",
 		"rimraf": "3.0.2",
-		"ts-node": "10.4.0",
-		"typescript": "4.5.4",
-		"@typechain/ethers-v5": "8.0.5",
-		"@typechain/hardhat": "3.1.0",
 		"solhint": "3.3.6",
-		"typechain": "6.1.0"
+		"ts-node": "10.4.0",
+		"typechain": "6.1.0",
+		"typescript": "4.5.4"
 	},
 	"dependencies": {
 		"@devprotocol/protocol-v2": "0.5.0",

scripts/deploy.ts

@@ -1,17 +1,20 @@
 /* eslint-disable capitalized-comments */
-/* eslint-disable spaced-comment */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import { ethers } from 'hardhat'
 
 async function main() {
-	//!please check!!!!!!!!!
-	const adminAddress = ''
-	//!!!!!!!!!!!!!!!!!!!!!!
+	const [deployer] = await ethers.getSigners()
+	console.log('the account:', deployer.address)
+	console.log('Account balance:', (await deployer.getBalance()).toString())
+
+	const adminAddress = process.env.ADMIN!
+	console.log('admin:', adminAddress)
 
 	// GitHubMarket
 	const gitHubMarketFactory = await ethers.getContractFactory('GitHubMarket')
 	const gitHubMarket = await gitHubMarketFactory.deploy()
 	await gitHubMarket.deployed()
-
 	const data = ethers.utils.arrayify('0x')
 
 	// MarketProxy
@@ -38,6 +41,6 @@ main()
 	})
 
 // memo
-// set registryAddress and adminAddress and update .env file
+// add admin address to .env file
 // and execute this command
 // npx hardhat run --network arbitrumRinkeby scripts/deploy.ts

scripts/initialize.ts

@@ -0,0 +1,31 @@
+/* eslint-disable capitalized-comments */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+import { ethers } from 'hardhat'
+
+async function main() {
+	const [deployer] = await ethers.getSigners()
+	console.log('the account:', deployer.address)
+	console.log('Account balance:', (await deployer.getBalance()).toString())
+
+	const githubMarketProxy = process.env.GITHUB_MARKET_PROXY!
+	console.log('github market:', githubMarketProxy)
+
+	// GitHubMarket
+	const gitHubMarketFactory = await ethers.getContractFactory('GitHubMarket')
+
+	const proxy = gitHubMarketFactory.attach(githubMarketProxy)
+	await proxy.initialize()
+}
+
+main()
+	.then(() => process.exit(0))
+	.catch((error) => {
+		console.error(error)
+		process.exit(1)
+	})
+
+// memo
+// add admin address to .env file
+// and execute this command
+// npx hardhat run --network arbitrumRinkeby scripts/deploy.ts

scripts/set-khaos-role.ts

@@ -1,16 +1,20 @@
 /* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/await-thenable */
-/* eslint-disable spaced-comment */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { ethers } from 'hardhat'
 
 async function main() {
-	//!please check!!!!!!!!!
-	const marketBehaviorProxyAddress = ''
-	const addRole = ''
-	//!!!!!!!!!!!!!!!!!!!!!!
+	const [deployer] = await ethers.getSigners()
+	console.log('the account:', deployer.address)
+	console.log('Account balance:', (await deployer.getBalance()).toString())
+
+	const marketBehaviorProxyAddress = process.env.GITHUB_MARKET_PROXY!
+	const addRole = process.env.ADD_ROLE!
 
 	console.log(`market behavior address:${marketBehaviorProxyAddress}`)
+	console.log(`add role address:${addRole}`)
+
 	// GitHubMarket
 	const gitHubMarketFactory = await ethers.getContractFactory('GitHubMarket')
 	const gitHubMarket = await gitHubMarketFactory.attach(
@@ -31,6 +35,6 @@ main()
 	})
 
 // Memo
-// set marketBehaviorProxyAddress and update .env file
+// Add the market behavior proxy address and the address of the wallet where you want to add the khaos roll to the .env file.
 // and execute this command
 // npx hardhat run --network arbitrumRinkeby scripts/set-khaos-role.ts

test/github-market.test.ts

@@ -9,7 +9,7 @@ import { solidity } from 'ethereum-waffle'
 import GitHubMarketArtifact from '../artifacts/contracts/GitHubMarket.sol/GitHubMarket.json'
 import MarketAdminArtifact from '../artifacts/contracts/test/MarketAdmin.sol/MarketAdmin.json'
 import MarketProxyArtifact from '../artifacts/contracts/MarketProxy.sol/MarketProxy.json'
-import { GitHubMarket, MarketAdmin, MarketProxy } from '../typechain'
+import { GitHubMarket, MarketAdmin, MarketProxy } from '../typechain-types'
 
 use(solidity)
 

tsconfig.json

@@ -10,6 +10,6 @@
 		"target": "es2019",
 		"outDir": "dist"
 	},
-	"include": ["./scripts", "./test", "./typechain"],
+	"include": ["./scripts", "./test", "./typechain-types"],
 	"files": ["./hardhat.config.ts"]
 }