Skip to content

Format files & update copyright notices of order managment contract #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gfournierPro merged 4 commits into from
May 24, 2024
Merged

Format files & update copyright notices of order managment contract #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77d62a8
upgrade order management smart contract to v.0.8
gfournierPro May 24, 2024
4bff0ec
update header
gfournierPro May 24, 2024
1d933df
only format and header
gfournierPro May 24, 2024
a6bd2f9
update changelog
gfournierPro May 24, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- DelegateBase, IexecERC20Core (#64)
- PoCo2 contracts (#54)
- PoCo1 contracts (#52)
- Order Management contract (#83)
- Remove enterprise mode. (#51, #56)

## v5.5.0 - PoCo Boost
Expand Down
209 changes: 111 additions & 98 deletions contracts/modules/delegates/IexecOrderManagementDelegate.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,116 +1,129 @@
// SPDX-FileCopyrightText: 2020-2024 IEXEC BLOCKCHAIN TECH <[email protected]>
// SPDX-License-Identifier: Apache-2.0

/******************************************************************************
* Copyright 2020 IEXEC BLOCKCHAIN TECH *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); *
* you may not use this file except in compliance with the License. *
* You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, *
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
* See the License for the specific language governing permissions and *
* limitations under the License. *
******************************************************************************/

pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

import "./SignatureVerifier.sol";
import "../DelegateBase.sol";
import "../interfaces/IexecOrderManagement.sol";

contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, SignatureVerifier {
using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrderOperation;

contract IexecOrderManagementDelegate is IexecOrderManagement, DelegateBase, SignatureVerifier
{
using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrder;
using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrderOperation;
using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrderOperation;

/***************************************************************************
* order management tools *
***************************************************************************/
function manageAppOrder(IexecLibOrders_v5.AppOrderOperation memory _apporderoperation)
public override
{
address owner = App(_apporderoperation.order.app).owner();
require(owner == _msgSender() || _checkSignature(owner, _toEthTypedStruct(_apporderoperation.hash(), EIP712DOMAIN_SEPARATOR), _apporderoperation.sign), 'invalid-sender-or-signature');
/***************************************************************************
* order management tools *
***************************************************************************/
function manageAppOrder(
IexecLibOrders_v5.AppOrderOperation memory _apporderoperation
) public override {
address owner = App(_apporderoperation.order.app).owner();
require(
owner == _msgSender() ||
_checkSignature(
owner,
_toEthTypedStruct(_apporderoperation.hash(), EIP712DOMAIN_SEPARATOR),
_apporderoperation.sign
),
"invalid-sender-or-signature"
);

bytes32 apporderHash = keccak256(_toEthTypedStruct(_apporderoperation.order.hash(), EIP712DOMAIN_SEPARATOR));
if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN)
{
m_presigned[apporderHash] = owner;
emit SignedAppOrder(apporderHash);
}
else if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE)
{
m_consumed[apporderHash] = _apporderoperation.order.volume;
emit ClosedAppOrder(apporderHash);
}
}
bytes32 apporderHash = keccak256(
_toEthTypedStruct(_apporderoperation.order.hash(), EIP712DOMAIN_SEPARATOR)
);
if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
m_presigned[apporderHash] = owner;
emit SignedAppOrder(apporderHash);
} else if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE) {
m_consumed[apporderHash] = _apporderoperation.order.volume;
emit ClosedAppOrder(apporderHash);
}
}

function manageDatasetOrder(IexecLibOrders_v5.DatasetOrderOperation memory _datasetorderoperation)
public override
{
address owner = Dataset(_datasetorderoperation.order.dataset).owner();
require(owner == _msgSender() || _checkSignature(owner, _toEthTypedStruct(_datasetorderoperation.hash(), EIP712DOMAIN_SEPARATOR), _datasetorderoperation.sign), 'invalid-sender-or-signature');
function manageDatasetOrder(
IexecLibOrders_v5.DatasetOrderOperation memory _datasetorderoperation
) public override {
address owner = Dataset(_datasetorderoperation.order.dataset).owner();
require(
owner == _msgSender() ||
_checkSignature(
owner,
_toEthTypedStruct(_datasetorderoperation.hash(), EIP712DOMAIN_SEPARATOR),
_datasetorderoperation.sign
),
"invalid-sender-or-signature"
);

bytes32 datasetorderHash = keccak256(_toEthTypedStruct(_datasetorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR));
if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN)
{
m_presigned[datasetorderHash] = owner;
emit SignedDatasetOrder(datasetorderHash);
}
else if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE)
{
m_consumed[datasetorderHash] = _datasetorderoperation.order.volume;
emit ClosedDatasetOrder(datasetorderHash);
}
}
bytes32 datasetorderHash = keccak256(
_toEthTypedStruct(_datasetorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR)
);
if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
m_presigned[datasetorderHash] = owner;
emit SignedDatasetOrder(datasetorderHash);
} else if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE) {
m_consumed[datasetorderHash] = _datasetorderoperation.order.volume;
emit ClosedDatasetOrder(datasetorderHash);
}
}

