feat: redstone oracle adapter test #13

md0x · 2024-05-16T11:31:24Z

Proposed Changes in this PR:

Test the integration of a RedStone Classic oracle with Oval and ChainlinkSourceAdapter.
Utilize the MergedPriceFeedAdapterWithRounds smart contract for the testing.
Fetch prices from the RedStone production gateway at https://oracle-gateway-1.a.redstone.finance/ and submit them to the adapter.
Demonstrate that Oval requires no modifications to work seamlessly with RedStone Classic.

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

v5.0.2

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

release-v4.5

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x · 2024-05-16T16:34:21Z

redstone/getRedstonePayload.js

+  return Number(bigNumberPrice);
+};
+
+const pickMedian = (arr) => {


We need to get the median here as we are pushing 3 prices from different signers that can slightly defer. Redstone contract does the same (https://github.com/UMAprotocol/oval-contracts/blob/pablo/redstone-adapter/lib/RedStoneBaseContracts/@redstone-finance/evm-connector/contracts/core/RedstoneDefaultsLib.sol#L37)

md0x · 2024-05-16T16:35:44Z

test/unit/RedStoneOracle.sol

+    }
+
+    function testPushPrice() public {
+        vm.warp(1234);


The timestamp associated to the price pushed is the block.timestamp when the price is pushed.

yup, same as with chainlink.

chrismaree

This is awesome. it shows we can use Redstone with zero changes, treating it directly as chainlink. only downside with this PR right now is that it has a lot of copy paste files to get the deployments of tests working. I'll try create a follow on commit that moves this into more minimal imports.

chrismaree · 2024-05-17T09:25:45Z

test/unit/RedStoneOracle.sol

+    function setUp() public {
+        redstoneOracle = new RedstonePriceFeedWithRounds(bytes32("BTC"));
+        sourceAdapter = new TestedSourceAdapter(
+            IAggregatorV3Source(address(redstoneOracle))


this is great! we can show that we can import redstone sources, treat them exactly as chainlink, and everything continues to work as we'd expect.

chrismaree · 2024-05-17T09:25:55Z

test/unit/RedStoneOracle.sol

+    }
+
+    function testPushPrice() public {
+        vm.warp(1234);


yup, same as with chainlink.

Reinis-FRP

nice, and agree with @chrismaree to clean dependencies in follow-up

mrice32

LGTM!

Signed-off-by: chrismaree <christopher.maree@gmail.com>

chrismaree · 2024-05-19T12:42:41Z

test/fork/adapters/ChainlinkSourceAdapter.sol

@@ -45,26 +45,26 @@ contract ChainlinkSourceAdapterTest is CommonTest {
        uint256 targetTime = block.timestamp - 1 hours;
        (uint80 latestRound,,,,) = chainlink.latestRoundData();
        (int256 lookBackPrice, uint256 lookBackTimestamp) = sourceAdapter.tryLatestDataAt(targetTime, 10);
-        (, int256 answer, uint256 startedAt,,) = chainlink.getRoundData(latestRound - 1);
-        assertTrue(startedAt <= targetTime); // The time from the chainlink source is at least 1 hours old.
+        (, int256 answer,, uint256 updatedAt,) = chainlink.getRoundData(latestRound - 1);


after writing the other tests (for redstone) I realized this is inconsistent with what the adapter actually does, so updated it.

chrismaree

I updated this PR somewhat (mainnet fork tests, moved scripts. toethers, moved scripts to typescript, cleaned up. someof the imports and pathing). but I'm still not totally done. I don't like that we have toe lib as a directory of files, it should be a git submodule. This is currently broken on the redstone imports. andneeds a bit of effort to fix. we should address this before merging this PR.

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

chrismaree · 2024-05-20T11:20:51Z

scripts/getRedstonePayload.log.txt

@@ -0,0 +1,2 @@
+You have to provide a data FeedAn error occurred: Request failed {"reqParams":{"dataServiceId":"redstone-primary-prod","uniqueSignersCount":3,"dataFeeds":["--no-warnings"],"urls":["https://oracle-gateway-1.a.redstone.finance"]}}, Original error: AggregateError: , errors: Error: Requested data feed id is not included in response: --no-warnings


This should not be committed and given its in the .gitignore it wont be in the future.

chrismaree · 2024-05-20T11:21:40Z

remappings.txt

@@ -1,3 +1,3 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-openzeppelin-contracts/=lib/openzeppelin-contracts/
+redstone-oracles-monorepo/=lib/redstone-contracts/src/RedStoneBaseContracts/redstone-oracles-monorepo


do you think naming it like redstone-oracles-monorepo makes sense? prehaps redstone-oracle?

chrismaree · 2024-05-20T11:21:46Z

remappings.txt

@@ -1,3 +1,3 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-openzeppelin-contracts/=lib/openzeppelin-contracts/


also what happened here?

I realized it wasn't needed when I was cleaning up the remappings.
Everything is imported with "openzeppelin-contracts/..." and Foundry automatically reads from the lib folder.

chrismaree

I think this is great. the only thing that once could argue we don't want is the file src/oracles/RedstonePriceFeedWithRounds.sol. this could be pulled into the test where its used? otherwise this file has no other direct usage and is a bit different to the rest of the repo?

chrismaree · 2024-05-20T11:23:32Z

src/adapters/source-adapters/ChainlinkSourceAdapter.sol

@@ -6,6 +6,7 @@ import {SafeCast} from "openzeppelin-contracts/contracts/utils/math/SafeCast.sol
 import {DecimalLib} from "../lib/DecimalLib.sol";
 import {IAggregatorV3Source} from "../../interfaces/chainlink/IAggregatorV3Source.sol";
 import {DiamondRootOval} from "../../DiamondRootOval.sol";
+import "forge-std/console.sol";


Suggested change

import "forge-std/console.sol";

chrismaree · 2024-05-20T11:23:43Z

src/oracles/RedstonePriceFeedWithRounds.sol

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.17;
+


if this is going to live in the repo here it needs comments & natspec

@chrismaree I pulled this out to https://github.com/UMAprotocol/redstone-contracts/tree/master/src/examples

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x · 2024-05-20T14:40:48Z

test/unit/CoinbaseSourceAdapter.sol

@@ -33,10 +33,10 @@ contract CoinbaseSourceAdapterTest is CommonTest {
    string public ticker = "ETH";
    uint256 public price = 3000e6;

-    function pushPrice(string memory ticker, uint256 price, uint256 timestamp) public {
+    function pushPrice(string memory ticker, uint256 priceToPush, uint256 timestamp) public {


this is to remove an unrelated warning of variable shadowing

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

chrismaree

This is great! love showing support for something by simple adding some tests :)

md0x added 9 commits May 16, 2024 10:20

feat: redstone lib

22fce48

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: remappings

d40df80

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

forge install: openzeppelin-contracts-upgradeable

ca1a2e6

v5.0.2

fixes

84fbaf7

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

forge install: openzeppelin-contracts-upgradeable

35fecdc

release-v4.5

fixes

3f422bf

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

wip

94ef06c

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

wip

e2ad14b

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

ffi

da4e998

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x changed the title ~~Pablo/redstone adapter~~ feat: redstone oracle and adapter test May 16, 2024

md0x added 5 commits May 16, 2024 16:39

working

7ab11ab

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: cleanup

26c33a1

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: cleanup2

0a1d27f

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: timestamp

1c71533

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: clean

e890b38

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x commented May 16, 2024

View reviewed changes

md0x marked this pull request as ready for review May 17, 2024 09:19

md0x requested review from chrismaree, daywiss and Reinis-FRP May 17, 2024 09:19

chrismaree reviewed May 17, 2024

View reviewed changes

Reinis-FRP approved these changes May 17, 2024

View reviewed changes

mrice32 approved these changes May 17, 2024

View reviewed changes

more tests

ff7c301

Signed-off-by: chrismaree <christopher.maree@gmail.com>

chrismaree reviewed May 19, 2024

View reviewed changes

md0x added 3 commits May 19, 2024 14:24

fix: ci

7744fe0

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

fix: ci bis

cfc7eee

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: clean libs

0a7c2a3

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x added 5 commits May 20, 2024 11:44

forge install: redstone-contracts

9a5b832

feat: remappings

282fbba

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

Merge branch 'master' into pablo/redstone-adapter

48ebe72

fix: redstone tests

da0ab20

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

fix: redstone test round id

08875ca

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

chrismaree reviewed May 20, 2024

View reviewed changes

md0x added 7 commits May 20, 2024 14:27

feat: update redstone lib

08cd2d5

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: update redstone lib

5cf167b

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: update redstone lib

5808795

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: update remappings

9931d9b

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: updates

fdafdc4

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: del test redstone oracle

e4073cf

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

feat: rename redstone remapping

4c625ea

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x commented May 20, 2024

View reviewed changes

md0x added 2 commits May 20, 2024 15:43

feat: clean submodules

31ac93f

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

refactor: console log

fcf2613

Signed-off-by: Pablo Maldonado <pablo@umaproject.org>

md0x requested a review from chrismaree May 20, 2024 15:22

chrismaree approved these changes May 20, 2024

View reviewed changes

md0x changed the title ~~feat: redstone oracle and adapter test~~ feat: redstone oracle adapter test May 20, 2024

md0x merged commit c98863e into master May 20, 2024
3 checks passed

md0x deleted the pablo/redstone-adapter branch May 20, 2024 15:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: redstone oracle adapter test #13

feat: redstone oracle adapter test #13

md0x commented May 16, 2024 •

edited

md0x May 16, 2024

md0x May 16, 2024

chrismaree May 17, 2024

chrismaree left a comment

chrismaree May 17, 2024

chrismaree May 17, 2024

Reinis-FRP left a comment

mrice32 left a comment

chrismaree May 19, 2024 •

edited

chrismaree left a comment

chrismaree May 20, 2024

chrismaree May 20, 2024

chrismaree May 20, 2024

md0x May 20, 2024

chrismaree left a comment

chrismaree May 20, 2024

chrismaree May 20, 2024

md0x May 20, 2024

md0x May 20, 2024

chrismaree left a comment

		@@ -0,0 +1,2 @@
		You have to provide a data FeedAn error occurred: Request failed {"reqParams":{"dataServiceId":"redstone-primary-prod","uniqueSignersCount":3,"dataFeeds":["--no-warnings"],"urls":["https://oracle-gateway-1.a.redstone.finance"]}}, Original error: AggregateError: , errors: Error: Requested data feed id is not included in response: --no-warnings

		@@ -0,0 +1,41 @@
		// SPDX-License-Identifier: BUSL-1.1
		pragma solidity 0.8.17;

feat: redstone oracle adapter test #13

feat: redstone oracle adapter test #13

Conversation

md0x commented May 16, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrismaree left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Reinis-FRP left a comment

Choose a reason for hiding this comment

mrice32 left a comment

Choose a reason for hiding this comment

chrismaree May 19, 2024 • edited

Choose a reason for hiding this comment

chrismaree left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrismaree left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chrismaree left a comment

Choose a reason for hiding this comment

md0x commented May 16, 2024 •

edited

chrismaree May 19, 2024 •

edited