feat(AcrossV3): adds support for AcrossV3 (AcrossFacetV3 v1.0.0, AcrossFacetPackedV3 v1.0.0, ReceiverAcrossV3 v1.0.0)

.github/workflows/forge.yml

@@ -48,6 +48,6 @@ jobs:
       - name: Run forge tests (with auto-repeat in case of error)
         uses: Wandalen/[email protected]
         with:
-          command: forge test
+          command: forge test --evm-version 'shanghai'
           attempt_limit: 10
-          attempt_delay: 15000
+          attempt_delay: 15000

.github/workflows/unreviewedPRReminder.yml

@@ -41,6 +41,11 @@ jobs:
               continue
             fi
 
+            # Continue loop if the PR has the label "WaitForBackend"
+            if echo "$PR_LABELS" | grep -q "WaitForBackend"; then
+              continue
+            fi
+
             # Convert date to Unix timestamp
             PR_CREATED_AT=$(date -d"$PR_CREATED_AT" +%s)
             NOW=$(date +%s)

.solhint.json

@@ -9,12 +9,12 @@
       }
     ],
     "code-complexity": ["error", 20],
-    "compiler-version": ["error", "^0.8.7"],
+    "compiler-version": ["error", "^0.8.17"],
     "const-name-snakecase": "off",
     "func-name-mixedcase": "off",
     "constructor-syntax": "error",
-    "func-visibility": ["error", {"ignoreConstructors": true}],
+    "func-visibility": ["error", { "ignoreConstructors": true }],
     "not-rely-on-time": "off",
-    "reason-string": ["warn", {"maxLength": 64}]
+    "reason-string": ["warn", { "maxLength": 64 }]
   }
 }

archive/scripts/Deploy/DeployLiFiDiamondImmutable.s.sol

@@ -4,12 +4,13 @@ pragma solidity ^0.8.17;
 import { DeployScriptBase } from "./utils/DeployScriptBase.sol";
 import { stdJson } from "forge-std/Script.sol";
 import { LiFiDiamondImmutable } from "lifi/LiFiDiamondImmutable.sol";
-import { DiamondCutFacet, IDiamondCut } from "lifi/Facets/DiamondCutFacet.sol";
+import { DiamondCutFacet } from "lifi/Facets/DiamondCutFacet.sol";
+import { LibDiamond } from "lifi/Libraries/LibDiamond.sol";
 
 contract DeployScript is DeployScriptBase {
     using stdJson for string;
 
-    IDiamondCut.FacetCut[] internal cut;
+    LibDiamond.FacetCut[] internal cut;
     address internal diamondImmutable;
     DiamondCutFacet internal cutter;
 

archive/scripts/Deploy/DeployNonStandardSelectorsRegistryFacet.s.sol

@@ -1,5 +1,5 @@
 // // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { DeployScriptBase } from "./utils/DeployScriptBase.sol";
 import { NonStandardSelectorsRegistryFacet } from "lifi/Facets/NonStandardSelectorsRegistryFacet.sol";

archive/scripts/Deploy/UpdateNonStandardSelectorsRegistryFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { UpdateScriptBase } from "./utils/UpdateScriptBase.sol";
 import { stdJson } from "forge-std/StdJson.sol";

archive/scripts/Deploy/zkSync/008_deploy_service_fee_collector.ts → archive/scripts/zkSync/008_deploy_service_fee_collector.ts

@@ -1,13 +1,13 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
 import { DeployFunction } from 'hardhat-deploy/types'
 import { ethers, network } from 'hardhat'
-import { PeripheryRegistryFacet } from '../../../../typechain'
+import { PeripheryRegistryFacet } from '../../../typechain'
 import {
   diamondContractName,
   updateDeploymentLogs,
   verifyContract,
-} from '../../../../script/deploy/zksync/9999_utils'
-import globalConfig from '../../../../config/global.json'
+} from '../../../script/deploy/zksync/9999_utils'
+import globalConfig from '../../../config/global.json'
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // Protect against unwanted redeployments

archive/src/Facets/CelerIMFacetImmutable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { CelerIMFacetBase, IMessageBus, MsgDataTypes, IERC20, CelerIM } from "../Helpers/CelerIMFacetBase.sol";
 

archive/src/Facets/CircleBridgeFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { ILiFi } from "../Interfaces/ILiFi.sol";
 import { ITokenMessenger } from "../Interfaces/ITokenMessenger.sol";

archive/src/Facets/DeBridgeDlnFacet.sol

