fix(PerpV2BasisTradingModule): bytecode size limit bug #200

0xSachinK · 2022-03-09T17:24:32Z

Bytecode Sizes

Limit: 24,567 bytes

Master Branch

PerpV2LeverageModule: 23,970 bytes
PerpV2BasisTradingModule: 27,499 bytes

Current Branch

PerpV2LeverageModule: 23,970 bytes
PerpV2LeverageModuleV2: 20,680 bytes
PerpV2BasisTradingModule: 24,339 bytes

ChangeLog

Create V2 versions of Position library, PerpV2 library, PerpV2LeverageModule, named PositionV2, PerpV2LibraryV2 and PerpV2LeverageModuleV2 respectively.
PositionV2 is a linkable library and contains external/public versions of functions available in Position.
PerpV2LibraryV2 contains executeTrade and simulateTrade generic functions, moved over from PerpV2LeverageModule.
New PerpV2Positions library contains generic getter functions, getNetQuoteBalance, getPositionUnitInfo and getPositionNotionalInfo, moved over from PerpV2LeverageModule.
ModuleBaseV2 uses the new PositionV2 library contract.
PerpV2LeverageModuleV2 extends ModuleBaseV2 and uses the new libraries, and thus has a smaller bytecode size than PerpV2LeverageModule.
PerpV2BasisTradingModule now extends PerpV2LeverageModuleV2 instead of the V1 version.

Diffs

Todo

