Code

Notional Trade Module#251

Code

Merged

cgewecke merged 121 commits intoSetProtocol:masterSetProtocol/set-protocol-v2:masterfrom ckoopmann:ckoopmann/notional-moduleckoopmann/set-protocol-v2:ckoopmann/notional-moduleCopy head branch name to clipboardMay 23, 2022

+3,691-34

Commits

Commits on Apr 16, 2022

• Add skeleton code for NotionalTradeModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  119c11f

  Copy full SHA for 119c11f

• Add skeleton test for NotionalTradeModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  9db0704

  Copy full SHA for 9db0704

Commits on Apr 17, 2022

• Add component issuance hook

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  83cdd7c

  Copy full SHA for 83cdd7c

• Add WrappedfCash Interface and Mock

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  816958e

  Copy full SHA for 816958e

• Remove wrongly cased file

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  2ae8c4a

  Copy full SHA for 2ae8c4a

• Add WrappedFCash ERC-777 Interface and Mock

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  905ef8b

  Copy full SHA for 905ef8b

Commits on Apr 20, 2022

• Extend notional trade module code with mint / and redeem helper functions

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  8e4e271

  Copy full SHA for 8e4e271

• Adjust redeem function to use operatorBurn and add input token transfer for minting

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  88934db

  Copy full SHA for 88934db

Commits on Apr 21, 2022

• Remove component after redemption

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  9a0e041

  Copy full SHA for 9a0e041

• Add skeleton integration test for NotionalTradeModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  0143a47

  Copy full SHA for 0143a47

• Deploy notional trade module in test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  0fc426e

  Copy full SHA for 0fc426e

• Install notional solidity sdk from github branch

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a76bbeb

  Copy full SHA for a76bbeb

Commits on Apr 22, 2022

• Add 0.8.11 solidity compiler

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  cf669fb

  Copy full SHA for cf669fb

• Import notional-solidity-sdk

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d476e02

  Copy full SHA for d476e02

• Create derivative contract from imported WrappedfCash

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  15013d5

  Copy full SHA for 15013d5

• Upgrade notional-solidity-sdk

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  3841b8a

  Copy full SHA for 3841b8a

• Deploy WrappedFCashBeacon in notional trade module test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  fe5c5e5

  Copy full SHA for fe5c5e5

• Deploy WrappedFCashFactory in notional trade module test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a7df03a

  Copy full SHA for a7df03a

• Add some extra tests against notional proxy

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f353aa9

  Copy full SHA for f353aa9

• Adjustments to enable the notional tests to be run against mainnet node directly

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  6345496

  Copy full SHA for 6345496

Commits on Apr 24, 2022

• Import newer version of notional solidity sdk fork with MarketData struct fixed

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  8b2d37a

  Copy full SHA for 8b2d37a

• Test view methods of wrappedFCash contract deployed from factory

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  8772bfd

  Copy full SHA for 8772bfd

• Downgrade notional-solidity-sdk version

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  472e343

  Copy full SHA for 472e343

Commits on Apr 25, 2022

• Add mint test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  7ca7726

  Copy full SHA for 7ca7726

Commits on Apr 26, 2022

• Try to deploy Notional upgrade in test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  df79de9

  Copy full SHA for df79de9

• fix invalid bytecode

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  b502bc9

  Copy full SHA for b502bc9

• Finish notional setup in integration test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  83eb617

  Copy full SHA for 83eb617

Commits on Apr 27, 2022

• Additional comment in failing mint test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  508e9b9

  Copy full SHA for 508e9b9

• Log out selected maturity in test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  eafb521

  Copy full SHA for eafb521

• Swap out notional compiled bytecodes to make test work

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f2ab1a6

  Copy full SHA for f2ab1a6

Commits on Apr 28, 2022

• Refactor wrappeFCash tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a202151

  Copy full SHA for a202151

• Refactor and simplify integration tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  45d5076

  Copy full SHA for 45d5076

Commits on Apr 29, 2022

• Sell and buy trades via notional trade module are working

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a172947

  Copy full SHA for a172947

• More tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  7a69bef

  Copy full SHA for 7a69bef

• add check on minReceiveQuantity when redeeming

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d5a5ea7

  Copy full SHA for d5a5ea7

Commits on Apr 30, 2022

• Use logic to adjust positions from trade module

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ad77c24

  Copy full SHA for ad77c24

• Additional tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  486b828

  Copy full SHA for 486b828

Commits on May 2, 2022

• Adjust trade interface to remove useUnderlying parameter

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c6afc32

  Copy full SHA for c6afc32

