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

[eth] Some contract improvements (#356)

This commit is contained in:
Ali Behjati 2022-10-19 19:47:09 +02:00 committed by GitHub
parent 398b18743d
commit bdc492f919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,8 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
} }
function updatePriceFeeds(bytes[] calldata updateData) public override payable { function updatePriceFeeds(bytes[] calldata updateData) public override payable {
uint requiredFee = getUpdateFee(updateData.length); uint requiredFee = getUpdateFee(updateData);
require(msg.value >= requiredFee, "insufficient paid fee amount"); require(msg.value >= requiredFee, "insufficient paid fee amount");
payable(msg.sender).transfer(msg.value - requiredFee);
for(uint i = 0; i < updateData.length; i++) { for(uint i = 0; i < updateData.length; i++) {
updatePriceBatchFromVm(updateData[i]); updatePriceBatchFromVm(updateData[i]);
@ -68,10 +67,15 @@ abstract contract Pyth is PythGetters, PythSetters, AbstractPyth {
emit UpdatePriceFeeds(msg.sender, updateData.length, requiredFee); emit UpdatePriceFeeds(msg.sender, updateData.length, requiredFee);
} }
function getUpdateFee(uint updateDataSize) public override view returns (uint feeAmount) { /// This method is deprecated, please use the `getUpdateFee(bytes[])` instead.
function getUpdateFee(uint updateDataSize) public view returns (uint feeAmount) {
return singleUpdateFeeInWei() * updateDataSize; return singleUpdateFeeInWei() * updateDataSize;
} }
function getUpdateFee(bytes[] calldata updateData) public override view returns (uint feeAmount) {
return singleUpdateFeeInWei() * updateData.length;
}
function createNewPriceInfo(PythInternalStructs.PriceAttestation memory pa) private view returns (PythInternalStructs.PriceInfo memory info) { function createNewPriceInfo(PythInternalStructs.PriceAttestation memory pa) private view returns (PythInternalStructs.PriceInfo memory info) {
info.attestationTime = pa.attestationTime; info.attestationTime = pa.attestationTime;
info.arrivalTime = block.timestamp; info.arrivalTime = block.timestamp;

14
ethereum/package-lock.json generated
View File

@ -12,7 +12,7 @@
"@certusone/wormhole-sdk-wasm": "^0.0.1", "@certusone/wormhole-sdk-wasm": "^0.0.1",
"@openzeppelin/contracts": "^4.5.0", "@openzeppelin/contracts": "^4.5.0",
"@openzeppelin/contracts-upgradeable": "^4.5.2", "@openzeppelin/contracts-upgradeable": "^4.5.2",
"@pythnetwork/pyth-sdk-solidity": "^1.0.1", "@pythnetwork/pyth-sdk-solidity": "^2.0.0",
"@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js", "@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"elliptic": "^6.5.2", "elliptic": "^6.5.2",
@ -3708,9 +3708,9 @@
"dev": true "dev": true
}, },
"node_modules/@pythnetwork/pyth-sdk-solidity": { "node_modules/@pythnetwork/pyth-sdk-solidity": {
"version": "1.0.1", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-1.0.1.tgz", "resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-2.0.0.tgz",
"integrity": "sha512-qcuDM1E8X6LNg+Eyq1WcwSpO0hWuQpDPb9YNG3GCR9NjaQObB0AlZ2ayLGtdUTc/yMm26haTtZyKx+9S+J6FWw==" "integrity": "sha512-ogWpnI23Ofz1D5AmglkRxr+M/up/y15CBvXuxDcdq0Q6DvW3ksfPWP0DwCV2s7xbeSKYdpr97O+4NRmDCGeDsg=="
}, },
"node_modules/@pythnetwork/xc-governance-sdk": { "node_modules/@pythnetwork/xc-governance-sdk": {
"resolved": "../third_party/pyth/xc-governance-sdk-js", "resolved": "../third_party/pyth/xc-governance-sdk-js",
@ -39676,9 +39676,9 @@
"dev": true "dev": true
}, },
"@pythnetwork/pyth-sdk-solidity": { "@pythnetwork/pyth-sdk-solidity": {
"version": "1.0.1", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-1.0.1.tgz", "resolved": "https://registry.npmjs.org/@pythnetwork/pyth-sdk-solidity/-/pyth-sdk-solidity-2.0.0.tgz",
"integrity": "sha512-qcuDM1E8X6LNg+Eyq1WcwSpO0hWuQpDPb9YNG3GCR9NjaQObB0AlZ2ayLGtdUTc/yMm26haTtZyKx+9S+J6FWw==" "integrity": "sha512-ogWpnI23Ofz1D5AmglkRxr+M/up/y15CBvXuxDcdq0Q6DvW3ksfPWP0DwCV2s7xbeSKYdpr97O+4NRmDCGeDsg=="
}, },
"@pythnetwork/xc-governance-sdk": { "@pythnetwork/xc-governance-sdk": {
"version": "file:../third_party/pyth/xc-governance-sdk-js", "version": "file:../third_party/pyth/xc-governance-sdk-js",

2
ethereum/package.json
View File

@ -30,7 +30,7 @@
"@certusone/wormhole-sdk-wasm": "^0.0.1", "@certusone/wormhole-sdk-wasm": "^0.0.1",
"@openzeppelin/contracts": "^4.5.0", "@openzeppelin/contracts": "^4.5.0",
"@openzeppelin/contracts-upgradeable": "^4.5.2", "@openzeppelin/contracts-upgradeable": "^4.5.2",
"@pythnetwork/pyth-sdk-solidity": "^1.0.1", "@pythnetwork/pyth-sdk-solidity": "^2.0.0",
"@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js", "@pythnetwork/xc-governance-sdk": "file:../third_party/pyth/xc-governance-sdk-js",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"elliptic": "^6.5.2", "elliptic": "^6.5.2",

10
ethereum/test/pyth.js
View File

@ -435,7 +435,7 @@ contract("Pyth", function () {
let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338); let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
// Getting the fee from the contract // Getting the fee from the contract
let feeInWei = await this.pythProxy.getUpdateFee(2); let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
assert.equal(feeInWei, 20); assert.equal(feeInWei, 20);
// When a smaller fee is payed it reverts // When a smaller fee is payed it reverts
@ -464,7 +464,7 @@ contract("Pyth", function () {
let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338); let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
// Getting the fee from the contract // Getting the fee from the contract
let feeInWei = await this.pythProxy.getUpdateFee(2); let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
assert.equal(feeInWei, 20); assert.equal(feeInWei, 20);
const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei); const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei);
@ -493,8 +493,8 @@ contract("Pyth", function () {
let rawBatch1 = generateRawBatchAttestation(ts - 5, ts, 1337); let rawBatch1 = generateRawBatchAttestation(ts - 5, ts, 1337);
let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338); let rawBatch2 = generateRawBatchAttestation(ts + 5, ts + 10, 1338);
// Getting the fee from the contract // Paying the fee works and extra fee is not paid back.
let feeInWei = await this.pythProxy.getUpdateFee(2); let feeInWei = await this.pythProxy.methods["getUpdateFee(bytes[])"]([rawBatch1, rawBatch2]);
assert.equal(feeInWei, 20); assert.equal(feeInWei, 20);
const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei + 10); const receipt = await updatePriceFeeds(this.pythProxy, [rawBatch1, rawBatch2], feeInWei + 10);
@ -502,7 +502,7 @@ contract("Pyth", function () {
fee: feeInWei fee: feeInWei
}); });
const pythBalance = await web3.eth.getBalance(this.pythProxy.address); const pythBalance = await web3.eth.getBalance(this.pythProxy.address);
assert.equal(pythBalance, feeInWei); assert.equal(pythBalance, feeInWei + 10);
}); });
it("should cache price updates", async function () { it("should cache price updates", async function () {

5
third_party/pyth/p2w-relay/src/relay/evm.ts vendored
View File

@ -45,10 +45,11 @@ export class EvmRelay implements Relay {
? await this.queryMany(priceIds) ? await this.queryMany(priceIds)
: null; : null;
const updateFee = await this.p2wContract.getUpdateFee(1); const updateData = ["0x" + signedVAAs[i]];
const updateFee = await this.p2wContract["getUpdateFee(bytes[])"](updateData);
let tx = this.p2wContract let tx = this.p2wContract
.updatePriceFeeds(["0x" + signedVAAs[i]], { gasLimit: 2000000, value: updateFee }) .updatePriceFeeds(updateData, { gasLimit: 2000000, value: updateFee })
.then(async (pending) => { .then(async (pending) => {
let receipt = await pending.wait(); let receipt = await pending.wait();
logger.info( logger.info(