Commit 6038a99
committed
Merge upstream/devnet-ready
Resolves conflicts from upstream precompile test port (#2616),
remove_stake benchmark fix (#2602), TransactionFeePaidWithAlpha
netuid event, and spec_version bumps.
- pallets/proxy/src/weights.rs: accept upstream regenerated weights
- pallets/subtensor/src/weights.rs: accept upstream regenerated weights
- runtime/src/lib.rs: bump spec_version 401 -> 403 (was 402 upstream)
- pallets/subtensor/src/macros/dispatches.rs: auto-merged40 files changed
Lines changed: 3816 additions & 3158 deletions
File tree
- contract-tests
- src/contracts
- test
- pallets
- proxy/src
- subtensor/src
- macros
- transaction-fee/src
- tests
- utility/src
- precompiles
- src
- solidity
- runtime
- src
- tests
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
557 | 557 | | |
558 | 558 | | |
559 | 559 | | |
560 | | - | |
| 560 | + | |
561 | 561 | | |
562 | 562 | | |
563 | 563 | | |
564 | | - | |
565 | | - | |
566 | | - | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
567 | 567 | | |
568 | 568 | | |
569 | 569 | | |
| |||
572 | 572 | | |
573 | 573 | | |
574 | 574 | | |
575 | | - | |
| 575 | + | |
576 | 576 | | |
577 | 577 | | |
578 | 578 | | |
579 | 579 | | |
580 | | - | |
| 580 | + | |
581 | 581 | | |
582 | 582 | | |
583 | 583 | | |
| |||
This file was deleted.
This file was deleted.
0 commit comments