Arbitrum deploy

.github/workflows/deploy-market.yaml

@@ -12,6 +12,8 @@ on:
           - goerli
           - mumbai
           - polygon
+          - arbitrum
+          - arbitrum-goerli
       deployment:
         description: Deployment Name (e.g. "usdc")
         required: true
@@ -29,11 +31,12 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Seacrest
         uses: hayesgm/seacrest@v1
         with:
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan-eth.compound.finance\",\"mainnet\":\"https://mainnet-eth.compound.finance\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan-eth.compound.finance\",\"mainnet\":\"https://mainnet-eth.compound.finance\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

.github/workflows/enact-migration.yaml

@@ -12,6 +12,8 @@ on:
           - goerli
           - mumbai
           - polygon
+          - arbitrum
+          - arbitrum-goerli
       deployment:
         description: Deployment Name (e.g. "usdc")
         required: true
@@ -37,13 +39,14 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Get governance network
         run: |
           case ${{ github.event.inputs.network }} in
-            polygon)
+            polygon | arbitrum)
                 echo "GOV_NETWORK=mainnet" >> $GITHUB_ENV ;;
-            mumbai)
+            mumbai | arbitrum-goerli)
                 echo "GOV_NETWORK=goerli" >> $GITHUB_ENV ;;
             *)
                 echo "No governance network for selected network" ;;
@@ -52,14 +55,14 @@ jobs:
       - name: Seacrest
         uses: hayesgm/seacrest@v1
         with:
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 
       - name: Seacrest (governance network)
         uses: hayesgm/seacrest@v1
         with:
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\"}')[env.GOV_NETWORK] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[env.GOV_NETWORK] }}"
           port: 8685
         if: github.event.inputs.eth_pk == '' && env.GOV_NETWORK != ''
 

.github/workflows/prepare-migration.yaml

@@ -12,6 +12,8 @@ on:
           - goerli
           - mumbai
           - polygon
+          - arbitrum
+          - arbitrum-goerli
       deployment:
         description: Deployment Name (e.g. "usdc")
         required: true
@@ -32,11 +34,12 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Seacrest
         uses: hayesgm/seacrest@v1
         with:
-          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
+          ethereum_url: "${{ fromJSON('{\"fuji\":\"https://api.avax-test.network/ext/bc/C/rpc\",\"kovan\":\"https://kovan.infura.io/v3/$INFURA_KEY\",\"mainnet\":\"https://mainnet.infura.io/v3/$INFURA_KEY\",\"goerli\":\"https://goerli.infura.io/v3/$INFURA_KEY\",\"mumbai\":\"https://polygon-mumbai.infura.io/v3/$INFURA_KEY\",\"polygon\":\"https://polygon-mainnet.infura.io/v3/$INFURA_KEY\",\"arbitrum-goerli\":\"https://arbitrum-goerli.infura.io/v3/$INFURA_KEY\",\"arbitrum\":\"https://arbitrum-mainnet.infura.io/v3/$INFURA_KEY\"}')[inputs.network] }}"
           port: 8585
         if: github.event.inputs.eth_pk == ''
 

.github/workflows/run-contract-linter.yaml

@@ -11,6 +11,7 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/run-coverage.yaml

@@ -13,6 +13,7 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/run-eslint.yaml

@@ -11,6 +11,7 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/run-forge-tests.yaml

@@ -27,6 +27,7 @@ jobs:
           SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
           INFURA_KEY: ${{ secrets.INFURA_KEY }}
           POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+          ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
 
       - name: Build Comet with older solc versions
         run: |

.github/workflows/run-gas-profiler.yaml

@@ -12,6 +12,7 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.github/workflows/run-scenarios.yaml

@@ -7,13 +7,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, fuji, mumbai, polygon ]
+        bases: [ development, mainnet, mainnet-weth, goerli, goerli-weth, fuji, mumbai, polygon, arbitrum, arbitrum-goerli ]
     name: Run scenarios
     env:
       ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }}
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/run-unit-tests.yaml

