DEVREL-144 : Data Streams billing mechanism #47

andrejrakic · 2025-10-02T14:21:10Z

This PR adds support for toggling between on-chain and off-chain billing mechanisms in the DataStreamsLocalSimulator contract.

Usage

// Existing customers - no changes needed!
DataStreamsLocalSimulator simulator = new DataStreamsLocalSimulator();
// Defaults to on-chain billing (existing behavior)

// For off-chain billing (new chains like Monad)
simulator.enableOffChainBilling();

// Switch back to on-chain billing if needed
simulator.enableOnChainBilling();

// Consumer contracts can check current state
address feeManager = address(verifierProxy.s_feeManager());
if (feeManager != address(0)) {
    // On-chain billing active
} else {
    // Off-chain billing active
}

… in DataStreamsLocalSimulator

Copilot

Pull Request Overview

This PR adds the ability to toggle between on-chain and off-chain billing mechanisms in the DataStreamsLocalSimulator contract to support new chains like Monad that don't have FeeManager contracts deployed.

Adds feeManagerEnabled state variable and toggle functions to switch between billing modes
Maintains backward compatibility by defaulting to on-chain billing
Updates the configuration method to return the current billing state

Reviewed Changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 6 comments.

File	Description
src/data-streams/DataStreamsLocalSimulator.sol	Implements billing mechanism toggle functionality with state tracking and fee manager management
test/smoke/data-streams/BillingMechanisms.t.sol	Adds comprehensive tests for both billing mechanisms and toggle functionality

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

src/data-streams/DataStreamsLocalSimulator.sol

test/smoke/data-streams/BillingMechanisms.t.sol

…illing mechanism is used

Copilot

Pull Request Overview

Copilot reviewed 3 out of 4 changed files in this pull request and generated 2 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

test/smoke/data-streams/BillingMechanisms.t.sol

zeuslawyer

LGTM
all comments are raised only to prompt thinking to see if there are improvements we should be considering.

zeuslawyer · 2025-10-03T06:12:25Z

src/data-streams/DataStreamsLocalSimulator.sol

    LinkToken internal immutable i_linkToken;

+    /// @notice Whether fee manager is enabled (can be toggled after deployment)
+    bool public feeManagerEnabled;


how can we help newbies make the connection in their minds that feeManager == on chain? right now, the literal wording suggests different things but actually the feemanager is an onchain-only primitive but this may not be obvious to most devs.

zeuslawyer · 2025-10-03T06:13:44Z

src/data-streams/DataStreamsLocalSimulator.sol

+    bool public feeManagerEnabled;
+
    constructor() {
+        // Default to on-chain billing for backward compatibility


as per previous - note the comment and the var name suggest two different things (we know its connected but the end user cannot be expected to know)

zeuslawyer · 2025-10-03T06:15:04Z

src/data-streams/DataStreamsLocalSimulator.sol

+     * @dev This simulates chains that don't have FeeManager contracts deployed
+     */
+    function enableOffChainBilling() external {
+        if (feeManagerEnabled) {


the issue may be fixed by renaming feeManagerEnabled to onChainBillingEnabled and then the next line .setFeeManager(...) having a comment to explain the connection That way the boolean var is descriptive.

zeuslawyer · 2025-10-03T06:21:25Z

src/data-streams/MockVerifierProxy.sol

+            revert FeeManagerRequired(
+                "On-chain billing is active but your contract is using off-chain billing mechanism. "
+                "Either call simulator.enableOffChainBilling() or provide fee token address in parameterPayload. "
+                "See: https://docs.chain.link/data-streams/tutorials/evm-onchain-report-verification"


zeuslawyer · 2025-10-03T06:22:33Z

src/data-streams/MockVerifierProxy.sol

+        if (!hasFeeManager && hasParameterPayload) {
+            revert FeeManagerNotExpected(
+                "Off-chain billing is active but your contract is providing parameterPayload for on-chain billing. "
+                "Either call simulator.enableOnChainBilling() or pass empty bytes as parameterPayload. "


out of curiosity, would it revert on-chain if they passed an unnecessary parameterPayload?

zeuslawyer · 2025-10-03T06:25:15Z

test/smoke/data-streams/BillingMechanisms.t.sol

+
+        // Verify fee manager is deployed by default
+        assertFalse(address(mockFeeManager_) == address(0), "Fee manager should be deployed by default");
+        assertEq(address(mockVerifierProxy_.s_feeManager()), address(mockFeeManager_), "Fee manager should be set on verifier proxy");


assertEq(address(mockVerifierProxy_.s_feeManager()), address(mockFeeManager_),

is there any risk that this assertEq could pass incorrectly if both are address(0)s and thats the bug?

…ardhat 2

…illing-mechanism

Copilot

Pull Request Overview

Copilot reviewed 14 out of 20 changed files in this pull request and generated 2 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

test/smoke/data-streams/BillingMechanisms.t.sol

src/data-streams/DataStreamsLocalSimulator.sol

feat: Implement fee manager toggle for on-chain and off-chain billing…

dcf4e86

… in DataStreamsLocalSimulator

andrejrakic self-assigned this Oct 2, 2025

andrejrakic requested a review from Copilot October 2, 2025 14:21

andrejrakic changed the title ~~Data Streams billing mechanism~~ DEVREL-144 : Data Streams billing mechanism Oct 2, 2025

Copilot AI reviewed Oct 2, 2025

View reviewed changes

feat: Add developer friendly error messages when wrong Data Streams b…

a7a8ff0

…illing mechanism is used

andrejrakic requested a review from Copilot October 2, 2025 15:22

Copilot AI reviewed Oct 2, 2025

View reviewed changes

test/smoke/data-streams/BillingMechanisms.t.sol Show resolved Hide resolved

test/smoke/data-streams/BillingMechanisms.t.sol Show resolved Hide resolved

andrejrakic marked this pull request as ready for review October 2, 2025 15:25

andrejrakic requested a review from a team as a code owner October 2, 2025 15:25

andrejrakic requested review from zeuslawyer and Nalon October 2, 2025 15:25

zeuslawyer approved these changes Oct 3, 2025

View reviewed changes

andrejrakic added 4 commits October 9, 2025 14:36

fix: Vendor Chainlink contracts that caused compilation issues with H…

c8aacfd

…ardhat 2

Merge branch 'develop' into devrel-144/data-streams-billing-mechanism

1409635

Merge branch 'fix/hardhat2-remappings' into devrel-144/data-streams-b…

6235c88

…illing-mechanism

chore: Merge publishing beta releases into a single workflow file

7a56c65

andrejrakic requested a review from Copilot October 9, 2025 13:27

Copilot AI reviewed Oct 9, 2025

View reviewed changes

test/smoke/data-streams/BillingMechanisms.t.sol Show resolved Hide resolved

src/data-streams/DataStreamsLocalSimulator.sol Show resolved Hide resolved

andrejrakic requested a review from secure-michelemin October 9, 2025 13:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

DEVREL-144 : Data Streams billing mechanism #47

DEVREL-144 : Data Streams billing mechanism #47

andrejrakic commented Oct 2, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

zeuslawyer left a comment

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

zeuslawyer Oct 3, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DEVREL-144 : Data Streams billing mechanism #47

Are you sure you want to change the base?

DEVREL-144 : Data Streams billing mechanism #47

Conversation

andrejrakic commented Oct 2, 2025

Usage

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

zeuslawyer left a comment

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

zeuslawyer Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!