Change OCEAN token to USDC by trizin · Pull Request #1751 · oceanprotocol/pdr-backend

trizin · 2025-11-03T11:10:06Z

This pull request refactors the codebase to generalize the staking and payout token from a hardcoded "OCEAN" token to a hardcoded "USDC" token

CLI and Documentation Updates

Renamed the payout claim CLI command and related code from claim_OCEAN to claim_payouts, and updated documentation and argument parsing to reflect the new naming.

Testing Refactor

Updated all tests to use the USDC fixture and address, and ensured mocks and test logic are compatible with the new token abstraction.

Code Improvements

Added a cached token_symbol property to FeedContract for improved logging clarity and reduced redundant contract calls.

These changes collectively make the codebase more flexible, maintainable, and ready for supporting USDC

…tency

…for consistency across tests and implementations

…ty in code and configuration

…onsistency across tests

…istency in check_network and predictoor_stats modules

…s CLI and tests

…nd related tests

…ract

…gent

…ed coverage

…dling

KatunaNorbert · 2025-11-06T15:05:56Z

Doing a quick search in the code base I can see there are still multiple places where OCEAN token is mentioned, why aren't those updates as well?

KatunaNorbert · 2025-11-07T07:45:34Z

-            " LOW OCEAN BALANCE!"
-            if ocean_bal < Eth(10).to_wei() and name != "trueval"
+            " LOW PREDICTION TOKEN BALANCE!"
+            if prediction_bal < Eth(10).to_wei() and name != "trueval"


Why do we refere to the stake token as prediction token here? I suggest we keep it consistent with the rest and name is to stake_token_bal

Good catch, I first changed it to that then made it prediction token, missed this one.

Fixed now!

…_main

KatunaNorbert · 2025-11-07T10:23:12Z

 - `trader` - buy aggregated predictions, then trade
 - `sim` - experiments / simulation flow
- `payout` - OCEAN & ROSE payout
+- `payout` - prediction & ROSE payout


One more thing left, I think here it should say staked_token or USDC

trentmc · 2025-11-07T12:53:18Z

What is the github issue for this? Please link to it in the PR title, and the PR description. (And that issue should link to the overall epic.) If these github issue(s) do not exist, then please create them.

trentmc · 2025-11-07T12:59:01Z

(I just renamed this PR to be in line with the naming in the code changes itself. Prediction token -> stake token.)

trentmc

I thought more about this. I don't think we should make it more general to stake_token.

Rather, just make it a hardcoded change from OCEAN to USDC.

Why: because the extra layer of indirection adds complexity & risk.

Complexity in code changes. Eg munging "address.json" for stake_token. Instead, "address.json" itself should simply hold the addresses for USDC. Way way cleaner.
Complexity in review. If hardcoded OCEAN -> USDC, most changes would be trivial. But with stake_token there's a bunch more logic. Also in general it makes the code harder to read.
Complexity in usage. READMEs should be saying USDC not stake_token. Etc etc.
This additional complexity increases risk. Predictoor is not the main focus right now. I don't want to accidentally break, and then lose weeks fixing it. KISS, get the thing done, move on.

Once this change is made, ping me, and I will do a more thorough review.

@KatunaNorbert changes elsewhere (webapp etc) should also be hardcoded USDC, not stake_token. Please update as needed.

…ub.com/oceanprotocol/pdr-backend into rename-ocean-token-to-prediction-token

… modules

trentmc

Getting close! My comments are all about minimizing the changes to minimize risk, so that it's just nearly only a character-for-character change of OCEAN -> USDC.

trentmc · 2025-11-08T14:46:39Z

-    stake_token = feed_contract1.get_stake_token()
-    assert stake_token == web3_pp.OCEAN_address
+def test_get_USDC(feed_contract1, web3_pp):
+    USDC = feed_contract1.get_USDC()


If the contract previously had the function get_stake_token() then why change it here? Let's minimize the changes.

