chore: update prophet-core dependency (#81)

defi-wonderland · Nov 20, 2024 · bf1b482 · bf1b482
1 parent d66609b
commit bf1b482
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "package.json": "sort-package-json"
   },
   "dependencies": {
-    "@defi-wonderland/prophet-core": "0.0.0-88db2d6f",
+    "@defi-wonderland/prophet-core": "0.0.0-819e5fe9",
     "@openzeppelin/contracts": "4.9.5",
     "solmate": "https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c"
   },

diff --git a/...racts/modules/finality/CallbackModule.sol → ...mples/modules/finality/CallbackModule.sol b/...racts/modules/finality/CallbackModule.sol → ...mples/modules/finality/CallbackModule.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.19;
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
-import {IProphetCallback} from '../../../interfaces/IProphetCallback.sol';
-import {ICallbackModule} from '../../../interfaces/modules/finality/ICallbackModule.sol';
+import {IProphetCallback} from '../../../../interfaces/IProphetCallback.sol';
+import {ICallbackModule} from '../../../../interfaces/examples/modules/finality/ICallbackModule.sol';
 
 contract CallbackModule is Module, ICallbackModule {
   constructor(IOracle _oracle) Module(_oracle) {}

diff --git a/...cts/modules/request/HttpRequestModule.sol → ...les/modules/request/HttpRequestModule.sol b/...cts/modules/request/HttpRequestModule.sol → ...les/modules/request/HttpRequestModule.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
-import {IHttpRequestModule} from '../../../interfaces/modules/request/IHttpRequestModule.sol';
+import {IHttpRequestModule} from '../../../../interfaces/examples/modules/request/IHttpRequestModule.sol';
 
 contract HttpRequestModule is Module, IHttpRequestModule {
   constructor(IOracle _oracle) Module(_oracle) {}

diff --git a/...aces/modules/finality/ICallbackModule.sol → ...ples/modules/finality/ICallbackModule.sol b/...aces/modules/finality/ICallbackModule.sol → ...ples/modules/finality/ICallbackModule.sol
diff --git a/...es/modules/request/IHttpRequestModule.sol → ...es/modules/request/IHttpRequestModule.sol b/...es/modules/request/IHttpRequestModule.sol → ...es/modules/request/IHttpRequestModule.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {IAccountingExtension} from '../../../interfaces/extensions/IAccountingExtension.sol';
+import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 import {IRequestModule} from '@defi-wonderland/prophet-core/solidity/interfaces/modules/request/IRequestModule.sol';
 import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';

diff --git a/solidity/scripts/Deploy.sol b/solidity/scripts/Deploy.sol
@@ -13,10 +13,10 @@ import {BondEscalationModule} from '../contracts/modules/dispute/BondEscalationM
 import {CircuitResolverModule} from '../contracts/examples/modules/dispute/CircuitResolverModule.sol';
 import {RootVerificationModule} from '../contracts/examples/modules/dispute/RootVerificationModule.sol';
 
+import {CallbackModule} from '../contracts/examples/modules/finality/CallbackModule.sol';
 import {MultipleCallbacksModule} from '../contracts/examples/modules/finality/MultipleCallbacksModule.sol';
 import {ContractCallRequestModule} from '../contracts/examples/modules/request/ContractCallRequestModule.sol';
-import {CallbackModule} from '../contracts/modules/finality/CallbackModule.sol';
-import {HttpRequestModule} from '../contracts/modules/request/HttpRequestModule.sol';
+import {HttpRequestModule} from '../contracts/examples/modules/request/HttpRequestModule.sol';
 
 import {SparseMerkleTreeRequestModule} from '../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';
 

diff --git a/solidity/test/integration/HttpRequest.t.sol b/solidity/test/integration/HttpRequest.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
+import {IHttpRequestModule} from '../../contracts/examples/modules/request/HttpRequestModule.sol';
 import './IntegrationBase.sol';
 
 contract Integration_HttpRequest is IntegrationBase {

diff --git a/solidity/test/integration/IntegrationBase.sol b/solidity/test/integration/IntegrationBase.sol
@@ -30,6 +30,7 @@ import {
   RootVerificationModule
 } from '../../contracts/examples/modules/dispute/RootVerificationModule.sol';
 
+import {CallbackModule, ICallbackModule} from '../../contracts/examples/modules/finality/CallbackModule.sol';
 import {
   IMultipleCallbacksModule,
   MultipleCallbacksModule
@@ -39,15 +40,14 @@ import {
   BondEscalationAccounting, IBondEscalationAccounting
 } from '../../contracts/extensions/BondEscalationAccounting.sol';
 import {BondEscalationModule, IBondEscalationModule} from '../../contracts/modules/dispute/BondEscalationModule.sol';
-import {CallbackModule, ICallbackModule} from '../../contracts/modules/finality/CallbackModule.sol';
 
 import {
   ISparseMerkleTreeRequestModule,
   SparseMerkleTreeRequestModule
 } from '../../contracts/examples/modules/request/SparseMerkleTreeRequestModule.sol';
 
+import {HttpRequestModule, IHttpRequestModule} from '../../contracts/examples/modules/request/HttpRequestModule.sol';
 import {SparseMerkleTreeL32Verifier} from '../../contracts/examples/periphery/SparseMerkleTreeL32Verifier.sol';
-import {HttpRequestModule, IHttpRequestModule} from '../../contracts/modules/request/HttpRequestModule.sol';
 import {ArbitratorModule, IArbitratorModule} from '../../contracts/modules/resolution/ArbitratorModule.sol';
 import {BondedResponseModule, IBondedResponseModule} from '../../contracts/modules/response/BondedResponseModule.sol';
 

diff --git a/solidity/test/unit/modules/finality/CallbackModule.t.sol b/solidity/test/unit/modules/finality/CallbackModule.t.sol
@@ -8,7 +8,7 @@ import {Helpers} from '../../../utils/Helpers.sol';
 import {IModule} from '@defi-wonderland/prophet-core/solidity/interfaces/IModule.sol';
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 
-import {CallbackModule, ICallbackModule} from '../../../../contracts/modules/finality/CallbackModule.sol';
+import {CallbackModule, ICallbackModule} from '../../../../contracts/examples/modules/finality/CallbackModule.sol';
 
 import {IProphetCallback} from '../../../../interfaces/IProphetCallback.sol';
 

diff --git a/solidity/test/unit/modules/request/HttpRequestModule.t.sol b/solidity/test/unit/modules/request/HttpRequestModule.t.sol
@@ -9,7 +9,9 @@ import {IModule} from '@defi-wonderland/prophet-core/solidity/interfaces/IModule
 import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
 import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
-import {HttpRequestModule, IHttpRequestModule} from '../../../../contracts/modules/request/HttpRequestModule.sol';
+import {
+  HttpRequestModule, IHttpRequestModule
+} from '../../../../contracts/examples/modules/request/HttpRequestModule.sol';
 
 import {IAccountingExtension} from '../../../../interfaces/extensions/IAccountingExtension.sol';
 

diff --git a/yarn.lock b/yarn.lock
@@ -193,10 +193,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@defi-wonderland/[email protected]88db2d6f":
-  version "0.0.0-88db2d6f"
-  resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core/-/prophet-core-0.0.0-88db2d6f.tgz#cda83fc86ed283d9e979630a07ef4b98eafc4c44"
-  integrity sha512-aNbFp1lKVfjzuugKTpmLQNwVIInbhZ/5AFnFR2aZlfzo3JGKwgB1I6Q+X0cgtFgHmXQXDcIUBedOPdxSCBRFCA==
+"@defi-wonderland/[email protected]819e5fe9":
+  version "0.0.0-819e5fe9"
+  resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core/-/prophet-core-0.0.0-819e5fe9.tgz#bd165f5cec99ae23bfd8c7f2f2cc3fa018abc676"
+  integrity sha512-K+zc0woc2mbZ6kqtO7ix/TJp7Y4YuCyz+l1XJL0VumsQkw7nJ5pLXOaV8Ss4wOyxu+P6vQ4aJpfY2yMHjQ+Hsw==
 
 "@defi-wonderland/[email protected]":
   version "0.0.0-3e9c8e8b"