Initial Impl of SBRV

contracts/scripts/native_solc_compile_all_llo-feeds

@@ -28,15 +28,19 @@ compileContract () {
       "$ROOT"/contracts/src/v0.8/"$1"
 }
 
-compileContract llo-feeds/Verifier.sol
-compileContract llo-feeds/VerifierProxy.sol
-compileContract llo-feeds/FeeManager.sol
-compileContract llo-feeds/RewardManager.sol
+compileContract llo-feeds/v0.3.0/Verifier.sol
+compileContract llo-feeds/v0.3.0/VerifierProxy.sol
+compileContract llo-feeds/v0.3.0/FeeManager.sol
+compileContract llo-feeds/v0.3.0/RewardManager.sol
+compileContract llo-feeds/v0.4.0/DestinationVerifier.sol
+compileContract llo-feeds/v0.4.0/DestinationVerifierProxy.sol
+compileContract llo-feeds/v0.4.0/DestinationFeeManager.sol
+compileContract llo-feeds/v0.4.0/DestinationRewardManager.sol
 
 
 # Test | Mocks
-compileContract llo-feeds/test/mocks/ErroredVerifier.sol
-compileContract llo-feeds/test/mocks/ExposedVerifier.sol
+compileContract llo-feeds/v0.3.0/test/mocks/ErroredVerifier.sol
+compileContract llo-feeds/v0.3.0/test/mocks/ExposedVerifier.sol
 
 # LLO
 compileContract llo-feeds/dev/ChannelConfigStore.sol

contracts/src/v0.8/llo-feeds/libraries/Common.sol

@@ -19,6 +19,28 @@ library Common {
     uint64 weight;
   }
 
+  /**
+   * @notice Checks if an array of AddressAndWeight has duplicate addresses
+   * @param recipients The array of AddressAndWeight to check
+   * @return bool True if there are duplicates, false otherwise
+   */
+  function _hasDuplicateAddresses(address[] memory recipients) internal pure returns (bool) {
+    for (uint256 i = 0; i < recipients.length; ) {
+      for (uint256 j = i + 1; j < recipients.length; ) {
+        if (recipients[i] == recipients[j]) {
+          return true;
+        }
+        unchecked {
+          ++j;
+        }
+      }
+      unchecked {
+        ++i;
+      }
+    }
+    return false;
+  }
+
   /**
    * @notice Checks if an array of AddressAndWeight has duplicate addresses
    * @param recipients The array of AddressAndWeight to check
@@ -40,4 +62,28 @@ library Common {
     }
     return false;
   }
+
+  /**
+   * @notice sorts a list of addresses numerically
+   * @param arr The array of addresses to sort
+   * @param left the start index
+   * @param right the end index
+   */
+  function _quickSort(address[] memory arr, int256 left, int256 right) internal pure {
+    int256 i = left;
+    int256 j = right;
+    if (i == j) return;
+    address pivot = arr[uint256(left + (right - left) / 2)];
+    while (i <= j) {
+      while (uint160(arr[uint256(i)]) < uint160(pivot)) i++;
+      while (uint160(pivot) < uint160(arr[uint256(j)])) j--;
+      if (i <= j) {
+        (arr[uint256(i)], arr[uint256(j)]) = (arr[uint256(j)], arr[uint256(i)]);
+        i++;
+        j--;
+      }
+    }
+    if (left < j) _quickSort(arr, left, j);
+    if (i < right) _quickSort(arr, i, right);
+  }
 }

contracts/src/v0.8/llo-feeds/test/ByteUtilTest.t.sol → contracts/src/v0.8/llo-feeds/libraries/test/ByteUtilTest.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import {Test} from "forge-std/Test.sol";
-import {ByteUtil} from "../libraries/ByteUtil.sol";
+import {ByteUtil} from "../ByteUtil.sol";
 
 contract ByteUtilTest is Test {
   using ByteUtil for bytes;

contracts/src/v0.8/llo-feeds/FeeManager.sol → contracts/src/v0.8/llo-feeds/v0.3.0/FeeManager.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IFeeManager} from "./interfaces/IFeeManager.sol";
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
-import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "./libraries/Common.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../libraries/Common.sol";
 import {IRewardManager} from "./interfaces/IRewardManager.sol";
