Skip to content

Merge v1.0.27 from core-chain - #17

Merged
napallday merged 13 commits into
mainfrom
merge-v1.0.27
Nov 2, 2026
Merged

napallday merged 13 commits into
mainfrom
merge-v1.0.27

Conversation

@napallday

Copy link
Copy Markdown
Collaborator

合并上游 coredao-org/core-chain 的 v1.0.27 版本。

主要变更(来自上游):

  • 新增 Fermi 硬分叉(主网 FermiTime = 1793592000,即 2026-11-02 04:00:00 UTC),在分叉块对 chainId 1116 执行 misc.ApplyFermiAdjustment(consensus/misc/fermi.go)
  • 版本号升级到 1.0.27

冲突处理:

  • 继续保持删除 workflow 文件(commit-lint.yml、docker-release.yml、nancy.yml、unit-test.yml)
  • core/state_processor.go、miner/worker.go、params/config.go、params/version.go、version/version.go 的冲突均为上游新增内容,本地无定制改动,直接采用上游版本

验证:

  • CGO_ENABLED=1 go build ./cmd/geth ./params ./core ./miner 通过
  • go vet ./params ./core ./miner 通过
  • 未运行单元测试

🤖 Generated with Claude Code

ggcore0 and others added 13 commits September 1, 2026 09:15
Adds the Fermi fork: a one-time, mainnet-only state adjustment applied at the
transition block. Follows the established CoreRewardFix pattern — new fork
time in the chain config, Is/IsOn predicates, and a single apply() wired into
both block processing and block building, gated on chainId 1116.

The adjustment moves the full balance of a fixed set of single-owner accounts
to a recipient account; it is balance-conserving (sum debited == sum credited),
so total supply is unchanged. Applied exactly once at the first block at or
after FermiTime.

FermiTime is set to a near-future timestamp; every validator must upgrade
before it, or an un-upgraded node continues on a divergent state root.

Includes unit tests covering the move, supply conservation, idempotence, and
the recipient-not-a-source invariant.
# Conflicts:
#	.github/workflows/commit-lint.yml
#	.github/workflows/docker-release.yml
#	.github/workflows/nancy.yml
#	.github/workflows/unit-test.yml
#	core/state_processor.go
#	miner/worker.go
#	params/config.go
#	params/version.go
#	version/version.go
@napallday
napallday merged commit 0f343db into main Nov 2, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants