Fix Dogecoin & Monero multi-output refunds with proper fee handling #84

Merged

russellballestrini merged 11 commits from feature/multi-output-refunds into master

2025-10-03 11:15:29 -04:00

russellballestrini commented

2025-10-03 08:57:18 -04:00

(Migrated from git2.unturf.com)

Add payment amount to shop output for overpayment refunds
Both XMR and DOGE now send payment + restocking fee to shop
Fix insufficient funds error by using conservative fee buffer (0.01 DOGE)
Round outputs down to 3 decimal places to avoid precision issues
Update sendmany to try actual account first (where funds are located)
Add better error handling for different account formats
Fix fee calculation to properly account for Dogecoin's fee-on-top model

The issue was that sendmany adds network fee on top of outputs, and we
were trying to send exactly the wallet balance, leaving no room for fees.
Now we reserve 0.01 DOGE for fees and round conservatively.

Summary by CodeRabbit

New Features
- Multi-output refunds for DOGE and XMR, splitting amounts between customer and shop with optional fee buffer and balance checks.
- Dogecoin fee check/fix targets added to tooling and help output.
- Allow link color styling in rich text and preserve shop styling context.
- Checkout and quotes pages recognize new/renamed payment statuses for improved terminal handling.
Bug Fixes
- Smarter single-item cart redirect: only auto-opens digital products with files; otherwise redirects to invoice.
Tests
- Comprehensive tests for multi-output refunds and edge cases.
Chores
- Track sweep confirmation counts; database migration included.

- Add payment amount to shop output for overpayment refunds - Both XMR and DOGE now send payment + restocking fee to shop - Fix insufficient funds error by using conservative fee buffer (0.01 DOGE) - Round outputs down to 3 decimal places to avoid precision issues - Update sendmany to try actual account first (where funds are located) - Add better error handling for different account formats - Fix fee calculation to properly account for Dogecoin's fee-on-top model The issue was that sendmany adds network fee on top of outputs, and we were trying to send exactly the wallet balance, leaving no room for fees. Now we reserve 0.01 DOGE for fees and round conservatively.  ## Summary by CodeRabbit - New Features - Multi-output refunds for DOGE and XMR, splitting amounts between customer and shop with optional fee buffer and balance checks. - Dogecoin fee check/fix targets added to tooling and help output. - Allow link color styling in rich text and preserve shop styling context. - Checkout and quotes pages recognize new/renamed payment statuses for improved terminal handling. - Bug Fixes - Smarter single-item cart redirect: only auto-opens digital products with files; otherwise redirects to invoice. - Tests - Comprehensive tests for multi-output refunds and edge cases. - Chores - Track sweep confirmation counts; database migration included.

coderabbitai commented

2025-10-03 08:57:34 -04:00

(Migrated from git2.unturf.com)

Walkthrough

Adds Dogecoin Makefile tools and config; extends DogecoinClient.sendmany signature; implements multi-output refunds for DOGE/XMR with fee buffering, balance checks, and retries; adds swept_confirmations field and migration; broadens crypto status vocabulary across views/templates; adjusts cart single-item redirect logic; adds tests for multi-output refunds.

Changes

