Code

Jung/staking#69

Code

Open

prateekreddy wants to merge 158 commits intomastermarlinprotocol/kalypso-contracts:masterfrom jung/stakingmarlinprotocol/kalypso-contracts:jung/stakingCopy head branch name to clipboard

+3,397-76

Commits

Commits on Aug 23, 2024

• Add staking contracts with interfaces

  Frenchkebab

  committed
  1be8e65

Commits on Aug 28, 2024

• add Enumerable Set for tokens

  Frenchkebab

  committed
  c8dedb3

• add getter for stake amount

  Frenchkebab

  committed
  67b6c38

Commits on Aug 29, 2024

• add contract inheritance

  Frenchkebab

  committed
  bf7fdb6

• add add/remove token feature

  Frenchkebab

  committed
  27fafca

• add supportedSignature feature

  Frenchkebab

  committed
  f4441fd

• implement stake/operatorSelfStake logic

  Frenchkebab

  committed
  3b6dbca

• add interfaces

  Frenchkebab

  committed
  215b33c

• add getter for signature support

  Frenchkebab

  committed
  78f02d0

• add getters for stake

  Frenchkebab

  committed
  9936d1c

• add unstake

  Frenchkebab

  committed
  9126919

• add userStakeInfo mapping

  Frenchkebab

  committed
  5f873f6

• add token transfer logic

  Frenchkebab

  committed
  657119c

• todos

  Frenchkebab

  committed
  170567c

• add check logic for submitSnapshot

  Frenchkebab

  committed
  c8928f1

• implement submitSnapshot logic

  Frenchkebab

  committed
  4ba1ee4

Commits on Aug 30, 2024

• add mapping for slash result submission

  Frenchkebab

  committed
  e3a947a

• fix return fix logic for getters

  Frenchkebab

  committed
  33c92e8

• add Snapshot submission logic

  Frenchkebab

  committed
  335deeb

• add operator snapshot update logic

  Frenchkebab

  committed
  7193efb

• add vault snapshot logic

  Frenchkebab

  committed
  1291204

• add slash result submission logic

  Frenchkebab

  committed
  98499ee

• refactor code

  Frenchkebab

  committed
  b27093d

• finish submitSlashResultData logic

  Frenchkebab

  committed
  4d8461e

• fix typo

  Frenchkebab

  committed
  42a6c02

• fix typo

  Frenchkebab

  committed
  933809d

Commits on Aug 31, 2024

• add upgradeability to StakingManager

  Frenchkebab

  committed
  0a277b7

Commits on Sep 1, 2024

• add logic for jobCreation and stake lock

  Frenchkebab

  committed
  40e0b01

Commits on Sep 2, 2024

• implement unlock stake

  Frenchkebab

  committed
  2463e2c

Commits on Sep 3, 2024

• fix compile erorrs

  Frenchkebab

  committed
  1d90243

• remove slashjob

  Frenchkebab

  committed
  2964e1d

• add lockPool to IKalypsoStaking

  Frenchkebab

  committed
  40e4eee

Commits on Sep 10, 2024

• add core feature in JobManager

  Frenchkebab

  committed
  eb8a9af

Commits on Sep 12, 2024

• create SymbioticStakingReward contract

  Frenchkebab

  committed
  a65ea70

• add upgradeable contracts inheritance

  Frenchkebab

  committed
  5890845

Commits on Sep 13, 2024

• add logic

  Frenchkebab

  committed
  1738b0f

• add _stakeToken and _rewardToken

  Frenchkebab

  committed
  e239d01

• import Math, EnumerableSet

  Frenchkebab

  committed
  a10c4c3

• add active stake and more update logic

  Frenchkebab

  committed
  d6ebec6

• refactor reward logic

  Frenchkebab

  committed
  c788c51

• refactor admin functions

  Frenchkebab

  committed
  467efcd

• refactor code

  Frenchkebab

  committed
  6525aa5

Commits on Sep 14, 2024

• create NativeStakingReward contract

  Frenchkebab

  committed
  c2060cb

• remove everything related to jobManager

  Frenchkebab

  committed
  5c00314

• add initialize

  Frenchkebab

  committed
  59e6209

• add rewardPerToken logic

  Frenchkebab

  committed
  3fe574e

Commits on Sep 15, 2024

• fix mappings structure

  Frenchkebab

  committed
  46369f6

Commits on Sep 16, 2024

• add update logic

  Frenchkebab

  committed
  66a646c

Commits on Sep 17, 2024

• remove lock getting deducted in RewardDistributors

  Frenchkebab

  committed
  dac1008

