Move NEO to TokenManagement #4413
Merged
+1,571
−2,487
Conversation
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
Member
Author
|
@superboyiii Can you fix the UTs? 🙏🙏🙏 |
Member
Sure |
Member
|
@erikzhang All done on erikzhang#3. Please review. |
18 tasks
erikzhang
commented
Jan 7, 2026
cschuchardt88
previously requested changes
Jan 11, 2026
# Conflicts: # tests/Neo.UnitTests/SmartContract/Native/UT_NativeContract.cs
Member
Author
|
Need review again. |
shargon
reviewed
Jan 14, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request moves NEO token functionality from a standalone native contract (NeoToken) into the Governance contract, managed through TokenManagement. This is a major architectural change that consolidates token management.
Changes:
- Deleted
NeoTokenandFungibleTokenclasses, moving NEO token logic into theGovernancecontract - Removed
AssetDescriptorclass and NEO-specific extension methods - Updated all references from
NativeContract.NEOtoNativeContract.Governancefor governance-related operations andNativeContract.TokenManagementfor balance/transfer operations - Modified storage structure: NEO balances now stored in TokenManagement (prefix 12), while NEO-specific state (voting, gas distribution) stored in Governance (prefix 10)
- Updated test files extensively to use reflection for accessing internal types and adapted to new storage patterns
Reviewed changes
Copilot reviewed 27 out of 27 changed files in this pull request and generated 13 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Neo/SmartContract/Native/NeoToken.cs | Deleted - NEO token logic moved to Governance |
| src/Neo/SmartContract/Native/FungibleToken.cs | Deleted - base class no longer needed |
| src/Neo/SmartContract/Native/Governance.cs | Major expansion - now handles NEO token, voting, rewards, and committee management |
| src/Neo/SmartContract/Native/NativeContract.cs | Removed NEO property, updated committee checks |
| src/Neo/Wallets/AssetDescriptor.cs | Deleted - asset descriptor functionality removed |
| src/Neo/Wallets/Wallet.cs | Simplified to use TokenManagement.BalanceOf for all tokens |
| tests/Neo.UnitTests/SmartContract/Native/UT_NeoToken.cs | Extensively refactored to use reflection for internal types |
| tests/Neo.UnitTests/Wallets/UT_Wallet.cs | Updated storage setup for NEO/GAS balances |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
shargon
reviewed
Jan 21, 2026
| [ContractMethod(CpuFee = 1 << 17, RequiredCallFlags = CallFlags.ReadStates)] | ||
| public BigInteger UnclaimedGas(ApplicationEngine engine, UInt160 account, uint end) | ||
| { | ||
| var expectEnd = Ledger.CurrentIndex(engine.SnapshotCache) + 1; |
Member
Author
There was a problem hiding this comment.
But UnclaimedGas can be called in verify, and verify typically runs in an environment without a PersistingBlock.
shargon
approved these changes
Jan 22, 2026
vncoelho
approved these changes
Jan 22, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
No description provided.