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

Closed
gfournierPro wants to merge 37 commits into from
Closed

feat: deposit and match orders #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ce0077c
feat: Add support for Arbitrum fork configuration in Hardhat
gfournierPro Sep 16, 2025
6863e62
feat: draft Add DepositAndMatchOrders modules and integrate with diam…
gfournierPro Sep 16, 2025
c4ce955
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 13, 2025
8d20181
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 17, 2025
8be5fa9
feat: refactor deposit and match functionality by removing legacy nat…
gfournierPro Oct 17, 2025
5b60f68
feat: add IexecPocoDepositAndMatchTokenFacet and IexecPocoDepositAndM…
gfournierPro Oct 17, 2025
8016518
feat: remove depositAndSponsorMatchOrders function and update SPDX li…
gfournierPro Oct 17, 2025
e53b883
feat: add DepositAndMatch event and depositAndMatchOrders function to…
gfournierPro Oct 17, 2025
620617b
feat: remove DepositAndMatchOrders deployment scripts and update upgr…
gfournierPro Oct 17, 2025
bc3f563
feat: remove redundant comments for order hash verification in tests
gfournierPro Oct 17, 2025
1dc0f62
fix: update contracts/interfaces/IexecPocoDepositAndMatchToken.sol
gfournierPro Oct 20, 2025
1922fd7
feat: implement custom errors for deposit and match operations
gfournierPro Oct 20, 2025
85de82e
feat: add custom error types for Deposit and Match operations
gfournierPro Oct 20, 2025
2d14cfb
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 20, 2025
bb6cc04
feat: add upgrade script for Deposit and Match Orders (v6.2.0)
gfournierPro Oct 20, 2025
4b6c800
fix: Apply suggestion from @Copilot
gfournierPro Oct 20, 2025
2229484
refactor: remove apply-deposit-match-upgrade script
gfournierPro Oct 20, 2025
7d9d6e2
Merge branch 'feature/deposit-matchOrders' of https://github.com/iExe…
gfournierPro Oct 20, 2025
3d55cbe
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 21, 2025
f91ae5b
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 27, 2025
a7ca176
chore: Update TODO comment to clarify removal of IexecAccessorsABILeg…
gfournierPro Oct 27, 2025
70261be
feat: Rename IexecPocoDepositAndMatchTokenFacet to IexecDepositAndMat…
gfournierPro Oct 27, 2025
0905534
refactor: Rename error messages for clarity in IexecDepositAndMatchOr…
gfournierPro Oct 27, 2025
dd6bfaa
refactor: Simplify error names in IexecDepositAndMatchOrders and rela…
gfournierPro Oct 27, 2025
1c58747
feat: Update deployment script to add IexecDepositAndMatchOrdersFacet…
gfournierPro Oct 27, 2025
e7849bd
feat: Implement deposit and match orders functionality in IexecPoco1F…
gfournierPro Oct 28, 2025
236b948
refactor: Remove DepositAndMatch event from IexecDepositAndMatchOrder…
gfournierPro Oct 28, 2025
48f6482
refactor: Remove DepositAndMatch event from various interfaces and up…
gfournierPro Oct 28, 2025
ef6e44d
refactor: Update upgrade documentation by removing transaction hash d…
gfournierPro Oct 28, 2025
fddbb4b
refactor: Simplify deal cost calculation in depositAndMatchOrders fun…
gfournierPro Oct 28, 2025
9cec46b
refactor: Reorganize IexecInterfaceNative and IexecInterfaceToken doc…
gfournierPro Oct 28, 2025
78a8e8b
Merge branch 'main' into feature/deposit-matchOrders
gfournierPro Oct 28, 2025
9f98f94
refactor: Remove DepositAndMatch event assertions from tests
gfournierPro Oct 29, 2025
1e24cb8
refactor: Reintroduce depositAndMatchOrders function with updated imp…
gfournierPro Oct 29, 2025
277c605
refactor: Update depositAndMatchOrders documentation and adjust facet…
gfournierPro Oct 29, 2025
cb9898e
refactor: Consolidate depositAndMatchOrders functionality and remove …
gfournierPro Oct 30, 2025
afdc4ee
refactor: Change matchOrders function visibility from external to public
gfournierPro Oct 30, 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
279 changes: 278 additions & 1 deletion abis/contracts/IexecInterfaceNative.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"inputs": [],
"name": "CallerMustBeRequester",
"type": "error"
},
{
"inputs": [
{
Expand All @@ -10,6 +15,11 @@
"name": "IncompatibleDatasetOrder",
"type": "error"
},
{
"inputs": [],
"name": "TokenTransferFailed",
"type": "error"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -1884,6 +1894,273 @@
"stateMutability": "payable",
"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 @@ -4396,4 +4673,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
Loading