Skip to content

Use correct addresses for collateral and claim outputs #17

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
noonio merged 2 commits into from
Oct 29, 2025
Merged

Use correct addresses for collateral and claim outputs #17

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
b343058
Use correct addresses for collateral and claim outputs
locallycompact Oct 29, 2025
494358f
Update video
locallycompact Oct 29, 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
14 changes: 8 additions & 6 deletions hydra-lightning-router/src/Hydra/Lightning/Scenario.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ aliceBobIdaTransferAcrossHeads tracer backend hydraScriptsTxId = do
-- CLAIM TX
headUTxO' <- getSnapshotUTxO n2
let claimUTxO = C.filter (\(TxOut a _ _ _) -> a == mkScriptAddress networkId htlcValidatorScript) headUTxO'
let headCollateral = C.filter (\(TxOut a _ _ _) -> a /= mkScriptAddress networkId htlcValidatorScript) headUTxO'

let claimRecipient =
C.shelleyAddressInEra C.ShelleyBasedEraConway (vkAddress networkId carolWalletVk)
let headCollateral = C.filter (\(TxOut a _ _ _) -> a == claimRecipient) headUTxO'
let expectedKeyHashes = [C.verificationKeyHash carolWalletVk]
let collateral = head $ Set.toList $ C.inputSet headCollateral

claimTx <- buildClaimTX pparams preImage' claimRecipient expectedKeyHashes lockedVal claimUTxO headCollateral collateral changeAddress
claimTx <- buildClaimTX pparams preImage' claimRecipient expectedKeyHashes lockedVal claimUTxO headCollateral collateral claimRecipient
-- We only need Alice sig for collateral input
let signedClaimTx = signTx aliceWalletSk $ signTx carolWalletSk claimTx
let signedClaimTx = signTx carolWalletSk claimTx

send n2 $ input "NewTx" ["transaction" Aeson..= signedClaimTx]

Expand Down Expand Up @@ -300,17 +300,19 @@ aliceBobIdaTransferAcrossHeads tracer backend hydraScriptsTxId = do
Aeson.toJSON signedL2tx
`elem` (v ^.. key "snapshot" . key "confirmed" . values)

threadDelay 5_000_000

-- CLAIM TX
headUTxO' <- getSnapshotUTxO n3
let claimUTxO = C.filter (\(TxOut a _ _ _) -> a == mkScriptAddress networkId htlcValidatorScript) headUTxO'
let headCollateral = C.filter (\(TxOut a _ _ _) -> a /= mkScriptAddress networkId htlcValidatorScript) headUTxO'
let claimRecipient =
C.shelleyAddressInEra C.ShelleyBasedEraConway (vkAddress networkId bobWalletVk)
let headCollateral = C.filter (\(TxOut a _ _ _) -> a == claimRecipient) headUTxO'
let expectedKeyHashes = [C.verificationKeyHash bobWalletVk]
let collateral = head $ Set.toList $ C.inputSet headCollateral

claimTx <- buildClaimTX pparams preImage claimRecipient expectedKeyHashes lockedVal claimUTxO headCollateral collateral changeAddress
let signedClaimTx = signTx carolWalletSk $ signTx bobWalletSk claimTx
claimTx <- buildClaimTX pparams preImage claimRecipient expectedKeyHashes lockedVal claimUTxO headCollateral collateral claimRecipient
let signedClaimTx = signTx bobWalletSk claimTx

send n3 $ input "NewTx" ["transaction" Aeson..= signedClaimTx]

Expand Down
Binary file modified images/out.mp4
View file
Open in desktop
Binary file not shown.