From 6842d22ceb5e1a570878006671c66921cc9602fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:35:44 +0200 Subject: [PATCH 1/4] Update function visibilities to `external` in`IexecPoco` modules --- CHANGELOG.md | 1 + contracts/modules/delegates/IexecPoco1Delegate.sol | 3 +-- contracts/modules/delegates/IexecPoco2Delegate.sol | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd1b9be84..d3b7125aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## vNEXT +- Update function visibilities to `external` in`IexecPoco` modules. (#131) - Fix configs native and token. (#129) - Bump dependencies: (#127) - `@openzeppelin/hardhat-upgrades`, `hardhat-dependency-compiler`, `web3`, diff --git a/contracts/modules/delegates/IexecPoco1Delegate.sol b/contracts/modules/delegates/IexecPoco1Delegate.sol index eff036518..066cdf0a4 100644 --- a/contracts/modules/delegates/IexecPoco1Delegate.sol +++ b/contracts/modules/delegates/IexecPoco1Delegate.sol @@ -68,7 +68,6 @@ contract IexecPoco1Delegate is /*************************************************************************** * ODB order matching * ***************************************************************************/ - // TODO: should be external /** * Match orders. The requester gets debited. * @@ -82,7 +81,7 @@ contract IexecPoco1Delegate is IexecLibOrders_v5.DatasetOrder calldata _datasetorder, IexecLibOrders_v5.WorkerpoolOrder calldata _workerpoolorder, IexecLibOrders_v5.RequestOrder calldata _requestorder - ) public override returns (bytes32) { + ) external override returns (bytes32) { return _matchOrders( _apporder, diff --git a/contracts/modules/delegates/IexecPoco2Delegate.sol b/contracts/modules/delegates/IexecPoco2Delegate.sol index b40a92019..33aeecec4 100644 --- a/contracts/modules/delegates/IexecPoco2Delegate.sol +++ b/contracts/modules/delegates/IexecPoco2Delegate.sol @@ -101,7 +101,7 @@ contract IexecPoco2Delegate is IexecPoco2, DelegateBase, IexecEscrow, SignatureV address _enclaveChallenge, bytes calldata _enclaveSign, bytes calldata _authorizationSign - ) public override { + ) external override { IexecLibCore_v5.Task storage task = m_tasks[_taskid]; IexecLibCore_v5.Contribution storage contribution = m_contributions[_taskid][_msgSender()]; IexecLibCore_v5.Deal memory deal = m_deals[task.dealid]; @@ -177,7 +177,7 @@ contract IexecPoco2Delegate is IexecPoco2, DelegateBase, IexecEscrow, SignatureV address _enclaveChallenge, bytes calldata _enclaveSign, bytes calldata _authorizationSign - ) public override { + ) external override { IexecLibCore_v5.Task storage task = m_tasks[_taskid]; IexecLibCore_v5.Contribution storage contribution = m_contributions[_taskid][_msgSender()]; IexecLibCore_v5.Deal memory deal = m_deals[task.dealid]; From 1e45f3562618f4db88878721e7daf0b0dbfd20f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:37:37 +0200 Subject: [PATCH 2/4] Update sol doc --- docs/solidity/index.md | 62 +++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/solidity/index.md b/docs/solidity/index.md index b0d6691ab..572de3f2c 100644 --- a/docs/solidity/index.md +++ b/docs/solidity/index.md @@ -432,32 +432,6 @@ event Reward(address owner, uint256 amount, bytes32 ref) event Seize(address owner, uint256 amount, bytes32 ref) ``` -## IexecOrderManagementDelegate - -### manageAppOrder - -```solidity -function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) public -``` - -### manageDatasetOrder - -```solidity -function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) public -``` - -### manageWorkerpoolOrder - -```solidity -function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) public -``` - -### manageRequestOrder - -```solidity -function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) public -``` - ## Matching ```solidity @@ -496,7 +470,7 @@ function verifyPresignatureOrSignature(address _identity, bytes32 _hash, bytes _ ### matchOrders ```solidity -function matchOrders(struct IexecLibOrders_v5.AppOrder _apporder, struct IexecLibOrders_v5.DatasetOrder _datasetorder, struct IexecLibOrders_v5.WorkerpoolOrder _workerpoolorder, struct IexecLibOrders_v5.RequestOrder _requestorder) public returns (bytes32) +function matchOrders(struct IexecLibOrders_v5.AppOrder _apporder, struct IexecLibOrders_v5.DatasetOrder _datasetorder, struct IexecLibOrders_v5.WorkerpoolOrder _workerpoolorder, struct IexecLibOrders_v5.RequestOrder _requestorder) external returns (bytes32) ``` Match orders. The requester gets debited. @@ -549,13 +523,13 @@ function initialize(bytes32 _dealid, uint256 idx) public returns (bytes32) ### contribute ```solidity -function contribute(bytes32 _taskid, bytes32 _resultHash, bytes32 _resultSeal, address _enclaveChallenge, bytes _enclaveSign, bytes _authorizationSign) public +function contribute(bytes32 _taskid, bytes32 _resultHash, bytes32 _resultSeal, address _enclaveChallenge, bytes _enclaveSign, bytes _authorizationSign) external ``` ### contributeAndFinalize ```solidity -function contributeAndFinalize(bytes32 _taskid, bytes32 _resultDigest, bytes _results, bytes _resultsCallback, address _enclaveChallenge, bytes _enclaveSign, bytes _authorizationSign) public +function contributeAndFinalize(bytes32 _taskid, bytes32 _resultDigest, bytes _results, bytes _resultsCallback, address _enclaveChallenge, bytes _enclaveSign, bytes _authorizationSign) external ``` ### reveal @@ -655,6 +629,34 @@ For existing deals, use the deal accessors instead. | ---- | ---- | ----------- | | [0] | uint256 | The computed deal volume. | +## IexecPocoCommonDelegate + +## IexecOrderManagementDelegate + +### manageAppOrder + +```solidity +function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) public +``` + +### manageDatasetOrder + +```solidity +function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) public +``` + +### manageWorkerpoolOrder + +```solidity +function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) public +``` + +### manageRequestOrder + +```solidity +function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) public +``` + ## IexecPocoBoostAccessorsDelegate Access to PoCo Boost tasks must be done with PoCo Classic `IexecAccessors`. @@ -764,8 +766,6 @@ Claim task to get a refund if task is not completed after deadline. | dealId | bytes32 | The ID of the deal. | | index | uint256 | The index of the task. | -## IexecPocoCommonDelegate - ## DelegateBase ## ENSIntegrationDelegate From 10889cce95050b438a1291ef33f9e01850ea8630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:56:35 +0200 Subject: [PATCH 3/4] Update function visibilities to `external` in`IexecOrderManagement` modules --- CHANGELOG.md | 2 +- .../IexecOrderManagementDelegate.sol | 8 +-- docs/solidity/index.md | 52 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3b7125aa..1b11fdb6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## vNEXT -- Update function visibilities to `external` in`IexecPoco` modules. (#131) +- Update function visibilities to `external` in`IexecPoco` and `IexecOrderManagement` modules. (#131) - Fix configs native and token. (#129) - Bump dependencies: (#127) - `@openzeppelin/hardhat-upgrades`, `hardhat-dependency-compiler`, `web3`, diff --git a/contracts/modules/delegates/IexecOrderManagementDelegate.sol b/contracts/modules/delegates/IexecOrderManagementDelegate.sol index e126ba5d2..3ebba8a13 100644 --- a/contracts/modules/delegates/IexecOrderManagementDelegate.sol +++ b/contracts/modules/delegates/IexecOrderManagementDelegate.sol @@ -24,7 +24,7 @@ contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, Sig ***************************************************************************/ function manageAppOrder( IexecLibOrders_v5.AppOrderOperation calldata _apporderoperation - ) public override { + ) external override { address owner = IERC5313(_apporderoperation.order.app).owner(); require( owner == _msgSender() || @@ -48,7 +48,7 @@ contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, Sig function manageDatasetOrder( IexecLibOrders_v5.DatasetOrderOperation calldata _datasetorderoperation - ) public override { + ) external override { address owner = IERC5313(_datasetorderoperation.order.dataset).owner(); require( owner == _msgSender() || @@ -72,7 +72,7 @@ contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, Sig function manageWorkerpoolOrder( IexecLibOrders_v5.WorkerpoolOrderOperation calldata _workerpoolorderoperation - ) public override { + ) external override { address owner = IERC5313(_workerpoolorderoperation.order.workerpool).owner(); require( owner == _msgSender() || @@ -98,7 +98,7 @@ contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, Sig function manageRequestOrder( IexecLibOrders_v5.RequestOrderOperation calldata _requestorderoperation - ) public override { + ) external override { address owner = _requestorderoperation.order.requester; require( owner == _msgSender() || diff --git a/docs/solidity/index.md b/docs/solidity/index.md index 572de3f2c..0e6864cba 100644 --- a/docs/solidity/index.md +++ b/docs/solidity/index.md @@ -400,6 +400,32 @@ function hash(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperat _Every module must inherit from this contract._ +## IexecOrderManagementDelegate + +### manageAppOrder + +```solidity +function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) external +``` + +### manageDatasetOrder + +```solidity +function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) external +``` + +### manageWorkerpoolOrder + +```solidity +function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) external +``` + +### manageRequestOrder + +```solidity +function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) external +``` + ## IexecEscrow ### Transfer @@ -631,32 +657,6 @@ For existing deals, use the deal accessors instead. ## IexecPocoCommonDelegate -## IexecOrderManagementDelegate - -### manageAppOrder - -```solidity -function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) public -``` - -### manageDatasetOrder - -```solidity -function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) public -``` - -### manageWorkerpoolOrder - -```solidity -function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) public -``` - -### manageRequestOrder - -```solidity -function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) public -``` - ## IexecPocoBoostAccessorsDelegate Access to PoCo Boost tasks must be done with PoCo Classic `IexecAccessors`. From 68da454ed34349052beba09610acfcb4a94f550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:47:13 +0200 Subject: [PATCH 4/4] Update typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b11fdb6e..47fb02857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## vNEXT -- Update function visibilities to `external` in`IexecPoco` and `IexecOrderManagement` modules. (#131) +- Update function visibilities to `external` in `IexecPoco` and `IexecOrderManagement` modules. (#131) - Fix configs native and token. (#129) - Bump dependencies: (#127) - `@openzeppelin/hardhat-upgrades`, `hardhat-dependency-compiler`, `web3`,