Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV-7. Balance pool: optimizations, redundant logic removed. ValidDelta bug fix #39

Merged
merged 6 commits into from
Jun 2, 2024
Merged

DEV-7. Balance pool: optimizations, redundant logic removed. ValidDelta bug fix #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb45b78
Balance pool. Optimizations, redundant logic removed, validDelta bug fix
Bromel777 Apr 3, 2024
91eeefc
update balanceFeeSwitch
Bromel777 Apr 17, 2024
6fdef34
remove redundant variable in ppow10
Bromel777 Apr 18, 2024
e53539e
Fix incorrect flow in deposit, redeem contracts
Bromel777 Apr 22, 2024
5f9bdea
Merge pull request #41 from splashprotocol/dev-567-fix-incorrect-logi…
oskin1 Apr 24, 2024
4fadd8f
Balance pool. New approach (#43)
Bromel777 Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions plutarch-validators/PExtra/Integer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module PExtra.Integer (
podd,
peven,
ppow,
ppow10
) where

import Plutarch.Prelude
Expand Down Expand Up @@ -32,5 +33,57 @@ pexp' = phoistAcyclic $
1
$ pif (podd # n) a 1 * (psquare #$ self # a # (pdiv # n # 2))

ppow10 :: Term s (PInteger :--> PInteger)
ppow10 = phoistAcyclic $
plam $ \n ->
pif
(n #< 0)
perror
(pexp10' # n)

pexp10' :: Term s (PInteger :--> PInteger)
pexp10' = phoistAcyclic $
pfix #$ plam $ \self n ->
pif
(n #< 12)
(pexp10constant' # n)
$ pif (podd # n) (pconstant 10) 1 * (psquare #$ self # (pdiv # n # 2))

-- max degree is 11
pexp10constant' :: Term s (PInteger :--> PInteger)
pexp10constant' = phoistAcyclic $
plam $ \n ->
pif
( n #== 11 )
(pconstant 100000000000)
( pif (n #== 10)
(pconstant 10000000000)
( pif (n #== 9)
(pconstant 1000000000)
( pif (n #== 8)
(pconstant 100000000)
( pif (n #== 7)
(pconstant 10000000)
( pif (n #== 6)
(pconstant 1000000)
( pif (n #== 5)
(pconstant 100000)
( pif (n #== 4)
(pconstant 10000)
( pif (n #== 3)
(pconstant 1000)
( pif (n #== 2)
(pconstant 100)
$ pif (n #== 1) (pconstant 10) (pconstant 1)
)
)
)
)
)
)
)
)
)

psquare :: Term s (PInteger :--> PInteger)
psquare = phoistAcyclic $ plam $ \x' -> plet x' $ \x -> x * x
5 changes: 0 additions & 5 deletions plutarch-validators/WhalePoolsDex/Contracts/BalancePool.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,14 @@ import PlutusLedgerApi.V1.Credential
data BalancePoolConfig = BalancePoolConfig
{ poolNft :: AssetClass
, poolX :: AssetClass
, weightX :: Integer
, poolY :: AssetClass
, weightY :: Integer
, poolLq :: AssetClass
, poolFeeNum :: Integer
, treasuryFee :: Integer
, treasuryX :: Integer
, treasuryY :: Integer
, daoPolicy :: [StakingCredential]
, treasuryAddress :: ValidatorHash
, invariant :: Integer
}
deriving stock (Show)

Expand Down Expand Up @@ -62,8 +59,6 @@ instance PlutusTx.ToData BalancePoolAction where
data BalancePoolRedeemer = BalancePoolRedeemer
{ action :: BalancePoolAction
, selfIx :: Integer
, g :: [Integer]
, t :: [Integer]
}
deriving (Show)

Expand Down
Loading
Loading