Merge pull request #6 from tellor-io/bridge-name

rename data bridge

Author: tkernell

README.md

@@ -2,19 +2,19 @@
 
 Use this package to install the Tellor user contracts and integrate Tellor into your contracts.
 
-Once installed this will allow your contracts to inherit the functions from IBlobstreamO.
+Once installed this will allow your contracts to inherit the functions from ITellorDataBridge.
 
 ## How to Use
 
 ```solidity
-import "usingtellorlayer/contracts/interfaces/IBlobstreamO.sol";
+import "usingtellorlayer/contracts/interfaces/ITellorDataBridge.sol";
 
 contract PriceContract {
-    IBlobstreamO public blobstream;
+    ITellorDataBridge public dataBridge;
     uint256 public price;
 
-    constructor(address _blobstreamO) {
-        blobstream = IBlobstreamO(_blobstreamO);
+    constructor(address _dataBridge) {
+        dataBridge = ITellorDataBridge(_dataBridge);
     }
 
     function resolveMarket(
@@ -23,7 +23,7 @@ contract PriceContract {
         Signature[] calldata _sigs
     ) public {
         // verify that data came from tellor chain
-        blobstream.verifyOracleData(_attestData, _currentValidatorSet, _sigs);
+        dataBridge.verifyOracleData(_attestData, _currentValidatorSet, _sigs);
         // NOTE: This is a simplified example. More security checks should be done
         // in production to ensure data integrity.
         price = abi.decode(_attestData.report.value, (uint256));

contracts/YoloTellorUser.sol

@@ -1,27 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import "./interfaces/IBlobstreamO.sol";
+import "./interfaces/ITellorDataBridge.sol";
 
 contract YoloTellorUser {
-    IBlobstreamO public blobstreamO;
+    ITellorDataBridge public dataBridge;
     OracleData[] public oracleData;
 
     struct OracleData {
         uint256 value; // reported value
         uint256 timestamp; // aggregate report timestamp
     }
 
-    constructor(address _blobstreamO) {
-        blobstreamO = IBlobstreamO(_blobstreamO);
+    constructor(address _dataBridge) {
+        dataBridge = ITellorDataBridge(_dataBridge);
     }
 
     function updateOracleData(
         OracleAttestationData calldata _attestData,
         Validator[] calldata _currentValidatorSet,
         Signature[] calldata _sigs
     ) external {
-        blobstreamO.verifyOracleData(_attestData, _currentValidatorSet, _sigs);
+        dataBridge.verifyOracleData(_attestData, _currentValidatorSet, _sigs);
         uint256 _value = abi.decode(_attestData.report.value, (uint256));
         oracleData.push(OracleData(
             _value, 

contracts/interfaces/IBlobstreamO.sol renamed to contracts/interfaces/ITellorDataBridge.sol

@@ -27,7 +27,7 @@ struct Validator {
     uint256 power;
 }
 
-interface IBlobstreamO {
+interface ITellorDataBridge {
     function guardian() external view returns (address);
     function powerThreshold() external view returns (uint256);
     function unbondingPeriod() external view returns (uint256);

contracts/testing/blobstream/Constants.sol renamed to contracts/testing/bridge/Constants.sol

@@ -31,12 +31,12 @@ struct Validator {
 }
 
 
-/// @title BlobstreamO: Tellor Layer -> EVM, Oracle relay.
+/// @title TellorDataBridge: Tellor Layer -> EVM, Oracle relay.
 /// @dev The relay relies on a set of signers to attest to some event on
 /// Tellor Layer. These signers are the validator set, who sign over every
 /// block. At least 2/3 of the voting power of the current
 /// view of the validator set must sign off on new relayed events.
-contract BlobstreamO is ECDSA {
+contract TellorDataBridge is ECDSA {
 
     /*Storage*/
     address public guardian; /// Able to reset the validator set only if the validator set becomes stale.
@@ -66,7 +66,7 @@ contract BlobstreamO is ECDSA {
     error ValidatorTimestampMustIncrease();
 
     /*Functions*/
-    /// @notice Constructor for the BlobstreamO contract.
+    /// @notice Constructor for the TellorDataBridge contract.
     /// @param _guardian Guardian address.
     constructor(
         address _guardian

contracts/testing/blobstream/ECDSA.sol renamed to contracts/testing/bridge/ECDSA.sol

@@ -5,7 +5,7 @@ const abiCoder = new ethers.utils.AbiCoder();
 
 describe("YoloTellorUser - Function Tests", async function () {
 
-    let blobstream, user, accounts, guardian, initialPowers, initialValAddrs, valCheckpoint;
+    let dataBridge, user, accounts, guardian, initialPowers, initialValAddrs, valCheckpoint;
     let val1, val2, val3;
     const UNBONDING_PERIOD = 86400 * 7 * 3; // 3 weeks
 
@@ -23,15 +23,15 @@ describe("YoloTellorUser - Function Tests", async function () {
         valTimestamp = (blocky.timestamp - 2) * 1000
         newValHash = await h.calculateValHash(initialValAddrs, initialPowers)
         valCheckpoint = h.calculateValCheckpoint(newValHash, threshold, valTimestamp)
-        // deploy blobstream
-        blobstream = await ethers.deployContract("BlobstreamO", [guardian.address])
-        await blobstream.init(threshold, valTimestamp, UNBONDING_PERIOD, valCheckpoint)
+        // deploy dataBridge
+        dataBridge = await ethers.deployContract("TellorDataBridge", [guardian.address])
+        await dataBridge.init(threshold, valTimestamp, UNBONDING_PERIOD, valCheckpoint)
         // deploy user
-        user = await ethers.deployContract("YoloTellorUser", [blobstream.address])
+        user = await ethers.deployContract("YoloTellorUser", [dataBridge.address])
     });
 
     it("constructor", async function () {
-        assert.equal(await user.blobstreamO(), await blobstream.address)
+        assert.equal(await user.dataBridge(), await dataBridge.address)
     })
 
     it("updateOracleData", async function () {