Remove Goerli

Remove
trezor · Mar 27, 2024 · 3c57a0c · 3c57a0c
1 parent b5cfbdf
commit 3c57a0c
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 302 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -157,15 +157,4 @@ backend-deploy-and-test-zcash_testnet:
       - configs/coins/zcash_testnet.json
   tags:
     - blockbook
-  script: ./contrib/scripts/backend-deploy-and-test.sh zcash_testnet zcash-testnet zcash=test testnet3/debug.log
-
-# backend-deploy-and-test-goerli-archive:
-#   stage: backend-deploy-and-test
-#   only:
-#     refs:
-#       - master
-#     changes:
-#       - configs/coins/ethereum_testnet_goerli_archive.json
-#   tags:
-#     - blockbook
-#   script: ./contrib/scripts/backend-deploy-and-test.sh ethereum_testnet_goerli_archive ethereum-testnet-goerli-archive ethereum=test ethereum_testnet_goerli_archive.log
+  script: ./contrib/scripts/backend-deploy-and-test.sh zcash_testnet zcash-testnet zcash=test testnet3/debug.log
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ the rest of coins were implemented by the community.
 
 Testnets for some coins are also supported, for example:
 
--   Bitcoin Testnet, Bitcoin Cash Testnet, ZCash Testnet, Ethereum Testnets (Goerli, Sepolia, Holesky)
+-   Bitcoin Testnet, Bitcoin Cash Testnet, ZCash Testnet, Ethereum Testnets (Sepolia, Holesky)
 
 List of all implemented coins is in [the registry of ports](/docs/ports.md).
 

diff --git a/bchain/coins/blockchain.go b/bchain/coins/blockchain.go
@@ -73,8 +73,6 @@ func init() {
 	BlockChainFactories["Ethereum"] = eth.NewEthereumRPC
 	BlockChainFactories["Ethereum Archive"] = eth.NewEthereumRPC
 	BlockChainFactories["Ethereum Classic"] = eth.NewEthereumRPC
-	BlockChainFactories["Ethereum Testnet Goerli"] = eth.NewEthereumRPC
-	BlockChainFactories["Ethereum Testnet Goerli Archive"] = eth.NewEthereumRPC
 	BlockChainFactories["Ethereum Testnet Sepolia"] = eth.NewEthereumRPC
 	BlockChainFactories["Ethereum Testnet Sepolia Archive"] = eth.NewEthereumRPC
 	BlockChainFactories["Ethereum Testnet Holesky"] = eth.NewEthereumRPC

diff --git a/bchain/coins/eth/ethrpc.go b/bchain/coins/eth/ethrpc.go
@@ -30,8 +30,6 @@ type Network uint32
 const (
 	// MainNet is production network
 	MainNet Network = 1
-	// TestNetGoerli is Goerli test network
-	TestNetGoerli Network = 5
 	// TestNetSepolia is Sepolia test network
 	TestNetSepolia Network = 11155111
 	// TestNetHolesky is Holesky test network
@@ -146,9 +144,6 @@ func (b *EthereumRPC) Initialize() error {
 	case MainNet:
 		b.Testnet = false
 		b.Network = "livenet"
-	case TestNetGoerli:
-		b.Testnet = true
-		b.Network = "goerli"
 	case TestNetSepolia:
 		b.Testnet = true
 		b.Network = "sepolia"

diff --git a/configs/coins/ethereum_testnet_goerli.json b/configs/coins/ethereum_testnet_goerli.json
diff --git a/configs/coins/ethereum_testnet_goerli_archive.json b/configs/coins/ethereum_testnet_goerli_archive.json
diff --git a/configs/coins/ethereum_testnet_goerli_archive_consensus.json b/configs/coins/ethereum_testnet_goerli_archive_consensus.json
diff --git a/configs/coins/ethereum_testnet_goerli_consensus.json b/configs/coins/ethereum_testnet_goerli_consensus.json
diff --git a/docs/ports.md b/docs/ports.md
@@ -53,11 +53,9 @@
 | eCash                            | 9197             | 9097               | 8097        | 38397                                |
 | Avalanche                        | 9198             | 9098               | 8098        | 38398 p2p                            |
 | Avalanche Archive                | 9199             | 9099               | 8099        | 38399 p2p                            |
-| Ethereum Testnet Goerli Archive  | 19106            | 19006              | 18006       | 18106 http, 18506 authrpc, 48306 p2p |
 | Ethereum Testnet Holesky         | 19116            | 19016              | 18016       | 18116 http, 18516 authrpc, 48316 p2p |
 | Bitcoin Signet                   | 19120            | 19020              | 18020       | 48320                                |
 | Bitcoin Regtest                  | 19121            | 19021              | 18021       | 48321                                |
-| Ethereum Testnet Goerli          | 19126            | 19026              | 18026       | 18126 http, 18526 authrpc, 48326 p2p |
 | Bitcoin Testnet                  | 19130            | 19030              | 18030       | 48330                                |
 | Bitcoin Cash Testnet             | 19131            | 19031              | 18031       | 48331                                |
 | Zcash Testnet                    | 19132            | 19032              | 18032       | 48332                                |

diff --git a/tests/rpc/testdata/ethereum_testnet_goerli_archive.json b/tests/rpc/testdata/ethereum_testnet_goerli_archive.json
diff --git a/tests/tests.json b/tests/tests.json
@@ -103,10 +103,6 @@
                 "GetBestBlockHash", "GetBestBlockHeight", "GetBlockHeader"],
         "sync": ["ConnectBlocksParallel", "ConnectBlocks", "HandleFork"]
     },
-    "ethereum_testnet_goerli_archive": {
-        "rpc": ["GetBlock", "GetBlockHash", "GetTransaction", "EstimateFee", "GetBestBlockHash", "GetBestBlockHeight",
-                "GetBlockHeader"]
-    },
     "flo": {
         "rpc": ["GetBlock", "GetBlockHash", "GetTransaction", "GetTransactionForMempool", "MempoolSync",
                 "EstimateSmartFee", "EstimateFee", "GetBestBlockHash", "GetBestBlockHeight", "GetBlockHeader"],