fix: raise unwrap+2hop gas so USTR→USTC does not OOG (#599) #1118

Merged

PlasticDigits merged 2 commits from issue-599-ustr-ustc-unwrap-gas into main

2026-08-23 03:30:13 +00:00

PlasticDigits commented

2026-08-23 03:21:25 +00:00

(Migrated from gitlab.com)

Summary

Adds UNWRAP_ROUTER_COMBO_OVERHEAD_GAS (400k) for same-msg router unwrap_output after N≥2 hops so hub USTR → USTC (2-hop + taxed uusd InstantWithdraw) is no longer granted the 2.71M envelope that OOGs on columbus-5.
New combined envelope is 3,110,000 (~88.09 LUNC at 28.325). Direct mapper unwrap (cUSTC→USTC) stays 800k; wrap+1hop stays 1.8M. Same combo covers USTR→LUNC. Native path stays pool-only (H596-7).
Inventory fixture send_2hop_unwrap_ustc, Playwright E9, make verify-issue-599, and docs/skill crosslinks (docs/frontend.md, AGENTS_TERRACLASSIC_GAS.md, AGENTS_FRONTEND_HYBRID_ALWAYS_ON.md).

Closes #599

Test plan

make verify-issue-599 (unit + docs, first pass + retest) — 226 tests, 4/4 steps
make verify-issue-587 — no wrap-combo regression
make verify-issue-475 — inventory + drip floor
LocalTerra Playwright e2e/wrap-swap.spec.ts E9 (USTR or JADE/RUBY → USTC) — chain was down in this workspace
Manual columbus-5: USTR→USTC one Swap, no OOG toast; Network fee ~88 LUNC
Manual: LUNC→USTR and USTC→USTR still one-tx (#587)
Manual: cUSTC→USTC still 800k mapper unwrap

## Summary - Adds `UNWRAP_ROUTER_COMBO_OVERHEAD_GAS` (400k) for same-msg router `unwrap_output` after N≥2 hops so hub **USTR → USTC** (2-hop + taxed `uusd` InstantWithdraw) is no longer granted the 2.71M envelope that OOGs on columbus-5. - New combined envelope is **3,110,000** (~88.09 LUNC at 28.325). Direct mapper unwrap (cUSTC→USTC) stays **800k**; wrap+1hop stays **1.8M**. Same combo covers USTR→LUNC. Native path stays pool-only (**H596-7**). - Inventory fixture `send_2hop_unwrap_ustc`, Playwright **E9**, `make verify-issue-599`, and docs/skill crosslinks (`docs/frontend.md`, `AGENTS_TERRACLASSIC_GAS.md`, `AGENTS_FRONTEND_HYBRID_ALWAYS_ON.md`). Closes #599 ## Test plan - [x] `make verify-issue-599` (unit + docs, first pass + retest) — 226 tests, 4/4 steps - [x] `make verify-issue-587` — no wrap-combo regression - [x] `make verify-issue-475` — inventory + drip floor - [ ] LocalTerra Playwright `e2e/wrap-swap.spec.ts` E9 (USTR or JADE/RUBY → USTC) — chain was down in this workspace - [ ] Manual columbus-5: USTR→USTC one Swap, no OOG toast; Network fee ~88 LUNC - [ ] Manual: LUNC→USTR and USTC→USTR still one-tx (#587) - [ ] Manual: cUSTC→USTC still 800k mapper unwrap

PlasticDigits commented

2026-08-23 03:29:58 +00:00

(Migrated from gitlab.com)

added 3 commits

9c2035e2...276423e6 - 2 commits from branch main
328b2b8d - Merge origin/main into issue-599-ustr-ustc-unwrap-gas

Compare with previous version

added 3 commits <ul><li>9c2035e2...276423e6 - 2 commits from branch <code>main</code></li><li>328b2b8d - Merge origin/main into issue-599-ustr-ustc-unwrap-gas</li></ul> [Compare with previous version](/PlasticDigits/cl8y-dex-terraclassic/-/merge_requests/400/diffs?diff_id=1978006323&start_sha=9c2035e21e8845fb2d7a7cbb8bb1363dc6dacd8d)

PlasticDigits commented

2026-08-23 03:30:14 +00:00

(Migrated from gitlab.com)

mentioned in commit 4f245fc839

mentioned in commit 4f245fc839002f3ac287a4531b1ecc2e8b0aba7d