Skip to content

Merge main into dev - #197

Merged
lilbonekit merged 22 commits into
devfrom
feature/merge-main-into-dev
Nov 12, 2026
Merged

lilbonekit merged 22 commits into
devfrom
feature/merge-main-into-dev

Conversation

@lilbonekit

@lilbonekit lilbonekit commented Nov 10, 2026 •

Copy link
Copy Markdown
Collaborator

Merges main into dev: docs, landing site, web fixes and the move to upstream LWK (#196).

  • Dev-only hooks (usePartialRepayOffer, useLenderVaultWithdrawPart, useProtocolFeeVaultClaim, useProtocolFeeVaultWithdrawPart) moved from the fork's TxBuilder to buildPset; covenant finalization uses finalizeTransaction(tx, spendInfo.controlBlock(cmr), ...).
  • LWK bumped to enable SimplicityHL imports (LWK !1570), needed by the module-based contracts.
  • Web adapted to the withdraw-on-liquidation vault (Feat/withdraw on liquidation #194): LIQUIDATION_HEIGHT argument and the new witness path.
  • Conflicts: useRepayOffer stays deleted (replaced by partial repay); liquidate, chopper and demo pages keep dev's logic on main's builder.

Tested on testnet: borrower account, create, accept, claim principal, partial repay (first and final with both vaults), lender vault claim. Not run: vault partial withdrawals, protocol-fee claim, liquidation after a partial repayment.

Pass LIQUIDATION_HEIGHT to AssetAuthVault (loan expiration for the lender
vault, 0 for the protocol-fee vault) and use the new witness path with
the WithdrawOnLiquidation branch. Lower the untested vault weight
placeholders to 4000 WU, and rebuild partial repay prevouts per covenant
since finalizeTransaction consumes them.

@Hrom131 Hrom131 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@lilbonekit
lilbonekit merged commit 52df6e2 into dev Nov 12, 2026
5 checks passed
@lilbonekit
lilbonekit deleted the feature/merge-main-into-dev branch November 12, 2026 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants