Skip to content

Merge branch v1.0.21 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charles2023wood merged 2 commits into from
Oct 11, 2025
Merged

Merge branch v1.0.21 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85323fe
params/config: postpone the hermes fork time of the testnet2
zfliex924 Sep 24, 2025
285a434
upgrade: configure hermes upgrade on testnet2
zfliex924 Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .github/workflows/integration-test.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/systemcontracts/hermes/pigeon/BTCStakeContract
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/systemcontracts/hermes/pigeon/CandidateHubContract
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/systemcontracts/hermes/pigeon/ValidatorContract
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions core/systemcontracts/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,87 +560,87 @@ func init() {
Configs: []*UpgradeConfig{
{
ContractAddr: common.HexToAddress(ValidatorContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonValidatorContract,
},
{
ContractAddr: common.HexToAddress(SlashContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonSlashContract,
},
{
ContractAddr: common.HexToAddress(SystemRewardContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonSystemRewardContract,
},
{
ContractAddr: common.HexToAddress(LightClientContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonLightClientContract,
},
{
ContractAddr: common.HexToAddress(RelayerHubContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonRelayerHubContract,
},
{
ContractAddr: common.HexToAddress(CandidateHubContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonCandidateHubContract,
},
{
ContractAddr: common.HexToAddress(GovHubContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonGovHubContract,
},
{
ContractAddr: common.HexToAddress(PledgeCandidateContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonPledgeCandidateContract,
},
{
ContractAddr: common.HexToAddress(BurnContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonBurnContract,
},
{
ContractAddr: common.HexToAddress(FoundationContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonFoundationContract,
},
{
ContractAddr: common.HexToAddress(StakeHubContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonStakeHubContract,
},
{
ContractAddr: common.HexToAddress(CoreAgentContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonCoreAgentContract,
},
{
ContractAddr: common.HexToAddress(HashAgentContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonHashAgentContract,
},
{
ContractAddr: common.HexToAddress(BTCAgentContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonBTCAgentContract,
},
{
ContractAddr: common.HexToAddress(BTCStakeContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonBTCStakeContract,
},
{
ContractAddr: common.HexToAddress(FeeMarketContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonFeeMarketContract,
},
{
ContractAddr: common.HexToAddress(ChannelContract),
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55c040cc68598789111958020c1cba951752c999",
CommitUrl: "https://github.com/coredao-org/core-genesis-contract/commit/55578e96d6083d942dd1613a4d44da749d68792b",
Code: hermes.PigeonChannelContract,
},
},
Expand Down
12 changes: 6 additions & 6 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ var (
TheseusTime: newUint64(1748592000), // 2025-05-30 08:00:00 AM UTC
CancunTime: newUint64(1748592000), // 2025-05-30 08:00:00 AM UTC
TheseusFixTime: newUint64(1752652800), // 2025-07-16 08:00:00 AM UTC
LubanTime: newUint64(1758700800),
PlatoTime: newUint64(1758700800),
BohrTime: newUint64(1758700800),
PascalTime: newUint64(1758700800),
PragueTime: newUint64(1758700800),
HermesTime: newUint64(1758700800), // 2025-09-24 08:00:00 AM UTC
LubanTime: newUint64(1760515200),
PlatoTime: newUint64(1760515200),
BohrTime: newUint64(1760515200),
PascalTime: newUint64(1760515200),
PragueTime: newUint64(1760515200),
HermesTime: newUint64(1760515200), // 2025-10-15 08:00:00 AM UTC
Satoshi: &SatoshiConfig{
Period: 3,
Epoch: 200,
Expand Down
2 changes: 1 addition & 1 deletion params/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 0 // Minor version component of the current release
VersionPatch = 20 // Patch version component of the current release
VersionPatch = 21 // Patch version component of the current release
VersionMeta = "" // Version metadata to append to the version string
)

Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ package version
const (
Major = 1 // Major version component of the current release
Minor = 0 // Minor version component of the current release
Patch = 20 // Patch version component of the current release
Patch = 21 // Patch version component of the current release
Meta = "" // Version metadata to append to the version string
)
Loading