fix: zeroExV4Adapter minIncomingAmount validation

enzymefinance · May 9, 2023 · da8ed1e · da8ed1e
1 parent cea915a
commit da8ed1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/contracts/release/extensions/integration-manager/integrations/adapters/ZeroExV4Adapter.sol b/contracts/release/extensions/integration-manager/integrations/adapters/ZeroExV4Adapter.sol
@@ -124,6 +124,7 @@ contract ZeroExV4Adapter is AdapterBase, MathHelpers, ZeroExV4ActionsMixin {
         spendAssetAmounts_ = new uint256[](1);
 
         address maker;
+        uint256 makerAmount;
         uint256 takerAmount;
         uint256 takerTokenFeeAmount;
 
@@ -133,6 +134,7 @@ contract ZeroExV4Adapter is AdapterBase, MathHelpers, ZeroExV4ActionsMixin {
             );
 
             maker = order.maker;
+            makerAmount = order.makerAmount;
             incomingAssets_[0] = order.makerToken;
             spendAssets_[0] = order.takerToken;
             takerAmount = order.takerAmount;
@@ -142,6 +144,7 @@ contract ZeroExV4Adapter is AdapterBase, MathHelpers, ZeroExV4ActionsMixin {
                 encodedZeroExOrderArgs
             );
             maker = order.maker;
+            makerAmount = order.makerAmount;
             incomingAssets_[0] = order.makerToken;
             spendAssets_[0] = order.takerToken;
             takerAmount = order.takerAmount;
@@ -163,6 +166,12 @@ contract ZeroExV4Adapter is AdapterBase, MathHelpers, ZeroExV4ActionsMixin {
             spendAssetAmounts_[0] = takerAssetFillAmount;
         }
 
+        minIncomingAssetAmounts_[0] = __calcRelativeQuantity({
+            _quantity1: takerAmount,
+            _quantity2: makerAmount,
+            _relativeQuantity1: takerAssetFillAmount
+        });
+
         return (
             IIntegrationManager.SpendAssetsHandleType.Transfer,
             spendAssets_,

diff --git a/...rotocol/tests/release/extensions/integration-manager/integrations/ZeroExV4Adapter.test.ts b/...rotocol/tests/release/extensions/integration-manager/integrations/ZeroExV4Adapter.test.ts
@@ -171,7 +171,7 @@ describe('parseAssetsForAction', () => {
 
     expect(result).toMatchFunctionOutput(zeroExV4AdapterWithWhitelist.parseAssetsForAction, {
       incomingAssets_: [incomingAsset],
-      minIncomingAssetAmounts_: [0],
+      minIncomingAssetAmounts_: [makerAmount.mul(takerAssetFillAmount).div(takerAmount)],
       spendAssetAmounts_: [takerAssetFillAmount],
       spendAssetsHandleType_: SpendAssetsHandleType.Transfer,
       spendAssets_: [outgoingAsset],
@@ -206,7 +206,7 @@ describe('parseAssetsForAction', () => {
 
     expect(result).toMatchFunctionOutput(zeroExV4Adapter.parseAssetsForAction, {
       incomingAssets_: [incomingAsset],
-      minIncomingAssetAmounts_: [0],
+      minIncomingAssetAmounts_: [makerAmount.mul(takerAssetFillAmount).div(takerAmount)],
       spendAssetAmounts_: [takerAssetFillAmount],
       spendAssetsHandleType_: SpendAssetsHandleType.Transfer,
       spendAssets_: [outgoingAsset],
@@ -243,7 +243,7 @@ describe('parseAssetsForAction', () => {
 
     expect(result).toMatchFunctionOutput(zeroExV4Adapter.parseAssetsForAction, {
       incomingAssets_: [incomingAsset],
-      minIncomingAssetAmounts_: [0],
+      minIncomingAssetAmounts_: [makerAmount.mul(takerAssetFillAmount).div(takerAmount)],
       spendAssetAmounts_: [takerAssetFillAmount.add(expectedTakerFee)],
       spendAssetsHandleType_: SpendAssetsHandleType.Transfer,
       spendAssets_: [outgoingAsset],