Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

devsvcs-514: update automaiton data streams lookup test contracts #14505

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
+162 −34
Draft

devsvcs-514: update automaiton data streams lookup test contracts #14505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd2a8ce
devsvcs-514: update automaiton data streams lookup test contracts
FelixFan1992 Sep 19, 2024
f6449f4
update
FelixFan1992 Sep 20, 2024
040cc2b
Merge branch 'develop' into devsvcs-514-1
FelixFan1992 Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions contracts/src/v0.8/tests/StreamsLookupUpkeep.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp

ArbSys internal constant ARB_SYS = ArbSys(0x0000000000000000000000000000000000000064);
// keep these in sync with verifier proxy in RDD
IVerifierProxy internal constant PRODUCTION_TESTNET_VERIFIER_PROXY =
IVerifierProxy(0x09DFf56A4fF44e0f4436260A04F5CFa65636A481);
IVerifierProxy internal constant STAGING_TESTNET_VERIFIER_PROXY =
IVerifierProxy(0x60448B880c9f3B501af3f343DA9284148BD7D77C);
IVerifierProxy public production_testnet_verifier_proxy = IVerifierProxy(0x2ff010DEbC1297f19579B4246cad07bd24F2488A);
IVerifierProxy public staging_testnet_verifier_proxy = IVerifierProxy(0x2ff010DEbC1297f19579B4246cad07bd24F2488A);

uint256 public testRange;
uint256 public interval;
Expand All @@ -37,7 +35,9 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
bool public verify;
bool public shouldRevertCallback;
bool public callbackReturnBool;
uint256 public verifyNthReport;

// find related info here: https://docs.chain.link/data-streams/stream-ids?network=arbitrum&page=1
constructor(uint256 _testRange, uint256 _interval, bool _useArbBlock, bool _staging, bool _verify) {
testRange = _testRange;
interval = _interval;
Expand All @@ -49,13 +49,13 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
timeParamKey = "timestamp"; // timestamp
// search feeds in notion: "Schema and Feed ID Registry"
feeds = [
//"0x4554482d5553442d415242495452554d2d544553544e45540000000000000000", // ETH / USD in production testnet v0.2
//"0x4254432d5553442d415242495452554d2d544553544e45540000000000000000" // BTC / USD in production testnet v0.2
"0x00028c915d6af0fd66bba2d0fc9405226bca8d6806333121a7d9832103d1563c" // ETH / USD in staging testnet v0.3
"0x00037da06d56d083fe599397a4769a042d63aa73dc4ef57709d31e9971a5b439", // BTC / USD in testnet v0.3
"0x000359843a543ee2fe414dc14c7e7920ef10f4372990b79d6361cdc0dd1ba782" // ETH / USD
];
staging = _staging;
verify = _verify;
callbackReturnBool = true;
verifyNthReport = 0;
}

function setParamKeys(string memory _feedParamKey, string memory _timeParamKey) external {
Expand All @@ -75,7 +75,7 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
callbackReturnBool = value;
}

function reset() public {
function reset() external {
previousPerformBlock = 0;
initialBlock = 0;
counter = 0;
Expand All @@ -100,17 +100,7 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
if (!eligible()) {
return (false, data);
}
uint256 timeParam;
if (keccak256(abi.encodePacked(feedParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
if (useArbBlock) {
timeParam = ARB_SYS.arbBlockNumber();
} else {
timeParam = block.number;
}
} else {
// assume this will be feedIDs for v0.3
timeParam = block.timestamp;
}
uint256 timeParam = block.timestamp;

// encode ARB_SYS as extraData to verify that it is provided to checkCallback correctly.
// in reality, this can be any data or empty
Expand All @@ -135,12 +125,28 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
bytes memory v1 = "";
if (verify) {
if (staging) {
v0 = STAGING_TESTNET_VERIFIER_PROXY.verify(values[0]);
v0 = staging_testnet_verifier_proxy.verify(values[verifyNthReport]);
} else {
v0 = PRODUCTION_TESTNET_VERIFIER_PROXY.verify(values[0]);
v0 = production_testnet_verifier_proxy.verify(values[verifyNthReport]);
}
}
emit MercuryPerformEvent(msg.sender, blockNumber, values[0], v0, extraData);
emit MercuryPerformEvent(msg.sender, blockNumber, values[verifyNthReport], v0, extraData);
}

function setProductionTestnetVerifierProxy(IVerifierProxy proxy) external {
production_testnet_verifier_proxy = proxy;
}

function setStagingTestnetVerifierProxy(IVerifierProxy proxy) external {
staging_testnet_verifier_proxy = proxy;
}

function setStaging(bool _staging) external {
staging = _staging;
}

function setVerifyNthReport(uint256 _n) external {
verifyNthReport = _n;
}

function eligible() public view returns (bool) {
Expand Down
8 changes: 1 addition & 7 deletions contracts/src/v0.8/tests/VerifiableLoadStreamsLookupUpkeep.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,7 @@ contract VerifiableLoadStreamsLookupUpkeep is VerifiableLoadBase, StreamsLookupC
return (false, pData);
}

uint256 timeParam;
if (keccak256(abi.encodePacked(feedParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
timeParam = blockNum;
} else {
// assume this will be feedIDs for v0.3
timeParam = block.timestamp;
}
uint256 timeParam = block.timestamp;

revert StreamsLookup(feedParamKey, feedsHex, timeParamKey, timeParam, abi.encode(upkeepId));
}
Expand Down
Loading
Loading