• Add docstrings for notional trade module

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  82229cd

  Copy full SHA for 82229cd

• Refactoring and adding redeem / mint events to NotionalTradeModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  114fed5

  Copy full SHA for 114fed5

• Remove unneeded wrappedFCash test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  fdc8e60

  Copy full SHA for fdc8e60

• Adjust wbtcRate in integration test to be in line with new pinned block number

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  07e10b7

  Copy full SHA for 07e10b7

Commits on May 4, 2022

• Remove unneeded contracts

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  aed6f34

  Copy full SHA for aed6f34

• Import new wrappedFcash repo instead of old one

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e45147f

  Copy full SHA for e45147f

• Add WrappedFCash and nBeaconProxy back in

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  db0cf2d

  Copy full SHA for db0cf2d

• Get minting to work with new interface

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c79c075

  Copy full SHA for c79c075

Commits on May 5, 2022

• Replace operatorBurn with calling redeem method via set token

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f980ed3

  Copy full SHA for f980ed3

• Add tolerance in component position change of sendToken

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  28c2517

  Copy full SHA for 28c2517

Commits on May 6, 2022

• Update WrappedFCash interface and mock

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  3c8a62d

  Copy full SHA for 3c8a62d

• Deploy WrappedFCashMock in unittest

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a201eea

  Copy full SHA for a201eea

Commits on May 8, 2022

• Add trade scenarios to unit tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  57a0a41

  Copy full SHA for 57a0a41

Commits on May 9, 2022

• Add unit tests for issuance / redemption hook

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ab56837

  Copy full SHA for ab56837

• Add test for getFCashPositions getter

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e4ef888

  Copy full SHA for e4ef888

• Remove logs from wrappedfCashMock

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f503577

  Copy full SHA for f503577

• Add unit test for removeModule method

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f711c80

  Copy full SHA for f711c80

• Add registerToModule unittest

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  aba4ad4

  Copy full SHA for aba4ad4

• Fix registerToModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ab30064

  Copy full SHA for ab30064

• Add additional unit test cases

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  62d9677

  Copy full SHA for 62d9677

• More unittest cases for managing allowed set tokens

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  405917e

  Copy full SHA for 405917e

• Test cases for wrong in/output amounts during trades

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  84404ca

  Copy full SHA for 84404ca

• Fill coverage gaps in notionalModule unittests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  4071e0e

  Copy full SHA for 4071e0e

Commits on May 10, 2022

• Add test case executing trade twice to fill last coverage gap

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  7d03a77

  Copy full SHA for 7d03a77

• Deregister fcash positions when redeeming

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f748e21

  Copy full SHA for f748e21

• Add external methods to add / remove registered fcash positions

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f2db5bd

  Copy full SHA for f2db5bd

• Add todo comments and javadoc params

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c0eb2cd

  Copy full SHA for c0eb2cd

• Undo empty lines added at end of contract files

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e50ac7c

  Copy full SHA for e50ac7c

• Undo autoformatter changes

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  0566d6c

  Copy full SHA for 0566d6c

• Undo unnecessary changes to hardhat.config

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  24f7cbb

  Copy full SHA for 24f7cbb

Commits on May 14, 2022

• Minor nits based on PR feedback

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  6c040cc

  Copy full SHA for 6c040cc

• Add top level docstring to NotionalTradeModule

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e7150ac

  Copy full SHA for e7150ac

• Add method to change redeemToUnderlying option and associated tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  3276681

  Copy full SHA for 3276681

• Fix unittests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  1fef416

  Copy full SHA for 1fef416

• Add unit test to set the redeemToUnderlying parameter

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  7889355

  Copy full SHA for 7889355

• Adjust unit test to account for checks on wether given addresses are actually fCash wrappers

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d7d167f

  Copy full SHA for d7d167f

• Fix integrationtests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  caf6e4b

  Copy full SHA for caf6e4b

Commits on May 15, 2022

• Add missing WrappedfCashFactory contracts

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  afb6e76

  Copy full SHA for afb6e76

• Add test cases for invalid fcash wrapper address in addFCashPositions

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  33b3cd9

  Copy full SHA for 33b3cd9

• Remove reliance on registered tokens when redeeming matured positions

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c1b5769

  Copy full SHA for c1b5769

• Add methods to redeem / mint fCash position using currencyId and maturity

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  fa85626

  Copy full SHA for fa85626

• Use new redeem / mint methods in integration test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  9bb4ac8

  Copy full SHA for 9bb4ac8

