blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abehjati/update-eth-contract-prev-price (#252) 

* Set prev* to current* when price gets stale

* Add new solidity sdk

* Add migration files for this update

* rename diff to absDiff

Strangely, although you cannot use parent private method, you cannot
define a method with same name

* Add a comment to explain the prevPrice replacement
This commit is contained in:
Ali Behjati 2022-08-19 16:12:19 +04:30 committed by GitHub
parent 2a5b98187b
commit 22cdd5efb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethereum/contracts/pyth/Pyth.sol
View File

@ -223,19 +223,27 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
// Check that there is not a significant difference between this chain's time
// and the price publish time.
if (diff(block.timestamp, info.priceFeed.publishTime) > VALID_TIME_PERIOD_SECS) {
if (info.priceFeed.status == PythStructs.PriceStatus.TRADING &&
absDiff(block.timestamp, info.priceFeed.publishTime) > VALID_TIME_PERIOD_SECS) {
info.priceFeed.status = PythStructs.PriceStatus.UNKNOWN;
// getLatestAvailablePrice* gets prevPrice when status is
// unknown. So, now that status is being set to unknown,
// we should move the current price to the previous
// price to ensure getLatestAvailablePrice* works
// as intended.
info.priceFeed.prevPrice = info.priceFeed.price;
info.priceFeed.prevConf = info.priceFeed.conf;
info.priceFeed.prevPublishTime = info.priceFeed.publishTime;
}
return info.priceFeed;
}
function diff(uint x, uint y) private pure returns (uint) {
function absDiff(uint x, uint y) private pure returns (uint) {
if (x > y) {
return x - y;
} else {
return y - x;
}
}
}

16
ethereum/migrations/prod-receiver/6_pyth_update_interface_add_latest_methods.js Normal file
View File

@ -0,0 +1,16 @@
require('dotenv').config({ path: "../.env" });
const PythUpgradable = artifacts.require("PythUpgradable");
const { upgradeProxy } = require("@openzeppelin/truffle-upgrades");
/**
* This change:
* - Updates the interface, removes `getPrevPriceUnsafe` and adds two functions
* `getLatestAvailablePriceUnsafe` and `getLatestAvailablePriceWithinDuration`
* to replace its behaviour in a more elegant way.
*/
module.exports = async function (deployer) {
const proxy = await PythUpgradable.deployed();
await upgradeProxy(proxy.address, PythUpgradable, { deployer });
}

16
ethereum/migrations/prod/5_pyth_update_interface_add_latest_methods.js Normal file
View File

@ -0,0 +1,16 @@
require('dotenv').config({ path: "../.env" });
const PythUpgradable = artifacts.require("PythUpgradable");
const { upgradeProxy } = require("@openzeppelin/truffle-upgrades");
/**
* This change:
* - Updates the interface, removes `getPrevPriceUnsafe` and adds two functions
* `getLatestAvailablePriceUnsafe` and `getLatestAvailablePriceWithinDuration`
* to replace its behaviour in a more elegant way.
*/
module.exports = async function (deployer) {
const proxy = await PythUpgradable.deployed();
await upgradeProxy(proxy.address, PythUpgradable, { deployer });
}

16
ethereum/migrations/test/6_pyth_update_interface_add_latest_methods.js Normal file
View File

@ -0,0 +1,16 @@
require('dotenv').config({ path: "../.env" });
const PythUpgradable = artifacts.require("PythUpgradable");
const { upgradeProxy } = require("@openzeppelin/truffle-upgrades");
/**
* This change:
* - Updates the interface, removes `getPrevPriceUnsafe` and adds two functions
* `getLatestAvailablePriceUnsafe` and `getLatestAvailablePriceWithinDuration`
* to replace its behaviour in a more elegant way.
*/
module.exports = async function (deployer) {
const proxy = await PythUpgradable.deployed();
await upgradeProxy(proxy.address, PythUpgradable, { deployer });
}

14
ethereum/package-lock.json generated
View File

@ -11,7 +11,7 @@
"dependencies": {
"@openzeppelin/contracts": "^4.5.0",
"@openzeppelin/contracts-upgradeable": "^4.5.2",
"@pythnetwork/pyth-sdk-solidity": "^0.4.0",
"@pythnetwork/pyth-sdk-solidity": "^0.5.0",
"dotenv": "^10.0.0",
"elliptic": "^6.5.2",
"ganache-cli": "^6.12.1",
@ -3674,9 +3674,9 @@
"dev": true
},
"node_modules/@pythnetwork/pyth-sdk-solidity": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-0.4.0.tgz",
"integrity": "sha512-5WTLIajhYGLVxbwxWEp0BoklBVZ5y3+dooc+L2ipilDw632z7cHu79Cn8gGGNN3UstxuYEVNkQuJ+HGaxFiEwQ=="
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-0.5.0.tgz",
"integrity": "sha512-zAtQtPnYNSzrGFgeXWzoEOJcXrE2Ga+46RtllzON8SF0ExGWcDkt3IGaDFI4sSybrCXhK6KW9So9vw2qlJnVTg=="
},
"node_modules/@redux-saga/core": {
"version": "1.1.3",
@ -39998,9 +39998,9 @@
"dev": true
},
"@pythnetwork/pyth-sdk-solidity": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-0.4.0.tgz",
"integrity": "sha512-5WTLIajhYGLVxbwxWEp0BoklBVZ5y3+dooc+L2ipilDw632z7cHu79Cn8gGGNN3UstxuYEVNkQuJ+HGaxFiEwQ=="
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-0.5.0.tgz",
"integrity": "sha512-zAtQtPnYNSzrGFgeXWzoEOJcXrE2Ga+46RtllzON8SF0ExGWcDkt3IGaDFI4sSybrCXhK6KW9So9vw2qlJnVTg=="
},
"@redux-saga/core": {
"version": "1.1.3",

2
ethereum/package.json
View File

@ -30,7 +30,7 @@
"dependencies": {
"@openzeppelin/contracts": "^4.5.0",
"@openzeppelin/contracts-upgradeable": "^4.5.2",
"@pythnetwork/pyth-sdk-solidity": "^0.4.0",
"@pythnetwork/pyth-sdk-solidity": "^0.5.0",
"dotenv": "^10.0.0",
"elliptic": "^6.5.2",
"ganache-cli": "^6.12.1",