Cross-chain Strategy

contracts/README.md

@@ -409,6 +409,15 @@ Validator public key: 90db8ae56a9e741775ca37dd960606541306974d4a998ef6a6227c85a9
 
 The Hardhat plug-in [@nomiclabs/hardhat-verify](https://www.npmjs.com/package/@nomiclabs/hardhat-etherscan) is used to verify contracts on Etherscan. Etherscan has migrated to V2 api where all the chains use the same endpoint. Hardhat verify should be run with `--contract` parameter otherwise there is a significant slowdown while hardhat is gathering contract information.
 
+### Auto-verification
+When deploying contracts, set `VERIFY_CONTRACTS=true` environment variable to verify contract immediately after deployment with no manual action.
+```
+VERIFY_CONTRACTS=true npx hardhat deploy:mainnet
+```
+If it reverts for any reason, it'll print out the command that you can use to run manually or debug.
+
+### Manual verification
+
 **IMPORTANT:**
 
 - Currently only yarn works. Do not use npx/pnpm

contracts/abi/createx.json

@@ -23,6 +23,30 @@
         "stateMutability": "payable",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32",
+                "name": "salt",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "bytes",
+                "name": "initCode",
+                "type": "bytes"
+            }
+        ],
+        "name": "deployCreate3",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "newContract",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "payable",
+        "type": "function"
+    },
     {
         "inputs": [
             {

contracts/contracts/interfaces/cctp/ICCTP.sol

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+interface ICCTPTokenMessenger {
+    function depositForBurn(
+        uint256 amount,
+        uint32 destinationDomain,
+        bytes32 mintRecipient,
+        address burnToken,
+        bytes32 destinationCaller,
+        uint256 maxFee,
+        uint32 minFinalityThreshold
+    ) external;
+
+    function depositForBurnWithHook(
+        uint256 amount,
+        uint32 destinationDomain,
+        bytes32 mintRecipient,
+        address burnToken,
+        bytes32 destinationCaller,
+        uint256 maxFee,
+        uint32 minFinalityThreshold,
+        bytes memory hookData
+    ) external;
+
+    function getMinFeeAmount(uint256 amount) external view returns (uint256);
+}
+
+interface ICCTPMessageTransmitter {
+    function sendMessage(
+        uint32 destinationDomain,
+        bytes32 recipient,
+        bytes32 destinationCaller,
+        uint32 minFinalityThreshold,
+        bytes memory messageBody
+    ) external;
+
+    function receiveMessage(bytes calldata message, bytes calldata attestation)
+        external
+        returns (bool);
+}
+
+interface IMessageHandlerV2 {
+    /**
+     * @notice Handles an incoming finalized message from an IReceiverV2
+     * @dev Finalized messages have finality threshold values greater than or equal to 2000
+     * @param sourceDomain The source domain of the message
+     * @param sender The sender of the message
+     * @param finalityThresholdExecuted the finality threshold at which the message was attested to
+     * @param messageBody The raw bytes of the message body
+     * @return success True, if successful; false, if not.
+     */
+    function handleReceiveFinalizedMessage(
+        uint32 sourceDomain,
+        bytes32 sender,
+        uint32 finalityThresholdExecuted,
+        bytes calldata messageBody
+    ) external returns (bool);
+
+    /**
+     * @notice Handles an incoming unfinalized message from an IReceiverV2
+     * @dev Unfinalized messages have finality threshold values less than 2000
+     * @param sourceDomain The source domain of the message
+     * @param sender The sender of the message
+     * @param finalityThresholdExecuted The finality threshold at which the message was attested to
+     * @param messageBody The raw bytes of the message body
+     * @return success True, if successful; false, if not.
+     */
+    function handleReceiveUnfinalizedMessage(
+        uint32 sourceDomain,
+        bytes32 sender,
+        uint32 finalityThresholdExecuted,
+        bytes calldata messageBody
+    ) external returns (bool);
+}

contracts/contracts/mocks/crosschain/CrossChainMasterStrategyMock.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+/**
+ * @title OUSD Yearn V3 Master Strategy Mock - the Mainnet part
+ * @author Origin Protocol Inc
+ */
+
+contract CrossChainMasterStrategyMock {
+    address public _remoteAddress;
+
+    constructor() {}
+
+    function remoteAddress() public view returns (address) {
+        return _remoteAddress;
+    }
+
+    function setRemoteAddress(address __remoteAddress) public {
+        _remoteAddress = __remoteAddress;
+    }
+}

contracts/contracts/mocks/crosschain/CrossChainRemoteStrategyMock.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+/**
+ * @title OUSD Yearn V3 Remote Strategy Mock - the Mainnet part
+ * @author Origin Protocol Inc
+ */
+
+contract CrossChainRemoteStrategyMock {
+    address public _masterAddress;
+
+    constructor() {}
+
+    function masterAddress() public view returns (address) {
+        return _masterAddress;
+    }
+
+    function setMasterAddress(address __masterAddress) public {
+        _masterAddress = __masterAddress;
+    }
+}

contracts/contracts/proxies/InitializeGovernedUpgradeabilityProxy2.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { InitializeGovernedUpgradeabilityProxy } from "./InitializeGovernedUpgradeabilityProxy.sol";
+
+/**
+ * @title BaseGovernedUpgradeabilityProxy2
+ * @dev This is the same as InitializeGovernedUpgradeabilityProxy except that the
+ *      governor is defined in the constructor.
+ * @author Origin Protocol Inc
+ */
+contract InitializeGovernedUpgradeabilityProxy2 is
+    InitializeGovernedUpgradeabilityProxy
+{
+    /**
+     * This is used when the msg.sender can not be the governor. E.g. when the proxy is
+     * deployed via CreateX
+     */
+    constructor(address governor) InitializeGovernedUpgradeabilityProxy() {
+        _setGovernor(governor);
+    }
+}

contracts/contracts/proxies/Proxies.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { InitializeGovernedUpgradeabilityProxy } from "./InitializeGovernedUpgradeabilityProxy.sol";
+import { InitializeGovernedUpgradeabilityProxy2 } from "./InitializeGovernedUpgradeabilityProxy2.sol";
 
 /**
  * @notice OUSDProxy delegates calls to an OUSD implementation

contracts/contracts/proxies/create2/CCTPHookWrapperProxy.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { InitializeGovernedUpgradeabilityProxy2 } from "../InitializeGovernedUpgradeabilityProxy2.sol";
+
+// ********************************************************
+// ********************************************************
+// IMPORTANT: DO NOT CHANGE ANYTHING IN THIS FILE.
+// Any changes to this file (even whitespaces) will
+// affect the create2 address of the proxy
+// ********************************************************
+// ********************************************************
+
+/**
+ * @notice CCTPHookWrapperProxy delegates calls to a CCTPHookWrapper implementation
+ */
+contract CCTPHookWrapperProxy is InitializeGovernedUpgradeabilityProxy2 {
+    constructor(address governor)
+        InitializeGovernedUpgradeabilityProxy2(governor)
+    {}
+}

contracts/contracts/proxies/create2/CrossChainStrategyProxy.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { InitializeGovernedUpgradeabilityProxy2 } from "../InitializeGovernedUpgradeabilityProxy2.sol";
+
+// ********************************************************
+// ********************************************************
+// IMPORTANT: DO NOT CHANGE ANYTHING IN THIS FILE.
+// Any changes to this file (even whitespaces) will
+// affect the create2 address of the proxy
+// ********************************************************
+// ********************************************************
+
+/**
+ * @notice CrossChainStrategyProxy delegates calls to a
+ * CrossChainMasterStrategy or CrossChainRemoteStrategy
+ * implementation contract.
+ */
+contract CrossChainStrategyProxy is InitializeGovernedUpgradeabilityProxy2 {
+    constructor(address governor)
+        InitializeGovernedUpgradeabilityProxy2(governor)
+    {}
+}

contracts/contracts/strategies/Generalized4626Strategy.sol

@@ -57,6 +57,7 @@ contract Generalized4626Strategy is InitializableAbstractStrategy {
      */
     function deposit(address _asset, uint256 _amount)
         external
+        virtual
         override
         onlyVault
         nonReentrant
@@ -99,6 +100,14 @@ contract Generalized4626Strategy is InitializableAbstractStrategy {
         address _asset,
         uint256 _amount
     ) external virtual override onlyVault nonReentrant {
+        _withdraw(_recipient, _asset, _amount);
+    }
+
+    function _withdraw(
+        address _recipient,
+        address _asset,
+        uint256 _amount
+    ) internal virtual {
         require(_amount > 0, "Must withdraw something");
         require(_recipient != address(0), "Must specify recipient");
         require(_asset == address(assetToken), "Unexpected asset address");
@@ -147,7 +156,7 @@ contract Generalized4626Strategy is InitializableAbstractStrategy {
      * @return balance    Total value of the asset in the platform
      */
     function checkBalance(address _asset)
-        external
+        public
         view
         virtual
         override