OriginProtocol
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎contracts/.solhintignore‎
Lines changed: 2 additions & 1 deletion b/‎contracts/.solhintignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎contracts/README.md‎
Lines changed: 6 additions & 1 deletion b/‎contracts/README.md‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎contracts/abi/createx.json‎
Lines changed: 24 additions & 0 deletions b/‎contracts/abi/createx.json‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎contracts/contracts/governance/Strategizable.sol‎
Lines changed: 1 addition & 1 deletion b/‎contracts/contracts/governance/Strategizable.sol‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎contracts/contracts/interfaces/cctp/ICCTP.sol‎
Lines changed: 75 additions & 0 deletions b/‎contracts/contracts/interfaces/cctp/ICCTP.sol‎
Lines changed: 75 additions & 0 deletions
diff --git a/‎contracts/contracts/mocks/MockERC4626Vault.sol‎
Lines changed: 166 additions & 0 deletions b/‎contracts/contracts/mocks/MockERC4626Vault.sol‎
Lines changed: 166 additions & 0 deletions
@@ -63,6 +63,7 @@ contracts/dist/
 contracts/.localKeyValueStorage
 contracts/.localKeyValueStorage.mainnet
 contracts/.localKeyValueStorage.holesky
+contracts/.localKeyValueStorage.base
 contracts/scripts/defender-actions/dist/
 
 contracts/lib/defender-actions/dist/
 
@@ -1,2 +1,3 @@
 node_modules
-contracts/interfaces/morpho/Types.sol
+contracts/interfaces/morpho/Types.sol
+contracts/mocks/**/*.sol
@@ -370,7 +370,12 @@ pnpm hardhat updateAction --id f92ea662-fc34-433b-8beb-b34e9ab74685 --file sonic
 pnpm hardhat updateAction --id b1d831f1-29d4-4943-bb2e-8e625b76e82c --file claimBribes
 pnpm hardhat updateAction --id 6567d7c6-7ec7-44bd-b95b-470dd1ff780b --file manageBribeOnSonic
 pnpm hardhat updateAction --id 6a633bb0-aff8-4b37-aaae-b4c6f244ed87 --file managePassThrough
-pnpm hardhat updateAction --id 076c59e4-4150-42c7-9ba0-9962069ac353 --file manageBribes 
+pnpm hardhat updateAction --id 076c59e4-4150-42c7-9ba0-9962069ac353 --file manageBribes
+# These are Base -> Mainnet & Mainnet -> Base actions
+# they share the codebase. The direction of relaying attestations is defined by the
+# network of the relayer that is attached to the action
+pnpm hardhat updateAction --id bb43e5da-f936-4185-84da-253394583665 --file crossChainRelay
+pnpm hardhat updateAction --id e571409b-5399-48e4-bfb2-50b7af9903aa --file crossChainRelay
 ```
 
 `rollup` can be installed globally to avoid the `npx` prefix.
 
@@ -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": [
             {
 
@@ -15,7 +15,7 @@ contract Strategizable is Governable {
     /**
      * @dev Verifies that the caller is either Governor or Strategist.
      */
-    modifier onlyGovernorOrStrategist() {
+    modifier onlyGovernorOrStrategist() virtual {
         require(
             msg.sender == strategistAddr || isGovernor(),
             "Caller is not the Strategist or Governor"
 
@@ -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);
+}
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC4626 } from "../../lib/openzeppelin/interfaces/IERC4626.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
+contract MockERC4626Vault is IERC4626, ERC20 {
+    using SafeERC20 for IERC20;
+
+    address public asset;
+    uint8 public constant DECIMALS = 18;
+
+    constructor(address _asset) ERC20("Mock Vault Share", "MVS") {
+        asset = _asset;
+    }
+
+    // ERC20 totalSupply is inherited
+
+    // ERC20 balanceOf is inherited
+
+    function deposit(uint256 assets, address receiver)
+        public
+        override
+        returns (uint256 shares)
+    {
+        shares = previewDeposit(assets);
+        IERC20(asset).safeTransferFrom(msg.sender, address(this), assets);
+        _mint(receiver, shares);
+        return shares;
+    }
+
+    function mint(uint256 shares, address receiver)
+        public
+        override
+        returns (uint256 assets)
+    {
+        assets = previewMint(shares);
+        IERC20(asset).safeTransferFrom(msg.sender, address(this), assets);
+        _mint(receiver, shares);
+        return assets;
+    }
+
+    function withdraw(
+        uint256 assets,
+        address receiver,
+        address owner
+    ) public override returns (uint256 shares) {
+        shares = previewWithdraw(assets);
+        if (msg.sender != owner) {
+            // No approval check for mock
+        }
+        _burn(owner, shares);
+        IERC20(asset).safeTransfer(receiver, assets);
+        return shares;
+    }
+
+    function redeem(
+        uint256 shares,
+        address receiver,
+        address owner
+    ) public override returns (uint256 assets) {
+        assets = previewRedeem(shares);
+        if (msg.sender != owner) {
+            // No approval check for mock
+        }
+        _burn(owner, shares);
+        IERC20(asset).safeTransfer(receiver, assets);
+        return assets;
+    }
+
+    function totalAssets() public view override returns (uint256) {
+        return IERC20(asset).balanceOf(address(this));
+    }
+
+    function convertToShares(uint256 assets)
+        public
+        view
+        override
+        returns (uint256 shares)
+    {
+        uint256 supply = totalSupply(); // Use ERC20 totalSupply
+        return
+            supply == 0 || assets == 0
+                ? assets
+                : (assets * supply) / totalAssets();
+    }
+
+    function convertToAssets(uint256 shares)
+        public
+        view
+        override
+        returns (uint256 assets)
+    {
+        uint256 supply = totalSupply(); // Use ERC20 totalSupply
+        return supply == 0 ? shares : (shares * totalAssets()) / supply;
+    }
+
+    function maxDeposit(address receiver)
+        public
+        view
+        override
+        returns (uint256)
+    {
+        return type(uint256).max;
+    }
+
+    function maxMint(address receiver) public view override returns (uint256) {
+        return type(uint256).max;
+    }
+
+    function maxWithdraw(address owner) public view override returns (uint256) {
+        return convertToAssets(balanceOf(owner));
+    }
+
+    function maxRedeem(address owner) public view override returns (uint256) {
+        return balanceOf(owner);
+    }
+
+    function previewDeposit(uint256 assets)
+        public
+        view
+        override
+        returns (uint256 shares)
+    {
+        return convertToShares(assets);
+    }
+
+    function previewMint(uint256 shares)
+        public
+        view
+        override
+        returns (uint256 assets)
+    {
+        return convertToAssets(shares);
+    }
+
+    function previewWithdraw(uint256 assets)
+        public
+        view
+        override
+        returns (uint256 shares)
+    {
+        return convertToShares(assets);
+    }
+
+    function previewRedeem(uint256 shares)
+        public
+        view
+        override
+        returns (uint256 assets)
+    {
+        return convertToAssets(shares);
+    }
+
+    function _mint(address account, uint256 amount) internal override {
+        super._mint(account, amount);
+    }
+
+    function _burn(address account, uint256 amount) internal override {
+        super._burn(account, amount);
+    }
+
+    // Inherited from ERC20
+}