Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## vNEXT
- 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`,
Expand Down
8 changes: 4 additions & 4 deletions contracts/modules/delegates/IexecOrderManagementDelegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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() ||
Expand All @@ -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() ||
Expand All @@ -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() ||
Expand All @@ -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() ||
Expand Down
3 changes: 1 addition & 2 deletions contracts/modules/delegates/IexecPoco1Delegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ contract IexecPoco1Delegate is
/***************************************************************************
* ODB order matching *
***************************************************************************/
// TODO: should be external
/**
* Match orders. The requester gets debited.
*
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions contracts/modules/delegates/IexecPoco2Delegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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];
Expand Down
52 changes: 26 additions & 26 deletions docs/solidity/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,62 +400,62 @@ function hash(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperat

_Every module must inherit from this contract._

## IexecEscrow
## IexecOrderManagementDelegate

### Transfer
### manageAppOrder

```solidity
event Transfer(address from, address to, uint256 value)
function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) external
```

### Lock
### manageDatasetOrder

```solidity
event Lock(address owner, uint256 amount)
function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) external
```

### Unlock
### manageWorkerpoolOrder

```solidity
event Unlock(address owner, uint256 amount)
function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) external
```

### Reward
### manageRequestOrder

```solidity
event Reward(address owner, uint256 amount, bytes32 ref)
function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) external
```

### Seize
## IexecEscrow

### Transfer

```solidity
event Seize(address owner, uint256 amount, bytes32 ref)
event Transfer(address from, address to, uint256 value)
```

## IexecOrderManagementDelegate

### manageAppOrder
### Lock

```solidity
function manageAppOrder(struct IexecLibOrders_v5.AppOrderOperation _apporderoperation) public
event Lock(address owner, uint256 amount)
```

### manageDatasetOrder
### Unlock

```solidity
function manageDatasetOrder(struct IexecLibOrders_v5.DatasetOrderOperation _datasetorderoperation) public
event Unlock(address owner, uint256 amount)
```

### manageWorkerpoolOrder
### Reward

```solidity
function manageWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrderOperation _workerpoolorderoperation) public
event Reward(address owner, uint256 amount, bytes32 ref)
```

### manageRequestOrder
### Seize

```solidity
function manageRequestOrder(struct IexecLibOrders_v5.RequestOrderOperation _requestorderoperation) public
event Seize(address owner, uint256 amount, bytes32 ref)
```

## Matching
Expand Down Expand Up @@ -496,7 +496,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.
Expand Down Expand Up @@ -549,13 +549,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
Expand Down Expand Up @@ -655,6 +655,8 @@ For existing deals, use the deal accessors instead.
| ---- | ---- | ----------- |
| [0] | uint256 | The computed deal volume. |

## IexecPocoCommonDelegate

## IexecPocoBoostAccessorsDelegate

Access to PoCo Boost tasks must be done with PoCo Classic `IexecAccessors`.
Expand Down Expand Up @@ -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
Expand Down