Skip to content

Commit

Permalink
Merge pull request #311 from 1Hive/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@Corantin
Corantin committed Jun 7, 2022
2 parents 89660a2 + ff61b26 commit d484eb0
Show file tree
Hide file tree
Showing 82 changed files with 7,965 additions and 1,742 deletions.
40 changes: 40 additions & 0 deletions packages/hardhat/contracts/mocks/OwnableCelesteMock.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ contract OwnableCeleste is IArbitrator {
uint256 private constant DISPUTES_NOT_RULED = 0;
uint256 private constant DISPUTES_RULING_CHALLENGER = 3;
uint256 private constant DISPUTES_RULING_SUBMITTER = 4;
address private disputeManager;

enum State {
NOT_DISPUTED,
Expand Down Expand Up @@ -248,6 +249,11 @@ contract OwnableCeleste is IArbitrator {
owner = msg.sender;
feeToken = _feeToken;
feeAmount = _feeAmount;
disputeManager = address(new DisputeManager(address(this)));
}

function getDisputeManager() external view returns (address) {
return disputeManager;
}

function setOwner(address _owner) public onlyOwner {
Expand Down Expand Up @@ -349,3 +355,37 @@ contract OwnableCeleste is IArbitrator {
return (address(this), feeToken, feeAmount);
}
}

contract DisputeManager {
using SafeGovernERC20 for GovernERC20;

OwnableCeleste celeste;

constructor(address mockCelesteAddress) public {
celeste = OwnableCeleste(mockCelesteAddress);
}

function getDisputeFees() external view returns (GovernERC20, uint256) {
(address celeste, GovernERC20 feeToken, uint256 feeAmount) = celeste
.getDisputeFees();
return (feeToken, feeAmount);
}

function getDispute(uint256 _disputeId)
external
view
returns (
address subject,
uint8 possibleRulings,
OwnableCeleste.State state,
uint8 finalRuling,
uint256 lastRoundId,
uint64 createTermId
)
{
(address subject, OwnableCeleste.State state) = celeste.disputes(
_disputeId
);
return (subject, 0, state, 0, 0, 0);
}
}
14 changes: 7 additions & 7 deletions packages/hardhat/default-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"GovernQueueFactory": {
"rinkeby": "0x3383032F06BB4Bc4c9DfE08c564cde467c2f725e",
"xdai": "TODO"
"xdai": "0x52abc1238254d878D1761cD83c3fbF4d61B2581b"
},
"GovernFactory": {
"rinkeby": "0x3ddc3e8bbf3f6987e4008a7d6f486dae4d0f120f",
"xdai": "TODO"
"xdai": "0x8De393cd9F84D7989A1164191a1f6CDd5D2a7F9B"
},
"CreateQuestDeposit": {
"rinkeby": {
Expand All @@ -14,7 +14,7 @@
},
"xdai": {
"token": "0x71850b7E9Ee3f13Ab46d67167341E4bDc905Eef9",
"amount": 0.01
"amount": 0.1
}
},
"ScheduleDeposit": {
Expand All @@ -24,7 +24,7 @@
},
"xdai": {
"token": "0x71850b7E9Ee3f13Ab46d67167341E4bDc905Eef9",
"amount": 0.01
"amount": 0.1
}
},
"ChallengeDeposit": {
Expand All @@ -34,7 +34,7 @@
},
"xdai": {
"token": "0x71850b7E9Ee3f13Ab46d67167341E4bDc905Eef9",
"amount": 0.01
"amount": 0.1
}
},
"ChallengeFee": {
Expand All @@ -49,13 +49,13 @@
},
"RootOwner": {
"rinkeby": "0x7375Ed576952BD6CeD060EeE2Db763130eA13bA0",
"xdai": "TODO"
"xdai": "0x7375Ed576952BD6CeD060EeE2Db763130eA13bA0"
},
"ClaimDelay": {
"rinkeby": 300,
"xdai": 604800
},
"CelesteResolver": {
"xdai": "TODO"
"xdai": "0x44E4fCFed14E1285c9e0F6eae77D5fDd0F196f85"
}
}
36 changes: 19 additions & 17 deletions packages/hardhat/deploy/deploy-quest_factory.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default async (
? { token: args.createDepositToken, amount: args.createDepositAmount }
: defaultConfig.CreateQuestDeposit[network.name];
const constructorArguments = [
args.governAddress ?? govern,
args?.governAddress ?? govern,
deposit.token,
ethers.utils.parseEther(deposit.amount.toString()),
owner,
Expand All @@ -34,22 +34,24 @@ export default async (
});
await ethers.getContract("QuestFactory", deployResult.address);

try {
console.log("Verifying QuestFactory...");
await new Promise((res, rej) => {
setTimeout(
() =>
run("verify:verify", {
address: deployResult.address,
constructorArguments,
})
.then(res)
.catch(rej),
2000
); // Wait for contract to be deployed
});
} catch (error) {
console.error("Failed when verifying the QuestFactory", error);
if (network.name === "rinkeby") {
try {
console.log("Verifying QuestFactory...");
await new Promise((res, rej) => {
setTimeout(
() =>
run("verify:verify", {
address: deployResult.address,
constructorArguments,
})
.then(res)
.catch(rej),
2000
); // Wait for contract to be deployed
});
} catch (error) {
console.error("Failed when verifying the QuestFactory", error);
}
}

return deployResult;
Expand Down
2 changes: 1 addition & 1 deletion packages/hardhat/deployments/rinkeby/Celeste.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"address":"0xdCA81bde631EA9A85D12c57150427cAc350E3952","abi":[{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"},{"name":"_state","type":"uint8"}],"name":"decideDispute","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"disputes","outputs":[{"name":"subject","type":"address"},{"name":"state","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"feeToken","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"feeAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getDisputeFees","outputs":[{"name":"","type":"address"},{"name":"","type":"address"},{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"},{"name":"_submitter","type":"address"},{"name":"_evidence","type":"bytes"}],"name":"submitEvidence","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"}],"name":"closeEvidencePeriod","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_possibleRulings","type":"uint256"},{"name":"_metadata","type":"bytes"}],"name":"createDispute","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"}],"name":"rule","outputs":[{"name":"subject","type":"address"},{"name":"ruling","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"currentId","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_feeToken","type":"address"},{"name":"_feeAmount","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]}
{"address":"0xe772723b98E58F4b6217DeB381AA164f2b5FB33c","abi":[{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"},{"name":"_state","type":"uint8"}],"name":"decideDispute","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"disputes","outputs":[{"name":"subject","type":"address"},{"name":"state","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"feeToken","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"feeAmount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getDisputeFees","outputs":[{"name":"","type":"address"},{"name":"","type":"address"},{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"},{"name":"_submitter","type":"address"},{"name":"_evidence","type":"bytes"}],"name":"submitEvidence","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"}],"name":"closeEvidencePeriod","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_possibleRulings","type":"uint256"},{"name":"_metadata","type":"bytes"}],"name":"createDispute","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_disputeId","type":"uint256"}],"name":"rule","outputs":[{"name":"subject","type":"address"},{"name":"ruling","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getDisputeManager","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"currentId","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_feeToken","type":"address"},{"name":"_feeAmount","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]}
38 changes: 26 additions & 12 deletions packages/hardhat/deployments/rinkeby/OwnableCeleste.json
View file

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions packages/hardhat/deployments/rinkeby/Quest.json
View file

Large diffs are not rendered by default.

Loading

1 comment on commit d484eb0

@vercel
Copy link

@vercel vercel bot commented on d484eb0 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

quests – ./

quests.vercel.app
quests-git-main-1hive.vercel.app
quests-1hive.vercel.app
quests.1hive.org

Please sign in to comment.