Fix hardhat config file
Fix existing flaky tests
Specify security aspects of PositionV2
Move formatAdjustments to a new library contract to decrease it further (Don't pass in components as a parameter).

Tests

Security

Add hardhat-contract-sizer as dev dependency Add PerpV2Positions library Add functions to PerpV2 library Modify PerpV2LeverageModuel to use the new libraries Fix existing interfaces

contracts/interfaces/external/perp-v2/IMarketRegistry.sol

contracts/protocol/integration/lib/PerpV2.sol

contracts/protocol/modules/PerpV2LeverageModule.sol

hardhat.config.ts

contracts/protocol/modules/PerpV2LeverageModule.sol

contracts/protocol/integration/lib/PerpV2Positions.sol

…xternal

bweick · 2022-03-15T21:12:15Z

contracts/protocol-viewers/PerpV2LeverageModuleViewer.sol

@@ -30,6 +30,7 @@ import { IClearingHouseConfig } from "../interfaces/external/perp-v2/IClearingHo
 import { IIndexPrice } from "../interfaces/external/perp-v2/IIndexPrice.sol";
 import { IPerpV2LeverageModule } from "../interfaces/IPerpV2LeverageModule.sol";
 import { ISetToken } from "../interfaces/ISetToken.sol";
+import { PerpV2Positions } from "../protocol/integration/lib/PerpV2Positions.sol";


Seems like we should be able to still use the same viewer and not to redeploy. Are there anymore end points we can add here that the front end may need?

We can't use the current viewer as it has the module from which it is fetching data as a state variable set to PerpV2LeverageModule in the constructor. We would need to write a new V2 viewer contract, which accepts the module to fetch data from in every function.

Update: We are not gonna write a new contract. Just redeploy another viewer contract and point it to BasisTradingModule.

contracts/protocol/integration/lib/PerpV2LibraryV2.sol

contracts/protocol/integration/lib/PerpV2Positions.sol

contracts/protocol/modules/DebtIssuanceModuleV2.sol

contracts/protocol/lib/PositionV2.sol

contracts/protocol/lib/ModuleBaseV2.sol

contracts/protocol/integration/lib/PerpV2LibraryV2.sol

contracts/protocol/modules/PerpV2LeverageModuleV2.sol

contracts/protocol/integration/lib/PerpV2Positions.sol

PerpV2LeveageModuleV2<>SIM integration tests

hardhat.config.ts

contracts/protocol/modules/PerpV2BasisTradingModule.sol

cgewecke · 2022-03-21T22:34:56Z

🎉 This PR is included in version 0.2.0-hhat.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

# [0.2.0](v0.1.15...v0.2.0) (2022-03-21) ### Bug Fixes * **build:** Upgrade eslint-plugin-jsdoc to latest ([#228](#228)) ([f5758d2](f5758d2)) * **PerpV2BasisTradingModule:** bytecode size limit bug ([#200](#200)) ([ddfab38](ddfab38)) ### Features * **publishing:** Auto publish repository to npm in CI [SIM-123] ([#203](#203)) ([8ddbbf1](8ddbbf1))

# 1.0.0 (2022-10-04) ### Bug Fixes * **adapter:** Support Curve stableswap pools ([SetProtocol#253](https://github.com/IndexCoop/index-protocol/issues/253)) ([777ed94](777ed94)) * add proper tests, require statements for sellTokenForToken ([5c84995](5c84995)) * address review feedback ([5c6fcfc](5c6fcfc)) * **build:** Upgrade eslint-plugin-jsdoc to latest ([SetProtocol#228](https://github.com/IndexCoop/index-protocol/issues/228)) ([f5758d2](f5758d2)) * **interfaces:** add IAirdropModule, IClaimModule, and IWrapModuleV2 ([SetProtocol#252](https://github.com/IndexCoop/index-protocol/issues/252)) ([6999e84](6999e84)) * **interfaces:** Add protocol interfaces for set-v2-strategies [SIM-124] ([SetProtocol#226](https://github.com/IndexCoop/index-protocol/issues/226)) ([0bd5ca4](0bd5ca4)) * **IPerpV2BasisTradingModule:** Improve javadocs [SetProtocol#246](https://github.com/IndexCoop/index-protocol/issues/246) ([3129b37](3129b37)) * **NotionalTradeModule:** audit adjustments ([de39ee1](de39ee1)) * **PerpV2BasisTradingModule:** bytecode size limit bug ([SetProtocol#200](https://github.com/IndexCoop/index-protocol/issues/200)) ([ddfab38](ddfab38)) * **PerpV2BasisTradingModule:** Expose getter to fetch updated settled funding ([SetProtocol#244](https://github.com/IndexCoop/index-protocol/issues/244)) ([f215147](f215147)) * **PerpV2BasisTradingModule:** External audit fixes for low-risk findings and Internal audit fixes ([SetProtocol#232](https://github.com/IndexCoop/index-protocol/issues/232)) ([d7d37da](d7d37da)), closes [SetProtocol#243](https://github.com/IndexCoop/index-protocol/issues/243) * **PerpV2LeverageModuleV2:** Round up during withdraw ([SetProtocol#249](https://github.com/IndexCoop/index-protocol/issues/249)) ([7780963](7780963)) * remove incorrect require check for sellEthForTokenToUniswapV3 ([7f8048d](7f8048d)) * sellEthForTokenToUniswapV3 impl and address review comments ([73ea7b3](73ea7b3)) * **SlippageIssuanceModule:** Fix issuance & redemption flows to not update position units ([SetProtocol#254](https://github.com/IndexCoop/index-protocol/issues/254)) ([9be3d1b](9be3d1b)) * **tests:** Add Hardhat deployment subgraph test scripts ([SetProtocol#242](https://github.com/IndexCoop/index-protocol/issues/242)) ([0aa0d14](0aa0d14)) * **utils:** Port StringArrayUtils from set-v2-strategies [SIM-124] ([SetProtocol#227](https://github.com/IndexCoop/index-protocol/issues/227)) ([dbf6c04](dbf6c04)) ### Features * **adapter:** Add Curve trade adapter [SIM-173] ([SetProtocol#238](https://github.com/IndexCoop/index-protocol/issues/238)) ([f697783](f697783)) * **adapter:** Add RGT to Tribe migration adapter [SIM-52] ([SetProtocol#188](https://github.com/IndexCoop/index-protocol/issues/188)) ([ca5c2ab](ca5c2ab)) * add direct RFQT fill suport to ZeroExApiAdapter [SIM-230] ([SetProtocol#241](https://github.com/IndexCoop/index-protocol/issues/241)) ([f4b976e](f4b976e)) * **BytesArrayUtils:** Add BytesArrayUtils library ([SetProtocol#248](https://github.com/IndexCoop/index-protocol/issues/248)) ([7b35392](7b35392)) * **deprecation:** Consolidate or remove deprecated contracts [SIM-124] ([SetProtocol#225](https://github.com/IndexCoop/index-protocol/issues/225)) ([579852a](579852a)) * implement sellTokenForEthToUniswapV3 and sellEthForTokenToUniswapV3 ([2296f6e](2296f6e)) * initial stab at Uniswap V3 adaptor ([c25665b](c25665b)) * **Intefaces:** Add basis trading module interfaces ([SetProtocol#237](https://github.com/IndexCoop/index-protocol/issues/237)) ([c7af322](c7af322)) * **module:** Notional Trade Module ([SetProtocol#251](https://github.com/IndexCoop/index-protocol/issues/251)) ([49bdf46](49bdf46)) * **publishing:** Auto publish repository to npm in CI [SIM-123] ([SetProtocol#203](https://github.com/IndexCoop/index-protocol/issues/203)) ([8ddbbf1](8ddbbf1)) * **reorg:** Re-org modules into v1 and v2 directories ([SetProtocol#230](https://github.com/IndexCoop/index-protocol/issues/230)) ([d43df0c](d43df0c)) * **UniswapV3ExchangeAdapterV2:** Add UniswapV3ExchangeAdapterV2 exchange adapter ([SetProtocol#240](https://github.com/IndexCoop/index-protocol/issues/240)) ([b4d95ca](b4d95ca)) * verify path for multiple hops ([06ca9b6](06ca9b6)) * verify uniswap path for single hops WIP ([7905d73](7905d73))

# 1.0.0 (2022-10-05) ### Bug Fixes * **adapter:** Support Curve stableswap pools ([SetProtocol#253](https://github.com/IndexCoop/index-protocol/issues/253)) ([777ed94](777ed94)) * add proper tests, require statements for sellTokenForToken ([5c84995](5c84995)) * address review feedback ([5c6fcfc](5c6fcfc)) * **build:** Upgrade eslint-plugin-jsdoc to latest ([SetProtocol#228](https://github.com/IndexCoop/index-protocol/issues/228)) ([f5758d2](f5758d2)) * **interfaces:** add IAirdropModule, IClaimModule, and IWrapModuleV2 ([SetProtocol#252](https://github.com/IndexCoop/index-protocol/issues/252)) ([6999e84](6999e84)) * **interfaces:** Add protocol interfaces for set-v2-strategies [SIM-124] ([SetProtocol#226](https://github.com/IndexCoop/index-protocol/issues/226)) ([0bd5ca4](0bd5ca4)) * **IPerpV2BasisTradingModule:** Improve javadocs [SetProtocol#246](https://github.com/IndexCoop/index-protocol/issues/246) ([3129b37](3129b37)) * **NotionalTradeModule:** audit adjustments ([de39ee1](de39ee1)) * **PerpV2BasisTradingModule:** bytecode size limit bug ([SetProtocol#200](https://github.com/IndexCoop/index-protocol/issues/200)) ([ddfab38](ddfab38)) * **PerpV2BasisTradingModule:** Expose getter to fetch updated settled funding ([SetProtocol#244](https://github.com/IndexCoop/index-protocol/issues/244)) ([f215147](f215147)) * **PerpV2BasisTradingModule:** External audit fixes for low-risk findings and Internal audit fixes ([SetProtocol#232](https://github.com/IndexCoop/index-protocol/issues/232)) ([d7d37da](d7d37da)), closes [SetProtocol#243](https://github.com/IndexCoop/index-protocol/issues/243) * **PerpV2LeverageModuleV2:** Round up during withdraw ([SetProtocol#249](https://github.com/IndexCoop/index-protocol/issues/249)) ([7780963](7780963)) * remove incorrect require check for sellEthForTokenToUniswapV3 ([7f8048d](7f8048d)) * sellEthForTokenToUniswapV3 impl and address review comments ([73ea7b3](73ea7b3)) * **SlippageIssuanceModule:** Fix issuance & redemption flows to not update position units ([SetProtocol#254](https://github.com/IndexCoop/index-protocol/issues/254)) ([9be3d1b](9be3d1b)) * **tests:** Add Hardhat deployment subgraph test scripts ([SetProtocol#242](https://github.com/IndexCoop/index-protocol/issues/242)) ([0aa0d14](0aa0d14)) * **utils:** Port StringArrayUtils from set-v2-strategies [SIM-124] ([SetProtocol#227](https://github.com/IndexCoop/index-protocol/issues/227)) ([dbf6c04](dbf6c04)) ### Features * **adapter:** Add Curve trade adapter [SIM-173] ([SetProtocol#238](https://github.com/IndexCoop/index-protocol/issues/238)) ([f697783](f697783)) * **adapter:** Add RGT to Tribe migration adapter [SIM-52] ([SetProtocol#188](https://github.com/IndexCoop/index-protocol/issues/188)) ([ca5c2ab](ca5c2ab)) * add direct RFQT fill suport to ZeroExApiAdapter [SIM-230] ([SetProtocol#241](https://github.com/IndexCoop/index-protocol/issues/241)) ([f4b976e](f4b976e)) * **BytesArrayUtils:** Add BytesArrayUtils library ([SetProtocol#248](https://github.com/IndexCoop/index-protocol/issues/248)) ([7b35392](7b35392)) * **deprecation:** Consolidate or remove deprecated contracts [SIM-124] ([SetProtocol#225](https://github.com/IndexCoop/index-protocol/issues/225)) ([579852a](579852a)) * implement sellTokenForEthToUniswapV3 and sellEthForTokenToUniswapV3 ([2296f6e](2296f6e)) * initial stab at Uniswap V3 adaptor ([c25665b](c25665b)) * **Intefaces:** Add basis trading module interfaces ([SetProtocol#237](https://github.com/IndexCoop/index-protocol/issues/237)) ([c7af322](c7af322)) * **module:** Notional Trade Module ([SetProtocol#251](https://github.com/IndexCoop/index-protocol/issues/251)) ([49bdf46](49bdf46)) * **publishing:** Auto publish repository to npm in CI [SIM-123] ([SetProtocol#203](https://github.com/IndexCoop/index-protocol/issues/203)) ([8ddbbf1](8ddbbf1)) * **reorg:** Re-org modules into v1 and v2 directories ([SetProtocol#230](https://github.com/IndexCoop/index-protocol/issues/230)) ([d43df0c](d43df0c)) * **UniswapV3ExchangeAdapterV2:** Add UniswapV3ExchangeAdapterV2 exchange adapter ([SetProtocol#240](https://github.com/IndexCoop/index-protocol/issues/240)) ([b4d95ca](b4d95ca)) * verify path for multiple hops ([06ca9b6](06ca9b6)) * verify uniswap path for single hops WIP ([7905d73](7905d73))

0xSachinK added 3 commits March 9, 2022 22:50

Set allowUnlimitedContractSize to false

71e3502

Fix PerpV2BasisTradingModule bytecode size limit

46f71d5

Add hardhat-contract-sizer as dev dependency Add PerpV2Positions library Add functions to PerpV2 library Modify PerpV2LeverageModuel to use the new libraries Fix existing interfaces

Remove contractSizer config settings

da16e40

0xSachinK changed the title ~~Set allowUnlimitedContractSize to false~~ Fix PerpV2BasisTradingModule bytecode size limit bug Mar 11, 2022

bweick reviewed Mar 11, 2022

View reviewed changes

contracts/protocol/modules/PerpV2LeverageModule.sol Outdated Show resolved Hide resolved

0xSachinK added 7 commits March 11, 2022 23:16

Delete commented stuff

d4d5143

Add PerpV2Positions mock

28c13a8

Fix tests by linking libraries during deployment

a025096

Fix failing tests

faf08bf

Fix warnings

ad7b7b8

Use public getPositionNotionalInfo

f898ea0

Fix failing integration & viewer tests

93bc54a

0xSachinK commented Mar 14, 2022

View reviewed changes

contracts/protocol/integration/lib/PerpV2Positions.sol Outdated Show resolved Hide resolved

0xSachinK added 2 commits March 16, 2022 00:28

Update to V2 for every contract; Make PositionsV2 library functions e…

6cc578a

…xternal

Link PositionV2 library and fix PerpV2PositionV2 linking

2f41f90

cgewecke changed the title ~~Fix PerpV2BasisTradingModule bytecode size limit bug~~ fix(PerpV2BasisTradingModule): bytecode size limit bug Mar 15, 2022

0xSachinK added 2 commits March 16, 2022 01:30

Fix failing perpV2BasisTradingModule tests

cdc382c

Remove unnecessary todo

10c091e

bweick reviewed Mar 15, 2022

View reviewed changes

contracts/protocol/integration/lib/PerpV2Positions.sol Show resolved Hide resolved

contracts/protocol/integration/lib/PerpV2Positions.sol Outdated Show resolved Hide resolved

contracts/protocol/integration/lib/PerpV2Positions.sol Outdated Show resolved Hide resolved

0xSachinK added 5 commits March 16, 2022 14:38

Add tests for PositionV2 and ModuleBaseV2; Increase coverage

f61d144

Fix javadocs; Add changelogs; Add missing test cases; Add

1e3effb

PerpV2LeveageModuleV2<>SIM integration tests

Add changelog in PerpV2LeverageModuleV2

9e4efde

Fix javadocs and hardhat config

c570678

Add tests for PerpV2LibraryV2

8cb142a

0xSachinK commented Mar 16, 2022

View reviewed changes

hardhat.config.ts Show resolved Hide resolved

0xSachinK added 3 commits March 16, 2022 21:37

Updated version to 0.1.13-basis.0

5e277c3

Add PerpV2LibraryV2 tests

0448da9

Add tests for PerpV2Positions library

4462762

0xSachinK added 3 commits March 17, 2022 18:23

Move formatAdjustments to PerpV2Positioons library

1ab4e0c

Remove .only and bump package

1651761

Attempt to fix existing flaky test

d193f69

0xSachinK requested a review from bweick March 17, 2022 17:45

bweick approved these changes Mar 17, 2022

View reviewed changes

contracts/protocol/modules/PerpV2BasisTradingModule.sol Outdated Show resolved Hide resolved

0xSachinK added 4 commits March 18, 2022 00:11

Fix variable name; Removing trailing whitespaces

3062b18

Override initalize function

0d05add

Fix coverage; Add tests for intialize(old) function

6e621f2

Merge branch 'master' into sachin/update-allowUnlimitedContractSize

8160cfc

0xSachinK merged commit ddfab38 into master Mar 18, 2022

0xSachinK deleted the sachin/update-allowUnlimitedContractSize branch March 18, 2022 04:05

cgewecke added the released on @hardhat label Mar 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(PerpV2BasisTradingModule): bytecode size limit bug #200

fix(PerpV2BasisTradingModule): bytecode size limit bug #200

0xSachinK commented Mar 9, 2022 •

edited

Loading

bweick Mar 15, 2022

0xSachinK Mar 16, 2022

0xSachinK Mar 17, 2022

cgewecke commented Mar 21, 2022

fix(PerpV2BasisTradingModule): bytecode size limit bug #200

fix(PerpV2BasisTradingModule): bytecode size limit bug #200

Conversation

0xSachinK commented Mar 9, 2022 • edited Loading

Bytecode Sizes

Master Branch

Current Branch

ChangeLog

Diffs

Todo

Tests

Security

bweick Mar 15, 2022

Choose a reason for hiding this comment

0xSachinK Mar 16, 2022

Choose a reason for hiding this comment

0xSachinK Mar 17, 2022

Choose a reason for hiding this comment

cgewecke commented Mar 21, 2022

0xSachinK commented Mar 9, 2022 •

edited

Loading