Skip to content

Commit

Permalink
Merge pull request #12 from kleros/feat/core-plurality-disputekit-jay…
Browse files Browse the repository at this point in the history
…buidl

Feat/core plurality disputekit
  • Loading branch information
jaybuidl authored Jan 20, 2022
2 parents 4e13c91 + cbde56a commit 7c781a3
Show file tree
Hide file tree
Showing 14 changed files with 3,761 additions and 251 deletions.
6 changes: 6 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
engines:
tslint:
enabled: true
checks:
quotemark:
enabled: false
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"solidity.compileUsingRemoteVersion": "v0.8.9+commit.e5eed63a",
"solidity.compileUsingRemoteVersion": "v0.8.10+commit.fc410830",
"mochaExplorer.files": "contracts/test/**/*.{j,t}s"
}
37 changes: 35 additions & 2 deletions contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import "@nomiclabs/hardhat-waffle";
import "@typechain/hardhat";
import "hardhat-gas-reporter";
import "solidity-coverage";
import "hardhat-deploy"
import "hardhat-deploy-ethers"
import "hardhat-deploy";
import "hardhat-deploy-ethers";
import "hardhat-watcher";
import "hardhat-docgen";

dotenv.config();

Expand Down Expand Up @@ -43,6 +45,18 @@ const config: HardhatUserConfig = {
saveDeployments: false,
tags: ["test", "local"],
},
mainnetFork: {
url: `http://127.0.0.1:8545`,
chainId: 1,
forking: {
url: `https://mainnet.infura.io/v3/${process.env.INFURA_API_KEY}`,
},
accounts: process.env.MAINNET_PRIVATE_KEY !== undefined ? [process.env.MAINNET_PRIVATE_KEY] : [],
live: false,
saveDeployments: false,
tags: ["test", "local"],
},

// Home chain ---------------------------------------------------------------------------------
arbitrumRinkeby: {
chainId: 421611,
Expand Down Expand Up @@ -101,6 +115,25 @@ const config: HardhatUserConfig = {
etherscan: {
apiKey: process.env.ETHERSCAN_API_KEY,
},
watcher: {
compilation: {
tasks: ["compile"],
files: ["./contracts"],
verbose: true,
},
testArbitration: {
tasks: [
{ command: "compile", params: { quiet: true } },
{ command: "test", params: { noCompile: true, testFiles: ["./test/arbitration/index.ts"] } },
],
files: ["./test/**/*", "./src/**/*"],
},
},
docgen: {
path: './docs',
clear: true,
runOnCompile: false,
},
};

export default config;
7 changes: 6 additions & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
"build": "hardhat compile",
"clean": "hardhat clean",
"deploy": "hardhat deploy",
"test": "hardhat test"
"test": "hardhat test",
"watch": "hardhat watch",
"docgen": "hardhat docgen"
},
"devDependencies": {
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-etherscan": "^2.1.7",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@openzeppelin/contracts": "^4.4.1",
"@typechain/ethers-v5": "^7.2.0",
"@typechain/hardhat": "^2.3.1",
"@types/chai": "^4.2.22",
Expand All @@ -35,7 +38,9 @@
"hardhat": "^2.6.8",
"hardhat-deploy": "^0.9.6",
"hardhat-deploy-ethers": "^0.3.0-beta.11",
"hardhat-docgen": "^1.2.1",
"hardhat-gas-reporter": "^1.0.4",
"hardhat-watcher": "^2.1.1",
"json-schema": "^0.4.0",
"mocha": "^9.1.3",
"solhint": "^3.3.6",
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/arbitration/ArbitrableExample.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "./IArbitrable.sol";

/**
* @title ArbitrableExample
* An example of the arbitrable contract which connects to the arbitator that implements IArbitrator interface.
* An example of an arbitrable contract which connects to the arbitator that implements the updated interface.
*/
contract ArbitrableExample is IArbitrable {
struct DisputeStruct {
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/arbitration/CentralizedArbitrator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ contract CentralizedArbitrator is IArbitrator {
uint256 _arbitrationFee,
uint256 _appealDuration,
uint256 _appealFee
) public {
) {
arbitrationFee = _arbitrationFee;
appealDuration = _appealDuration;
appealFee = _appealFee;
Expand Down
Loading

0 comments on commit 7c781a3

Please sign in to comment.