diff --git a/package.json b/package.json index 43bd7e5..0a893bb 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "package.json": "sort-package-json" }, "dependencies": { - "@defi-wonderland/prophet-core": "0.0.0-17b27bfb", + "@defi-wonderland/prophet-core": "0.0.0-823459fc", "@openzeppelin/contracts": "4.9.5", "solmate": "https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c" }, diff --git a/solidity/contracts/modules/accessControl/ModuleAccessController.sol b/solidity/contracts/modules/accessControl/ModuleAccessController.sol index 0708a14..a672868 100644 --- a/solidity/contracts/modules/accessControl/ModuleAccessController.sol +++ b/solidity/contracts/modules/accessControl/ModuleAccessController.sol @@ -5,7 +5,6 @@ import {CommonAccessController} from '@defi-wonderland/prophet-core/solidity/con import {Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol'; import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol'; -import {IAccessModule} from '@defi-wonderland/prophet-core/solidity/interfaces/modules/accessControl/IAccessModule.sol'; abstract contract ModuleAccessController is CommonAccessController, Module { constructor(IOracle _oracle) Module(_oracle) {} diff --git a/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol b/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol index 8f4a0ca..623a20d 100644 --- a/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol +++ b/solidity/test/unit/modules/dispute/BondEscalationModule.t.sol @@ -9,7 +9,7 @@ import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfac import {IModule} from '@defi-wonderland/prophet-core/solidity/interfaces/IModule.sol'; import {IOracle, IOracleAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol'; -import {IAccessModule} from '@defi-wonderland/prophet-core/solidity/interfaces/modules/accessControl/IAccessModule.sol'; +import {IAccessModule} from '@defi-wonderland/prophet-core/solidity/interfaces/modules/access/IAccessModule.sol'; import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/ValidatorLib.sol'; import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol'; import {Strings} from '@openzeppelin/contracts/utils/Strings.sol'; @@ -1550,9 +1550,9 @@ contract BondEscalationModule_Unit_AccessControl is BaseTest { abi.encode( IAccessModule.AccessControlParameters({ sender: _caller, + accessControl: _accessControl, typehash: _PLEDGE_FOR_DISPUTE_TYPEHASH, - params: abi.encode(mockRequest, _dispute), - accessControl: _accessControl + typehashParams: abi.encode(mockRequest, _dispute) }) ) ) @@ -1623,9 +1623,9 @@ contract BondEscalationModule_Unit_AccessControl is BaseTest { abi.encode( IAccessModule.AccessControlParameters({ sender: _caller, + accessControl: _accessControl, typehash: _PLEDGE_AGAINST_DISPUTE_TYPEHASH, - params: abi.encode(mockRequest, _dispute), - accessControl: _accessControl + typehashParams: abi.encode(mockRequest, _dispute) }) ) ) diff --git a/yarn.lock b/yarn.lock index d93b761..ac0d62e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -193,10 +193,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@defi-wonderland/prophet-core@0.0.0-17b27bfb": - version "0.0.0-17b27bfb" - resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core/-/prophet-core-0.0.0-17b27bfb.tgz#118bb97067eb84bf4059e2b5c35ce7d10689694f" - integrity sha512-auL03R3YeBQDdyAq4GH+I653oBMWOIMH1+sYdxl6HYqWZSb/8+973hZ4tj3M5EfQZeWcFywdjkceKdVjeAcD3g== +"@defi-wonderland/prophet-core@0.0.0-823459fc": + version "0.0.0-823459fc" + resolved "https://registry.yarnpkg.com/@defi-wonderland/prophet-core/-/prophet-core-0.0.0-823459fc.tgz#a48f7b35899968468f37f5c9eb2c67a1c8a823ff" + integrity sha512-lqTFlKFUwt4yjBGnSUJf9PwNQE6MP4KJHUSCov2+yxJCkKHKzFlYQ7M25dAdebiwa6Hfd+XHQfLx1bzff6mM6Q== "@defi-wonderland/solidity-utils@0.0.0-3e9c8e8b": version "0.0.0-3e9c8e8b"