-import {IWERC20} from "../shared/interfaces/IWERC20.sol";
-import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";
-import {Math} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/Math.sol";
-import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IWERC20} from "../../shared/interfaces/IWERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";
+import {Math} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/Math.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IVerifierFeeManager} from "./interfaces/IVerifierFeeManager.sol";
 
 /**

contracts/src/v0.8/llo-feeds/RewardManager.sol → contracts/src/v0.8/llo-feeds/v0.3.0/RewardManager.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IRewardManager} from "./interfaces/IRewardManager.sol";
-import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
-import {Common} from "./libraries/Common.sol";
-import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC20.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {Common} from "../libraries/Common.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
  * @title RewardManager

contracts/src/v0.8/llo-feeds/Verifier.sol → contracts/src/v0.8/llo-feeds/v0.3.0/Verifier.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IVerifier} from "./interfaces/IVerifier.sol";
 import {IVerifierProxy} from "./interfaces/IVerifierProxy.sol";
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
-import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "./libraries/Common.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../libraries/Common.sol";
 
 // OCR2 standard
 uint256 constant MAX_NUM_ORACLES = 31;

contracts/src/v0.8/llo-feeds/VerifierProxy.sol → contracts/src/v0.8/llo-feeds/v0.3.0/VerifierProxy.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {ConfirmedOwner} from "../shared/access/ConfirmedOwner.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IVerifierProxy} from "./interfaces/IVerifierProxy.sol";
 import {IVerifier} from "./interfaces/IVerifier.sol";
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
-import {AccessControllerInterface} from "../shared/interfaces/AccessControllerInterface.sol";
-import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {AccessControllerInterface} from "../../shared/interfaces/AccessControllerInterface.sol";
+import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
 import {IVerifierFeeManager} from "./interfaces/IVerifierFeeManager.sol";
-import {Common} from "./libraries/Common.sol";
+import {Common} from "../libraries/Common.sol";
 
 /**
  * The verifier proxy contract is the gateway for all report verification requests

contracts/src/v0.8/llo-feeds/interfaces/IFeeManager.sol → contracts/src/v0.8/llo-feeds/v0.3.0/interfaces/IFeeManager.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../../libraries/Common.sol";
 import {IVerifierFeeManager} from "./IVerifierFeeManager.sol";
 
 interface IFeeManager is IERC165, IVerifierFeeManager {

contracts/src/v0.8/llo-feeds/interfaces/IRewardManager.sol → contracts/src/v0.8/llo-feeds/v0.3.0/interfaces/IRewardManager.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../../libraries/Common.sol";
 
 interface IRewardManager is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifier.sol → contracts/src/v0.8/llo-feeds/v0.3.0/interfaces/IVerifier.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../../libraries/Common.sol";
 
 interface IVerifier is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifierFeeManager.sol → contracts/src/v0.8/llo-feeds/v0.3.0/interfaces/IVerifierFeeManager.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IERC165} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
-import {Common} from "../libraries/Common.sol";
+import {IERC165} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/interfaces/IERC165.sol";
+import {Common} from "../../libraries/Common.sol";
 
 interface IVerifierFeeManager is IERC165 {
   /**

contracts/src/v0.8/llo-feeds/interfaces/IVerifierProxy.sol → contracts/src/v0.8/llo-feeds/v0.3.0/interfaces/IVerifierProxy.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {Common} from "../libraries/Common.sol";
-import {AccessControllerInterface} from "../../shared/interfaces/AccessControllerInterface.sol";
+import {Common} from "../../libraries/Common.sol";
+import {AccessControllerInterface} from "../../../shared/interfaces/AccessControllerInterface.sol";
 import {IVerifierFeeManager} from "./IVerifierFeeManager.sol";
 
 interface IVerifierProxy {

contracts/src/v0.8/llo-feeds/test/fee-manager/BaseFeeManager.t.sol → contracts/src/v0.8/llo-feeds/v0.3.0/test/fee-manager/BaseFeeManager.t.sol

@@ -4,9 +4,9 @@ pragma solidity 0.8.19;
 import {Test} from "forge-std/Test.sol";
 import {FeeManager} from "../../FeeManager.sol";
 import {RewardManager} from "../../RewardManager.sol";
-import {Common} from "../../libraries/Common.sol";
-import {ERC20Mock} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/mocks/ERC20Mock.sol";
-import {WERC20Mock} from "../../../shared/mocks/WERC20Mock.sol";
+import {Common} from "../../../libraries/Common.sol";
+import {ERC20Mock} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/mocks/ERC20Mock.sol";
+import {WERC20Mock} from "../../../../shared/mocks/WERC20Mock.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 import {FeeManagerProxy} from "../mocks/FeeManagerProxy.sol";
 

contracts/src/v0.8/llo-feeds/test/fee-manager/FeeManager.getFeeAndReward.t.sol → contracts/src/v0.8/llo-feeds/v0.3.0/test/fee-manager/FeeManager.getFeeAndReward.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../../../libraries/Common.sol";
 import "./BaseFeeManager.t.sol";
 
 /**
@@ -10,15 +10,15 @@ import "./BaseFeeManager.t.sol";
  * @notice This contract will test the functionality of the feeManager's getFeeAndReward
  */
 contract FeeManagerProcessFeeTest is BaseFeeManagerTest {
-  function test_baseFeeIsAppliedForNative() public {
+  function test_baseFeeIsAppliedForNative() public view {
     //get the fee required by the feeManager
     Common.Asset memory fee = getFee(getV3Report(DEFAULT_FEED_1_V3), getNativeQuote(), USER);
 
     //fee should be the default
     assertEq(fee.amount, DEFAULT_REPORT_NATIVE_FEE);
   }
 
-  function test_baseFeeIsAppliedForLink() public {
+  function test_baseFeeIsAppliedForLink() public view {
     //get the fee required by the feeManager
     Common.Asset memory fee = getFee(getV3Report(DEFAULT_FEED_1_V3), getLinkQuote(), USER);
 
@@ -378,7 +378,7 @@ contract FeeManagerProcessFeeTest is BaseFeeManagerTest {
     assertEq(fee.amount, DEFAULT_REPORT_NATIVE_FEE - expectedDiscount);
   }
 
-  function test_reportWithNoExpiryOrFeeReturnsZero() public {
+  function test_reportWithNoExpiryOrFeeReturnsZero() public view {
     //get the fee required by the feeManager
     Common.Asset memory fee = getFee(getV1Report(DEFAULT_FEED_1_V1), getNativeQuote(), USER);
 
@@ -462,7 +462,7 @@ contract FeeManagerProcessFeeTest is BaseFeeManagerTest {
     setNativeSurcharge(nativeSurcharge, ADMIN);
   }
 
-  function test_getBaseRewardWithLinkQuote() public {
+  function test_getBaseRewardWithLinkQuote() public view {
     //get the fee required by the feeManager
     Common.Asset memory reward = getReward(getV3Report(DEFAULT_FEED_1_V3), getLinkQuote(), USER);
 
@@ -481,7 +481,7 @@ contract FeeManagerProcessFeeTest is BaseFeeManagerTest {
     assertEq(reward.amount, DEFAULT_REPORT_LINK_FEE / 2);
   }
 
-  function test_getRewardWithNativeQuote() public {
+  function test_getRewardWithNativeQuote() public view {
     //get the fee required by the feeManager
     Common.Asset memory reward = getReward(getV3Report(DEFAULT_FEED_1_V3), getNativeQuote(), USER);
 

contracts/src/v0.8/llo-feeds/test/fee-manager/FeeManager.processFee.t.sol → contracts/src/v0.8/llo-feeds/v0.3.0/test/fee-manager/FeeManager.processFee.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../../../libraries/Common.sol";
 import "./BaseFeeManager.t.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 

contracts/src/v0.8/llo-feeds/test/gas/Gas_VerifierTest.t.sol → contracts/src/v0.8/llo-feeds/v0.3.0/test/gas/Gas_VerifierTest.t.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.19;
 
 import {BaseTest, BaseTestWithConfiguredVerifierAndFeeManager} from "../verifier/BaseVerifierTest.t.sol";
-import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";
-import {Common} from "../../libraries/Common.sol";
+import {SimpleWriteAccessController} from "../../../../shared/access/SimpleWriteAccessController.sol";
+import {Common} from "../../../libraries/Common.sol";
 import {IRewardManager} from "../../interfaces/IRewardManager.sol";
 
 contract Verifier_setConfig is BaseTest {

contracts/src/v0.8/llo-feeds/test/mocks/ErroredVerifier.sol → contracts/src/v0.8/llo-feeds/v0.3.0/test/mocks/ErroredVerifier.sol

@@ -2,13 +2,24 @@
 pragma solidity 0.8.19;
 
 import {IVerifier} from "../../interfaces/IVerifier.sol";
-import {Common} from "../../libraries/Common.sol";
+import {Common} from "../../../libraries/Common.sol";
 
 contract ErroredVerifier is IVerifier {
   function supportsInterface(bytes4 interfaceId) public pure override returns (bool) {
     return interfaceId == this.verify.selector;
   }
 
+  //define each of the errors thrown in the revert below
+
+  error FailedToVerify();
+  error FailedToSetConfig();
+  error FailedToActivateConfig();
+  error FailedToDeactivateConfig();
+  error FailedToActivateFeed();
+  error FailedToDeactivateFeed();
+  error FailedToGetLatestConfigDigestAndEpoch();
+  error FailedToGetLatestConfigDetails();
+
   function verify(
     bytes memory,
     /**
@@ -26,7 +37,7 @@ contract ErroredVerifier is IVerifier {
       bytes memory
     )
   {
-    revert("Failed to verify");
+    revert FailedToVerify();
   }
 
   function setConfig(
@@ -39,7 +50,7 @@ contract ErroredVerifier is IVerifier {
     bytes memory,
     Common.AddressAndWeight[] memory
   ) external pure override {
-    revert("Failed to set config");
+    revert FailedToSetConfig();
   }
 
   function setConfigFromSource(
@@ -55,30 +66,30 @@ contract ErroredVerifier is IVerifier {
     bytes memory,
     Common.AddressAndWeight[] memory
   ) external pure override {
-    revert("Failed to set config");
+    revert FailedToSetConfig();
   }
 
   function activateConfig(bytes32, bytes32) external pure {
-    revert("Failed to activate config");
+    revert FailedToActivateConfig();
   }
 
   function deactivateConfig(bytes32, bytes32) external pure {
-    revert("Failed to deactivate config");
+    revert FailedToDeactivateConfig();
   }
 
   function activateFeed(bytes32) external pure {
-    revert("Failed to activate feed");
+    revert FailedToActivateFeed();
   }
 
   function deactivateFeed(bytes32) external pure {
-    revert("Failed to deactivate feed");
+    revert FailedToDeactivateFeed();
   }
 
   function latestConfigDigestAndEpoch(bytes32) external pure override returns (bool, bytes32, uint32) {
-    revert("Failed to get latest config digest and epoch");
+    revert FailedToGetLatestConfigDigestAndEpoch();
   }
 
   function latestConfigDetails(bytes32) external pure override returns (uint32, uint32, bytes32) {
-    revert("Failed to get latest config details");
+    revert FailedToGetLatestConfigDetails();
   }
 }