Code

Combined protocol "program" fees#244

Code

Merged

jgur-psyops merged 37 commits intomainmrgnlabs/marginfi-v2:mainfrom combined-protocol-feesmrgnlabs/marginfi-v2:combined-protocol-feesCopy head branch name to clipboardOct 21, 2024

+1,974-458

Commits

Commits on May 26, 2024

• feat: add protocol fee support

  jkbpvsc

  committed
  834cde5

  Copy full SHA for 834cde5

Commits on May 28, 2024

• fix: tests

  jkbpvsc

  committed
  a30465b

  Copy full SHA for a30465b

• fix: tests

  jkbpvsc

  committed
  c569448

  Copy full SHA for c569448

Commits on Jul 3, 2024

• feat: ir calc + fixed tests

  jkbpvsc

  committed
  fa3d37e

  Copy full SHA for fa3d37e

• fix: fmt

  jkbpvsc

  committed
  309ef2a

  Copy full SHA for 309ef2a

Commits on Aug 27, 2024

• Boilerplate for global fees

  jgur-psyops

  committed
  33eae0f

  Copy full SHA for 33eae0f

• Add fee state to pool generation args, basic setup of text fixture, WIP updating tests to include the fee

  jgur-psyops

  committed
  18b2b3a

  Copy full SHA for 18b2b3a

Commits on Aug 28, 2024

• Add testing for fee state init and charging of fee state on pool creation

  jgur-psyops

  committed
  b29cbb6

  Copy full SHA for b29cbb6

• Attempt fix cli and lint

  jgur-psyops

  committed
  1f07a9b

  Copy full SHA for 1f07a9b

• Fix lint

  jgur-psyops

  committed
  6de23a5

  Copy full SHA for 6de23a5

• Attempt fix fuzz

  jgur-psyops

  committed
  59eec2f

  Copy full SHA for 59eec2f

• Attempt fix fuzz

  jgur-psyops

  committed
  2ba05f2

  Copy full SHA for 2ba05f2

• Attempt fix fuzz 3

  jgur-psyops

  committed
  6503eea

  Copy full SHA for 6503eea

• Attempt fix fuzz 4

  jgur-psyops

  committed
  e06a591

  Copy full SHA for e06a591

Commits on Aug 29, 2024

• Fix fuzz, placeholder to add system program to fuzz later

  jgur-psyops

  committed
  93f6222

  Copy full SHA for 93f6222

Commits on Sep 3, 2024

• Merge main, resolve initial compilation issues

  jgur-psyops

  committed
  cbc9954

  Copy full SHA for cbc9954

• Cargo tests working

  jgur-psyops

  committed
  7b34748

  Copy full SHA for 7b34748

• Fix lint, fix fuzz attempt 1

  jgur-psyops

  committed
  9c4a1f1

  Copy full SHA for 9c4a1f1

• Fix lint, fix fuzz attempt 2

  jgur-psyops

  committed
  af11eae

  Copy full SHA for af11eae

• Fix lint, fix fuzz attempt 3

  jgur-psyops

  committed
  648335d

  Copy full SHA for 648335d

Commits on Sep 4, 2024

• Unify program-level fees in global FeeState

  jgur-psyops

  committed
  b38a634

  Copy full SHA for b38a634

• Fix type in interest test

  jgur-psyops

  committed
  63432cd

  Copy full SHA for 63432cd

Commits on Sep 5, 2024

• Transfer program fees in collect_bank_fees complete, add ata support to spl test library.

  jgur-psyops

  committed
  f00cd97

  Copy full SHA for f00cd97

• Typo in TS test

  jgur-psyops

  committed
  d45de81

  Copy full SHA for d45de81

• Various Cli/Fuzz/CI fixes

  jgur-psyops

  committed
  5c1afeb

  Copy full SHA for 5c1afeb

Commits on Sep 6, 2024

• Lint fix

  jgur-psyops

  committed
  1b6b8ae

  Copy full SHA for 1b6b8ae

• Config group fee ix to enable/disable program fees for any group

  jgur-psyops

  committed
  f89ba58

  Copy full SHA for f89ba58

Commits on Oct 15, 2024

• Merge branch 'main' into combined-protocol-fees

  jkbpvsc

  authored
  a2c4988

  Copy full SHA for a2c4988

• hardcode fee state admin on mainnet. Some fee flags renamed. Add validation to avoid setting disused flags.

  jgur-psyops

  committed
  dac3b4f

  Copy full SHA for dac3b4f

• Merge branch 'combined-protocol-fees' of https://github.com/mrgnlabs/marginfi-v2 into combined-protocol-fees

  jgur-psyops

  committed
  66d610b

  Copy full SHA for 66d610b

• Minor formatting

  jgur-psyops

  committed
  a4ff330

  Copy full SHA for a4ff330

• mrgn program must sign, but does not become admin on mainnet

  jgur-psyops

  committed
  14a0b7b

  Copy full SHA for 14a0b7b

Commits on Oct 16, 2024

• Add cargo feature flag for mainnet wallet check

  jgur-psyops

  committed
  af52497

  Copy full SHA for af52497

Commits on Oct 17, 2024

• Attempt to make tests ignore fee state deploy while mainnet keeps the feature

  jgur-psyops

  committed
  babd8ed

  Copy full SHA for babd8ed

• Attempt fix fuzz 1

  jgur-psyops

  committed
  27394e0

  Copy full SHA for 27394e0

• Attempt fix fuzz 2

  jgur-psyops

  committed
  bbcd753

  Copy full SHA for bbcd753

• Attempt fix tests 3

  jgur-psyops

  committed
  d73c631

  Copy full SHA for d73c631