Move code to check amount of tokens transferred to library #52

src/Facets/ArbitrumBridgeFacet.sol

@@ -42,18 +42,8 @@ contract ArbitrumBridgeFacet is ILiFi, SwapperV2, ReentrancyGuard {
         if (_bridgeData.receiver == address(0)) {
             revert InvalidReceiver();
         }
-        if (_bridgeData.amount == 0) {
-            revert InvalidAmount();
-        }
 
-        if (!LibAsset.isNativeAsset(_bridgeData.assetId)) {
-            uint256 _fromTokenBalance = LibAsset.getOwnBalance(_bridgeData.assetId);
-            LibAsset.transferFromERC20(_bridgeData.assetId, msg.sender, address(this), _bridgeData.amount);
-
-            if (LibAsset.getOwnBalance(_bridgeData.assetId) - _fromTokenBalance != _bridgeData.amount) {
-                revert InvalidAmount();
-            }
-        }
+        LibAsset.depositAsset(_bridgeData.assetId, _bridgeData.amount);
 
         _startBridge(_lifiData, _bridgeData, _bridgeData.amount, false);
     }

src/Facets/OptimismBridgeFacet.sol

@@ -41,18 +41,8 @@ contract OptimismBridgeFacet is ILiFi, SwapperV2, ReentrancyGuard {
         if (_bridgeData.receiver == address(0)) {
             revert InvalidReceiver();
         }
-        if (_bridgeData.amount == 0) {
-            revert InvalidAmount();
-        }
-
-        if (!LibAsset.isNativeAsset(_bridgeData.assetId)) {
-            uint256 _fromTokenBalance = LibAsset.getOwnBalance(_bridgeData.assetId);
-            LibAsset.transferFromERC20(_bridgeData.assetId, msg.sender, address(this), _bridgeData.amount);
 
-            if (LibAsset.getOwnBalance(_bridgeData.assetId) - _fromTokenBalance != _bridgeData.amount) {
-                revert InvalidAmount();
-            }
-        }
+        LibAsset.depositAsset(_bridgeData.assetId, _bridgeData.amount);
 
         _startBridge(_lifiData, _bridgeData, _bridgeData.amount, false);
     }

src/Facets/PolygonBridgeFacet.sol

@@ -41,18 +41,8 @@ contract PolygonBridgeFacet is ILiFi, SwapperV2, ReentrancyGuard {
         if (_bridgeData.receiver == address(0)) {
             revert InvalidReceiver();
         }
-        if (_bridgeData.amount == 0) {
-            revert InvalidAmount();
-        }
 
-        if (!LibAsset.isNativeAsset(_bridgeData.assetId)) {
-            uint256 _fromTokenBalance = LibAsset.getOwnBalance(_bridgeData.assetId);
-            LibAsset.transferFromERC20(_bridgeData.assetId, msg.sender, address(this), _bridgeData.amount);
-
-            if (LibAsset.getOwnBalance(_bridgeData.assetId) - _fromTokenBalance != _bridgeData.amount) {
-                revert InvalidAmount();
-            }
-        }
+        LibAsset.depositAsset(_bridgeData.assetId, _bridgeData.amount);
 
         _startBridge(_lifiData, _bridgeData, false);
     }

src/Facets/StargateFacet.sol

@@ -68,22 +68,13 @@ contract StargateFacet is ILiFi, SwapperV2, ReentrancyGuard {
         payable
         nonReentrant
     {
-        if (_stargateData.amountLD == 0) {
-            revert InvalidAmount();
-        }
-
         address token = getTokenFromPoolId(_stargateData.router, _stargateData.srcPoolId);
 
         if (token == address(0)) {
             revert TokenAddressIsZero();
         }
 
-        uint256 _fromTokenBalance = LibAsset.getOwnBalance(token);
-        LibAsset.transferFromERC20(token, msg.sender, address(this), _stargateData.amountLD);
-
-        if (LibAsset.getOwnBalance(token) - _fromTokenBalance != _stargateData.amountLD) {
-            revert InvalidAmount();
-        }
+        LibAsset.depositAsset(token, _stargateData.amountLD);
 
         _startBridge(_stargateData, _lifiData, msg.value, false);
     }

src/Libraries/LibAsset.sol

@@ -93,9 +93,8 @@ library LibAsset {
     ) internal {
         if (amount == 0) revert InvalidAmount();
         if (isNative) {
-            if (msg.value != amount) revert InvalidAmount();
+            if (msg.value < amount) revert InvalidAmount();
         } else {
-            if (msg.value != 0) revert NativeValueWithERC();
             uint256 _fromTokenBalance = LibAsset.getOwnBalance(tokenId);
             LibAsset.transferFromERC20(tokenId, msg.sender, address(this), amount);
             if (LibAsset.getOwnBalance(tokenId) - _fromTokenBalance != amount) revert InvalidAmount();

test/facets/ArbitrumBridgeFacet.test.ts

@@ -225,9 +225,7 @@ describe('ArbitrumBridgeFacet', function () {
             .startBridgeTokensViaArbitrumBridge(validLiFiData, bridgeData, {
               value: utils.parseEther('9'),
             })
-        ).to.be.revertedWith(
-          'Transaction reverted: function call failed to execute'
-        )
+        ).to.be.revertedWith('InvalidAmount()')
       })
     })
 

test/facets/CBridgeFacet.test.ts

@@ -127,7 +127,7 @@ describe('CBridgeFacet', function () {
     ).to.be.revertedWith('InvalidAmount()')
   })
 
-  it('fails to start a native token bridge transaction with too much msg.value', async function () {
+  it('fails to start a native token bridge transaction with no enough msg.value', async function () {
     const CBridgeDataNative = {
       cBridge: CBRIDGE_ADDRESS,
       receiver: alice.address,
@@ -142,7 +142,7 @@ describe('CBridgeFacet', function () {
         .connect(alice)
         .startBridgeTokensViaCBridge(lifiData, CBridgeDataNative, {
           gasLimit: 500000,
-          value: utils.parseUnits('0.01', 18),
+          value: utils.parseUnits('0.00001', 18),
         })
     ).to.be.revertedWith('InvalidAmount()')
   })

test/facets/GenericSwapFacet.test.ts

@@ -145,7 +145,7 @@ describe('Generic Swap Facet', async () => {
     expect(postBalance.gt(preBalance)).to.eq(true)
   })
 
-  it('fails tp perform a swap if using a DEX that is not approved', async () => {
+  it('fails to perform a swap if using a DEX that is not approved', async () => {
     await dexMgr.removeDex(SADDLESWAP_ADDRESS)
     const amountIn = utils.parseUnits('1010', 6)
     const amountOut = utils.parseUnits('1000', 6)

test/facets/OptimismBridgeFacet.test.ts

@@ -197,9 +197,7 @@ describe('OptimismBridgeFacet', function () {
             .startBridgeTokensViaOptimismBridge(validLiFiData, bridgeData, {
               value: utils.parseEther('9'),
             })
-        ).to.be.revertedWith(
-          'Transaction reverted: function call failed to execute'
-        )
+        ).to.be.revertedWith('InvalidAmount()')
       })
     })
 

test/facets/PolygonBridgeFacet.test.ts

@@ -196,7 +196,7 @@ describe('PolygonBridgeFacet', function () {
               gasLimit: 500000,
               value: utils.parseEther('9'),
             })
-        ).to.be.reverted
+        ).to.be.revertedWith('InvalidAmount()')
       })
     })