Fix/417 420 duplicate imports and methods - #550
Merged
BigBen-7 merged 3 commits intoAug 28, 2026
Merged
Conversation
…etProtocolFee admin.ts had three separate merge-artifact duplications, all stemming from the same botched merge that combined five parallel admin feature branches (setProtocolFee, updateTokenMetadata, enableWhitelist/whitelistAddress, forceRefundEscrow, dividendDistribute) into one commit. The corruption wasn't three clean isolated duplicate pairs as each issue describes in isolation -- doc comments and method bodies from different methods were spliced together, so the three fixes could not be separated into independent commits without reconstructing overlapping regions of the same corrupted block in each one. Rebuilt the file from the last known-clean single-feature commit (setProtocolFee, 53a516f) and reinserted each of the other four methods once, using the clean implementation from its own originating feature commit (forceRefundEscrow @ 41c9e70, dividendDistribute @ 780f454, updateTokenMetadata @ 1255ed7, enableWhitelist/whitelistAddress @ 4552911): - dividendDistribute: kept the single-arg (totalAmount: bigint) overload, matching the contract's distribute_dividend(e, admin, total_amount) signature; removed the two-arg (recipients, totalAmount) overload. - forceRefundEscrow: kept the writeCall-based implementation; removed the duplicate. - setProtocolFee: kept the single implementation; removed the duplicate. Verified: no method name appears more than once, brace count is balanced, and `npx tsc --noEmit` reports zero errors for this file. Closes Lead-Studios#418 Closes Lead-Studios#419 Closes Lead-Studios#420
src/modules/splitter.ts had two consecutive import statements both pulling addressToScVal from ../utils/scval, a merge artifact that caused a TypeScript duplicate identifier compile error. Merged into a single import. Closes Lead-Studios#417
|
@abdoolyaro Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
src/modules/splitter.ts had two consecutive import statements both pulling addressToScVal from ../utils/scval, a merge artifact that caused a TypeScript duplicate identifier compile error. Merged into a single import. Deviates from Lead-Studios#417's literal wording: the issue's suggested merged import list included stringToScVal, but that symbol is not used anywhere else in this file, so keeping it fails @typescript-eslint/no-unused-vars in CI. Dropped it instead. Closes Lead-Studios#417
abdoolyaro
force-pushed
the
fix/417-420-duplicate-imports-and-methods
branch
from
August 28, 2026 11:00
4897e30 to
3cab33c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
closes #417
closes #418
closes #419
closes #420