From e92df59d53c8c82dcf930442f1df22028f8f208d Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 13 Sep 2021 16:26:36 -0400 Subject: [PATCH 1/4] remove morden --- tests/difficulty_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 8239850b7617..af9b0f86bd9a 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -52,11 +52,8 @@ func TestDifficulty(t *testing.T) { // files are 2 years old, contains strange values dt.skipLoad("difficultyCustomHomestead\\.json") - dt.skipLoad("difficultyMorden\\.json") - dt.skipLoad("difficultyOlimpic\\.json") dt.config("Ropsten", *params.RopstenChainConfig) - dt.config("Morden", *params.RopstenChainConfig) dt.config("Frontier", params.ChainConfig{}) dt.config("Homestead", params.ChainConfig{ From 3146eace4e2a334c47134393b658226f437bc4b8 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 13 Sep 2021 16:27:45 -0400 Subject: [PATCH 2/4] Update commons.go --- les/commons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/les/commons.go b/les/commons.go index d090fc21fcca..e83319543d36 100644 --- a/les/commons.go +++ b/les/commons.go @@ -63,7 +63,7 @@ type lesCommons struct { // NodeInfo represents a short summary of the Ethereum sub-protocol metadata // known about the host peer. type NodeInfo struct { - Network uint64 `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3, Rinkeby=4) + Network uint64 `json:"network"` // Ethereum network ID (1=Mainnet, Ropsten=3, Rinkeby=4, Goerli=5) Difficulty *big.Int `json:"difficulty"` // Total difficulty of the host's blockchain Genesis common.Hash `json:"genesis"` // SHA3 hash of the host's genesis block Config *params.ChainConfig `json:"config"` // Chain configuration for the fork rules From 8622c4fb34f265c47e15ce0c3ab9727979566368 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Mon, 13 Sep 2021 16:28:43 -0400 Subject: [PATCH 3/4] Update handler.go --- eth/protocols/eth/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 3a0b21c30bdb..87b1f20a2dc2 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -127,7 +127,7 @@ func MakeProtocols(backend Backend, network uint64, dnsdisc enode.Iterator) []p2 // NodeInfo represents a short summary of the `eth` sub-protocol metadata // known about the host peer. type NodeInfo struct { - Network uint64 `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3, Rinkeby=4) + Network uint64 `json:"network"` // Ethereum network ID (1=Mainnet, Ropsten=3, Rinkeby=4, Goerli=5) Difficulty *big.Int `json:"difficulty"` // Total difficulty of the host's blockchain Genesis common.Hash `json:"genesis"` // SHA3 hash of the host's genesis block Config *params.ChainConfig `json:"config"` // Chain configuration for the fork rules From 789917aebdcf607ab8c6ee1e44e58d17767263e4 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Wed, 15 Sep 2021 17:58:42 -0400 Subject: [PATCH 4/4] empty commit to make appveyor happy