Skip to content

Commit

Permalink
fix: update prophet core canary
Browse files Browse the repository at this point in the history
  • Loading branch information
moebius committed Dec 7, 2023
1 parent 136af42 commit 1a93a91
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
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-c8bd8736",
"@defi-wonderland/prophet-core-contracts": "0.0.0-ad870035",
"@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
9 changes: 5 additions & 4 deletions solidity/test/integration/Finalization.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,17 @@ contract Integration_Finalization is IntegrationBase {

vm.prank(_finalizer);

//asdf
// Check: reverts if request has no response?
vm.expectRevert(
abi.encodeWithSelector(IOracle.Oracle_InvalidFinalizedResponse.selector, _getId(_nonExistentResponse))
);
vm.expectRevert(IOracle.Oracle_InvalidFinalizedResponse.selector);

oracle.finalize(_request, _nonExistentResponse);
}

/**
* @notice Test to check that finalizing a request with a ongoing dispute with revert.
*/
//asdf
function test_revertFinalizeWithDisputedResponse() public {
address _callbackTarget = makeAddr('target');
vm.etch(_callbackTarget, hex'069420');
Expand Down Expand Up @@ -146,7 +147,7 @@ contract Integration_Finalization is IntegrationBase {
vm.stopPrank();

vm.prank(_finalizer);
vm.expectRevert(abi.encodeWithSelector(IOracle.Oracle_InvalidFinalizedResponse.selector, _responseId));
vm.expectRevert(IOracle.Oracle_InvalidFinalizedResponse.selector);
oracle.finalize(_request, _response);
}

Expand Down
19 changes: 4 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,10 @@
dependencies:
"@jridgewell/trace-mapping" "0.3.9"

"@defi-wonderland/[email protected]":
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"
ds-test "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0"
forge-std "https://github.com/foundry-rs/forge-std.git#e8a047e3f40f13fa37af6fe14e6e06283d9a060e"
solmate "https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c"
"@defi-wonderland/[email protected]":
version "0.0.0-ad870035"
resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core-contracts/-/prophet-core-contracts-0.0.0-ad870035.tgz#b3ed33f46310bbac137f4c5952bd75c5cd608507"
integrity sha512-tfGPXUYB8zF7+NSGzTNKZfYDJ4/yihmf2ZQevTmHn8gzkNEzQeBYf3qi/hslxXQ0HwnHfJd7VftCQDy/kVcr8g==

"@defi-wonderland/[email protected]":
version "0.0.0-3e9c8e8b"
Expand Down Expand Up @@ -1183,7 +1177,6 @@ dotgitignore@^2.1.0:

"ds-test@https://github.com/dapphub/ds-test":
version "1.0.0"
uid e282159d5170298eb2455a6c05280ab5a73a4ef0
resolved "https://github.com/dapphub/ds-test#e282159d5170298eb2455a6c05280ab5a73a4ef0"

"ds-test@https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0":
Expand Down Expand Up @@ -1569,10 +1562,6 @@ for-each@^0.3.3:
version "1.7.3"
resolved "https://github.com/foundry-rs/forge-std#2f112697506eab12d433a65fdc31a639548fe365"

"forge-std@https://github.com/foundry-rs/forge-std.git#e8a047e3f40f13fa37af6fe14e6e06283d9a060e":
version "1.5.6"
resolved "https://github.com/foundry-rs/forge-std.git#e8a047e3f40f13fa37af6fe14e6e06283d9a060e"

"forge-std@https://github.com/foundry-rs/forge-std.git#f73c73d2018eb6a111f35e4dae7b4f27401e9421":
version "1.7.1"
resolved "https://github.com/foundry-rs/forge-std.git#f73c73d2018eb6a111f35e4dae7b4f27401e9421"
Expand Down

0 comments on commit 1a93a91

Please sign in to comment.