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

Feat: add MKR poking #47

Merged
merged 4 commits into from
Oct 15, 2024
Merged

Feat: add MKR poking #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcd55ba
feat: add MKR poking to aid the LSE launch
amusingaxl Oct 1, 2024
e7780f9
chore: update MKR OSM address
amusingaxl Oct 3, 2024
2817b96
test: add coverage for MKR OSM
amusingaxl Oct 3, 2024
7eafdee
docs: update `MegaPoker` deployed address
amusingaxl Oct 14, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Optimized Smart Contract to Poke (`poke`).

For Now, Hard Coded Addresses and Sequences. Easy for TechOps to Run.

MegaPoker current Mainnet Address: [0x8B5216aE00af5A4E920687C457eC7bEE05bd79e2](https://etherscan.io/address/0x8B5216aE00af5A4E920687C457eC7bEE05bd79e2#code)
MegaPoker current Mainnet Address: [0x37bA4427F664557e92493C5858A81C9B90fC09d6](https://etherscan.io/address/0x37bA4427F664557e92493C5858A81C9B90fC09d6#code)

# OmegaPoker

Expand Down
3 changes: 3 additions & 0 deletions src/MegaPoker.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ contract PokingAddresses {
address constant eth = 0x81FE72B5A8d1A857d176C3E7d5Bd2679A9B85763;
address constant reth = 0xeE7F0b350aA119b3d05DC733a4621a81972f7D47;
address constant wsteth = 0xFe7a2aC0B945f12089aEEB6eCebf4F384D9f043F;
address constant mkr = 0x4F94e33D0D74CfF5Ca0D3a66F1A650628551C56b;

address constant crvv1ethsteth = 0xEa508F82728927454bd3ce853171b0e2705880D4;
address constant guniv3daiusdc1 = 0x7F6d78CC0040c87943a0e0c140De3F77a273bd58;
Expand All @@ -46,6 +47,7 @@ contract MegaPoker is PokingAddresses {
(ok,) = eth.call(abi.encodeWithSelector(0x18178358));
(ok,) = reth.call(abi.encodeWithSelector(0x18178358));
(ok,) = wsteth.call(abi.encodeWithSelector(0x18178358));
(ok,) = mkr.call(abi.encodeWithSelector(0x18178358));

// poke(bytes32) = 0x1504460f
(ok,) = spotter.call(abi.encodeWithSelector(0x1504460f, bytes32("ETH-A")));
Expand All @@ -57,6 +59,7 @@ contract MegaPoker is PokingAddresses {
(ok,) = spotter.call(abi.encodeWithSelector(0x1504460f, bytes32("WBTC-C")));
(ok,) = spotter.call(abi.encodeWithSelector(0x1504460f, bytes32("WSTETH-A")));
(ok,) = spotter.call(abi.encodeWithSelector(0x1504460f, bytes32("WSTETH-B")));
(ok,) = spotter.call(abi.encodeWithSelector(0x1504460f, bytes32("LSE-MKR-A")));

// Daily pokes, i.e. reduced cost pokes
if (last <= block.timestamp - 1 days) {
Expand Down
102 changes: 74 additions & 28 deletions src/MegaPoker.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,22 @@ interface TokenLike {
}

interface OsmLike {
function peek() external view returns (bytes32, bool);
function poke() external;
function read() external view returns (bytes32);
function src() external view returns (address);
}

interface SpotLike {
function file(bytes32, bytes32, address) external;
function file(bytes32, bytes32, uint256) external;
function ilks(bytes32) external view returns (address, uint256);
function par() external view returns (uint256);
function vat() external view returns (address);
}

interface VatLike {
function init(bytes32) external;
function ilks(bytes32) external view returns (uint256, uint256, uint256, uint256, uint256);
}

Expand All @@ -75,6 +81,7 @@ contract MegaPokerTest is DSTest, PokingAddresses {
PauseLike pause;
ChiefLike chief;
TokenLike govToken;
VatLike vat;

Hevm hevm;

Expand All @@ -88,6 +95,7 @@ contract MegaPokerTest is DSTest, PokingAddresses {
pause = PauseLike(changelog.getAddress("MCD_PAUSE"));
chief = ChiefLike(changelog.getAddress("MCD_ADM"));
govToken = TokenLike(changelog.getAddress("MCD_GOV"));
vat = VatLike(SpotLike(spotter).vat());
hevm.warp(now + 3600);
}

Expand Down Expand Up @@ -155,6 +163,50 @@ contract MegaPokerTest is DSTest, PokingAddresses {
waitAndCast(spell);
}

// Grant ward access to the test contract
hevm.store(spotter, keccak256(abi.encode(address(this), uint256(0))), bytes32(uint256(1)));
hevm.store(address(vat), keccak256(abi.encode(address(this), uint256(0))), bytes32(uint256(1)));

// Whitelisting tester address
hevm.store(btc, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(crvv1ethsteth, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(eth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(guniv3daiusdc1, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(guniv3daiusdc2, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(reth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(univ2daiusdc, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(wsteth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(mkr, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));

// Initializing any uninitialized OSM and ilks
uint256 spot;
bool haz;

// MKR
{
// Authorize the MegaPoker in MKR OSM
hevm.store(mkr, keccak256(abi.encode(address(megaPoker), uint256(5))), bytes32(uint256(1)));
// Authorize the Spotter in MKR OSM
hevm.store(mkr, keccak256(abi.encode(address(spotter), uint256(5))), bytes32(uint256(1)));

(,, spot,,) = vat.ilks("LSE-MKR-A");
if (spot == 0) {
vat.init("LSE-MKR-A");
SpotLike(spotter).file("LSE-MKR-A", "pip", mkr);
SpotLike(spotter).file("LSE-MKR-A", "mat", 150 * RAY / 100);

}

(, haz) = OsmLike(mkr).peek();
if (!haz) {
// Whitelist OSM in Median
hevm.store(OsmLike(mkr).src(), keccak256(abi.encode(mkr, uint256(4))), bytes32(uint256(1)));
OsmLike(mkr).poke();
hevm.warp(block.timestamp + 1 hours);
OsmLike(mkr).poke();
}
}

// To update osms without any value yet
hevm.warp(block.timestamp + 1 hours);
megaPoker.poke();
Expand All @@ -173,16 +225,7 @@ contract MegaPokerTest is DSTest, PokingAddresses {
hevm.store(reth, bytes32(uint256(4)), hackedValue);
hevm.store(univ2daiusdc, bytes32(uint256(4)), hackedValue);
hevm.store(wsteth, bytes32(uint256(4)), hackedValue);

// Whitelisting tester address
hevm.store(btc, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(crvv1ethsteth, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(eth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(guniv3daiusdc1, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(guniv3daiusdc2, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(reth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(univ2daiusdc, keccak256(abi.encode(address(this), uint256(2))), bytes32(uint256(1)));
hevm.store(wsteth, keccak256(abi.encode(address(this), uint256(5))), bytes32(uint256(1)));
hevm.store(mkr, bytes32(uint256(4)), hackedValue);

// 0x123
hackedValue = 0x0000000000000000000000000000000000000000000000000000000000000123;
Expand All @@ -191,19 +234,21 @@ contract MegaPokerTest is DSTest, PokingAddresses {
assertTrue(OsmLike(eth).read() != hackedValue);
assertTrue(OsmLike(reth).read() != hackedValue);
assertTrue(OsmLike(wsteth).read() != hackedValue);
assertTrue(OsmLike(mkr).read() != hackedValue);

assertTrue(OsmLike(crvv1ethsteth).read() != hackedValue);
assertTrue(OsmLike(guniv3daiusdc1).read() != hackedValue);
assertTrue(OsmLike(guniv3daiusdc2).read() != hackedValue);
assertTrue(OsmLike(univ2daiusdc).read() != hackedValue);

hevm.warp(block.timestamp + 1 hours);
hevm.warp(block.timestamp + 2 hours);
megaPoker.poke();

assertEq(OsmLike(btc).read(), hackedValue);
assertEq(OsmLike(eth).read(), hackedValue);
assertEq(OsmLike(reth).read(), hackedValue);
assertEq(OsmLike(wsteth).read(), hackedValue);
assertEq(OsmLike(mkr).read(), hackedValue);

// Daily OSM's are not updated after one hour
assertTrue(OsmLike(crvv1ethsteth).read() != hackedValue);
Expand All @@ -212,50 +257,51 @@ contract MegaPokerTest is DSTest, PokingAddresses {
assertTrue(OsmLike(univ2daiusdc).read() != hackedValue);

uint256 mat;
uint256 spot;
uint256 value = _rdiv(_mul(uint256(hackedValue), 10 ** 9), SpotLike(spotter).par());
address vat = SpotLike(spotter).vat();

(, mat) = SpotLike(spotter).ilks("ETH-A");
(,, spot,,) = VatLike(vat).ilks("ETH-A");
(,, spot,,) = vat.ilks("ETH-A");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("WBTC-A");
(,, spot,,) = VatLike(vat).ilks("WBTC-A");
(,, spot,,) = vat.ilks("WBTC-A");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("ETH-B");
(,, spot,,) = VatLike(vat).ilks("ETH-B");
(,, spot,,) = vat.ilks("ETH-B");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("ETH-C");
(,, spot,,) = VatLike(vat).ilks("ETH-C");
(,, spot,,) = vat.ilks("ETH-C");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("WSTETH-A");
(,, spot,,) = VatLike(vat).ilks("WSTETH-A");
(,, spot,,) = vat.ilks("WSTETH-A");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("WSTETH-B");
(,, spot,,) = VatLike(vat).ilks("WSTETH-B");
(,, spot,,) = vat.ilks("WSTETH-B");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("WBTC-B");
(,, spot,,) = VatLike(vat).ilks("WBTC-B");
(,, spot,,) = vat.ilks("WBTC-B");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("WBTC-C");
(,, spot,,) = VatLike(vat).ilks("WBTC-C");
(,, spot,,) = vat.ilks("WBTC-C");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("RETH-A");
(,, spot,,) = VatLike(vat).ilks("RETH-A");
(,, spot,,) = vat.ilks("RETH-A");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("LSE-MKR-A");
(,, spot,,) = vat.ilks("LSE-MKR-A");
assertEq(spot, _rdiv(value, mat));

// These collateral types should not be updated after 1 hour
(, mat) = SpotLike(spotter).ilks("CRVV1ETHSTETH-A");
(,, spot,,) = VatLike(vat).ilks("CRVV1ETHSTETH-A");
(,, spot,,) = vat.ilks("CRVV1ETHSTETH-A");
assertTrue(spot != _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("GUNIV3DAIUSDC1-A");
(,, spot,,) = VatLike(vat).ilks("GUNIV3DAIUSDC1-A");
(,, spot,,) = vat.ilks("GUNIV3DAIUSDC1-A");
assertTrue(spot != _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("GUNIV3DAIUSDC2-A");
(,, spot,,) = VatLike(vat).ilks("GUNIV3DAIUSDC2-A");
(,, spot,,) = vat.ilks("GUNIV3DAIUSDC2-A");
assertTrue(spot != _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("UNIV2DAIUSDC-A");
(,, spot,,) = VatLike(vat).ilks("UNIV2DAIUSDC-A");
(,, spot,,) = vat.ilks("UNIV2DAIUSDC-A");
assertTrue(spot != _rdiv(value, mat));

// Daily OSM's are eligible 24 hours after first poked
Expand All @@ -267,10 +313,10 @@ contract MegaPokerTest is DSTest, PokingAddresses {
assertEq(OsmLike(guniv3daiusdc2).read(), hackedValue);

(, mat) = SpotLike(spotter).ilks("GUNIV3DAIUSDC1-A");
(,, spot,,) = VatLike(vat).ilks("GUNIV3DAIUSDC1-A");
(,, spot,,) = vat.ilks("GUNIV3DAIUSDC1-A");
assertEq(spot, _rdiv(value, mat));
(, mat) = SpotLike(spotter).ilks("GUNIV3DAIUSDC2-A");
(,, spot,,) = VatLike(vat).ilks("GUNIV3DAIUSDC2-A");
(,, spot,,) = vat.ilks("GUNIV3DAIUSDC2-A");
assertEq(spot, _rdiv(value, mat));
}

Expand Down
Loading