@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import { ILiFi } from "../Interfaces/ILiFi.sol";
+import { LibDiamond } from "../Libraries/LibDiamond.sol";
+import { LibAsset, IERC20 } from "../Libraries/LibAsset.sol";
+import { LibSwap } from "../Libraries/LibSwap.sol";
+import { ReentrancyGuard } from "../Helpers/ReentrancyGuard.sol";
+import { SwapperV2 } from "../Helpers/SwapperV2.sol";
+import { Validatable } from "../Helpers/Validatable.sol";
+import { IDlnSource } from "../Interfaces/IDlnSource.sol";
+
+/// @title DeBridgeDLN Facet
+/// @author LI.FI (https://li.fi)
+/// @notice Provides functionality for bridging through DeBridge DLN
+/// @custom:version 1.0.0
+contract DeBridgeDlnFacet is ILiFi, ReentrancyGuard, SwapperV2, Validatable {
+    /// Storage ///
+
+    address internal constant NON_EVM_ADDRESS =
+        0x11f111f111f111F111f111f111F111f111f111F1;
+    IDlnSource public immutable dlnSource;
+
+    /// Types ///
+
+    /// @param receivingAssetId The address of the asset to receive
+    /// @param receiver The address of the receiver
+    /// @param minAmountOut The minimum amount to receive on the destination chain
+    struct DeBridgeDlnData {
+        bytes receivingAssetId;
+        bytes receiver;
+        uint256 minAmountOut;
+    }
+
+    /// Events ///
+
+    event DlnOrderCreated(bytes32 indexed orderId);
+
+    event BridgeToNonEVMChain(
+        bytes32 indexed transactionId,
+        uint256 indexed destinationChainId,
+        bytes receiver
+    );
+
+    /// Constructor ///
+
+    /// @notice Constructor for the contract.
+    /// @param _dlnSource The address of the DLN order creation contract
+    constructor(IDlnSource _dlnSource) {
+        dlnSource = _dlnSource;
+    }
+
+    /// External Methods ///
+
+    /// @notice Bridges tokens via DeBridgeDLN
+    /// @param _bridgeData The core information needed for bridging
+    /// @param _deBridgeDlnData Data specific to DeBridgeDLN
+    function startBridgeTokensViaDeBridgeDln(
+        ILiFi.BridgeData memory _bridgeData,
+        DeBridgeDlnData calldata _deBridgeDlnData
+    )
+        external
+        payable
+        nonReentrant
+        refundExcessNative(payable(msg.sender))
+        validateBridgeData(_bridgeData)
+        doesNotContainSourceSwaps(_bridgeData)
+        doesNotContainDestinationCalls(_bridgeData)
+    {
+        LibAsset.depositAsset(
+            _bridgeData.sendingAssetId,
+            _bridgeData.minAmount
+        );
+        _startBridge(
+            _bridgeData,
+            _deBridgeDlnData,
+            dlnSource.globalFixedNativeFee()
+        );
+    }
+
+    /// @notice Performs a swap before bridging via DeBridgeDLN
+    /// @param _bridgeData The core information needed for bridging
+    /// @param _swapData An array of swap related data for performing swaps before bridging
+    /// @param _deBridgeDlnData Data specific to DeBridgeDLN
+    function swapAndStartBridgeTokensViaDeBridgeDln(
+        ILiFi.BridgeData memory _bridgeData,
+        LibSwap.SwapData[] calldata _swapData,
+        DeBridgeDlnData calldata _deBridgeDlnData
+    )
+        external
+        payable
+        nonReentrant
+        refundExcessNative(payable(msg.sender))
+        containsSourceSwaps(_bridgeData)
+        doesNotContainDestinationCalls(_bridgeData)
+        validateBridgeData(_bridgeData)
+    {
+        uint256 fee = dlnSource.globalFixedNativeFee();
+        address assetId = _bridgeData.sendingAssetId;
+        _bridgeData.minAmount = _depositAndSwap(
+            _bridgeData.transactionId,
+            _bridgeData.minAmount,
+            _swapData,
+            payable(msg.sender),
+            LibAsset.isNativeAsset(assetId) ? 0 : fee
+        );
+        _startBridge(_bridgeData, _deBridgeDlnData, fee);
+    }
+
+    /// Internal Methods ///
+
+    /// @dev Contains the business logic for the bridge via DeBridgeDLN
+    /// @param _bridgeData The core information needed for bridging
+    /// @param _deBridgeDlnData Data specific to DeBridgeDLN
+    function _startBridge(
+        ILiFi.BridgeData memory _bridgeData,
+        DeBridgeDlnData calldata _deBridgeDlnData,
+        uint256 _fee
+    ) internal {
+        IDlnSource.OrderCreation memory orderCreation = IDlnSource
+            .OrderCreation({
+                giveTokenAddress: _bridgeData.sendingAssetId,
+                giveAmount: _bridgeData.minAmount,
+                takeTokenAddress: _deBridgeDlnData.receivingAssetId,
+                takeAmount: _deBridgeDlnData.minAmountOut,
+                takeChainId: _bridgeData.destinationChainId,
+                receiverDst: _deBridgeDlnData.receiver,
+                givePatchAuthoritySrc: _bridgeData.receiver,
+                orderAuthorityAddressDst: _deBridgeDlnData.receiver,
+                allowedTakerDst: "",
+                externalCall: "",
+                allowedCancelBeneficiarySrc: ""
+            });
+
+        bytes32 orderId;
+        if (!LibAsset.isNativeAsset(_bridgeData.sendingAssetId)) {
+            // Give the DLN Source approval to bridge tokens
+            LibAsset.maxApproveERC20(
+                IERC20(_bridgeData.sendingAssetId),
+                address(dlnSource),
+                _bridgeData.minAmount
+            );
+
+            orderId = dlnSource.createOrder{ value: _fee }(
+                orderCreation,
+                "",
+                0,
+                ""
+            );
+        } else {
+            orderCreation.giveAmount = orderCreation.giveAmount - _fee;
+            orderId = dlnSource.createOrder{ value: _bridgeData.minAmount }(
+                orderCreation,
+                "",
+                0,
+                ""
+            );
+        }
+
+        emit DlnOrderCreated(orderId);
+
+        if (_bridgeData.receiver == NON_EVM_ADDRESS) {
+            emit BridgeToNonEVMChain(
+                _bridgeData.transactionId,
+                _bridgeData.destinationChainId,
+                _deBridgeDlnData.receiver
+            );
+        }
+
+        emit LiFiTransferStarted(_bridgeData);
+    }
+}