@@ -11,6 +11,7 @@ jobs:
       SNOWTRACE_KEY: ${{ secrets.SNOWTRACE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
       POLYGONSCAN_KEY: ${{ secrets.POLYGONSCAN_KEY }}
+      ARBISCAN_KEY: ${{ secrets.ARBISCAN_KEY }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

contracts/CometRewards.sol

@@ -14,6 +14,8 @@ contract CometRewards {
         address token;
         uint64 rescaleFactor;
         bool shouldUpscale;
+        // Note: We define new variables after existing variables to keep interface backwards-compatible
+        uint256 multiplier;
     }
 
     struct RewardOwed {
@@ -30,14 +32,19 @@ contract CometRewards {
     /// @notice Rewards claimed per Comet instance and user account
     mapping(address => mapping(address => uint)) public rewardsClaimed;
 
+    /// @dev The scale for factors
+    uint256 internal constant FACTOR_SCALE = 1e18;
+
     /** Custom events **/
 
     event GovernorTransferred(address indexed oldGovernor, address indexed newGovernor);
+    event RewardsClaimedSet(address indexed user, address indexed comet, uint256 amount);
     event RewardClaimed(address indexed src, address indexed recipient, address indexed token, uint256 amount);
 
     /** Custom errors **/
 
     error AlreadyConfigured(address);
+    error BadData();
     error InvalidUInt64(uint);
     error NotPermitted(address);
     error NotSupported(address);
@@ -55,8 +62,9 @@ contract CometRewards {
      * @notice Set the reward token for a Comet instance
      * @param comet The protocol instance
      * @param token The reward token address
+     * @param multiplier The multiplier for converting a unit of accrued tracking to a unit of the reward token
      */
-    function setRewardConfig(address comet, address token) external {
+    function setRewardConfigWithMultiplier(address comet, address token, uint256 multiplier) public {
         if (msg.sender != governor) revert NotPermitted(msg.sender);
         if (rewardConfig[comet].token != address(0)) revert AlreadyConfigured(comet);
 
@@ -67,17 +75,45 @@ contract CometRewards {
             rewardConfig[comet] = RewardConfig({
                 token: token,
                 rescaleFactor: accrualScale / tokenScale,
-                shouldUpscale: false
+                shouldUpscale: false,
+                multiplier: multiplier
             });
         } else {
             rewardConfig[comet] = RewardConfig({
                 token: token,
                 rescaleFactor: tokenScale / accrualScale,
-                shouldUpscale: true
+                shouldUpscale: true,
+                multiplier: multiplier
             });
         }
     }
 
+    /**
+     * @notice Set the reward token for a Comet instance
+     * @param comet The protocol instance
+     * @param token The reward token address
+     */
+    function setRewardConfig(address comet, address token) external {
+        setRewardConfigWithMultiplier(comet, token, FACTOR_SCALE);
+    }
+
+    /**
+     * @notice Set the rewards claimed for a list of users
+     * @param comet The protocol instance to populate the data for
+     * @param users The list of users to populate the data for
+     * @param claimedAmounts The list of claimed amounts to populate the data with
+     */
+    function setRewardsClaimed(address comet, address[] calldata users, uint[] calldata claimedAmounts) external {
+        if (msg.sender != governor) revert NotPermitted(msg.sender);
+        if (users.length != claimedAmounts.length) revert BadData();
+
+        for (uint i = 0; i < users.length; ) {
+            rewardsClaimed[comet][users[i]] = claimedAmounts[i];
+            emit RewardsClaimedSet(users[i], comet, claimedAmounts[i]);
+            unchecked { i++; }
+        }
+    }
+
     /**
      * @notice Withdraw tokens from the contract
      * @param token The reward token address
@@ -176,7 +212,7 @@ contract CometRewards {
         } else {
             accrued /= config.rescaleFactor;
         }
-        return accrued;
+        return accrued * config.multiplier / FACTOR_SCALE;
     }
 
     /**

contracts/IGovernorBravo.sol

@@ -62,8 +62,8 @@ interface IGovernorBravo {
         bytes[] memory calldatas,
         string memory description
     ) external returns (uint256 proposalId);
-    function queue(uint256 proposalId) external payable;
-    function execute(uint256 proposalId) external payable;
+    function queue(uint256 proposalId) external;
+    function execute(uint256 proposalId) external;
     function castVote(uint256 proposalId, uint8 support) external returns (uint256 balance);
     function getActions(uint proposalId) external view returns (
         address[] memory targets,

contracts/bridges/SweepableBridgeReceiver.sol

@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.15;
+
+import "../IERC20NonStandard.sol";
+import "./BaseBridgeReceiver.sol";
+
+contract SweepableBridgeReceiver is BaseBridgeReceiver {
+    error FailedToSendNativeToken();
+    error TransferOutFailed();
+
+    /**
+     * @notice A public function to sweep accidental ERC-20 transfers to this contract
+     * @dev Note: Make sure to check that the asset being swept out is not malicious
+     * @param recipient The address that will receive the swept funds
+     * @param asset The address of the ERC-20 token to sweep
+     */
+    function sweepToken(address recipient, address asset) external {
+        if (msg.sender != localTimelock) revert Unauthorized();
+
+        uint256 balance = IERC20NonStandard(asset).balanceOf(address(this));
+        doTransferOut(asset, recipient, balance);
+    }
+
+    /**
+     * @notice A public function to sweep accidental native token transfers to this contract
+     * @param recipient The address that will receive the swept funds
+     */
+    function sweepNativeToken(address recipient) external {
+        if (msg.sender != localTimelock) revert Unauthorized();
+
+        uint256 balance = address(this).balance;
+        (bool success, ) = recipient.call{ value: balance }("");
+        if (!success) revert FailedToSendNativeToken();
+    }
+
+    /**
+     * @notice Similar to ERC-20 transfer, except it properly handles `transfer` from non-standard ERC-20 tokens
+     * @param asset The ERC-20 token to transfer out
+     * @param to The recipient of the token transfer
+     * @param amount The amount of the token to transfer
+     * @dev Note: This wrapper safely handles non-standard ERC-20 tokens that do not return a value. See here: https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca
+     */
+    function doTransferOut(address asset, address to, uint amount) internal {
+        IERC20NonStandard(asset).transfer(to, amount);
+
+        bool success;
+        assembly {
+            switch returndatasize()
+                case 0 {                      // This is a non-standard ERC-20
+                    success := not(0)         // set success to true
+                }
+                case 32 {                     // This is a compliant ERC-20
+                    returndatacopy(0, 0, 32)
+                    success := mload(0)       // Set `success = returndata` of override external call
+                }
+                default {                     // This is an excessively non-compliant ERC-20, revert.
+                    revert(0, 0)
+                }
+        }
+        if (!success) revert TransferOutFailed();
+    }
+}

contracts/bridges/arbitrum/AddressAliasHelper.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+
+/*
+ * Copyright 2019-2021, Offchain Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+pragma solidity 0.8.15;
+
+library AddressAliasHelper {
+    uint160 constant offset = uint160(0x1111000000000000000000000000000000001111);
+
+    /// @notice Utility function that converts the address in the L1 that submitted a tx to
+    /// the inbox to the msg.sender viewed in the L2
+    /// @param l1Address the address in the L1 that triggered the tx to L2
+    /// @return l2Address L2 address as viewed in msg.sender
+    function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {
+        l2Address = address(uint160(l1Address) + offset);
+    }
+
+    /// @notice Utility function that converts the msg.sender viewed in the L2 to the
+    /// address in the L1 that submitted a tx to the inbox
+    /// @param l2Address L2 address as viewed in msg.sender
+    /// @return l1Address the address in the L1 that triggered the tx to L2
+    function undoL1ToL2Alias(address l2Address) internal pure returns (address l1Address) {
+        l1Address = address(uint160(l2Address) - offset);
+    }
+}

contracts/bridges/arbitrum/ArbitrumBridgeReceiver.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.15;
+
+import "../SweepableBridgeReceiver.sol";
+import "./AddressAliasHelper.sol";
+
+contract ArbitrumBridgeReceiver is SweepableBridgeReceiver {
+    fallback() external payable {
+        processMessage(AddressAliasHelper.undoL1ToL2Alias(msg.sender), msg.data);
+    }
+}

contracts/bridges/test/SweepableBridgeReceiverHarness.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.15;
+
+import "../SweepableBridgeReceiver.sol";
+
+contract SweepableBridgeReceiverHarness is SweepableBridgeReceiver {
+    function processMessageExternal(
+        address rootMessageSender,
+        bytes calldata data
+    ) external {
+        processMessage(rootMessageSender, data);
+    }
+
+    fallback() external payable { }
+}