Commits on Sep 18, 2024

• fix signature for lockStake

  Frenchkebab

  committed
  230b8ba

• fix jobCreation logic

  Frenchkebab

  committed
  dfc1a8b

• add unlock logic

  Frenchkebab

  committed
  97d4152

• resolve cimpile error

  Frenchkebab

  committed
  7dab574

Commits on Sep 19, 2024

• fix NativeStaking stake logic

  Frenchkebab

  committed
  842c686

• hardhat config for compile

  Frenchkebab

  committed
  10d3ab6

• fix withdrawStake logic

  Frenchkebab

  committed
  3cc6914

Commits on Sep 23, 2024

• reflect review comments

  Frenchkebab

  committed
  5bb69e6

• fix mask from bytes4 to bytes32

  Frenchkebab

  committed
  a464606

Commits on Sep 24, 2024

• move lockStake logic from StsakingManager to NativeStaking

  Frenchkebab

  committed
  fe4a8dc

• refactor _selectToken logic

  Frenchkebab

  committed
  9f54798

• move lockStake logic to SymbioticStaking from StakingManager

  Frenchkebab

  committed
  2b5a282

• refactor code

  Frenchkebab

  committed
  a766094

Commits on Sep 25, 2024

• fix SD, TC to be more verbose name

  Frenchkebab

  committed
  8a1e5c2

• minor fix

  Frenchkebab

  committed
  f00b55a

• add comments

  Frenchkebab

  committed
  cd62599

• comment out unnecessary variables

  Frenchkebab

  committed
  2c6cb90

• force Snapshot submission to be sequential

  Frenchkebab

  committed
  a2c92ed

• consolidate OperatorSnapshot into VaultSnapshot

  Frenchkebab

  committed
  8d20006

• remove unnecessary comment

  Frenchkebab

  committed
  6d0c15f

• fix typo

  Frenchkebab

  committed
  2c8a0bc

• fix transmitterComission to baseTransmitterComission

  Frenchkebab

  committed
  c67c32b

• fix IKalysoStaking to IStakingPool

  Frenchkebab

  committed
  b202fe8

• init jobManager

  Frenchkebab

  committed
  193a86b

• remove unused struct

  Frenchkebab

  committed
  a3d605e

• remove minStake from StakingManager

  Frenchkebab

  committed
  1f4afc1

• remove isEnabledPool mapping

  Frenchkebab

  committed
  dac7f80

• remove unlockEpoch

  Frenchkebab

  committed
  2262916

• fix submitProof logic

  Frenchkebab

  committed
  8d86dd3

• remove operatorSet

  Frenchkebab

  committed
  ffea6b6

Commits on Sep 26, 2024

• fix lockStake logic

  Frenchkebab

  committed
  245beb7

• fix account to msg.sender

  Frenchkebab

  committed
  d265222

• remove selfstake

  Frenchkebab

  committed
  819c13f

• remove account param

  Frenchkebab

  committed
  f31ae90

• withdraw checks operatorActiveStakeAmount

  Frenchkebab

  committed
  2dce130

• add todo comment

  Frenchkebab

  committed
  3195325

• remove minStakeAmount and fix typo

  Frenchkebab

  committed
  fae46b1

• remove locked token address from StakingManager

  Frenchkebab

  committed
  948ea0e

• add deadline logic

  Frenchkebab

  committed
  e60d824

• remove supported signature

  Frenchkebab

  committed
  2575a1f

• add refundFee

  Frenchkebab

  committed
  cd47892

• add upgradeability

  Frenchkebab

  committed
  2204958

• fix param variable

  Frenchkebab

  committed
  8c2cbe0

• resolve TODOs for StakingManager

  Frenchkebab

  committed
  c934123

• remove onlyAdmin

  Frenchkebab

  committed
  683e429

• add missing admin functions

  Frenchkebab

  committed
  f4df6e1

• remove unnecessary functions

  Frenchkebab

  committed
  a421c16

• add admin function

  Frenchkebab

  committed
  f8422ec

• refactor code

  Frenchkebab

  committed
  96ffa9f

• add missing admin functions

  Frenchkebab

  committed
  fb50a1c

• add upgradeability

  Frenchkebab

  committed
  3c2e6fa

• remove onlyAdmin

  Frenchkebab

  committed
  2a2c043

• remove transmitter from setShare

  Frenchkebab

  committed
  a04883b

• add unlockStake logic

  Frenchkebab

  committed
  a5a761d

• implement completeSubmission logic

  Frenchkebab

  committed
  082b2e3

