Skip to content

FUN-411. Double royalty pool #55

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

Merged
Bromel777 merged 2 commits into from
Oct 21, 2025
Merged

FUN-411. Double royalty pool #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f539980
FUN-411. Double royalty pool
Bromel777 Jun 10, 2025
ef2e529
Single/Double royalty withdraw pool contracts (#56)
Bromel777 Oct 20, 2025
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
247 changes: 0 additions & 247 deletions blueprint.ts
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions plutarch-validators/WhalePoolsDex/PContracts/PBalancePool.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ newtype BalancePoolConfig (s :: S)
, "treasuryY" ':= PInteger
, "DAOPolicy" ':= PBuiltinList (PAsData PStakingCredential)
, "treasuryAddress" ':= PValidatorHash
, "nonce" ':= PInteger
]
)
)
Expand Down Expand Up @@ -148,7 +149,7 @@ validSwap ::
validSwap = plam $ \prevState' newState' prevPoolConfig newPoolConfig -> unTermCont $ do
prevState <- pletFieldsC @'["reservesX", "reservesY", "liquidity"] prevState'
newState <- pletFieldsC @'["reservesX", "reservesY", "liquidity"] newState'
prevConfig <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "treasuryFee", "treasuryX", "treasuryY", "DAOPolicy", "treasuryAddress"] prevPoolConfig
prevConfig <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "treasuryFee", "treasuryX", "treasuryY", "DAOPolicy", "treasuryAddress", "nonce"] prevPoolConfig
newConfig <- pletFieldsC @'["treasuryX", "treasuryY"] newPoolConfig
let
prevPoolNft = getField @"poolNft" prevConfig
Expand All @@ -161,6 +162,7 @@ validSwap = plam $ \prevState' newState' prevPoolConfig newPoolConfig -> unTermC
prevTreasuryY = getField @"treasuryY" prevConfig
prevDAOPolicy = getField @"DAOPolicy" prevConfig
prevTreasuryAddress = getField @"treasuryAddress" prevConfig
prevNonce = getField @"nonce" prevConfig

newTreasuryX = getField @"treasuryX" newConfig
newTreasuryY = getField @"treasuryY" newConfig
Expand Down Expand Up @@ -223,6 +225,7 @@ validSwap = plam $ \prevState' newState' prevPoolConfig newPoolConfig -> unTermC
#$ pdcons @"treasuryY" @PInteger # pdata newTreasuryY
#$ pdcons @"DAOPolicy" @(PBuiltinList (PAsData PStakingCredential)) # pdata prevDAOPolicy
#$ pdcons @"treasuryAddress" @PValidatorHash # pdata prevTreasuryAddress
#$ pdcons @"nonce" @PInteger # pdata prevNonce
# pdnil)

pure $
Expand Down Expand Up @@ -274,7 +277,7 @@ validDepositRedeemAllTokens ::
validDepositRedeemAllTokens = plam $ \prevState' newState' prevPoolConfig newPoolConfig -> unTermCont $ do
prevState <- pletFieldsC @'["reservesX", "reservesY", "liquidity"] prevState'
newState <- pletFieldsC @'["reservesX", "reservesY", "liquidity"] newState'
prevConfig <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "treasuryFee", "treasuryX", "treasuryY", "DAOPolicy", "treasuryAddress"] prevPoolConfig
prevConfig <- pletFieldsC @'["poolNft", "poolX", "poolY", "poolLq", "feeNum", "treasuryFee", "treasuryX", "treasuryY", "DAOPolicy", "treasuryAddress", "nonce"] prevPoolConfig
let
prevPoolNft = getField @"poolNft" prevConfig
prevPoolX = getField @"poolX" prevConfig
Expand All @@ -286,6 +289,7 @@ validDepositRedeemAllTokens = plam $ \prevState' newState' prevPoolConfig newPoo
prevTreasuryY = getField @"treasuryY" prevConfig
prevDAOPolicy = getField @"DAOPolicy" prevConfig
prevTreasuryAddress = getField @"treasuryAddress" prevConfig
prevNonce = getField @"nonce" prevConfig

prevX = pfromData $ getField @"reservesX" prevState
prevY = pfromData $ getField @"reservesY" prevState
Expand Down Expand Up @@ -315,6 +319,7 @@ validDepositRedeemAllTokens = plam $ \prevState' newState' prevPoolConfig newPoo
#$ pdcons @"treasuryY" @PInteger # pdata prevTreasuryY
#$ pdcons @"DAOPolicy" @(PBuiltinList (PAsData PStakingCredential)) # pdata prevDAOPolicy
#$ pdcons @"treasuryAddress" @PValidatorHash # pdata prevTreasuryAddress
#$ pdcons @"nonce" @PInteger # pdata prevNonce
# pdnil)

pure $
Expand Down
Loading
Loading