add http client as an argument to abifetcher

cmd/database.go

@@ -29,6 +29,8 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"log"
+	"net/http"
+	"time"
 )
 
 var runDatabaseCmd = &cobra.Command{
@@ -59,7 +61,7 @@ var runDatabaseCmd = &cobra.Command{
 
 		client := ethereum.NewClient(ethereum.ConvertGlobalConfigToEthereumConfig(&cfg.EthereumRpcConfig), l)
 
-		af := abiFetcher.NewAbiFetcher(client, l)
+		af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 		pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
 

cmd/debugger/main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"time"
 
 	"github.com/Layr-Labs/sidecar/pkg/abiFetcher"
 	"github.com/Layr-Labs/sidecar/pkg/clients/ethereum"
@@ -56,7 +58,7 @@ func main() {
 
 	client := ethereum.NewClient(ethereum.ConvertGlobalConfigToEthereumConfig(&cfg.EthereumRpcConfig), l)
 
-	af := abiFetcher.NewAbiFetcher(client, l)
+	af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 	pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
 

cmd/operatorRestakedStrategies.go

@@ -23,6 +23,8 @@ import (
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"log"
+	"net/http"
+	"time"
 )
 
 var runOperatorRestakedStrategiesCmd = &cobra.Command{
@@ -47,7 +49,7 @@ var runOperatorRestakedStrategiesCmd = &cobra.Command{
 
 		client := ethereum.NewClient(ethereum.ConvertGlobalConfigToEthereumConfig(&cfg.EthereumRpcConfig), l)
 
-		af := abiFetcher.NewAbiFetcher(client, l)
+		af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 		pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
 

cmd/run.go

@@ -29,6 +29,7 @@ import (
 	"github.com/Layr-Labs/sidecar/pkg/sidecar"
 	pgStorage "github.com/Layr-Labs/sidecar/pkg/storage/postgres"
 	"log"
+	"net/http"
 	"time"
 
 	"github.com/Layr-Labs/sidecar/internal/config"
@@ -74,7 +75,7 @@ var runCmd = &cobra.Command{
 
 		client := ethereum.NewClient(ethereum.ConvertGlobalConfigToEthereumConfig(&cfg.EthereumRpcConfig), l)
 
-		af := abiFetcher.NewAbiFetcher(client, l)
+		af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 		pgConfig := postgres.PostgresConfigFromDbConfig(&cfg.DatabaseConfig)
 

internal/config/config.go

@@ -98,6 +98,10 @@ type SidecarPrimaryConfig struct {
 	IsPrimary bool
 }
 
+type IpfsConfig struct {
+	Url string
+}
+
 type Config struct {
 	Debug                bool
 	EthereumRpcConfig    EthereumRpcConfig
@@ -109,6 +113,7 @@ type Config struct {
 	DataDogConfig        DataDogConfig
 	PrometheusConfig     PrometheusConfig
 	SidecarPrimaryConfig SidecarPrimaryConfig
+	IpfsConfig           IpfsConfig
 }
 
 func StringWithDefault(value, defaultValue string) string {
@@ -147,6 +152,8 @@ var (
 	PrometheusPort    = "prometheus.port"
 
 	SidecarPrimaryUrl = "sidecar-primary.url"
+
+	IpfsUrl = "ipfs.url"
 )
 
 func NewConfig() *Config {
@@ -202,6 +209,10 @@ func NewConfig() *Config {
 		SidecarPrimaryConfig: SidecarPrimaryConfig{
 			Url: viper.GetString(normalizeFlagName(SidecarPrimaryUrl)),
 		},
+
+		IpfsConfig: IpfsConfig{
+			Url: StringWithDefault(viper.GetString(normalizeFlagName(IpfsUrl)), "https://ipfs.io/ipfs"),
+		},
 	}
 }
 

pkg/abiFetcher/abiFetcher.go

@@ -8,16 +8,18 @@ import (
 	"io"
 	"net/http"
 	"strings"
-	"time"
 
+	"github.com/Layr-Labs/sidecar/internal/config"
 	"github.com/Layr-Labs/sidecar/pkg/clients/ethereum"
 	"github.com/btcsuite/btcutil/base58"
 	"go.uber.org/zap"
 )
 
 type AbiFetcher struct {
 	EthereumClient *ethereum.Client
+	httpClient     *http.Client
 	Logger         *zap.Logger
+	Config         *config.Config
 }
 
 type Response struct {
@@ -28,11 +30,15 @@ type Response struct {
 
 func NewAbiFetcher(
 	e *ethereum.Client,
+	hc *http.Client,
 	l *zap.Logger,
+	cfg *config.Config,
 ) *AbiFetcher {
 	return &AbiFetcher{
 		EthereumClient: e,
+		httpClient:     hc,
 		Logger:         l,
+		Config:         cfg,
 	}
 }
 
@@ -51,7 +57,6 @@ func (af *AbiFetcher) FetchMetadataFromAddress(ctx context.Context, address stri
 		zap.String("address", address),
 		zap.String("bytecodeHash", bytecodeHash),
 	)
-	fmt.Printf("bytecodeHash: %s", bytecodeHash)
 
 	// fetch ABI using IPFS
 	// TODO: add a fallback method using Etherscan
@@ -93,7 +98,7 @@ func (af *AbiFetcher) GetIPFSUrlFromBytecode(bytecode string) (string, error) {
 	// Convert to base58
 	base58Hash := base58.Encode(bytes)
 
-	return fmt.Sprintf("https://ipfs.io/ipfs/%s", base58Hash), nil
+	return fmt.Sprintf("%s/%s", af.Config.IpfsConfig.Url, base58Hash), nil
 }
 
 func (af *AbiFetcher) FetchAbiFromIPFS(address string, bytecode string) (string, error) {
@@ -107,13 +112,8 @@ func (af *AbiFetcher) FetchAbiFromIPFS(address string, bytecode string) (string,
 	}
 	af.Logger.Sugar().Debug("Successfully retrieved IPFS URL",
 		zap.String("address", address),
-		zap.String("IPFS URL", url),
+		zap.String("ipfsUrl", url),
 	)
-	fmt.Printf("IPFS URL: %s \n", url)
-
-	httpClient := &http.Client{
-		Timeout: 5 * time.Second,
-	}
 
 	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
 	if err != nil {
@@ -124,7 +124,7 @@ func (af *AbiFetcher) FetchAbiFromIPFS(address string, bytecode string) (string,
 		return "", err
 	}
 
-	resp, err := httpClient.Do(req)
+	resp, err := af.httpClient.Do(req)
 	if err != nil {
 		af.Logger.Sugar().Errorw("Failed to perform HTTP request",
 			zap.Error(err),

pkg/abiFetcher/abiFetcher_test.go

@@ -2,7 +2,10 @@ package abiFetcher
 
 import (
 	"context"
+	"net/http"
+	"reflect"
 	"testing"
+	"time"
 
 	"os"
 
@@ -11,6 +14,8 @@ import (
 	"github.com/Layr-Labs/sidecar/internal/tests"
 	"github.com/Layr-Labs/sidecar/pkg/clients/ethereum"
 	"github.com/Layr-Labs/sidecar/pkg/postgres"
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/jarcoal/httpmock"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
@@ -39,20 +44,24 @@ func setup() (
 }
 
 func Test_AbiFetcher(t *testing.T) {
-	_, _, l, _, err := setup()
+	_, _, l, cfg, err := setup()
 
 	if err != nil {
 		t.Fatal(err)
 	}
 
+	httpClient := &http.Client{
+		Timeout: 5 * time.Second,
+	}
+
 	baseUrl := "http://72.46.85.253:8545"
 	ethConfig := ethereum.DefaultNativeCallEthereumClientConfig()
 	ethConfig.BaseUrl = baseUrl
 
 	client := ethereum.NewClient(ethConfig, l)
 
 	t.Run("Test getting IPFS url from bytecode", func(t *testing.T) {
-		af := NewAbiFetcher(client, l)
+		af := NewAbiFetcher(client, httpClient, l, cfg)
 
 		address := "0x29a954e9e7f12936db89b183ecdf879fbbb99f14"
 		bytecode, err := af.EthereumClient.GetCode(context.Background(), address)
@@ -65,15 +74,36 @@ func Test_AbiFetcher(t *testing.T) {
 		assert.Equal(t, expectedUrl, url)
 	})
 	t.Run("Test fetching ABI from IPFS", func(t *testing.T) {
-		af := NewAbiFetcher(client, l)
+		mockUrl := "https://test"
+		patches := gomonkey.ApplyMethod(reflect.TypeOf(&AbiFetcher{}), "GetIPFSUrlFromBytecode",
+			func(_ *AbiFetcher, _ string) (string, error) {
+				return mockUrl, nil
+			})
+		defer patches.Reset()
 
-		address := "0x29a954e9e7f12936db89b183ecdf879fbbb99f14"
-		bytecode, err := af.EthereumClient.GetCode(context.Background(), address)
-		assert.Nil(t, err)
+		httpmock.Activate()
+		defer httpmock.DeactivateAndReset()
 
-		abi, err := af.FetchAbiFromIPFS(address, bytecode)
+		mockAbiResponse := `{
+			"output": {
+				"abi": "[{\"type\":\"function\",\"name\":\"test\"}]"
+			}
+		}`
+
+		httpmock.RegisterResponder("GET", mockUrl,
+			httpmock.NewStringResponder(200, mockAbiResponse))
+
+		mockHttpClient := &http.Client{
+			Transport: httpmock.DefaultTransport,
+		}
+
+		af := NewAbiFetcher(client, mockHttpClient, l, cfg)
+
+		address := "0x29a954e9e7f12936db89b183ecdf879fbbb99f14"
+		abi, err := af.FetchAbiFromIPFS(address, "mocked")
 		assert.Nil(t, err)
 
-		assert.Greater(t, len(abi), 0)
+		expectedAbi := `"[{\"type\":\"function\",\"name\":\"test\"}]"`
+		assert.Equal(t, abi, expectedAbi)
 	})
 }

pkg/contractManager/contractManager.go

@@ -53,7 +53,7 @@ func (cm *ContractManager) GetContractWithProxy(
 	return contract, nil
 }
 
-// this function is called when there's an "Upgraded" event
+// HandleContractUpgrade parses an Upgraded contract log and inserts the new upgraded implementation into the database
 func (cm *ContractManager) HandleContractUpgrade(ctx context.Context, blockNumber uint64, upgradedLog *parser.DecodedLog) error {
 	// the new address that the contract points to
 	newProxiedAddress := ""
@@ -87,10 +87,11 @@ func (cm *ContractManager) HandleContractUpgrade(ctx context.Context, blockNumbe
 		}
 
 		newProxiedAddress = "0x" + storageValue[26:]
-		if newProxiedAddress == "" {
-			cm.Logger.Sugar().Debugw("No new proxied address found", zap.String("address", upgradedLog.Address))
-			return fmt.Errorf("no new proxied address found for %s during the 'Upgraded' event", upgradedLog.Address)
-		}
+	}
+
+	if newProxiedAddress == "" {
+		cm.Logger.Sugar().Debugw("No new proxied address found", zap.String("address", upgradedLog.Address))
+		return fmt.Errorf("no new proxied address found for %s during the 'Upgraded' event", upgradedLog.Address)
 	}
 
 	err := cm.CreateUpgradedProxyContract(ctx, blockNumber, upgradedLog.Address, newProxiedAddress)

pkg/contractManager/contractManager_test.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"reflect"
 	"testing"
+	"time"
 
 	"os"
 
@@ -72,7 +73,7 @@ func Test_ContractManager(t *testing.T) {
 
 	client := ethereum.NewClient(ethConfig, l, mockHttpClient)
 
-	af := abiFetcher.NewAbiFetcher(client, l)
+	af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 	metricsClients, err := metrics.InitMetricsSinksFromConfig(cfg, l)
 	if err != nil {

pkg/indexer/restakedStrategies_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"testing"
 	"time"
 
@@ -76,7 +77,7 @@ func Test_IndexerRestakedStrategies(t *testing.T) {
 
 	client := ethereum.NewClient(ethConfig, l)
 
-	af := abiFetcher.NewAbiFetcher(client, l)
+	af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 	metricsClients, err := metrics.InitMetricsSinksFromConfig(cfg, l)
 	if err != nil {

pkg/pipeline/pipelineIntegration_test.go

@@ -5,7 +5,9 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"net/http"
 	"testing"
+	"time"
 
 	"os"
 
@@ -77,7 +79,7 @@ func setup(ethConfig *ethereum.EthereumClientConfig) (
 	ethConfig.BaseUrl = rpcUrl
 	client := ethereum.NewClient(ethConfig, l)
 
-	af := abiFetcher.NewAbiFetcher(client, l)
+	af := abiFetcher.NewAbiFetcher(client, &http.Client{Timeout: 5 * time.Second}, l, cfg)
 
 	dbname, _, grm, err := postgres.GetTestPostgresDatabase(cfg.DatabaseConfig, cfg, l)
 	if err != nil {