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

Change internal storage layout and order (#379)

This commit is contained in:
Ali Behjati 2022-11-07 13:01:49 +01:00 committed by GitHub
parent 81325a5a0d
commit 9d5cc533ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,20 +137,19 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
priceId = encoded.toBytes32(index + attestationIndex); priceId = encoded.toBytes32(index + attestationIndex);
attestationIndex += 32; attestationIndex += 32;
info.price.price = int64(encoded.toUint64(index + attestationIndex)); info.price = int64(encoded.toUint64(index + attestationIndex));
attestationIndex += 8; attestationIndex += 8;
info.price.conf = encoded.toUint64(index + attestationIndex); info.conf = encoded.toUint64(index + attestationIndex);
attestationIndex += 8; attestationIndex += 8;
info.price.expo = int32(encoded.toUint32(index + attestationIndex)); info.expo = int32(encoded.toUint32(index + attestationIndex));
info.emaPrice.expo = info.price.expo;
attestationIndex += 4; attestationIndex += 4;
info.emaPrice.price = int64(encoded.toUint64(index + attestationIndex)); info.emaPrice = int64(encoded.toUint64(index + attestationIndex));
attestationIndex += 8; attestationIndex += 8;
info.emaPrice.conf = encoded.toUint64(index + attestationIndex); info.emaConf = encoded.toUint64(index + attestationIndex);
attestationIndex += 8; attestationIndex += 8;
{ {
@ -171,8 +170,7 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
// Unused uint64 attestationTime // Unused uint64 attestationTime
attestationIndex += 8; attestationIndex += 8;
info.price.publishTime = encoded.toUint64(index + attestationIndex); info.publishTime = encoded.toUint64(index + attestationIndex);
info.emaPrice.publishTime = info.price.publishTime;
attestationIndex += 8; attestationIndex += 8;
if (status == 1) { // status == TRADING if (status == 1) { // status == TRADING
@ -182,20 +180,16 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
// the previous price info that are passed here. // the previous price info that are passed here.
// Previous publish time // Previous publish time
info.price.publishTime = encoded.toUint64(index + attestationIndex); info.publishTime = encoded.toUint64(index + attestationIndex);
attestationIndex += 8; attestationIndex += 8;
// Previous price // Previous price
info.price.price = int64(encoded.toUint64(index + attestationIndex)); info.price = int64(encoded.toUint64(index + attestationIndex));
attestationIndex += 8; attestationIndex += 8;
// Previous confidence // Previous confidence
info.price.conf = encoded.toUint64(index + attestationIndex); info.conf = encoded.toUint64(index + attestationIndex);
attestationIndex += 8; attestationIndex += 8;
// The EMA is last updated when the aggregate had trading status,
// so, we use previous publish time here too.
info.emaPrice.publishTime = info.price.publishTime;
} }
} }
@ -209,14 +203,14 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
uint64 latestPublishTime = latestPriceInfoPublishTime(priceId); uint64 latestPublishTime = latestPriceInfoPublishTime(priceId);
bool fresh = false; bool fresh = false;
if(info.price.publishTime > latestPublishTime) { if(info.publishTime > latestPublishTime) {
freshPrices += 1; freshPrices += 1;
fresh = true; fresh = true;
setLatestPriceInfo(priceId, info); setLatestPriceInfo(priceId, info);
} }
emit PriceFeedUpdate(priceId, fresh, vm.emitterChainId, vm.sequence, latestPublishTime, emit PriceFeedUpdate(priceId, fresh, vm.emitterChainId, vm.sequence, latestPublishTime,
info.price.publishTime, info.price.price, info.price.conf); info.publishTime, info.price, info.conf);
} }
@ -227,18 +221,18 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
function queryPriceFeed(bytes32 id) public view override returns (PythStructs.PriceFeed memory priceFeed){ function queryPriceFeed(bytes32 id) public view override returns (PythStructs.PriceFeed memory priceFeed){
// Look up the latest price info for the given ID // Look up the latest price info for the given ID
PythInternalStructs.PriceInfo memory info = latestPriceInfo(id); PythInternalStructs.PriceInfo memory info = latestPriceInfo(id);
require(info.price.publishTime != 0, "price feed for the given id is not pushed or does not exist"); require(info.publishTime != 0, "price feed for the given id is not pushed or does not exist");
priceFeed.id = id; priceFeed.id = id;
priceFeed.price.price = info.price.price; priceFeed.price.price = info.price;
priceFeed.price.conf = info.price.conf; priceFeed.price.conf = info.conf;
priceFeed.price.expo = info.price.expo; priceFeed.price.expo = info.expo;
priceFeed.price.publishTime = uint(info.price.publishTime); priceFeed.price.publishTime = uint(info.publishTime);
priceFeed.emaPrice.price = info.emaPrice.price; priceFeed.emaPrice.price = info.emaPrice;
priceFeed.emaPrice.conf = info.emaPrice.conf; priceFeed.emaPrice.conf = info.emaConf;
priceFeed.emaPrice.expo = info.emaPrice.expo; priceFeed.emaPrice.expo = info.expo;
priceFeed.emaPrice.publishTime = uint(info.emaPrice.publishTime); priceFeed.emaPrice.publishTime = uint(info.publishTime);
} }
function priceFeedExists(bytes32 id) public override view returns (bool) { function priceFeedExists(bytes32 id) public override view returns (bool) {

2
ethereum/contracts/pyth/PythGetters.sol
View File

@ -28,7 +28,7 @@ contract PythGetters is PythState {
} }
function latestPriceInfoPublishTime(bytes32 priceId) public view returns (uint64) { function latestPriceInfoPublishTime(bytes32 priceId) public view returns (uint64) {
return _state.latestPriceInfo[priceId].price.publishTime; return _state.latestPriceInfo[priceId].publishTime;
} }
function hashDataSource(PythInternalStructs.DataSource memory ds) public pure returns (bytes32) { function hashDataSource(PythInternalStructs.DataSource memory ds) public pure returns (bytes32) {

15
ethereum/contracts/pyth/PythInternalStructs.sol
View File

@ -9,19 +9,16 @@ import "@pythnetwork/pyth-sdk-solidity/PythStructs.sol";
contract PythInternalStructs { contract PythInternalStructs {
using BytesLib for bytes; using BytesLib for bytes;
struct InternalPrice {
int64 price;
uint64 conf;
uint64 publishTime;
int32 expo;
}
struct PriceInfo { struct PriceInfo {
// slot 1 // slot 1
InternalPrice price; uint64 publishTime;
int32 expo;
int64 price;
uint64 conf;
// slot 2 // slot 2
InternalPrice emaPrice; int64 emaPrice;
uint64 emaConf;
} }
struct DataSource { struct DataSource {