Merge pull request #4342 from harmony-one/dev

Mainnet Release Candidate 4.3.14-rc3 (dev -> main)
pull/4354/head v2023.1.0
Soph 2 years ago committed by GitHub
commit 09dba41685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      internal/params/config.go
  2. 19
      rpc/harmony.go

@ -62,12 +62,12 @@ var (
DataCopyFixEpoch: big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time DataCopyFixEpoch: big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
IstanbulEpoch: big.NewInt(314), IstanbulEpoch: big.NewInt(314),
ReceiptLogEpoch: big.NewInt(101), ReceiptLogEpoch: big.NewInt(101),
SHA3Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC SHA3Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
HIP6And8Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC HIP6And8Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
StakingPrecompileEpoch: big.NewInt(871), // Around Tue Feb 11 2022 StakingPrecompileEpoch: big.NewInt(871), // Around Tue Feb 11 2022
ChainIdFixEpoch: EpochTBD, ChainIdFixEpoch: big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
SlotsLimitedEpoch: big.NewInt(999), // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time SlotsLimitedEpoch: big.NewInt(999), // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time
CrossShardXferPrecompileEpoch: EpochTBD, CrossShardXferPrecompileEpoch: big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
AllowlistEpoch: EpochTBD, AllowlistEpoch: EpochTBD,
FeeCollectEpoch: EpochTBD, FeeCollectEpoch: EpochTBD,
} }

@ -43,19 +43,24 @@ func (s *PublicHarmonyService) ProtocolVersion(
} }
// Syncing returns false in case the node is in sync with the network // Syncing returns false in case the node is in sync with the network
// With the current network height as well as the difference // If it is syncing, it returns:
// starting block, current block, and network height
func (s *PublicHarmonyService) Syncing( func (s *PublicHarmonyService) Syncing(
ctx context.Context, ctx context.Context,
) (interface{}, error) { ) (interface{}, error) {
// difference = target - current
inSync, target, difference := s.hmy.NodeAPI.SyncStatus(s.hmy.ShardID) inSync, target, difference := s.hmy.NodeAPI.SyncStatus(s.hmy.ShardID)
if inSync {
return false, nil
}
return struct { return struct {
InSync bool `json:"in-sync"` Start uint64 `json:"startingBlock"`
Target uint64 `json:"network-height"` Current uint64 `json:"currentBlock"`
Delta uint64 `json:"difference"` Target uint64 `json:"highestBlock"`
}{ }{
InSync: inSync, // Start: 0, // TODO
Target: target, Current: target - difference,
Delta: difference, Target: target,
}, nil }, nil
} }

Loading…
Cancel
Save