Merge branch 'dev' of https://github.com/wemixarchive/go-wemix into d…

…evnet
wemixarchive · May 31, 2024 · 7f37bf0 · 7f37bf0
2 parents e8c35c2 + d439b02
commit 7f37bf0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/eth/api.go b/eth/api.go
@@ -683,12 +683,13 @@ type PublicWemixAPI struct {
 	e *Ethereum
 }
 
-func NewPublicWemixAPI(e *Ethereum) *PublicWemixAPI {
-	return &PublicWemixAPI{e}
-}
-
-func (api *PublicWemixAPI) BriocheConfig() *params.BriocheConfig {
-	return api.e.BlockChain().Config().Brioche
+type BriocheConfigResult struct {
+	BlockReward       *hexutil.Big   `json:"blockReward,omitempty"`
+	FirstHalvingBlock *hexutil.Big   `json:"firstHalvingBlock,omitempty"`
+	HalvingPeriod     *hexutil.Big   `json:"halvingPeriod,omitempty"`
+	FinishRewardBlock *hexutil.Big   `json:"finishRewardBlock,omitempty"`
+	HalvingTimes      hexutil.Uint64 `json:"halvingTimes,omitempty"`
+	HalvingRate       hexutil.Uint64 `json:"halvingRate,omitempty"`
 }
 
 type HalvingInfo struct {
@@ -698,8 +699,24 @@ type HalvingInfo struct {
 	BlockReward  *hexutil.Big   `json:"blockReward"`
 }
 
+func NewPublicWemixAPI(e *Ethereum) *PublicWemixAPI {
+	return &PublicWemixAPI{e}
+}
+
+func (api *PublicWemixAPI) BriocheConfig() BriocheConfigResult {
+	bc := api.e.BlockChain().Config().Brioche
+	return BriocheConfigResult{
+		BlockReward:       (*hexutil.Big)(bc.BlockReward),
+		FirstHalvingBlock: (*hexutil.Big)(bc.FirstHalvingBlock),
+		HalvingPeriod:     (*hexutil.Big)(bc.HalvingPeriod),
+		FinishRewardBlock: (*hexutil.Big)(bc.FinishRewardBlock),
+		HalvingTimes:      hexutil.Uint64(bc.HalvingTimes),
+		HalvingRate:       hexutil.Uint64(bc.HalvingRate),
+	}
+}
+
 func (api *PublicWemixAPI) HalvingSchedule() []*HalvingInfo {
-	bc := api.BriocheConfig()
+	bc := api.e.BlockChain().Config().Brioche
 	if bc.FirstHalvingBlock == nil || bc.HalvingPeriod == nil || bc.HalvingTimes == 0 {
 		return nil
 	}
@@ -712,7 +729,7 @@ func (api *PublicWemixAPI) HalvingSchedule() []*HalvingInfo {
 	result := make([]*HalvingInfo, 0)
 	for i := uint64(0); i < bc.HalvingTimes; i++ {
 		startBlock := new(big.Int).Add(bc.FirstHalvingBlock, new(big.Int).Mul(bc.HalvingPeriod, new(big.Int).SetUint64(i)))
-		if lastRewardBlock != nil && startBlock.Cmp(lastRewardBlock) == 1 {
+		if lastRewardBlock != nil && startBlock.Cmp(lastRewardBlock) > 0 {
 			break
 		}
 		result = append(result, &HalvingInfo{
@@ -730,13 +747,14 @@ func (api *PublicWemixAPI) HalvingSchedule() []*HalvingInfo {
 
 func (api *PublicWemixAPI) GetBriocheBlockReward(blockNumber rpc.BlockNumber) *hexutil.Big {
 	height := new(big.Int)
-	if blockNumber == rpc.LatestBlockNumber {
+	switch blockNumber {
+	case rpc.LatestBlockNumber:
 		height.Set(api.e.BlockChain().CurrentHeader().Number)
-	} else if blockNumber == rpc.FinalizedBlockNumber {
+	case rpc.FinalizedBlockNumber:
 		height.Set(api.e.BlockChain().CurrentHeader().Number)
-	} else if blockNumber == rpc.PendingBlockNumber {
+	case rpc.PendingBlockNumber:
 		height.Set(api.e.miner.PendingBlock().Header().Number)
-	} else {
+	default:
 		height.SetInt64(blockNumber.Int64())
 	}
 

diff --git a/params/wemix_config.go b/params/wemix_config.go
@@ -16,13 +16,7 @@ var (
 
 	WemixTestnetBootnodes = []string{
 		"enode://6137facc7a938d245d3a9b8a8ab2bed33b4d4dbc6f75058e176d54f3f9689ac5b7fad00efbda3eec8a292412d3616e84507adecc12c175eaa5dd7c1374a46fb2@20.41.113.133:8589",
-		"enode://a7274dcc5653edf72db753208ce21fce4ed23f967f94eaa720d1296ef4ceb99ed429aec2daedf01864e07c38d48407e8c02b768698b4f34aac845829045b6705@20.41.113.165:8589",
 		"enode://7b53a01356fd4b227dc354f1f725705257c96b504f2da4bb6e0f1beb6bbd4e9203608711e13035f278dbfd144a904bddb3fe526719d878e15b3e9f759afbef85@20.89.67.116:8589",
-		"enode://f8b4979b8e8afd5031ced4ebb9c8e7ce0ad8d914be3186bc8a67346fbd1c9cae1447d2c006d986e910820956b755ce32e40f5af953e3e68812bb5f3f62ce8cd3@20.222.40.143:8589",
-		"enode://64e4cb4b0702f1fb33ca8f5beb62f19c928ecc0acf925c53312e44ea53ccf381616178bcc77f70eec68770158b8d8be994b4bde317bea33c13185bdc689a018e@20.24.30.174:8589",
-		"enode://0778431754005b5a0332ffbb61d54983668cbfdbfcd5d830364c0b7fb0355f81306ef761762eb38f0800f37b1aebbd4f680fde33cfc9c683bb3c8283d12dc64a@20.212.107.1:8589",
-		"enode://0b8f4bc0ada2695f5d064953cf9f2486c4fc3560dc662363d01a1908df9d273118009755413a3eb6e651f1cdc62ec5425e03ecf6e511c3a2fddae690e91f2b5c@20.245.249.106:8589",
-		"enode://1a66550c2e7ec3e07aa39efc615331539aadca109377575a4c86bf84d24e66317dd1939f99016699f217285c2a82e4f1e225796666f6af59ab2b29b3c8243fc8@20.245.249.99:8589",
 	}
 
 	WemixGenesisFile string