Cohort / File(s)	Summary
Build & Ops (Dogecoin tooling) `Makefile`	Adds `dogecoin-check-fee` and `dogecoin-fix-fee` targets, updates help text, and `dogecoin-config` appends `paytxfee`/`mintxfee` (0.001) with explanatory comments to `dogecoin.conf`.
Crypto client API tweak `make_post_sell/lib/crypto_watcher/crypto_clients.py`	Extends `DogecoinClient.sendmany` signature to accept `minconf: int = 1` and `comment: str = ""`; builds RPC params conditionally in the expected order before calling RPC.
Refund logic (multi-output + buffers & retries) `make_post_sell/lib/crypto_watcher/crypto_payment_rescue.py`	Adds `DOGE_REFUND_FEE_BUFFER`; implements multi-output refunds for DOGE and XMR (customer + shop sweep outputs); includes balance checks, optional env-driven fee buffer, account-derived/from-account fallback on insufficient funds, enhanced logging, and requires `shop_sweep_to_address`. Refund results now include `payment_amount`.
Data model + migration `make_post_sell/models/crypto_payment.py`, `make_post_sell/scripts/alembic/versions/0915b3ff883d_add_swept_confirmations_to_track_sweep_.py`	Adds non-null `swept_confirmations` integer column (default 0) to `CryptoPayment`; Alembic migration adds column with `server_default="10"` on upgrade and drops on downgrade.
Status vocabulary update (views/templates) `make_post_sell/views/crypto.py`, `make_post_sell/templates/crypto_checkout.j2`, `make_post_sell/templates/crypto_quotes_history.j2`	Renames/expands statuses to dash-separated forms (e.g., `confirmed-overpay`, `confirmed-complete`) and many refunded/not-refunded variants; updates status-to-display mappings, redirects, flashes, and UI conditionals to use the new status set.
Cart redirect control flow `make_post_sell/views/cart.py`	Changes single-item redirect logic to inspect product type and file presence: if single item is digital and has a product file => product page; otherwise => invoice. Adds detailed logging of decision factors.
Sanitizer / rendering (link color) `make_post_sell/lib/render.py`, `make_post_sell/lib/sanitize_html.py`	Attaches `shop` to `Cleaner` (`cleaner.shop = shop`); allows `style` attr on `a` tags and validates/appends `color:` styling from `cleaner.shop.theme_link_color` in `protect_links`.
Tests for multi-output refunds `make_post_sell/tests/test_multi_output_refunds.py`	New test suite validating DOGE/XMR multi-output refunds, edge cases (zero fee), missing sweep address failure, insufficient confirmations, and RPC call expectations.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  actor User
  participant App as PaymentRescue
  participant DOGE as Dogecoin RPC
  participant XMR as Monero RPC
  participant Log as Logger

  rect rgba(230,245,255,0.6)
  note over App: Execute overpayment refund (multi-output)
  User->>App: execute_refund(refund_details)
  alt Currency == DOGE
    App->>DOGE: getbalance / prepare outputs (customer, shop)
    App->>Log: Log outputs and fee buffer
    App->>DOGE: sendmany(from_account, {customer:amt, shop:amt}, [minconf, comment])
    alt Insufficient funds
      App->>Log: Log shortfall and retry
      App->>DOGE: sendmany("", {...}, [minconf, comment])
    end
    DOGE-->>App: txid / error
  else Currency == XMR
    App->>XMR: transfer(destinations=[{customer},{shop}], account_index)
    XMR-->>App: tx_hash
  end
  App-->>User: {success, tx_hash, fee_charged, payment_amount}
  end

sequenceDiagram
  autonumber
  actor Shopper
  participant Cart as Cart View
  participant Prod as Product Model
  participant Router as Router

  Shopper->>Cart: GET /cart/checkout
  Cart->>Prod: inspect line_items (count, product.physical, product.has_product_file)
  alt single item AND digital AND has file
    Cart->>Router: redirect -> product page
  else
    Cart->>Router: redirect -> invoice page
  end

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Poem

I thump my paws: two outputs to send,
One for the shopper, one for the friend.
Fees snug in buffers, colors now bright,
Cart hops smart to product or invoice light.
New statuses singing—refunds split, delight!
(_/) 🥕

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Free

📥 Commits

Reviewing files that changed from the base of the PR and between 2657f982ec and 9432375bcb.

📒 Files selected for processing (2)

make_post_sell/lib/render.py (1 hunks)
make_post_sell/lib/sanitize_html.py (4 hunks)

📝 NOTE

🎁 Summarized by CodeRabbit Free

Your organization is on the Free plan. CodeRabbit will generate a high-level summary and a walkthrough for each pull request. For a comprehensive line-by-line review, please upgrade your subscription to CodeRabbit Pro by visiting https://app.coderabbit.ai/login.

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