• Remove old trade method

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  abe0ce6

  Copy full SHA for abe0ce6

• Add test case for newly deployed wrapper in integration tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  42b9fb5

  Copy full SHA for 42b9fb5

Commits on May 16, 2022

• Reactivate the issuance / redeem hook tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  95f0884

  Copy full SHA for 95f0884

• Add additional test cases where isWrappedFCash returns false

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  de22cde

  Copy full SHA for de22cde

• Fix typo

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  6c55aa1

  Copy full SHA for 6c55aa1

• Close more coverage gaps in isWrappedFCash

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  37113d6

  Copy full SHA for 37113d6

• Add extra test case for negative position

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  afbf54c

  Copy full SHA for afbf54c

• Achieve negative unit on wrappedCash position in test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d2e7ce1

  Copy full SHA for d2e7ce1

• Add test case for trying to redeem an undeployed wrapper

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  3bc0f2a

  Copy full SHA for 3bc0f2a

• Add integration test case for trying to sell non deployed wrapper

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  1202d43

  Copy full SHA for 1202d43

• Make wrapper factory immutable and add some comments

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c662f2b

  Copy full SHA for c662f2b

• Add todo comment regarding inefficient fCash position listing

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c42eb82

  Copy full SHA for c42eb82

Commits on May 17, 2022

• Combine all notional abis to single line files

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  800c0f8

  Copy full SHA for 800c0f8

Commits on May 18, 2022

• Replace separate calls to getCurrencyId and getMaturity with single call to getDecodedID

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  a943e56

  Copy full SHA for a943e56

• Remove duplicated IERC20 import

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  32436ed

  Copy full SHA for 32436ed

• Replace _getPaymentToken with getToken on fcash wrapper

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ca922c4

  Copy full SHA for ca922c4

• Use function selectors instead of string signatures for encoding

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f0b7ae6

  Copy full SHA for f0b7ae6

• Parameterize integration tests to be run for different asset tokens

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  678f988

  Copy full SHA for 678f988

• Fix type error in integration test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  688e0ae

  Copy full SHA for 688e0ae

• Add eth case to parameterized integration tests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  07cba1f

  Copy full SHA for 07cba1f

• remove duplicated test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e06b679

  Copy full SHA for e06b679

• Merge a few tests to speed up integration pipeline

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  280e347

  Copy full SHA for 280e347

• Revert accidental change in synthetixExchangeAdapter test

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  aa75a94

  Copy full SHA for aa75a94

Commits on May 19, 2022

• Speed up tests using evm snapshots

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  bb1e376

  Copy full SHA for bb1e376

• Fix failing test due to rounding error / deviation

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  15cec5b

  Copy full SHA for 15cec5b

• Reactivate cEth testcase

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  c18fccb

  Copy full SHA for c18fccb

• Integrate updated wrapper version with weth support

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  14195e0

  Copy full SHA for 14195e0

• Extend unittest to cover eth/weth case

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  23a58ec

  Copy full SHA for 23a58ec

• Fix unittests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  e4eb15c

  Copy full SHA for e4eb15c

• Speed up unittests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ab1de26

  Copy full SHA for ab1de26

• Only approve as much as necessary

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  ec9d610

  Copy full SHA for ec9d610

Commits on May 20, 2022

• Fix unittests

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  8f4ad8c

  Copy full SHA for 8f4ad8c

• Add test case for reverting mint call

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d170363

  Copy full SHA for d170363

• Reactivate sell scenario

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  725bdaf

  Copy full SHA for 725bdaf

• Add test case for when token is not registered component

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  d0e6a19

  Copy full SHA for d0e6a19

Commits on May 21, 2022

• Adjust unit tests and add check if module is smartContract in removeModule loop

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f1b11c0

  Copy full SHA for f1b11c0

• Add unit test case illustrating issue when adding EOA as module

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  f4eb2d9

  Copy full SHA for f4eb2d9

Commits on May 22, 2022

• Add check requiring send token to be registered component

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  67d5bc6

  Copy full SHA for 67d5bc6

Commits on May 23, 2022

• Parameterize tests to trade less/equal/more than registered position

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  17e65c1

  Copy full SHA for 17e65c1

• Remove outdated TODO comments and logs

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  39f2e75

  Copy full SHA for 39f2e75

• Merge remote-tracking branch 'upstream/master' into ckoopmann/notional-module

  

  Christian Koopmann

  authored and

  Christian Koopmann

  committed
  2245d1b

  Copy full SHA for 2245d1b