Skip to content

Commit 72a3854

Browse files
zguesmizguesmi
authored
feat: Revert if dataset order is not compatible with deal (#278)
1 parent e50bfb4 commit 72a3854

File tree

13 files changed

+320
-289
lines changed

13 files changed

+320
-289
lines changed

‎abis/contracts/IexecInterfaceNative.json‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
[
2+
{
3+
"inputs": [
4+
{
5+
"internalType": "string",
6+
"name": "reason",
7+
"type": "string"
8+
}
9+
],
10+
"name": "IncompatibleDatasetOrder",
11+
"type": "error"
12+
},
213
{
314
"anonymous": false,
415
"inputs": [
@@ -922,6 +933,71 @@
922933
"stateMutability": "nonpayable",
923934
"type": "function"
924935
},
936+
{
937+
"inputs": [
938+
{
939+
"components": [
940+
{
941+
"internalType": "address",
942+
"name": "dataset",
943+
"type": "address"
944+
},
945+
{
946+
"internalType": "uint256",
947+
"name": "datasetprice",
948+
"type": "uint256"
949+
},
950+
{
951+
"internalType": "uint256",
952+
"name": "volume",
953+
"type": "uint256"
954+
},
955+
{
956+
"internalType": "bytes32",
957+
"name": "tag",
958+
"type": "bytes32"
959+
},
960+
{
961+
"internalType": "address",
962+
"name": "apprestrict",
963+
"type": "address"
964+
},
965+
{
966+
"internalType": "address",
967+
"name": "workerpoolrestrict",
968+
"type": "address"
969+
},
970+
{
971+
"internalType": "address",
972+
"name": "requesterrestrict",
973+
"type": "address"
974+
},
975+
{
976+
"internalType": "bytes32",
977+
"name": "salt",
978+
"type": "bytes32"
979+
},
980+
{
981+
"internalType": "bytes",
982+
"name": "sign",
983+
"type": "bytes"
984+
}
985+
],
986+
"internalType": "struct IexecLibOrders_v5.DatasetOrder",
987+
"name": "datasetOrder",
988+
"type": "tuple"
989+
},
990+
{
991+
"internalType": "bytes32",
992+
"name": "dealId",
993+
"type": "bytes32"
994+
}
995+
],
996+
"name": "assertDatasetDealCompatibility",
997+
"outputs": [],
998+
"stateMutability": "view",
999+
"type": "function"
1000+
},
9251001
{
9261002
"inputs": [
9271003
{
@@ -2076,82 +2152,6 @@
20762152
"stateMutability": "nonpayable",
20772153
"type": "function"
20782154
},
2079-
{
2080-
"inputs": [
2081-
{
2082-
"components": [
2083-
{
2084-
"internalType": "address",
2085-
"name": "dataset",
2086-
"type": "address"
2087-
},
2088-
{
2089-
"internalType": "uint256",
2090-
"name": "datasetprice",
2091-
"type": "uint256"
2092-
},
2093-
{
2094-
"internalType": "uint256",
2095-
"name": "volume",
2096-
"type": "uint256"
2097-
},
2098-
{
2099-
"internalType": "bytes32",
2100-
"name": "tag",
2101-
"type": "bytes32"
2102-
},
2103-
{
2104-
"internalType": "address",
2105-
"name": "apprestrict",
2106-
"type": "address"
2107-
},
2108-
{
2109-
"internalType": "address",
2110-
"name": "workerpoolrestrict",
2111-
"type": "address"
2112-
},
2113-
{
2114-
"internalType": "address",
2115-
"name": "requesterrestrict",
2116-
"type": "address"
2117-
},
2118-
{
2119-
"internalType": "bytes32",
2120-
"name": "salt",
2121-
"type": "bytes32"
2122-
},
2123-
{
2124-
"internalType": "bytes",
2125-
"name": "sign",
2126-
"type": "bytes"
2127-
}
2128-
],
2129-
"internalType": "struct IexecLibOrders_v5.DatasetOrder",
2130-
"name": "datasetOrder",
2131-
"type": "tuple"
2132-
},
2133-
{
2134-
"internalType": "bytes32",
2135-
"name": "dealid",
2136-
"type": "bytes32"
2137-
}
2138-
],
2139-
"name": "isDatasetCompatibleWithDeal",
2140-
"outputs": [
2141-
{
2142-
"internalType": "bool",
2143-
"name": "result",
2144-
"type": "bool"
2145-
},
2146-
{
2147-
"internalType": "string",
2148-
"name": "reason",
2149-
"type": "string"
2150-
}
2151-
],
2152-
"stateMutability": "view",
2153-
"type": "function"
2154-
},
21552155
{
21562156
"inputs": [],
21572157
"name": "kitty_address",

‎abis/contracts/IexecInterfaceToken.json‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
[
2+
{
3+
"inputs": [
4+
{
5+
"internalType": "string",
6+
"name": "reason",
7+
"type": "string"
8+
}
9+
],
10+
"name": "IncompatibleDatasetOrder",
11+
"type": "error"
12+
},
213
{
314
"anonymous": false,
415
"inputs": [
@@ -922,6 +933,71 @@
922933
"stateMutability": "nonpayable",
923934
"type": "function"
924935
},
936+
{
937+
"inputs": [
938+
{
939+
"components": [
940+
{
941+
"internalType": "address",
942+
"name": "dataset",
943+
"type": "address"
944+
},
945+
{
946+
"internalType": "uint256",
947+
"name": "datasetprice",
948+
"type": "uint256"
949+
},
950+
{
951+
"internalType": "uint256",
952+
"name": "volume",
953+
"type": "uint256"
954+
},
955+
{
956+
"internalType": "bytes32",
957+
"name": "tag",
958+
"type": "bytes32"
959+
},
960+
{
961+
"internalType": "address",
962+
"name": "apprestrict",
963+
"type": "address"
964+
},
965+
{
966+
"internalType": "address",
967+
"name": "workerpoolrestrict",
968+
"type": "address"
969+
},
970+
{
971+
"internalType": "address",
972+
"name": "requesterrestrict",
973+
"type": "address"
974+
},
975+
{
976+
"internalType": "bytes32",
977+
"name": "salt",
978+
"type": "bytes32"
979+
},
980+
{
981+
"internalType": "bytes",
982+
"name": "sign",
983+
"type": "bytes"
984+
}
985+
],
986+
"internalType": "struct IexecLibOrders_v5.DatasetOrder",
987+
"name": "datasetOrder",
988+
"type": "tuple"
989+
},
990+
{
991+
"internalType": "bytes32",
992+
"name": "dealId",
993+
"type": "bytes32"
994+
}
995+
],
996+
"name": "assertDatasetDealCompatibility",
997+
"outputs": [],
998+
"stateMutability": "view",
999+
"type": "function"
1000+
},
9251001
{
9261002
"inputs": [
9271003
{
@@ -2087,82 +2163,6 @@
20872163
"stateMutability": "nonpayable",
20882164
"type": "function"
20892165
},
2090-
{
2091-
"inputs": [
2092-
{
2093-
"components": [
2094-
{
2095-
"internalType": "address",
2096-
"name": "dataset",
2097-
"type": "address"
2098-
},
2099-
{
2100-
"internalType": "uint256",
2101-
"name": "datasetprice",
2102-
"type": "uint256"
2103-
},
2104-
{
2105-
"internalType": "uint256",
2106-
"name": "volume",
2107-
"type": "uint256"
2108-
},
2109-
{
2110-
"internalType": "bytes32",
2111-
"name": "tag",
2112-
"type": "bytes32"
2113-
},
2114-
{
2115-
"internalType": "address",
2116-
"name": "apprestrict",
2117-
"type": "address"
2118-
},
2119-
{
2120-
"internalType": "address",
2121-
"name": "workerpoolrestrict",
2122-
"type": "address"
2123-
},
2124-
{
2125-
"internalType": "address",
2126-
"name": "requesterrestrict",
2127-
"type": "address"
2128-
},
2129-
{
2130-
"internalType": "bytes32",
2131-
"name": "salt",
2132-
"type": "bytes32"
2133-
},
2134-
{
2135-
"internalType": "bytes",
2136-
"name": "sign",
2137-
"type": "bytes"
2138-
}
2139-
],
2140-
"internalType": "struct IexecLibOrders_v5.DatasetOrder",
2141-
"name": "datasetOrder",
2142-
"type": "tuple"
2143-
},
2144-
{
2145-
"internalType": "bytes32",
2146-
"name": "dealid",
2147-
"type": "bytes32"
2148-
}
2149-
],
2150-
"name": "isDatasetCompatibleWithDeal",
2151-
"outputs": [
2152-
{
2153-
"internalType": "bool",
2154-
"name": "result",
2155-
"type": "bool"
2156-
},
2157-
{
2158-
"internalType": "string",
2159-
"name": "reason",
2160-
"type": "string"
2161-
}
2162-
],
2163-
"stateMutability": "view",
2164-
"type": "function"
2165-
},
21662166
{
21672167
"inputs": [],
21682168
"name": "kitty_address",

‎abis/contracts/facets/IexecPoco1Facet.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
[
2+
{
3+
"inputs": [
4+
{
5+
"internalType": "string",
6+
"name": "reason",
7+
"type": "string"
8+
}
9+
],
10+
"name": "IncompatibleDatasetOrder",
11+
"type": "error"
12+
},
213
{
314
"anonymous": false,
415
"inputs": [
@@ -249,23 +260,12 @@
249260
},
250261
{
251262
"internalType": "bytes32",
252-
"name": "dealid",
263+
"name": "dealId",
253264
"type": "bytes32"
254265
}
255266
],
256-
"name": "isDatasetCompatibleWithDeal",
257-
"outputs": [
258-
{
259-
"internalType": "bool",
260-
"name": "result",
261-
"type": "bool"
262-
},
263-
{
264-
"internalType": "string",
265-
"name": "reason",
266-
"type": "string"
267-
}
268-
],
267+
"name": "assertDatasetDealCompatibility",
268+
"outputs": [],
269269
"stateMutability": "view",
270270
"type": "function"
271271
},

0 commit comments

Comments
 (0)