Skip to content

Feat/core plurality disputekit #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
95b8ada
feat: dispute kit in progress
jaybuidl Dec 13, 2021
f30d6bf
Merge branch 'feat/core-plurality-disputekit' into feat/core-pluralit…
jaybuidl Dec 17, 2021
f339e2b
feat(DisputeKitPlurality): split the responsibility of drawing jurors…
jaybuidl Dec 17, 2021
6a2490e
feat(DisputeKitPlurality): dispute creation
jaybuidl Dec 18, 2021
f32da6f
feat(KlerosCore): add first version
unknownunknown1 Dec 27, 2021
cd4a3df
test(DisputeKitPlurality): added basic test, work in progress
jaybuidl Dec 28, 2021
df9b414
Merge branch 'feat/core-plurality-disputekit-jaybuidl' of github.com:…
jaybuidl Dec 28, 2021
ba60d8f
chore: prettify and removal of CHANGELOG.md (cause of too many confli…
jaybuidl Dec 28, 2021
21f2f10
Merge remote-tracking branch 'origin/master' into feat/core-plurality…
jaybuidl Dec 28, 2021
319934a
chore: added hardhat-docgen
jaybuidl Dec 29, 2021
764a83e
feat(DisputeKit): changeCore() for the governor
jaybuidl Dec 29, 2021
373cc24
refactor(DisputeKit): abstraction of the dispute kit
jaybuidl Dec 29, 2021
da37929
refactor(KlerosCore): extracted a Round struct from the Dispute struct
jaybuidl Dec 30, 2021
7b39ade
feat(DisputeKitSybilResistant): naive sybil-resistant juror drawing
jaybuidl Dec 30, 2021
f09124a
chore(Code Climate): disable TS quote check
jaybuidl Jan 17, 2022
3317ffc
chore(contracts): github workflow for contracts testing (#10)
jaybuidl Jan 6, 2022
25fbf41
docs: pinned the Contracts Testing badge to master
jaybuidl Jan 6, 2022
cbde56a
Merge branch 'master' into feat/core-plurality-disputekit-jaybuidl
jaybuidl Jan 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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