Skip to content

Commit 09dba41

Browse files
authored
Merge pull request #4342 from harmony-one/dev
Mainnet Release Candidate 4.3.14-rc3 (dev -> main)
2 parents 20e4892 + dd6d0ee commit 09dba41

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

Diff for: internal/params/config.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ var (
6262
DataCopyFixEpoch: big.NewInt(689), // Around Wed Sept 15th 2021 with 3.5s block time
6363
IstanbulEpoch: big.NewInt(314),
6464
ReceiptLogEpoch: big.NewInt(101),
65-
SHA3Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
66-
HIP6And8Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
67-
StakingPrecompileEpoch: big.NewInt(871), // Around Tue Feb 11 2022
68-
ChainIdFixEpoch: EpochTBD,
69-
SlotsLimitedEpoch: big.NewInt(999), // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time
70-
CrossShardXferPrecompileEpoch: EpochTBD,
65+
SHA3Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
66+
HIP6And8Epoch: big.NewInt(725), // Around Mon Oct 11 2021, 19:00 UTC
67+
StakingPrecompileEpoch: big.NewInt(871), // Around Tue Feb 11 2022
68+
ChainIdFixEpoch: big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
69+
SlotsLimitedEpoch: big.NewInt(999), // Around Fri, 27 May 2022 09:41:02 UTC with 2s block time
70+
CrossShardXferPrecompileEpoch: big.NewInt(1323), // Around Wed 8 Feb 11:30PM UTC
7171
AllowlistEpoch: EpochTBD,
7272
FeeCollectEpoch: EpochTBD,
7373
}

Diff for: rpc/harmony.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,24 @@ func (s *PublicHarmonyService) ProtocolVersion(
4343
}
4444

4545
// Syncing returns false in case the node is in sync with the network
46-
// With the current network height as well as the difference
46+
// If it is syncing, it returns:
47+
// starting block, current block, and network height
4748
func (s *PublicHarmonyService) Syncing(
4849
ctx context.Context,
4950
) (interface{}, error) {
51+
// difference = target - current
5052
inSync, target, difference := s.hmy.NodeAPI.SyncStatus(s.hmy.ShardID)
53+
if inSync {
54+
return false, nil
55+
}
5156
return struct {
52-
InSync bool `json:"in-sync"`
53-
Target uint64 `json:"network-height"`
54-
Delta uint64 `json:"difference"`
57+
Start uint64 `json:"startingBlock"`
58+
Current uint64 `json:"currentBlock"`
59+
Target uint64 `json:"highestBlock"`
5560
}{
56-
InSync: inSync,
57-
Target: target,
58-
Delta: difference,
61+
// Start: 0, // TODO
62+
Current: target - difference,
63+
Target: target,
5964
}, nil
6065
}
6166

0 commit comments

Comments
 (0)