archive/src/Facets/DeBridgeFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { ILiFi } from "../Interfaces/ILiFi.sol";
 import { IDeBridgeGate } from "../Interfaces/IDeBridgeGate.sol";

archive/src/Facets/GnosisBridgeL2Facet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { ILiFi } from "../Interfaces/ILiFi.sol";
 import { IXDaiBridgeL2 } from "../Interfaces/IXDaiBridgeL2.sol";

archive/src/Facets/MakerTeleportFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";

archive/src/Facets/MultichainFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { ILiFi } from "../Interfaces/ILiFi.sol";
 import { LibAsset, IERC20 } from "../Libraries/LibAsset.sol";

archive/src/Facets/NonStandardSelectorsRegistryFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibDiamond } from "../Libraries/LibDiamond.sol";
 

archive/src/Facets/SynapseBridgeFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { ILiFi } from "../Interfaces/ILiFi.sol";
 import { ISynapseRouter } from "../Interfaces/ISynapseRouter.sol";

archive/src/LiFiDiamondImmutable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibDiamond } from "./Libraries/LibDiamond.sol";
 import { IDiamondCut } from "./Interfaces/IDiamondCut.sol";
@@ -14,12 +14,12 @@ contract LiFiDiamondImmutable {
         LibDiamond.setContractOwner(_contractOwner);
 
         // Add the diamondCut external function from the diamondCutFacet
-        IDiamondCut.FacetCut[] memory cut = new IDiamondCut.FacetCut[](1);
+        LibDiamond.FacetCut[] memory cut = new LibDiamond.FacetCut[](1);
         bytes4[] memory functionSelectors = new bytes4[](1);
         functionSelectors[0] = IDiamondCut.diamondCut.selector;
-        cut[0] = IDiamondCut.FacetCut({
+        cut[0] = LibDiamond.FacetCut({
             facetAddress: _diamondCutFacet,
-            action: IDiamondCut.FacetCutAction.Add,
+            action: LibDiamond.FacetCutAction.Add,
             functionSelectors: functionSelectors
         });
         LibDiamond.diamondCut(cut, address(0), "");

archive/src/Periphery/GasRebateDistributor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { TransferrableOwnership } from "../Helpers/TransferrableOwnership.sol";
 import { MerkleProof } from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";

archive/src/Periphery/ServiceFeeCollector.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibAsset } from "../Libraries/LibAsset.sol";
 import { TransferrableOwnership } from "../Helpers/TransferrableOwnership.sol";

archive/test/CircleBridgeFacet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibSwap, LibAllowList, TestBaseFacet, console } from "../utils/TestBaseFacet.sol";
 import { InsufficientBalance } from "src/Errors/GenericErrors.sol";

archive/test/DeBridgeDlnFacet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibAllowList, TestBaseFacet, console, ERC20, LibSwap } from "../utils/TestBaseFacet.sol";
 import { DeBridgeDlnFacet } from "lifi/Facets/DeBridgeDlnFacet.sol";

archive/test/DeBridgeFacet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibAllowList, TestBaseFacet, console } from "../utils/TestBaseFacet.sol";
 import { DeBridgeFacet } from "lifi/Facets/DeBridgeFacet.sol";

archive/test/GasRebateDistributor.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicensed
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { Test, stdJson } from "forge-std/Test.sol";
 import { console } from "../utils/Console.sol";

archive/test/GnosisBridgeL2Facet.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Unlicense
-pragma solidity 0.8.17;
+pragma solidity ^0.8.17;
 
 import { LibSwap, LibAllowList, TestBaseFacet, console } from "../utils/TestBaseFacet.sol";
 import { InsufficientBalance } from "src/Errors/GenericErrors.sol";