## Walkthrough Adds Dogecoin Makefile tools and config; extends DogecoinClient.sendmany signature; implements multi-output refunds for DOGE/XMR with fee buffering, balance checks, and retries; adds swept_confirmations field and migration; broadens crypto status vocabulary across views/templates; adjusts cart single-item redirect logic; adds tests for multi-output refunds. ## Changes | Cohort / File(s) | Summary | | --- | --- | | **Build & Ops (Dogecoin tooling)** `Makefile` | Adds `dogecoin-check-fee` and `dogecoin-fix-fee` targets, updates help text, and `dogecoin-config` appends `paytxfee`/`mintxfee` (0.001) with explanatory comments to `dogecoin.conf`. | | **Crypto client API tweak** `make_post_sell/lib/crypto_watcher/crypto_clients.py` | Extends `DogecoinClient.sendmany` signature to accept `minconf: int = 1` and `comment: str = ""`; builds RPC params conditionally in the expected order before calling RPC. | | **Refund logic (multi-output + buffers & retries)** `make_post_sell/lib/crypto_watcher/crypto_payment_rescue.py` | Adds `DOGE_REFUND_FEE_BUFFER`; implements multi-output refunds for DOGE and XMR (customer + shop sweep outputs); includes balance checks, optional env-driven fee buffer, account-derived/from-account fallback on insufficient funds, enhanced logging, and requires `shop_sweep_to_address`. Refund results now include `payment_amount`. | | **Data model + migration** `make_post_sell/models/crypto_payment.py`, `make_post_sell/scripts/alembic/versions/0915b3ff883d_add_swept_confirmations_to_track_sweep_.py` | Adds non-null `swept_confirmations` integer column (default 0) to `CryptoPayment`; Alembic migration adds column with `server_default="10"` on upgrade and drops on downgrade. | | **Status vocabulary update (views/templates)** `make_post_sell/views/crypto.py`, `make_post_sell/templates/crypto_checkout.j2`, `make_post_sell/templates/crypto_quotes_history.j2` | Renames/expands statuses to dash-separated forms (e.g., `confirmed-overpay`, `confirmed-complete`) and many refunded/not-refunded variants; updates status-to-display mappings, redirects, flashes, and UI conditionals to use the new status set. | | **Cart redirect control flow** `make_post_sell/views/cart.py` | Changes single-item redirect logic to inspect product type and file presence: if single item is digital and has a product file => product page; otherwise => invoice. Adds detailed logging of decision factors. | | **Sanitizer / rendering (link color)** `make_post_sell/lib/render.py`, `make_post_sell/lib/sanitize_html.py` | Attaches `shop` to `Cleaner` (`cleaner.shop = shop`); allows `style` attr on `a` tags and validates/appends `color:` styling from `cleaner.shop.theme_link_color` in `protect_links`. | | **Tests for multi-output refunds** `make_post_sell/tests/test_multi_output_refunds.py` | New test suite validating DOGE/XMR multi-output refunds, edge cases (zero fee), missing sweep address failure, insufficient confirmations, and RPC call expectations. | ## Sequence Diagram(s) ```mermaid sequenceDiagram autonumber actor User participant App as PaymentRescue participant DOGE as Dogecoin RPC participant XMR as Monero RPC participant Log as Logger rect rgba(230,245,255,0.6) note over App: Execute overpayment refund (multi-output) User->>App: execute_refund(refund_details) alt Currency == DOGE App->>DOGE: getbalance / prepare outputs (customer, shop) App->>Log: Log outputs and fee buffer App->>DOGE: sendmany(from_account, {customer:amt, shop:amt}, [minconf, comment]) alt Insufficient funds App->>Log: Log shortfall and retry App->>DOGE: sendmany("", {...}, [minconf, comment]) end DOGE-->>App: txid / error else Currency == XMR App->>XMR: transfer(destinations=[{customer},{shop}], account_index) XMR-->>App: tx_hash end App-->>User: {success, tx_hash, fee_charged, payment_amount} end ``` ```mermaid sequenceDiagram autonumber actor Shopper participant Cart as Cart View participant Prod as Product Model participant Router as Router Shopper->>Cart: GET /cart/checkout Cart->>Prod: inspect line_items (count, product.physical, product.has_product_file) alt single item AND digital AND has file Cart->>Router: redirect -> product page else Cart->>Router: redirect -> invoice page end ``` ## Estimated code review effort 🎯 4 (Complex) | ⏱️ ~60 minutes ## Poem > I thump my paws: two outputs to send, > One for the shopper, one for the friend. > Fees snug in buffers, colors now bright, > Cart hops smart to product or invoice light. > New statuses singing—refunds split, delight! > (\_/) 🥕  --- <details> <summary>📜 Recent review details</summary> **Configuration used**: CodeRabbit UI **Review profile**: CHILL **Plan**: Free <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 2657f982ecaf9b2a6877415e6d428924b7f2cd6e and 9432375bcbc8e32866ffa6468d0ed8d56b1b13ac. </details> <details> <summary>📒 Files selected for processing (2)</summary> * `make_post_sell/lib/render.py` (1 hunks) * `make_post_sell/lib/sanitize_html.py` (4 hunks) </details> </details>  --- > 📝 **NOTE** > <details> > <summary>🎁 Summarized by CodeRabbit Free</summary> > > Your organization is on the Free plan. CodeRabbit will generate a high-level summary and a walkthrough for each pull request. For a comprehensive line-by-line review, please upgrade your subscription to CodeRabbit Pro by visiting <https://app.coderabbit.ai/login>. > > </details> Comment `@coderabbitai help` to get the list of available commands and usage tips.

coderabbitai commented

2025-10-03 08:58:45 -04:00

(Migrated from git2.unturf.com)

changed the description

russellballestrini commented

2025-10-03 09:46:29 -04:00

(Migrated from git2.unturf.com)

added 1 commit

9432375b - Add shop ribbon color styling to links in product and content descriptions

Compare with previous version

added 1 commit <ul><li>9432375b - Add shop ribbon color styling to links in product and content descriptions</li></ul> [Compare with previous version](/engineering/make-post-sell/make_post_sell/-/merge_requests/48/diffs?diff_id=731&start_sha=2657f982ecaf9b2a6877415e6d428924b7f2cd6e)

coderabbitai commented

2025-10-03 09:47:14 -04:00

(Migrated from git2.unturf.com)

changed the description