| Network |
Seaport 1.1 |
-Seaport 1.2 |
-Seaport 1.3 |
+Seaport 1.4 |
ConduitController |
@@ -78,11 +83,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
-[0x00000000000006c7676171937C444f6BDe3D6282](https://etherscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://etherscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://etherscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -95,11 +96,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://goerli.etherscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://goerli.etherscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://goerli.etherscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -112,11 +109,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://sepolia.etherscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://sepolia.etherscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://sepolia.etherscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -129,11 +122,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://polygonscan.com/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://polygonscan.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://polygonscan.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -146,11 +135,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://mumbai.polygonscan.com/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://mumbai.polygonscan.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://mumbai.polygonscan.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -163,11 +148,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://scope.klaytn.com/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://scope.klaytn.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://scope.klaytn.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -180,11 +161,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://baobab.scope.klaytn.com/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://baobab.scope.klaytn.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://baobab.scope.klaytn.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -197,11 +174,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://optimistic.etherscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://optimistic.etherscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://optimistic.etherscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -214,11 +187,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://goerli-optimism.etherscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://goerli-optimism.etherscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://goerli-optimism.etherscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -231,11 +200,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://arbiscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://arbiscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://arbiscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -248,11 +213,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://goerli.arbiscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://goerli.arbiscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://goerli.arbiscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -265,11 +226,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://nova.arbiscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://nova.arbiscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://nova.arbiscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -282,11 +239,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://snowtrace.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://snowtrace.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://snowtrace.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -299,11 +252,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://testnet.snowtrace.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://testnet.snowtrace.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://testnet.snowtrace.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -316,11 +265,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://gnosisscan.io/address/0x00000000000006c7676171937C444f6BDe3D6282#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://gnosisscan.io/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://gnosisscan.io/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -333,11 +278,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://bscscan.com/address/0x00000000006c3852cbEf3e08E8dF289169EdE581#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://bscscan.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://bscscan.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
@@ -350,11 +291,7 @@ See the [documentation](docs/SeaportDocumentation.md), the [interface](contracts
|
-[0x00000000000006c7676171937C444f6BDe3D6282](https://testnet.bscscan.com/address/0x00000000006c3852cbEf3e08E8dF289169EdE581#code)
-
- |
-
-[0x0000000000000aD24e80fd803C6ac37206a45f15](https://testnet.bscscan.com/address/0x0000000000000ad24e80fd803c6ac37206a45f15#code)
+[0x00000000000001ad428e4906aE43D8F9852d0dD6](https://testnet.bscscan.com/address/0x00000000000001ad428e4906aE43D8F9852d0dD6#code)
|
diff --git a/contracts/Seaport.sol b/contracts/Seaport.sol
index a9ea72be5..057c498af 100644
--- a/contracts/Seaport.sol
+++ b/contracts/Seaport.sol
@@ -5,7 +5,7 @@ import { Consideration } from "./lib/Consideration.sol";
/**
* @title Seaport
- * @custom:version 1.3
+ * @custom:version 1.4
* @author 0age (0age.eth)
* @custom:coauthor d1ll0n (d1ll0n.eth)
* @custom:coauthor transmissions11 (t11s.eth)
diff --git a/contracts/interfaces/ConsiderationInterface.sol b/contracts/interfaces/ConsiderationInterface.sol
index 3eaff8ce1..5829952a4 100644
--- a/contracts/interfaces/ConsiderationInterface.sol
+++ b/contracts/interfaces/ConsiderationInterface.sol
@@ -15,7 +15,7 @@ import {
/**
* @title ConsiderationInterface
* @author 0age
- * @custom:version 1.3
+ * @custom:version 1.4
* @notice Consideration is a generalized native token/ERC20/ERC721/ERC1155
* marketplace. It minimizes external calls to the greatest extent
* possible and provides lightweight methods for common routes as well
diff --git a/contracts/interfaces/SeaportInterface.sol b/contracts/interfaces/SeaportInterface.sol
index aede7b94a..515c38e5d 100644
--- a/contracts/interfaces/SeaportInterface.sol
+++ b/contracts/interfaces/SeaportInterface.sol
@@ -15,7 +15,7 @@ import {
/**
* @title SeaportInterface
* @author 0age
- * @custom:version 1.3
+ * @custom:version 1.4
* @notice Seaport is a generalized native token/ERC20/ERC721/ERC1155
* marketplace. It minimizes external calls to the greatest extent
* possible and provides lightweight methods for common routes as well
diff --git a/contracts/lib/Consideration.sol b/contracts/lib/Consideration.sol
index e465c0831..d737a1156 100644
--- a/contracts/lib/Consideration.sol
+++ b/contracts/lib/Consideration.sol
@@ -42,7 +42,7 @@ import {
* @custom:coauthor d1ll0n (d1ll0n.eth)
* @custom:coauthor transmissions11 (t11s.eth)
* @custom:coauthor James Wenzel (emo.eth)
- * @custom:version 1.3
+ * @custom:version 1.4
* @notice Consideration is a generalized native token/ERC20/ERC721/ERC1155
* marketplace that provides lightweight methods for common routes as
* well as more flexible methods for composing advanced orders or groups
diff --git a/contracts/lib/ConsiderationBase.sol b/contracts/lib/ConsiderationBase.sol
index a8e1f0609..a83a235fd 100644
--- a/contracts/lib/ConsiderationBase.sol
+++ b/contracts/lib/ConsiderationBase.sol
@@ -224,7 +224,7 @@ contract ConsiderationBase is
nameHash = keccak256(bytes(_nameString()));
// Derive hash of the version string of the contract.
- versionHash = keccak256(bytes("1.3"));
+ versionHash = keccak256(bytes("1.4"));
// Construct the OfferItem type string.
bytes memory offerItemTypeString = bytes(
@@ -306,11 +306,9 @@ contract ConsiderationBase is
* @return _typeHash The EIP-712 typehash for the bulk order type with the
* given height.
*/
- function _lookupBulkOrderTypehash(uint256 _treeHeight)
- internal
- pure
- returns (bytes32 _typeHash)
- {
+ function _lookupBulkOrderTypehash(
+ uint256 _treeHeight
+ ) internal pure returns (bytes32 _typeHash) {
// Utilize assembly to efficiently retrieve correct bulk order typehash.
assembly {
// Use a Yul function to enable use of the `leave` keyword
diff --git a/contracts/lib/ConsiderationConstants.sol b/contracts/lib/ConsiderationConstants.sol
index 39f9f84af..796b8d1ef 100644
--- a/contracts/lib/ConsiderationConstants.sol
+++ b/contracts/lib/ConsiderationConstants.sol
@@ -46,7 +46,7 @@ uint256 constant information_version_cd_offset = 0x60;
uint256 constant information_domainSeparator_offset = 0x20;
uint256 constant information_conduitController_offset = 0x40;
uint256 constant information_versionLengthPtr = 0x63;
-uint256 constant information_versionWithLength = 0x03312e33; // 1.3
+uint256 constant information_versionWithLength = 0x03312e34; // 1.4
uint256 constant information_length = 0xa0;
uint256 constant _NOT_ENTERED = 1;
diff --git a/contracts/lib/OrderCombiner.sol b/contracts/lib/OrderCombiner.sol
index 648625a86..d2e3b1f81 100644
--- a/contracts/lib/OrderCombiner.sol
+++ b/contracts/lib/OrderCombiner.sol
@@ -334,16 +334,14 @@ contract OrderCombiner is OrderFulfiller, FulfillmentApplier {
// Retrieve the offer item.
OfferItem memory offerItem = offer[j];
- {
- assembly {
- // If the offer item is for the native token and the
- // order type is not a contract order type, set the
- // first bit of the error buffer to true.
- invalidNativeOfferItemErrorBuffer := or(
- invalidNativeOfferItemErrorBuffer,
- lt(mload(offerItem), mload(0))
- )
- }
+ // If the offer item is for the native token and the order
+ // type is not a contract order type, set the first bit of
+ // the error buffer to true.
+ assembly {
+ invalidNativeOfferItemErrorBuffer := or(
+ invalidNativeOfferItemErrorBuffer,
+ lt(mload(offerItem), mload(0))
+ )
}
// Apply order fill fraction to offer item end amount.
@@ -885,12 +883,15 @@ contract OrderCombiner is OrderFulfiller, FulfillmentApplier {
if (containsNonOpen) {
// Iterate over each order a second time.
for (uint256 i = 0; i < totalOrders; ) {
- // Check restricted orders and contract orders.
- _assertRestrictedAdvancedOrderValidity(
- advancedOrders[i],
- orderHashes,
- orderHashes[i]
- );
+ // Ensure the order in question is being fulfilled.
+ if (availableOrders[i]) {
+ // Check restricted orders and contract orders.
+ _assertRestrictedAdvancedOrderValidity(
+ advancedOrders[i],
+ orderHashes,
+ orderHashes[i]
+ );
+ }
// Skip overflow checks as for loop is indexed starting at zero.
unchecked {
diff --git a/contracts/lib/OrderValidator.sol b/contracts/lib/OrderValidator.sol
index afc927d25..22ac17326 100644
--- a/contracts/lib/OrderValidator.sol
+++ b/contracts/lib/OrderValidator.sol
@@ -551,6 +551,10 @@ contract OrderValidator is Executor, ZoneInteraction {
}
}
+ // From this point onward, do not allow for skipping orders as the
+ // contract offerer may have modified state in expectation of any named
+ // consideration items being sent to their designated recipients.
+
// Decode the returned contract order and/or update the error buffer.
(
uint256 errorBuffer,
@@ -558,9 +562,9 @@ contract OrderValidator is Executor, ZoneInteraction {
ConsiderationItem[] memory consideration
) = _convertGetGeneratedOrderResult(_decodeGenerateOrderReturndata)();
- // Revert or skip if the returndata could not be decoded correctly.
+ // Revert if the returndata could not be decoded correctly.
if (errorBuffer != 0) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ _revertInvalidContractOrder(orderHash);
}
{
@@ -570,7 +574,7 @@ contract OrderValidator is Executor, ZoneInteraction {
// Explicitly specified offer items cannot be removed.
if (originalOfferLength > newOfferLength) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ _revertInvalidContractOrder(orderHash);
}
// Iterate over each specified offer (e.g. minimumReceived) item.
@@ -612,7 +616,7 @@ contract OrderValidator is Executor, ZoneInteraction {
// New consideration items cannot be created.
if (newConsiderationLength > originalConsiderationArray.length) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ _revertInvalidContractOrder(orderHash);
}
// Iterate over returned consideration & do not exceed maximumSpent.
@@ -653,9 +657,9 @@ contract OrderValidator is Executor, ZoneInteraction {
orderParameters.consideration = consideration;
}
- // Revert or skip if any item comparison failed.
+ // Revert if any item comparison failed.
if (errorBuffer != 0) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ _revertInvalidContractOrder(orderHash);
}
// Return order hash and full fill amount (numerator & denominator = 1).
diff --git a/package.json b/package.json
index afba7954c..e3b277b4c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "seaport",
- "version": "1.3.0",
+ "version": "1.4.0",
"description": "Seaport is a marketplace protocol for safely and efficiently buying and selling NFTs. Each listing contains an arbitrary number of items that the offerer is willing to give (the \"offer\") along with an arbitrary number of items that must be received along with their respective receivers (the \"consideration\").",
"main": "contracts/Seaport.sol",
"author": "0age",
diff --git a/reference/ReferenceConsideration.sol b/reference/ReferenceConsideration.sol
index 94b50cc6a..91bd0f569 100644
--- a/reference/ReferenceConsideration.sol
+++ b/reference/ReferenceConsideration.sol
@@ -28,7 +28,7 @@ import { OrderToExecute } from "./lib/ReferenceConsiderationStructs.sol";
* @author 0age
* @custom:coauthor d1ll0n
* @custom:coauthor transmissions11
- * @custom:version 1.3-reference
+ * @custom:version 1.4-reference
* @notice Consideration is a generalized native token/ERC20/ERC721/ERC1155
* marketplace. It minimizes external calls to the greatest extent
* possible and provides lightweight methods for common routes as well
diff --git a/reference/lib/ReferenceConsiderationBase.sol b/reference/lib/ReferenceConsiderationBase.sol
index 09cff6686..75594705c 100644
--- a/reference/lib/ReferenceConsiderationBase.sol
+++ b/reference/lib/ReferenceConsiderationBase.sol
@@ -25,7 +25,7 @@ contract ReferenceConsiderationBase is
{
// Declare constants for name, version, and reentrancy sentinel values.
string internal constant _NAME = "Consideration";
- string internal constant _VERSION = "1.3-reference";
+ string internal constant _VERSION = "1.4-reference";
uint256 internal constant _NOT_ENTERED = 1;
uint256 internal constant _ENTERED = 2;
diff --git a/reference/lib/ReferenceOrderCombiner.sol b/reference/lib/ReferenceOrderCombiner.sol
index 833a34ea7..4cb34197a 100644
--- a/reference/lib/ReferenceOrderCombiner.sol
+++ b/reference/lib/ReferenceOrderCombiner.sol
@@ -311,6 +311,9 @@ contract ReferenceOrderCombiner is
// Modify the OrderToExecute Spent Item Amount.
orderToExecute.spentItems[j].amount = offerItem.startAmount;
+ // Modify the OrderToExecute Spent Item Original Amount.
+ orderToExecute.spentItemOriginalAmounts[j] = offerItem
+ .startAmount;
}
// Retrieve array of consideration items for order in question.
@@ -362,6 +365,10 @@ contract ReferenceOrderCombiner is
// Modify the OrderToExecute Received item amount.
orderToExecute.receivedItems[j].amount = considerationItem
.startAmount;
+ // Modify the OrderToExecute Received item original amount.
+ orderToExecute.receivedItemOriginalAmounts[
+ j
+ ] = considerationItem.startAmount;
}
}
@@ -661,6 +668,7 @@ contract ReferenceOrderCombiner is
// duplicate recipient onto stack to avoid stack-too-deep
address _recipient = recipient;
+
// Iterate over orders to ensure all consideration items are met.
for (uint256 i = 0; i < ordersToExecute.length; ++i) {
// Retrieve the order in question.
@@ -757,6 +765,29 @@ contract ReferenceOrderCombiner is
];
}
}
+ }
+
+ // Trigger any remaining accumulated transfers via call to the conduit.
+ _triggerIfArmed(accumulatorStruct);
+
+ // If any native token remains after fulfillments, return it to the
+ // caller.
+ if (nativeTokensRemaining != 0) {
+ _transferNativeTokens(payable(msg.sender), nativeTokensRemaining);
+ }
+
+ // Iterate over orders to ensure all consideration items are met.
+ for (uint256 i = 0; i < ordersToExecute.length; ++i) {
+ // Retrieve the order in question.
+ OrderToExecute memory orderToExecute = ordersToExecute[i];
+
+ // Skip consideration item checks for order if not fulfilled.
+ if (orderToExecute.numerator == 0) {
+ continue;
+ }
+
+ // Retrieve the original order in question.
+ AdvancedOrder memory advancedOrder = advancedOrders[i];
// Ensure restricted orders have valid submitter or pass check.
_assertRestrictedAdvancedOrderValidity(
@@ -771,15 +802,6 @@ contract ReferenceOrderCombiner is
);
}
- // Trigger any remaining accumulated transfers via call to the conduit.
- _triggerIfArmed(accumulatorStruct);
-
- // If any native token remains after fulfillments, return it to the
- // caller.
- if (nativeTokensRemaining != 0) {
- _transferNativeTokens(payable(msg.sender), nativeTokensRemaining);
- }
-
// Return the array containing available orders.
return availableOrders;
}
diff --git a/reference/lib/ReferenceOrderValidator.sol b/reference/lib/ReferenceOrderValidator.sol
index aa4cb252d..da4b506d0 100644
--- a/reference/lib/ReferenceOrderValidator.sol
+++ b/reference/lib/ReferenceOrderValidator.sol
@@ -356,8 +356,8 @@ contract ReferenceOrderValidator is
offer = _offer;
consideration = _consideration;
} catch {
- // If decoding fails, revert or return empty.
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ // If decoding fails, revert.
+ revert InvalidContractOrder(orderHash);
}
} else {
// If the call fails, revert or return empty.
@@ -372,7 +372,7 @@ contract ReferenceOrderValidator is
// Explicitly specified offer items cannot be removed.
if (originalOfferLength > newOfferLength) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ revert InvalidContractOrder(orderHash);
} else if (newOfferLength > originalOfferLength) {
// If new offer items are added, extend the original offer.
OfferItem[] memory extendedOffer = new OfferItem[](
@@ -417,7 +417,7 @@ contract ReferenceOrderValidator is
originalOffer.token != newOffer.token ||
originalOffer.identifierOrCriteria != newOffer.identifier
) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ revert InvalidContractOrder(orderHash);
}
// Update the original amounts to use the generated amounts.
@@ -447,7 +447,7 @@ contract ReferenceOrderValidator is
// New consideration items cannot be created.
if (newConsiderationLength > originalConsiderationArray.length) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ revert InvalidContractOrder(orderHash);
}
// Loop through and check consideration.
@@ -484,7 +484,7 @@ contract ReferenceOrderValidator is
originalConsideration.recipient !=
(newConsideration.recipient))
) {
- return _revertOrReturnEmpty(revertOnInvalid, orderHash);
+ revert InvalidContractOrder(orderHash);
}
// Update the original amounts to use the generated amounts.
diff --git a/test/advanced.spec.ts b/test/advanced.spec.ts
index 805129fe0..45b445ba3 100644
--- a/test/advanced.spec.ts
+++ b/test/advanced.spec.ts
@@ -3061,7 +3061,182 @@ describe(`Advanced orders (Seaport v${VERSION})`, function () {
"ConsiderationLengthNotEqualToTotalOriginal"
);
});
- it("Can fulfill and aggregate contract orders via fulfillAvailableAdvancedOrders with failing orders", async () => {
+ it("Can fulfill and aggregate contract orders via fulfillAvailableAdvancedOrders with failing orders due to reverts", async () => {
+ // Seller mints nfts
+ const { nftId: nftIdOne, amount: amountOne } = await mintAndApprove1155(
+ seller,
+ marketplaceContract.address,
+ 10000
+ );
+ const { nftId: nftIdTwo, amount: amountTwo } = await mintAndApprove1155(
+ seller,
+ marketplaceContract.address,
+ 10000
+ );
+
+ await mintAndApprove1155(seller, marketplaceContract.address, 10000);
+
+ await mintAndApprove1155(seller, marketplaceContract.address, 10000);
+
+ // seller deploys offererContracts and approves them for 1155 token
+ const offererContractOne = await deployContract(
+ "TestContractOfferer",
+ owner,
+ marketplaceContract.address
+ );
+
+ await set1155ApprovalForAll(seller, offererContractOne.address, true);
+
+ const offererContractTwo = await deployContract(
+ "TestContractOfferer",
+ owner,
+ marketplaceContract.address
+ );
+
+ await set1155ApprovalForAll(seller, offererContractTwo.address, true);
+
+ const offererContractThree = await deployContract(
+ "TestContractOfferer",
+ owner,
+ marketplaceContract.address
+ );
+
+ await set1155ApprovalForAll(seller, offererContractThree.address, true);
+
+ const offererContractFour = await deployContract(
+ "TestContractOfferer",
+ owner,
+ marketplaceContract.address
+ );
+
+ await set1155ApprovalForAll(seller, offererContractFour.address, true);
+
+ const offerOne = [
+ getTestItem1155(nftIdOne, amountOne.mul(10), amountOne.mul(10)) as any,
+ ];
+
+ const considerationOne = [
+ getItemETH(
+ amountOne.mul(1000),
+ amountOne.mul(1000),
+ offererContractOne.address
+ ) as any,
+ ];
+
+ offerOne[0].identifier = offerOne[0].identifierOrCriteria;
+ offerOne[0].amount = offerOne[0].endAmount;
+
+ considerationOne[0].identifier = considerationOne[0].identifierOrCriteria;
+ considerationOne[0].amount = considerationOne[0].endAmount;
+
+ await offererContractOne
+ .connect(seller)
+ .activate(offerOne[0], considerationOne[0]);
+
+ const { order: orderOne, value } = await createOrder(
+ seller,
+ zone,
+ offerOne,
+ considerationOne,
+ 4 // CONTRACT
+ );
+
+ const contractOffererOneNonce =
+ await marketplaceContract.getContractOffererNonce(
+ offererContractOne.address
+ );
+
+ const orderHashOne =
+ offererContractOne.address.toLowerCase() +
+ contractOffererOneNonce.toHexString().slice(2).padStart(24, "0");
+
+ orderOne.parameters.offerer = offererContractOne.address;
+ orderOne.numerator = 1;
+ orderOne.denominator = 1;
+ orderOne.signature = "0x";
+
+ // test orderHashes
+ orderOne.extraData = ethers.utils.defaultAbiCoder.encode(
+ ["bytes32[]"],
+ [[orderHashOne, ethers.constants.HashZero]]
+ );
+
+ expect((orderOne.extraData.length - 2) / 64).to.equal(4);
+
+ // second order reverts when generating the order
+ const offerTwo = [
+ getTestItem1155(nftIdTwo, amountTwo.mul(10), amountTwo.mul(10)) as any,
+ ];
+
+ const considerationTwo = [
+ getItemETH(
+ amountTwo.mul(1000),
+ amountTwo.mul(1000),
+ offererContractTwo.address
+ ) as any,
+ ];
+
+ offerTwo[0].identifier = offerTwo[0].identifierOrCriteria;
+ offerTwo[0].amount = offerTwo[0].endAmount;
+
+ considerationTwo[0].identifier = considerationTwo[0].identifierOrCriteria;
+ considerationTwo[0].amount = considerationTwo[0].endAmount;
+
+ await offererContractTwo
+ .connect(seller)
+ .activate(offerTwo[0], considerationTwo[0]);
+
+ const { order: orderTwo, value: valueTwo } = await createOrder(
+ seller,
+ zone,
+ offerTwo,
+ considerationTwo,
+ 4 // CONTRACT
+ );
+
+ orderTwo.parameters.offerer = offererContractTwo.address;
+ orderTwo.numerator = 1;
+ orderTwo.denominator = 1;
+ orderTwo.signature = "0x";
+ orderTwo.extraData = "0x1234"; // causes call to revert
+
+ const offerComponents = [
+ [{ orderIndex: 0, itemIndex: 0 }],
+ [{ orderIndex: 1, itemIndex: 0 }],
+ ];
+ const considerationComponents = [
+ [{ orderIndex: 0, itemIndex: 0 }],
+ [{ orderIndex: 1, itemIndex: 0 }],
+ ];
+
+ await withBalanceChecks([orderOne], 0, undefined, async () => {
+ const tx = marketplaceContract
+ .connect(buyer)
+ .fulfillAvailableAdvancedOrders(
+ [orderOne, orderTwo],
+ [],
+ offerComponents,
+ considerationComponents,
+ toKey(0),
+ ethers.constants.AddressZero,
+ 100,
+ {
+ value: value.add(valueTwo).mul(2),
+ }
+ );
+ const receipt = await (await tx).wait();
+ await checkExpectedEvents(tx, receipt, [
+ {
+ order: orderOne,
+ orderHash: orderHashOne,
+ fulfiller: buyer.address,
+ },
+ ]);
+
+ return receipt;
+ });
+ });
+ it("Cannot fulfill and aggregate contract orders via fulfillAvailableAdvancedOrders with failing orders due to bad data", async () => {
// Seller mints nfts
const { nftId: nftIdOne, amount: amountOne } = await mintAndApprove1155(
seller,
@@ -3259,6 +3434,15 @@ describe(`Advanced orders (Seaport v${VERSION})`, function () {
orderThree.denominator = 1;
orderThree.signature = "0x";
+ const contractOffererThreeNonce =
+ await marketplaceContract.getContractOffererNonce(
+ offererContractThree.address
+ );
+
+ const orderHashThree =
+ offererContractThree.address.toLowerCase() +
+ contractOffererThreeNonce.toHexString().slice(2).padStart(24, "0");
+
// fourth order: generated order exceeds expected consideration items
const offerFour = [
getTestItem1155(
@@ -3317,8 +3501,8 @@ describe(`Advanced orders (Seaport v${VERSION})`, function () {
[{ orderIndex: 3, itemIndex: 0 }],
];
- await withBalanceChecks([orderOne], 0, undefined, async () => {
- const tx = marketplaceContract
+ await expect(
+ marketplaceContract
.connect(buyer)
.fulfillAvailableAdvancedOrders(
[orderOne, orderTwo, orderThree, orderFour],
@@ -3331,18 +3515,13 @@ describe(`Advanced orders (Seaport v${VERSION})`, function () {
{
value: value.add(valueTwo).add(valueThree).add(valueFour).mul(2),
}
- );
- const receipt = await (await tx).wait();
- await checkExpectedEvents(tx, receipt, [
- {
- order: orderOne,
- orderHash: orderHashOne,
- fulfiller: buyer.address,
- },
- ]);
-
- return receipt;
- });
+ )
+ )
+ .to.be.revertedWithCustomError(
+ marketplaceContract,
+ "InvalidContractOrder"
+ )
+ .withArgs(orderHashThree);
});
});
diff --git a/test/foundry/GetterTests.t.sol b/test/foundry/GetterTests.t.sol
index c95addf57..6697185d3 100644
--- a/test/foundry/GetterTests.t.sol
+++ b/test/foundry/GetterTests.t.sol
@@ -41,7 +41,7 @@ contract TestGetters is BaseConsiderationTest {
function testGetsCorrectVersion() public {
(string memory version, , ) = consideration.information();
- assertEq(version, "1.3");
+ assertEq(version, "1.4");
}
function testGetCorrectDomainSeparator() public {
diff --git a/test/foundry/offerers/BadOfferer.t.sol b/test/foundry/offerers/BadOfferer.t.sol
index bbdb35e26..94c05f15f 100644
--- a/test/foundry/offerers/BadOfferer.t.sol
+++ b/test/foundry/offerers/BadOfferer.t.sol
@@ -28,13 +28,18 @@ import {
OrderType
} from "../../../contracts/lib/ConsiderationEnums.sol";
-contract BadOffererTest is BaseOrderTest {
+import {
+ ZoneInteractionErrors
+} from "../../../contracts/interfaces/ZoneInteractionErrors.sol";
+
+contract BadOffererTest is BaseOrderTest, ZoneInteractionErrors {
BadOfferer badOfferer;
struct Context {
ConsiderationInterface seaport;
uint256 id;
bool eoa;
+ bool shouldFail;
}
function setUp() public override {
@@ -52,50 +57,90 @@ contract BadOffererTest is BaseOrderTest {
}
function testNormalOrder() public {
- uint256 id = 1;
+ uint256 id = uint256(BadOfferer.Path.NORMAL);
test(
this.execOrderWithContext,
- Context({ seaport: consideration, id: id, eoa: false })
+ Context({
+ seaport: consideration,
+ id: id,
+ eoa: false,
+ shouldFail: false
+ })
);
test(
this.execOrderWithContext,
- Context({ seaport: referenceConsideration, id: id, eoa: false })
+ Context({
+ seaport: referenceConsideration,
+ id: id,
+ eoa: false,
+ shouldFail: false
+ })
);
}
function testOrderNothing() public {
- uint256 id = 2;
+ uint256 id = uint256(BadOfferer.Path.RETURN_NOTHING);
test(
this.execOrderWithContext,
- Context({ seaport: consideration, id: id, eoa: false })
+ Context({
+ seaport: consideration,
+ id: id,
+ eoa: false,
+ shouldFail: true
+ })
);
test(
this.execOrderWithContext,
- Context({ seaport: referenceConsideration, id: id, eoa: false })
+ Context({
+ seaport: referenceConsideration,
+ id: id,
+ eoa: false,
+ shouldFail: true
+ })
);
}
function testOrderRevert() public {
- uint256 id = 3;
+ uint256 id = uint256(BadOfferer.Path.REVERT);
test(
this.execOrderWithContext,
- Context({ seaport: consideration, id: id, eoa: false })
+ Context({
+ seaport: consideration,
+ id: id,
+ eoa: false,
+ shouldFail: false // shouldn't fail because the revert happens within GenerateOrder, so it can be safely skipped
+ })
);
test(
this.execOrderWithContext,
- Context({ seaport: referenceConsideration, id: id, eoa: false })
+ Context({
+ seaport: referenceConsideration,
+ id: id,
+ eoa: false,
+ shouldFail: false
+ })
);
}
function testOrderGarbage() public {
- uint256 id = 4;
+ uint256 id = uint256(BadOfferer.Path.RETURN_GARBAGE);
test(
this.execOrderWithContext,
- Context({ seaport: consideration, id: id, eoa: false })
+ Context({
+ seaport: consideration,
+ id: id,
+ eoa: false,
+ shouldFail: true
+ })
);
test(
this.execOrderWithContext,
- Context({ seaport: referenceConsideration, id: id, eoa: false })
+ Context({
+ seaport: referenceConsideration,
+ id: id,
+ eoa: false,
+ shouldFail: true
+ })
);
}
@@ -103,11 +148,21 @@ contract BadOffererTest is BaseOrderTest {
uint256 id = 1;
test(
this.execOrderWithContext,
- Context({ seaport: consideration, id: id, eoa: true })
+ Context({
+ seaport: consideration,
+ id: id,
+ eoa: true,
+ shouldFail: true
+ })
);
test(
this.execOrderWithContext,
- Context({ seaport: referenceConsideration, id: id, eoa: true })
+ Context({
+ seaport: referenceConsideration,
+ id: id,
+ eoa: true,
+ shouldFail: true
+ })
);
}
@@ -132,6 +187,18 @@ contract BadOffererTest is BaseOrderTest {
advancedOrders[1] = normalOrder;
CriteriaResolver[] memory resolvers;
+ if (context.shouldFail) {
+ if (context.seaport == consideration) {
+ vm.expectRevert(
+ abi.encodeWithSelector(
+ InvalidContractOrder.selector,
+ bytes32(uint256(uint160(address(badOfferer))) << 96)
+ )
+ );
+ } else {
+ vm.expectRevert();
+ }
+ }
context.seaport.fulfillAvailableAdvancedOrders({
advancedOrders: advancedOrders,
criteriaResolvers: resolvers,
diff --git a/test/foundry/offerers/impl/BadOfferer.sol b/test/foundry/offerers/impl/BadOfferer.sol
index 150bdf49a..51f5d151d 100644
--- a/test/foundry/offerers/impl/BadOfferer.sol
+++ b/test/foundry/offerers/impl/BadOfferer.sol
@@ -28,6 +28,13 @@ contract BadOfferer is ContractOffererInterface {
ERC20Interface token1;
ERC721Interface token2;
+ enum Path {
+ RETURN_GARBAGE,
+ NORMAL,
+ RETURN_NOTHING,
+ REVERT
+ }
+
constructor(
address seaport,
ERC20Interface _token1,
@@ -73,7 +80,10 @@ contract BadOfferer is ContractOffererInterface {
override
returns (SpentItem[] memory offer, ReceivedItem[] memory consideration)
{
- if (maximumSpent[0].identifier == 1) {
+ Path path = Path(
+ maximumSpent[0].identifier > 3 ? 0 : maximumSpent[0].identifier
+ );
+ if (path == Path.NORMAL) {
offer = minimumReceived;
consideration = new ReceivedItem[](1);
consideration[0] = ReceivedItem({
@@ -84,12 +94,12 @@ contract BadOfferer is ContractOffererInterface {
recipient: payable(address(this))
});
return (offer, consideration);
- } else if (maximumSpent[0].identifier == 2) {
+ } else if (path == Path.RETURN_NOTHING) {
// return nothing
assembly {
return(0, 0)
}
- } else if (maximumSpent[0].identifier == 3) {
+ } else if (path == Path.REVERT) {
revert IntentionalRevert();
} else {
// return garbage
diff --git a/test/foundry/zone/PostFulfillmentCheck.t.sol b/test/foundry/zone/PostFulfillmentCheck.t.sol
index 3b43e8717..1d321c00c 100644
--- a/test/foundry/zone/PostFulfillmentCheck.t.sol
+++ b/test/foundry/zone/PostFulfillmentCheck.t.sol
@@ -554,15 +554,14 @@ contract PostFulfillmentCheckTest is BaseOrderTest {
numTips: 0
})
);
- // todo: fix ref impl
- // test(
- // this.execFulfillAvailableAdvancedAscending,
- // Context({
- // consideration: referenceConsideration,
- // numOriginalAdditional: 0,
- // numTips: 0
- // })
- // );
+ test(
+ this.execFulfillAvailableAdvancedAscending,
+ Context({
+ consideration: referenceConsideration,
+ numOriginalAdditional: 0,
+ numTips: 0
+ })
+ );
}
function execFulfillAvailableAdvancedAscending(
diff --git a/test/revert.spec.ts b/test/revert.spec.ts
index 0b0908376..42506030a 100644
--- a/test/revert.spec.ts
+++ b/test/revert.spec.ts
@@ -8296,7 +8296,7 @@ describe(`Reverts (Seaport v${VERSION})`, function () {
)
.withArgs(orderHash);
});
- it("Fulfillment does not revert when valid order included with invalid contract offerer order", async () => {
+ it("Fulfillment reverts when valid order included with contract order where offerer returns bad data", async () => {
// Contract offerer mints nft
const nftId10 = await mint721(
offererContract,
@@ -8374,8 +8374,8 @@ describe(`Reverts (Seaport v${VERSION})`, function () {
[{ orderIndex: 1, itemIndex: 0 }],
];
- await withBalanceChecks([order2], 0, [], async () => {
- const tx = marketplaceContract
+ await expect(
+ marketplaceContract
.connect(buyer)
.fulfillAvailableAdvancedOrders(
[order, order2],
@@ -8388,25 +8388,13 @@ describe(`Reverts (Seaport v${VERSION})`, function () {
{
value: value.mul(2),
}
- );
- const receipt = await (await tx).wait();
- await checkExpectedEvents(
- tx,
- receipt,
- [
- {
- order: order2,
- orderHash: orderHash2,
- fulfiller: buyer.address,
- fulfillerConduitKey: toKey(0),
- },
- ],
- undefined,
- []
- );
-
- return receipt;
- });
+ )
+ )
+ .to.be.revertedWithCustomError(
+ marketplaceContract,
+ "InvalidContractOrder"
+ )
+ .withArgs(orderHash);
});
});
diff --git a/test/utils/helpers.ts b/test/utils/helpers.ts
index ba393ada2..5fceddba7 100644
--- a/test/utils/helpers.ts
+++ b/test/utils/helpers.ts
@@ -9,7 +9,7 @@ import type {
Order,
} from "./types";
-export const VERSION = `1.3${process.env.REFERENCE ? "-reference" : ""}`;
+export const VERSION = `1.4${process.env.REFERENCE ? "-reference" : ""}`;
export const minRandom = (min: ethers.BigNumberish) => randomBN(10).add(min);
diff --git a/yarn.lock b/yarn.lock
index 2214e8bb2..26d2927cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1576,13 +1576,13 @@ cacheable-lookup@^7.0.0:
integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==
cacheable-request@^10.2.1:
- version "10.2.3"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-10.2.3.tgz#25277efe121308ab722c28b4164e51382b4adeb1"
- integrity sha512-6BehRBOs7iurNjAYN9iPazTwFDaMQavJO8W1MEm3s2pH8q/tkPTtLDRUZaweWK87WFGf2Y5wLAlaCJlR5kOz3w==
+ version "10.2.7"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-10.2.7.tgz#8bb8da66338f321b3cbbc34a71ac231178171bcc"
+ integrity sha512-I4SA6mKgDxcxVbSt/UmIkb9Ny8qSkg6ReBHtAAXnZHk7KOSx5g3DTiAOaYzcHCs6oOdHn+bip9T48E6tMvK9hw==
dependencies:
"@types/http-cache-semantics" "^4.0.1"
get-stream "^6.0.1"
- http-cache-semantics "^4.1.0"
+ http-cache-semantics "^4.1.1"
keyv "^4.5.2"
mimic-response "^4.0.0"
normalize-url "^8.0.0"
@@ -3487,7 +3487,7 @@ http-basic@^8.1.1:
http-response-object "^3.0.1"
parse-cache-control "^1.0.1"
-http-cache-semantics@^4.1.0:
+http-cache-semantics@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -6067,9 +6067,9 @@ underscore@>=1.12.1:
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
undici@>=5.8.2, undici@^5.4.0:
- version "5.13.0"
- resolved "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz#56772fba89d8b25e39bddc8c26a438bd73ea69bb"
- integrity sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q==
+ version "5.19.1"
+ resolved "https://registry.yarnpkg.com/undici/-/undici-5.19.1.tgz#92b1fd3ab2c089b5a6bd3e579dcda8f1934ebf6d"
+ integrity sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==
dependencies:
busboy "^1.6.0"
|