Skip to content

Commit 2765735

Browse files
committed
Merge remote-tracking branch 'official/main' into Hansen33-Mod
2 parents dd15dab + 8d446af commit 2765735

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
### DERO HE Changelog
22

3+
### Release 117
4+
* Out of memory bug fix(Reported by Slixe)
35

46
### Release 116
57
* Added miniblock spam fix(Bug reported by Slixe)

config/seed_nodes.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ package config
2121
// some seed nodes for mainnet (these seed node are not compliant with earlier protocols)
2222
// only version 2
2323
var Mainnet_seed_nodes = []string{
24-
// "89.38.99.117:8443", // official seed node - not working
25-
// "109.236.81.137:8080", // official seed node - not working
26-
// "89.38.97.110:11011", // official seed node - not working
27-
// "190.2.136.120:11011", // official seed node - not working
24+
"89.38.99.117:8443", // official seed node
25+
"109.236.81.137:8080", // official seed node
26+
"89.38.97.110:11011", // official seed node
27+
"190.2.136.120:11011", // official seed node
2828
"74.208.54.173:50404", // (deronfts)
2929
"85.214.253.170:53387", // (mmarcel-vps)
3030
"51.222.86.51:11011", // (RabidMining Pool)

config/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ import "github.com/blang/semver/v4"
2020

2121
// right now it has to be manually changed
2222
// do we need to include git commitsha??
23-
var Version = semver.MustParse("3.5.3-116.DEROHE.STARGATE+16022023")
23+
var Version = semver.MustParse("3.5.3-117.DEROHE.STARGATE+18032023")

p2p/chain_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ try_again:
184184
goto try_again
185185

186186
} else if chain.Get_Height()-response.Common.Height >= 0 && chain.Get_Height()-response.Start_height <= config.STABLE_LIMIT {
187-
pop_count = chain.Load_TOPO_HEIGHT() - response.Start_topoheight
187+
//pop_count = chain.Load_TOPO_HEIGHT() - response.Start_topoheight
188188
} else if chain.Get_Height()-response.Start_height > config.STABLE_LIMIT { // we must somehow notify that deviation is way too much and manual interaction is necessary, so as any bug for chain deviationmay be detected
189189
connection.logger.V(1).Error(nil, "we have or others have deviated too much.you may have to use --sync-node option", "our topoheight", chain.Load_TOPO_HEIGHT(), "peer topoheight start", response.Start_topoheight)
190190
return

p2p/rpc_object_request.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ func (connection *Connection) GetObject(request ObjectList, response *Objects) e
4040
return nil
4141
}
4242

43+
if len(request.Block_list) > 4096 || len(request.Tx_list) > 4096 || len(request.Chunk_list) > 128 || len(request.Block_list)+len(request.Tx_list)+len(request.Chunk_list) > 4096 { // we are expecting max 4096 items
44+
connection.logger.V(2).Info("malformed object request received, banning peer", "request", request)
45+
connection.exit("malformed object request received")
46+
return nil
47+
}
48+
4349
connection.update(&request.Common) // update common information
4450

4551
for i := range request.Block_list { // find the block

0 commit comments

Comments
 (0)