chore: resolve dev/v2 merge conflicts in tron mechanism#10
Merged
Hades-Ye merged 4 commits intofeat/e2e-test-optimizationfrom Mar 12, 2026
Merged
chore: resolve dev/v2 merge conflicts in tron mechanism#10Hades-Ye merged 4 commits intofeat/e2e-test-optimizationfrom
Hades-Ye merged 4 commits intofeat/e2e-test-optimizationfrom
Conversation
boboliu-1010
pushed a commit
that referenced
this pull request
Apr 24, 2026
All three testnet scenarios now verified end-to-end on real chain: - exact_testnet — BSC tx 461d17b...159a0 - exact_permit_testnet — BSC tx 0xfc8b32d...98a23 - exact_gasfree_testnet — TRON Nile tx 1d77f242b72293116e65c46b5ad756dd2f8355ebc625078aec0eb4ea54d148d2 Two new solutions entries from closing the gasfree loop: #9 GasFree gasFreeAddress is per-query, not absolute. The API returns a fresh mapping for every queried address; our SDK queries with the main wallet and writes that layer's gasFreeAddress into the payload. If you deposit to a gasFreeAddress obtained by querying any *other* address (e.g. one resolved from a second hop), the balance won't register. Always deposit to api_client.get_address_info(main_wallet)["gasFreeAddress"]. #10 TRON multisig / witness accounts reject single-key signatures under the default permission_id=0 (owner). If owner_permission.threshold > 1, sign under an active permission via .permission_id(2) — confirmed on the Nile witness account used in our testnet .env. tronpy default path would otherwise return "Validate signature error: sig error" with no hint at the permission cause. Testnet README status table updated: all three rows ✅ verified. Regression: 217 pytest + 51 vitest + 8 mock e2e still green. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Summary
This PR resolves merge conflicts from dev/v2 into the feat/e2e-test-optimization branch.
Changes
Verified with pnpm build, pnpm lint, and pnpm test.