function manageWorkerpoolOrder(IexecLibOrders_v5.WorkerpoolOrderOperation memory _workerpoolorderoperation)
public override
{
address owner = Workerpool(_workerpoolorderoperation.order.workerpool).owner();
require(owner == _msgSender() || _checkSignature(owner, _toEthTypedStruct(_workerpoolorderoperation.hash(), EIP712DOMAIN_SEPARATOR), _workerpoolorderoperation.sign), 'invalid-sender-or-signature');
function manageWorkerpoolOrder(
IexecLibOrders_v5.WorkerpoolOrderOperation memory _workerpoolorderoperation
) public override {
address owner = Workerpool(_workerpoolorderoperation.order.workerpool).owner();
require(
owner == _msgSender() ||
_checkSignature(
owner,
_toEthTypedStruct(_workerpoolorderoperation.hash(), EIP712DOMAIN_SEPARATOR),
_workerpoolorderoperation.sign
),
"invalid-sender-or-signature"
);

bytes32 workerpoolorderHash = keccak256(_toEthTypedStruct(_workerpoolorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR));
if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN)
{
m_presigned[workerpoolorderHash] = owner;
emit SignedWorkerpoolOrder(workerpoolorderHash);
}
else if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE)
{
m_consumed[workerpoolorderHash] = _workerpoolorderoperation.order.volume;
emit ClosedWorkerpoolOrder(workerpoolorderHash);
}
}
bytes32 workerpoolorderHash = keccak256(
_toEthTypedStruct(_workerpoolorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR)
);
if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
m_presigned[workerpoolorderHash] = owner;
emit SignedWorkerpoolOrder(workerpoolorderHash);
} else if (
_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE
) {
m_consumed[workerpoolorderHash] = _workerpoolorderoperation.order.volume;
emit ClosedWorkerpoolOrder(workerpoolorderHash);
}
}

function manageRequestOrder(IexecLibOrders_v5.RequestOrderOperation memory _requestorderoperation)
public override
{
address owner = _requestorderoperation.order.requester;
require(owner == _msgSender() || _checkSignature(owner, _toEthTypedStruct(_requestorderoperation.hash(), EIP712DOMAIN_SEPARATOR), _requestorderoperation.sign), 'invalid-sender-or-signature');
function manageRequestOrder(
IexecLibOrders_v5.RequestOrderOperation memory _requestorderoperation
) public override {
address owner = _requestorderoperation.order.requester;
require(
owner == _msgSender() ||
_checkSignature(
owner,
_toEthTypedStruct(_requestorderoperation.hash(), EIP712DOMAIN_SEPARATOR),
_requestorderoperation.sign
),
"invalid-sender-or-signature"
);

bytes32 requestorderHash = keccak256(_toEthTypedStruct(_requestorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR));
if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN)
{
m_presigned[requestorderHash] = owner;
emit SignedRequestOrder(requestorderHash);
}
else if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE)
{
m_consumed[requestorderHash] = _requestorderoperation.order.volume;
emit ClosedRequestOrder(requestorderHash);
}
}
bytes32 requestorderHash = keccak256(
_toEthTypedStruct(_requestorderoperation.order.hash(), EIP712DOMAIN_SEPARATOR)
);
if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
m_presigned[requestorderHash] = owner;
emit SignedRequestOrder(requestorderHash);
} else if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.CLOSE) {
m_consumed[requestorderHash] = _requestorderoperation.order.volume;
emit ClosedRequestOrder(requestorderHash);
}
}
}