• fix setShare logic

  Frenchkebab

  committed
  4d0357f

• update unlockStake logic

  Frenchkebab

  committed
  4412bf6

Commits on Sep 27, 2024

• implement slashing logic

  Frenchkebab

  committed
  42aba9f

• move struct to Struct.sol

  Frenchkebab

  committed
  4bd8823

Commits on Sep 28, 2024

• remove lock/unlock from SymbioticStakingReward

  Frenchkebab

  committed
  c716bd0

Commits on Sep 30, 2024

• complete reward distribution logic

  Frenchkebab

  committed
  6db8ede

• refactor code

  Frenchkebab

  committed
  66ca214

• refactor code

  Frenchkebab

  committed
  2ca8ae2

• logic when operatorStakeAmount < operatorLockAmount

  Frenchkebab

  committed
  9513350

Commits on Oct 1, 2024

• add logic for inflation reward emission

  Frenchkebab

  committed
  4b3dd14

• refactor reward distribution logic

  Frenchkebab

  committed
  359f637

• refactor _update logic

  Frenchkebab

  committed
  9671f96

• update reward claim logic

  Frenchkebab

  committed
  5ea15b5

Commits on Oct 2, 2024

• fix reward distribution logic

  Frenchkebab

  committed
  dec69fd

Commits on Oct 5, 2024

• refactor code

  Frenchkebab

  committed
  d3d7f24

• reimplement symbioticStakingReward

  Frenchkebab

  committed
  25a981f

• fix symbiotic reward logic

  Frenchkebab

  committed
  2696f61

• fix compile errors

  Frenchkebab

  committed
  06276b8

• fix transmitter comission rate logic

  Frenchkebab

  committed
  9339d7d

• add comments

  Frenchkebab

  committed
  a1798aa

• add getter for pendingInflationReward

  Frenchkebab

  committed
  18c98a6

• fix variable name

  Frenchkebab

  committed
  c2f1192

• temporarily comment out

  Frenchkebab

  committed
  5b75efa

• temporarily comment out

  Frenchkebab

  committed
  29fa07d

• add comments

  Frenchkebab

  committed
  a5d9da4

Commits on Oct 7, 2024

• format code

  Frenchkebab

  committed
  99b3d3c

• add 2step withdrawal

  Frenchkebab

  committed
  cc59e38

• fix typo

  Frenchkebab

  committed
  e74888c

• resolve compile error

  Frenchkebab

  committed
  38fed2d

• remove totalFeeStored

  Frenchkebab

  committed
  c6caeb0

Commits on Oct 8, 2024

• symbioticStakingReward pulls reward

  Frenchkebab

  committed
  0d11aa9

• initialize foundry

  Frenchkebab

  committed
  5f8a4d3

• add comment

  Frenchkebab

  committed
  77ca2da

• remove internal change to add public

  Frenchkebab

  committed
  696b8e7

• refactor code

  Frenchkebab

  committed
  fb9aed3

• refactor SymbioticStakingLock

  Frenchkebab

  committed
  974df18

• remove epoch array and replace with single variable

  Frenchkebab

  committed
  4b74dbd

Commits on Oct 9, 2024

• add InflationRewardManager contract

  Frenchkebab

  committed
  d1109ca

• send comission to operator

  Frenchkebab

  committed
  106fc42

Commits on Oct 10, 2024

• add interaction with InflationRewardManager

  Frenchkebab

  committed
  82442e3

• add transmitter comission feature

  Frenchkebab

  committed
  7ef70c5

• fix timestampIdx logic

  Frenchkebab

  committed
  f6f8231

• implement weight based token selection

  Frenchkebab

  committed
  1376f23

• add gaps

  Frenchkebab

  committed
  7424f80

• foundry test setup

  Frenchkebab

  committed
  57ac65d

• consider the case when inflation reward is not enough

  Frenchkebab

  committed
  a245830

Commits on Oct 11, 2024

• minor fix

  Frenchkebab

  committed
  9a6019f

• test setup

  Frenchkebab

  committed
  30e11a2

• fix token selection algorithm in NativeStaking

  Frenchkebab

  committed
  22ddb9d

• minor fix

  Frenchkebab

  committed
  a4b58a2

• test operator self stake

  Frenchkebab

  committed
  ae2ac28

Commits on Oct 14, 2024

• fix unexpected logic

  Frenchkebab

  committed
  d1fba22

• e2e test

  Frenchkebab

  committed
  95f7fcb

• format import orders

  Frenchkebab

  committed
  45d17de