From 5fbcb3dd817ccde05921ec5e793878399b1bc846 Mon Sep 17 00:00:00 2001 From: Madhur Shrimal Date: Thu, 11 Apr 2024 16:57:24 -0700 Subject: [PATCH] deprecate goerli --- pkg/operator/config/create.go | 4 ---- pkg/operator/config/operator-config-example.yaml | 2 +- pkg/operator/register_test.go | 6 ------ pkg/utils/constants.go | 1 - pkg/utils/utils.go | 5 ----- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pkg/operator/config/create.go b/pkg/operator/config/create.go index b483726..3ea6e58 100644 --- a/pkg/operator/config/create.go +++ b/pkg/operator/config/create.go @@ -172,16 +172,12 @@ func promptOperatorInfo(config *types.OperatorConfigNew, p utils.Prompter) (type case "mainnet": config.ChainId = *big.NewInt(utils.MainnetChainId) config.ELDelegationManagerAddress = utils.ChainMetadataMap[utils.MainnetChainId].ELDelegationManagerAddress - case "goerli": - config.ChainId = *big.NewInt(utils.GoerliChainId) - config.ELDelegationManagerAddress = utils.ChainMetadataMap[utils.GoerliChainId].ELDelegationManagerAddress case "holesky": config.ChainId = *big.NewInt(utils.HoleskyChainId) config.ELDelegationManagerAddress = utils.ChainMetadataMap[utils.HoleskyChainId].ELDelegationManagerAddress case "local": config.ChainId = *big.NewInt(utils.LocalChainId) config.ELDelegationManagerAddress = utils.ChainMetadataMap[utils.LocalChainId].ELDelegationManagerAddress - } config.SignerType = types.LocalKeystoreSigner diff --git a/pkg/operator/config/operator-config-example.yaml b/pkg/operator/config/operator-config-example.yaml index 1f03598..63a8a5b 100644 --- a/pkg/operator/config/operator-config-example.yaml +++ b/pkg/operator/config/operator-config-example.yaml @@ -34,5 +34,5 @@ signer_type: local_keystore # Full path to local ecdsa private key store file private_key_store_path: /test.ecdsa.key.json -# Chain ID: 1 for mainnet, 5 for Goerli, 17000 for holesky, 31337 for local +# Chain ID: 1 for mainnet, 17000 for holesky, 31337 for local chain_id: 5 \ No newline at end of file diff --git a/pkg/operator/register_test.go b/pkg/operator/register_test.go index 72682c1..8262474 100644 --- a/pkg/operator/register_test.go +++ b/pkg/operator/register_test.go @@ -19,12 +19,6 @@ func TestGetTransactionLink(t *testing.T) { txHash string expectedTxLink string }{ - { - name: "Valid goerli tx hash", - chainID: big.NewInt(5), - txHash: "0x123", - expectedTxLink: fmt.Sprintf("%s/%s", "https://goerli.etherscan.io/tx", "0x123"), - }, { name: "valid mainnet tx hash", chainID: big.NewInt(1), diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go index 9333d54..53457bd 100644 --- a/pkg/utils/constants.go +++ b/pkg/utils/constants.go @@ -7,7 +7,6 @@ const ( EmojiInfo = "ℹ️" EmojiWait = "⏳" - GoerliChainId = 5 MainnetChainId = 1 HoleskyChainId = 17000 LocalChainId = 31337 diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index bb806be..f21bb63 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -18,11 +18,6 @@ var ChainMetadataMap = map[int64]types.ChainMetadata{ ELDelegationManagerAddress: "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A", ELAVSDirectoryAddress: "0x135dda560e946695d6f155dacafc6f1f25c1f5af", }, - GoerliChainId: { - BlockExplorerUrl: "https://goerli.etherscan.io/tx", - ELDelegationManagerAddress: "0x1b7b8F6b258f95Cf9596EabB9aa18B62940Eb0a8", - ELAVSDirectoryAddress: "0x0AC9694c271eFbA6059e9783769e515E8731f935", - }, HoleskyChainId: { BlockExplorerUrl: "https://holesky.etherscan.io/tx", ELDelegationManagerAddress: "0xA44151489861Fe9e3055d95adC98FbD462B948e7",