Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions lazer/contracts/evm/src/PythLazer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ pragma solidity ^0.8.13;

import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";

contract PythLazer is OwnableUpgradeable, UUPSUpgradeable {
TrustedSignerInfo[100] internal trustedSigners;
uint256 public verification_fee;

constructor() {
_disableInitializers();
}

struct TrustedSignerInfo {
address pubkey;
uint256 expiresAt;
Expand All @@ -20,10 +25,6 @@ contract PythLazer is OwnableUpgradeable, UUPSUpgradeable {
verification_fee = 1 wei;
}

function migrate() public onlyOwner {
verification_fee = 1 wei;
}

function _authorizeUpgrade(address) internal override onlyOwner {}

function updateTrustedSigner(
Expand Down Expand Up @@ -91,7 +92,7 @@ contract PythLazer is OwnableUpgradeable, UUPSUpgradeable {
}
payload = update[71:71 + payload_len];
bytes32 hash = keccak256(payload);
signer = ecrecover(
(signer, , ) = ECDSA.tryRecover(
hash,
uint8(update[68]) + 27,
bytes32(update[4:36]),
Expand Down
1 change: 0 additions & 1 deletion lazer/contracts/evm/src/PythLazerLib.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.13;

import {console} from "forge-std/console.sol";
import {PythLazer} from "./PythLazer.sol";

library PythLazerLib {
Expand Down
20 changes: 14 additions & 6 deletions lazer/contracts/evm/test/PythLazer.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,26 @@ pragma solidity ^0.8.13;

import {Test, console} from "forge-std/Test.sol";
import {PythLazer} from "../src/PythLazer.sol";
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract PythLazerTest is Test {
PythLazer public pythLazer;
address owner;

function setUp() public {
pythLazer = new PythLazer();
pythLazer.initialize(address(1));
owner = address(1);
PythLazer pythLazerImpl = new PythLazer();
TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
address(pythLazerImpl),
owner,
abi.encodeWithSelector(PythLazer.initialize.selector, owner)
);
pythLazer = PythLazer(address(proxy));
}

function test_update_add_signer() public {
assert(!pythLazer.isValidSigner(address(2)));
vm.prank(address(1));
vm.prank(owner);
pythLazer.updateTrustedSigner(address(2), block.timestamp + 1000);
assert(pythLazer.isValidSigner(address(2)));
skip(2000);
Expand All @@ -23,19 +31,19 @@ contract PythLazerTest is Test {

function test_update_remove_signer() public {
assert(!pythLazer.isValidSigner(address(2)));
vm.prank(address(1));
vm.prank(owner);
pythLazer.updateTrustedSigner(address(2), block.timestamp + 1000);
assert(pythLazer.isValidSigner(address(2)));

vm.prank(address(1));
vm.prank(owner);
pythLazer.updateTrustedSigner(address(2), 0);
assert(!pythLazer.isValidSigner(address(2)));
}

function test_verify() public {
// Prepare dummy update and signer
address trustedSigner = 0xb8d50f0bAE75BF6E03c104903d7C3aFc4a6596Da;
vm.prank(address(1));
vm.prank(owner);
pythLazer.updateTrustedSigner(trustedSigner, 3000000000000000);
bytes
memory update = hex"2a22999a9ee4e2a3df5affd0ad8c7c46c96d3b5ef197dd653bedd8f44a4b6b69b767fbc66341e80b80acb09ead98c60d169b9a99657ebada101f447378f227bffbc69d3d01003493c7d37500062cf28659c1e801010000000605000000000005f5e10002000000000000000001000000000000000003000104fff8";
Expand Down
Loading