Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: update core package #22

Merged
merged 3 commits into from
Nov 29, 2023
Merged

feat: update core package #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1541577
feat: update core package
gas1cent Nov 28, 2023
1d77f5a
feat: remove or comment out unused variables
gas1cent Nov 28, 2023
5cfb222
feat: resolve a todo
gas1cent Nov 28, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"package.json": "sort-package-json"
},
"dependencies": {
"@defi-wonderland/prophet-core-contracts": "0.0.0-5fbc6720",
"@defi-wonderland/prophet-core-contracts": "0.0.0-c8bd8736",
"@defi-wonderland/solidity-utils": "0.0.0-3e9c8e8b",
"@openzeppelin/contracts": "^4.9.3",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
Expand Down
2 changes: 1 addition & 1 deletion solidity/contracts/modules/dispute/BondEscalationModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract BondEscalationModule is Module, IBondEscalationModule {
/// @inheritdoc IBondEscalationModule
function disputeResponse(
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata _dispute
) external onlyOracle {
RequestParameters memory _params = decodeRequestData(_request.disputeModuleData);
Expand Down
6 changes: 3 additions & 3 deletions solidity/contracts/modules/dispute/BondedDisputeModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ contract BondedDisputeModule is Module, IBondedDisputeModule {
}

/// @inheritdoc IBondedDisputeModule
function decodeRequestData(bytes calldata _data) public view returns (RequestParameters memory _params) {
function decodeRequestData(bytes calldata _data) public pure returns (RequestParameters memory _params) {
_params = abi.decode(_data, (RequestParameters));
}

/// @inheritdoc IBondedDisputeModule
function disputeResponse(
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata _dispute
) external onlyOracle {
RequestParameters memory _params = decodeRequestData(_request.disputeModuleData);
Expand All @@ -48,7 +48,7 @@ contract BondedDisputeModule is Module, IBondedDisputeModule {
function onDisputeStatusChange(
bytes32 _disputeId,
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata _dispute
) external onlyOracle {
RequestParameters memory _params = decodeRequestData(_request.disputeModuleData);
Expand Down
2 changes: 1 addition & 1 deletion solidity/contracts/modules/resolution/ArbitratorModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ contract ArbitratorModule is Module, IArbitratorModule {
function startResolution(
bytes32 _disputeId,
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata _dispute
) external onlyOracle {
RequestParameters memory _params = decodeRequestData(_request.resolutionModuleData);
Expand Down
6 changes: 3 additions & 3 deletions solidity/contracts/modules/resolution/ERC20ResolutionModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ contract ERC20ResolutionModule is Module, IERC20ResolutionModule {
/// @inheritdoc IERC20ResolutionModule
function startResolution(
bytes32 _disputeId,
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Dispute calldata _dispute
IOracle.Request calldata, /* _request */
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata /* _dispute */
) external onlyOracle {
escalations[_disputeId].startTime = block.timestamp;
emit VotingPhaseStarted(block.timestamp, _disputeId);
Expand Down
6 changes: 3 additions & 3 deletions solidity/contracts/modules/resolution/PrivateERC20ResolutionModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ contract PrivateERC20ResolutionModule is Module, IPrivateERC20ResolutionModule {
/// @inheritdoc IPrivateERC20ResolutionModule
function startResolution(
bytes32 _disputeId,
IOracle.Request calldata _request,
IOracle.Response calldata _response,
IOracle.Dispute calldata _dispute
IOracle.Request calldata, /* _request */
IOracle.Response calldata, /* _response */
IOracle.Dispute calldata /* _dispute */
) external onlyOracle {
escalations[_disputeId].startTime = block.timestamp;
emit CommittingPhaseStarted(block.timestamp, _disputeId);
Expand Down
16 changes: 2 additions & 14 deletions solidity/test/unit/modules/dispute/BondEscalationModule.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@ contract BaseTest is Test, Helpers {
bondEscalationModule = new ForTest_BondEscalationModule(oracle);
}

function _getRandomDispute(
bytes32 _requestId,
IOracle.DisputeStatus _status
) internal view returns (IOracle.Dispute memory _dispute) {
function _getRandomDispute(bytes32 _requestId) internal view returns (IOracle.Dispute memory _dispute) {
_dispute =
IOracle.Dispute({disputer: disputer, responseId: bytes32('response'), proposer: proposer, requestId: _requestId});
}
Expand Down Expand Up @@ -387,12 +384,7 @@ contract BondEscalationModule_Unit_DisputeResponse is BaseTest {
/**
* @notice Tests that disputeResponse reverts the caller is not the oracle address.
*/
function test_revertIfCallerIsNotOracle(
bytes32 _requestId,
bytes32 _responseId,
address _caller,
IOracle.Request calldata _request
) public {
function test_revertIfCallerIsNotOracle(address _caller, IOracle.Request calldata _request) public {
vm.assume(_caller != address(oracle));

// Check: does it revert if not called by the Oracle?
Expand Down Expand Up @@ -573,17 +565,13 @@ contract BondEscalationModule_Unit_OnDisputeStatusChange is BaseTest {
*/
function test_revertIfCallerIsNotOracle(
bytes32 _disputeId,
bytes32 _requestId,
address _caller,
uint8 _status,
IOracle.Request calldata _request
) public {
vm.assume(_caller != address(oracle));
vm.assume(_status < 4);

IOracle.DisputeStatus _disputeStatus = IOracle.DisputeStatus(_status);
IOracle.Dispute memory _dispute = _getRandomDispute(_requestId, _disputeStatus);

// Check: does it revert if not called by the Oracle?
vm.expectRevert(IModule.Module_OnlyOracle.selector);
vm.prank(_caller);
Expand Down
5 changes: 2 additions & 3 deletions solidity/test/unit/modules/dispute/CircuitResolverModule.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,9 @@ contract CircuitResolverModule_Unit_OnDisputeStatusChange is BaseTest {
bytes32 _disputeId = _getId(mockDispute);
IOracle.DisputeStatus _status = IOracle.DisputeStatus.Lost;

// TODO: fix this test
// Check: is the event emitted?
// vm.expectEmit(true, true, true, true, address(circuitResolverModule));
// emit DisputeStatusChanged(_disputeId, mockDispute, _status);
vm.expectEmit(true, true, true, true, address(circuitResolverModule));
emit DisputeStatusChanged(_disputeId, mockDispute, _status);

vm.prank(address(oracle));
circuitResolverModule.onDisputeStatusChange(_disputeId, mockRequest, mockResponse, mockDispute);
Expand Down
3 changes: 1 addition & 2 deletions solidity/test/unit/modules/resolution/ERC20ResolutionModule.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ contract ERC20ResolutionModule_Unit_ClaimVote is BaseTest {
/**
* @notice Reverts if the vote is still ongoing
*/
function test_revertIfVoteIsOnGoing(address _voter, uint256 _amount) public {
function test_revertIfVoteIsOnGoing(address _voter) public {
mockRequest.resolutionModuleData = abi.encode(
IERC20ResolutionModule.RequestParameters({
accountingExtension: accountingExtension,
Expand All @@ -370,7 +370,6 @@ contract ERC20ResolutionModule_Unit_ClaimVote is BaseTest {
);

mockDispute.requestId = _getId(mockRequest);
bytes32 _disputeId = _getId(mockDispute);
module.forTest_setStartTime(_getId(mockDispute), block.timestamp);

// Expect an error to be thrown
Expand Down
1 change: 0 additions & 1 deletion solidity/test/unit/modules/resolution/PrivateERC20ResolutionModule.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ contract BaseTest is Test, Helpers {
uint256 _amountOfVotes
) internal returns (uint256 _totalVotesCast) {
bytes32 _disputeId = _getId(_dispute);
bytes32 _requestId = _getId(_request);

for (uint256 _i = 1; _i <= _amountOfVoters;) {
vm.warp(120_000);
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@
dependencies:
"@jridgewell/trace-mapping" "0.3.9"

"@defi-wonderland/[email protected]5fbc6720":
version "0.0.0-5fbc6720"
resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core-contracts/-/prophet-core-contracts-0.0.0-5fbc6720.tgz#5fef99e5a9064289566c8b7eec3e754c20c67166"
integrity sha512-tXiSGhSFW/QJhW4eLKJ7MCUXEG+NvJvOPteFHlri+GEiXfQRQztpWBQYSngI68C+rourOTVCbXSm0bDJK2UfMw==
"@defi-wonderland/[email protected]c8bd8736":
version "0.0.0-c8bd8736"
resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core-contracts/-/prophet-core-contracts-0.0.0-c8bd8736.tgz#3f27e8296831b384c9bb516bcef3d7bceb5383bd"
integrity sha512-Zh+kWY6GZsEf6+Fs399XOxlWojWN1yFyznjnXh2Ydfxa72AqzyviaEPgse5zc9diizGJnBsyo9FRF/BY+EbuTg==
dependencies:
"@defi-wonderland/solidity-utils" "0.0.0-3e9c8e8b"
"@openzeppelin/contracts" "^4.9.3"
Expand Down
Loading