trentmc · 2025-11-08T14:52:13Z


    mock_get_opf_addresses.return_value = {
-        "dfbuyer": "0xdfBuyerAddress",
+        "dfbuyer": "0x0000000000000000000000000000000000000000",


Keep it as 0xdfBuyerAddress if possible. It makes it more obvious.

0xdfBuyerAddress throws an error in tests because the address is not valid

OK. Then go ahead with the 0x00.. address I guess.

trentmc · 2025-11-08T14:54:06Z

    def set_token(self, web3_pp):
-        stake_token = self.get_stake_token()
-        self.token = Token(web3_pp, stake_token)
+        USDC = self.get_USDC()


As above, if the smart contract already has get_stake_token() then let's leave it as that. Minimize rocking the boat.

trentmc · 2025-11-08T14:54:58Z


        # approve
-        logger.info("Approve spend OCEAN: begin")
+        logger.info("Approve spend %s: begin", self.token_symbol)


Please remove the extra layer of indirection. Then: does it need self.token_symbol attribute at all? I want to minimize rocking the boat here.

trentmc · 2025-11-08T14:55:14Z

        @arguments
          predicted_value: The predicted value (True or False)
-          stake_amt: The amount of OCEAN to stake in prediction (in ETH, not wei)
+          stake_amt: The amount of tokens to stake in prediction (in ETH, not wei)


tokens -> USDC

trentmc · 2025-11-08T14:55:29Z

        @description
           Given an exact target # datatokens, calculates # basetokens
-           (OCEAN) needed to get it, and fee amounts too.
+           (tokens) needed to get it, and fee amounts too.


tokens -> USDC

trentmc · 2025-11-08T14:55:41Z


        @return
-           baseTokenAmt_wei - # OCEAN needed, in wei
+           baseTokenAmt_wei - # tokens needed, in wei


tokens -> USDC.

trentmc · 2025-11-08T14:56:45Z

    logger.info("Checking account balances")

-    OCEAN = web3_pp.OCEAN_Token
+    USDC = web3_pp.USDC


USDC -> `USDC_token'. Minimize rocking the boat.

…tract and FixedRate

…work_main function

trentmc

LGTM! Thanks for responding to my earlier comments.

trizin added 26 commits November 3, 2025 10:27

Rename OCEAN_Token to prediction_token across the codebase for consis…

01a85ee

…tency

Refactor code to replace OCEAN_address with prediction_token_address …

bdd2bb3

…for consistency across tests and implementations

Rename OCEAN references to prediction_token for consistency and clari…

45c7b6c

…ty in code and configuration

Refactor code to replace OCEAN references with prediction_token for c…

e316905

…onsistency across tests

Update references from OCEAN to prediction_token for clarity and cons…

f1cacf8

…istency in check_network and predictoor_stats modules

Rename claim_OCEAN to claim_payouts for clarity and consistency acros…

95cd7cb

…s CLI and tests

Add token symbol retrieval and logging improvements in FeedContract a…

4616d61

…nd related tests

Formatting

51b20d1

Add prediction_token alias to address.json in workflow

066382e

Update token symbol type to Optional for improved clarity in FeedCont…

770f7c5

…ract

Rename OCEAN_addr to prediction_token_address for clarity in DFBuyerA…

4a693ee

…gent

Add pytest import and skip marker for MEXC exchange test

33cd592

Add prediction_token to return value in test_get_addresses for improv…

1c39666

…ed coverage

format

c5ba0a6

rename prediction token to stake token

b7921f4

formatting

266190e

Mock stake_token property in network tests for consistent balance han…

71e490e

…dling

Add deprecation warning for L-BFGS-B solver options in pytest.ini

c072665

fix fixture name

951e774

Refactor stake_token mocking in network tests for consistency

891a918

Prevent get_address from reading addresses.json in network tests

3277154

fix mock

ae23499

formatting

1b23f47

fix

bcc23bc

remove unused

024f2e8

remove coverage stuff

9b78da8

trizin requested a review from KatunaNorbert November 6, 2025 12:07

trizin marked this pull request as ready for review November 6, 2025 12:07

KatunaNorbert reviewed Nov 6, 2025

View reviewed changes

Comment thread pdr_backend/dfbuyer/dfbuyer_agent.py Outdated

KatunaNorbert reviewed Nov 7, 2025

View reviewed changes

rename prediction_bal to stake_token_bal for clarity in check_network…

7263efa

…_main

trizin requested a review from KatunaNorbert November 7, 2025 09:55

trizin mentioned this pull request Nov 7, 2025

Add filter for paused contracts in subgraph queries #1753

Open

KatunaNorbert reviewed Nov 7, 2025

View reviewed changes

Update README.md

692e70c

KatunaNorbert approved these changes Nov 7, 2025

View reviewed changes

trizin requested a review from trentmc November 7, 2025 12:31

trentmc changed the title ~~Change OCEAN token to prediction token~~ Change OCEAN token to stake token Nov 7, 2025

trentmc requested changes Nov 8, 2025

View reviewed changes

Comment thread README.md Outdated

trizin linked an issue Nov 8, 2025 that may be closed by this pull request

Change web3_pp OCEAN address and token to USDC #1750

Open

trizin added 7 commits November 8, 2025 13:08

fix: update README to include USDC in token retrieval section

5fe07f1

rename stake token to USDC

e339b2b

Merge branch 'rename-ocean-token-to-prediction-token' of https://gith…

7a7d67a

…ub.com/oceanprotocol/pdr-backend into rename-ocean-token-to-prediction-token

Formatting

e94983d

fix

485fc1f

improve

c2efcda

rename stake token references to USDC in check_network and fixed_rate…

04427b4

… modules

trizin changed the title ~~Change OCEAN token to stake token~~ Change OCEAN token to USDC Nov 8, 2025

trizin requested a review from trentmc November 8, 2025 13:37

trentmc requested changes Nov 8, 2025

View reviewed changes

trizin added 4 commits November 10, 2025 11:21

revert back to get stake token

a68818c

address -> addr

6fced1b

refactor: update token references from USDC to stake token in FeedCon…

c254093

…tract and FixedRate

refactor: rename USDC variable to USDC_token for clarity in check_net…

5f64c67

…work_main function

trentmc approved these changes Nov 10, 2025

View reviewed changes

fix tests

458ab01

trizin closed this Feb 17, 2026

Conversation

trizin commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

KatunaNorbert commented Nov 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trentmc commented Nov 7, 2025

Uh oh!

trentmc commented Nov 7, 2025

Uh oh!

trentmc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

trentmc left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trentmc left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

trizin commented Nov 3, 2025 •

edited

Loading