Skip to content

feat: deposit and match orders #293

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

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

feat: deposit and match orders #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ce0077c
feat: Add support for Arbitrum fork configuration in Hardhat
gfournieriExec Sep 16, 2025
6863e62
feat: draft Add DepositAndMatchOrders modules and integrate with diam…
gfournieriExec Sep 16, 2025
c4ce955
Merge branch 'main' into feature/deposit-matchOrders
gfournieriExec Oct 13, 2025
8d20181
Merge branch 'main' into feature/deposit-matchOrders
gfournieriExec Oct 17, 2025
8be5fa9
feat: refactor deposit and match functionality by removing legacy nat…
gfournieriExec Oct 17, 2025
5b60f68
feat: add IexecPocoDepositAndMatchTokenFacet and IexecPocoDepositAndM…
gfournieriExec Oct 17, 2025
8016518
feat: remove depositAndSponsorMatchOrders function and update SPDX li…
gfournieriExec Oct 17, 2025
e53b883
feat: add DepositAndMatch event and depositAndMatchOrders function to…
gfournieriExec Oct 17, 2025
620617b
feat: remove DepositAndMatchOrders deployment scripts and update upgr…
gfournieriExec Oct 17, 2025
bc3f563
feat: remove redundant comments for order hash verification in tests
gfournieriExec Oct 17, 2025
1dc0f62
fix: update contracts/interfaces/IexecPocoDepositAndMatchToken.sol
gfournieriExec Oct 20, 2025
1922fd7
feat: implement custom errors for deposit and match operations
gfournieriExec Oct 20, 2025
85de82e
feat: add custom error types for Deposit and Match operations
gfournieriExec Oct 20, 2025
2d14cfb
Merge branch 'main' into feature/deposit-matchOrders
gfournieriExec Oct 20, 2025
bb6cc04
feat: add upgrade script for Deposit and Match Orders (v6.2.0)
gfournieriExec Oct 20, 2025
4b6c800
fix: Apply suggestion from @Copilot
gfournieriExec Oct 20, 2025
2229484
refactor: remove apply-deposit-match-upgrade script
gfournieriExec Oct 20, 2025
7d9d6e2
Merge branch 'feature/deposit-matchOrders' of https://github.com/iExe…
gfournieriExec Oct 20, 2025
3d55cbe
Merge branch 'main' into feature/deposit-matchOrders
gfournieriExec Oct 21, 2025
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
304 changes: 303 additions & 1 deletion abis/contracts/IexecInterfaceToken.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
[
{
"inputs": [],
"name": "DepositAndMatch_CallerMustBeRequester",
"type": "error"
},
{
"inputs": [],
"name": "DepositAndMatch_TokenTransferFailed",
"type": "error"
},
{
"inputs": [
{
Expand Down Expand Up @@ -441,6 +451,31 @@
"name": "DealSponsored",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"internalType": "address",
"name": "depositor",
"type": "address"
},
{
"indexed": false,
"internalType": "uint256",
"name": "depositedAmount",
"type": "uint256"
},
{
"indexed": false,
"internalType": "bytes32",
"name": "dealId",
"type": "bytes32"
}
],
"name": "DepositAndMatch",
"type": "event"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -1890,6 +1925,273 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "app",
"type": "address"
},
{
"internalType": "uint256",
"name": "appprice",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "volume",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "tag",
"type": "bytes32"
},
{
"internalType": "address",
"name": "datasetrestrict",
"type": "address"
},
{
"internalType": "address",
"name": "workerpoolrestrict",
"type": "address"
},
{
"internalType": "address",
"name": "requesterrestrict",
"type": "address"
},
{
"internalType": "bytes32",
"name": "salt",
"type": "bytes32"
},
{
"internalType": "bytes",
"name": "sign",
"type": "bytes"
}
],
"internalType": "struct IexecLibOrders_v5.AppOrder",
"name": "_apporder",
"type": "tuple"
},
{
"components": [
{
"internalType": "address",
"name": "dataset",
"type": "address"
},
{
"internalType": "uint256",
"name": "datasetprice",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "volume",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "tag",
"type": "bytes32"
},
{
"internalType": "address",
"name": "apprestrict",
"type": "address"
},
{
"internalType": "address",
"name": "workerpoolrestrict",
"type": "address"
},
{
"internalType": "address",
"name": "requesterrestrict",
"type": "address"
},
{
"internalType": "bytes32",
"name": "salt",
"type": "bytes32"
},
{
"internalType": "bytes",
"name": "sign",
"type": "bytes"
}
],
"internalType": "struct IexecLibOrders_v5.DatasetOrder",
"name": "_datasetorder",
"type": "tuple"
},
{
"components": [
{
"internalType": "address",
"name": "workerpool",
"type": "address"
},
{
"internalType": "uint256",
"name": "workerpoolprice",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "volume",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "tag",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "category",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "trust",
"type": "uint256"
},
{
"internalType": "address",
"name": "apprestrict",
"type": "address"
},
{
"internalType": "address",
"name": "datasetrestrict",
"type": "address"
},
{
"internalType": "address",
"name": "requesterrestrict",
"type": "address"
},
{
"internalType": "bytes32",
"name": "salt",
"type": "bytes32"
},
{
"internalType": "bytes",
"name": "sign",
"type": "bytes"
}
],
"internalType": "struct IexecLibOrders_v5.WorkerpoolOrder",
"name": "_workerpoolorder",
"type": "tuple"
},
{
"components": [
{
"internalType": "address",
"name": "app",
"type": "address"
},
{
"internalType": "uint256",
"name": "appmaxprice",
"type": "uint256"
},
{
"internalType": "address",
"name": "dataset",
"type": "address"
},
{
"internalType": "uint256",
"name": "datasetmaxprice",
"type": "uint256"
},
{
"internalType": "address",
"name": "workerpool",
"type": "address"
},
{
"internalType": "uint256",
"name": "workerpoolmaxprice",
"type": "uint256"
},
{
"internalType": "address",
"name": "requester",
"type": "address"
},
{
"internalType": "uint256",
"name": "volume",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "tag",
"type": "bytes32"
},
{
"internalType": "uint256",
"name": "category",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "trust",
"type": "uint256"
},
{
"internalType": "address",
"name": "beneficiary",
"type": "address"
},
{
"internalType": "address",
"name": "callback",
"type": "address"
},
{
"internalType": "string",
"name": "params",
"type": "string"
},
{
"internalType": "bytes32",
"name": "salt",
"type": "bytes32"
},
{
"internalType": "bytes",
"name": "sign",
"type": "bytes"
}
],
"internalType": "struct IexecLibOrders_v5.RequestOrder",
"name": "_requestorder",
"type": "tuple"
}
],
"name": "depositAndMatchOrders",
"outputs": [
{
"internalType": "bytes32",
"name": "dealId",
"type": "bytes32"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down Expand Up @@ -4407,4 +4709,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
Loading