MarketUpdated event #1697

0xjocke · 2023-06-30T01:48:24Z

Include market skew and market size in the settle order event

codecov · 2023-06-30T01:53:36Z

Codecov Report

Merging #1697 (0f26123) into main (9fa0cde) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1697   +/-   ##
=======================================
  Coverage   72.77%   72.77%           
=======================================
  Files          57       57           
  Lines         720      720           
  Branches      236      236           
=======================================
  Hits          524      524           
  Misses        167      167           
  Partials       29       29

Flag	Coverage Δ
core-contracts	`93.26% <ø> (ø)`
core-modules	`90.47% <ø> (ø)`
core-utils	`68.57% <ø> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

markets/perps-market/contracts/modules/AsyncOrderModule.sol

Note that for an event to be emitted from a library, it needs to be defined in two places: - The library itself, and - The interface of the contract that is using the library.

0xjocke · 2023-07-04T05:44:52Z

A bit of a journey but I think I got there in the end.
Added

    event MarketUpdated(
        uint128 marketId,
        int256 skew,
        uint256 size,
        int256 sizeDelta,
        int256 currentFundingRate,
        int256 currentFundingVelocity
    );

Learned that if you want to emit an event from a storage library you need to define it:

In the library
In the contract using it. (or that contract's interface)

Doing this we pushed the AsyncOrderModule over the size limit, so I created a new AsyncOrderViewModule

- Creating a AsyncOrderViewModule

leomassazza

LGTM

markets/perps-market/contracts/modules/AsyncOrderViewModule.sol

markets/perps-market/contracts/storage/PerpsMarket.sol

sunnyvempati · 2023-07-04T17:37:07Z

markets/perps-market/test/integration/helpers/funding-calcs.ts

+  const pSkew = wei(skew).div(skewScale);
+  const pSkewBounded = Wei.max(Wei.min(pSkew, wei(1)), wei(-1));
+
+  return pSkewBounded.mul(maxFundingVelocity);


maybe returns bignumber via .toBN() here?

Coming from the frontend we usually keep everything in Wei and just toBN before sending to ethers contract call. Wei usually makes math and most things easier.
But we do seem to like/use BigNumber more in contract tests, so I guess it make sense to return bn.

ok cool yeah fair enough!

markets/perps-market/contracts/storage/PerpsMarket.sol

…library

sunnyvempati

awesome! tyty

sunnyvempati · 2023-07-05T02:15:49Z

markets/perps-market/contracts/interfaces/IMarketEvents.sol

+//SPDX-License-Identifier: MIT
+pragma solidity >=0.8.11 <0.9.0;
+
+interface IMarketEvents {


any others around that we can throw in here maybe? 👀

Most modules will have their events defined in their own interface. I had a look, didn't see any clear ones to move

sunnyvempati · 2023-07-05T02:16:18Z

markets/perps-market/contracts/storage/AsyncOrder.sol

@@ -131,6 +131,7 @@ library AsyncOrder {
        uint initialRequiredMargin;
        uint totalRequiredMargin;
        Position.Data newPosition;
+        bytes32 trackingCode;


still need this?

Yea, without it we get "Stack too deep." Just at the limit now 😓

sunnyvempati · 2023-07-05T02:17:32Z

hmm some tests failed; seems legitimate?

0xjocke · 2023-07-05T02:24:14Z

hmm some tests failed; seems legitimate?

It does looks like that.. Looking now, pretty sure I ran it locally...

0xjocke · 2023-07-05T02:39:07Z

hmm some tests failed; seems legitimate?

It does looks like that.. Looking now, pretty sure I ran it locally...

Was a fluke :(... Reran fixed it

0xjocke added 3 commits June 30, 2023 11:45

Add tracking code to runtime

370fc2b

Add market size and market skew to

38edefe

Update test asserting the event

a010484

0xjocke requested review from sunnyvempati, leomassazza and Tburm June 30, 2023 01:48

0xjocke mentioned this pull request Jun 30, 2023

Update OrderSettled event #1696

Closed

Tburm reviewed Jun 30, 2023

View reviewed changes

markets/perps-market/contracts/modules/AsyncOrderModule.sol Outdated Show resolved Hide resolved

Add MarketUpdated event.

4350e84

Note that for an event to be emitted from a library, it needs to be defined in two places: - The library itself, and - The interface of the contract that is using the library.

0xjocke requested a review from Tburm July 4, 2023 05:44

0xjocke added 2 commits July 4, 2023 15:47

We now hit a size limit AsyncOrderModule

ee5f02a

- Creating a AsyncOrderViewModule

Dont forget to update cannon files

0282bcd

0xjocke force-pushed the settle-event-improvement branch from 66b462e to 0282bcd Compare July 4, 2023 05:47

Add currentFundingRate and currentFundingVelocity to MarketUpdated event

4f6529f

0xjocke changed the title ~~Settle event improvement~~ MarketUpdated event Jul 4, 2023

leomassazza approved these changes Jul 4, 2023

View reviewed changes

sunnyvempati suggested changes Jul 4, 2023

View reviewed changes

sunnyvempati reviewed Jul 4, 2023

View reviewed changes

markets/perps-market/contracts/storage/PerpsMarket.sol Outdated Show resolved Hide resolved

0xjocke added 2 commits July 5, 2023 07:21

Revert IAsyncOrderViewModule

e80afec

Use AsyncOrderSettlementModule like spot market

c77e2f6

0xjocke force-pushed the settle-event-improvement branch from c1ca838 to 853fe55 Compare July 5, 2023 00:48

Let call site emit MarketUpdated event to avoid emitting events from …

0f26123

…library

0xjocke force-pushed the settle-event-improvement branch from 853fe55 to 0f26123 Compare July 5, 2023 00:50

0xjocke requested a review from sunnyvempati July 5, 2023 00:51

sunnyvempati approved these changes Jul 5, 2023

View reviewed changes

0xjocke merged commit df26ebd into main Jul 5, 2023
19 checks passed

0xjocke deleted the settle-event-improvement branch July 5, 2023 02:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MarketUpdated event #1697

MarketUpdated event #1697

0xjocke commented Jun 30, 2023

codecov bot commented Jun 30, 2023 •

edited

Loading

0xjocke commented Jul 4, 2023 •

edited

Loading

leomassazza left a comment

sunnyvempati Jul 4, 2023

0xjocke Jul 4, 2023

sunnyvempati Jul 4, 2023

sunnyvempati left a comment

sunnyvempati Jul 5, 2023

0xjocke Jul 5, 2023 •

edited

Loading

sunnyvempati Jul 5, 2023

0xjocke Jul 5, 2023

sunnyvempati commented Jul 5, 2023

0xjocke commented Jul 5, 2023

0xjocke commented Jul 5, 2023

MarketUpdated event #1697

MarketUpdated event #1697

Conversation

0xjocke commented Jun 30, 2023

codecov bot commented Jun 30, 2023 • edited Loading

Codecov Report

0xjocke commented Jul 4, 2023 • edited Loading

leomassazza left a comment

Choose a reason for hiding this comment

sunnyvempati Jul 4, 2023

Choose a reason for hiding this comment

0xjocke Jul 4, 2023

Choose a reason for hiding this comment

sunnyvempati Jul 4, 2023

Choose a reason for hiding this comment

sunnyvempati left a comment

Choose a reason for hiding this comment

sunnyvempati Jul 5, 2023

Choose a reason for hiding this comment

0xjocke Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

sunnyvempati Jul 5, 2023

Choose a reason for hiding this comment

0xjocke Jul 5, 2023

Choose a reason for hiding this comment

sunnyvempati commented Jul 5, 2023

0xjocke commented Jul 5, 2023

0xjocke commented Jul 5, 2023

codecov bot commented Jun 30, 2023 •

edited

Loading

0xjocke commented Jul 4, 2023 •

edited

Loading

0xjocke Jul 5, 2023 •

edited

Loading