Merge branch 'develop' into fix/backoff-package

go.mod

@@ -24,7 +24,6 @@ require (
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/jackc/pgtype v1.14.0
 	github.com/jackc/pgx/v5 v5.4.3
-	github.com/joho/godotenv v1.5.1
 	github.com/libp2p/go-libp2p v0.27.8
 	github.com/libp2p/go-libp2p-pubsub v0.9.3
 	github.com/libp2p/go-libp2p-testing v0.12.0

go.sum

@@ -429,8 +429,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

indexer/config/config.go

@@ -8,7 +8,6 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/ethereum/go-ethereum/common"
 	geth_log "github.com/ethereum/go-ethereum/log"
-	"github.com/joho/godotenv"
 )
 
 // in future presets can just be onchain config and fetched on initialization
@@ -89,13 +88,6 @@ type MetricsConfig struct {
 
 // LoadConfig loads the `indexer.toml` config file from a given path
 func LoadConfig(logger geth_log.Logger, path string) (Config, error) {
-	if err := godotenv.Load(); err != nil {
-		logger.Warn("Unable to load .env file", err)
-		logger.Info("Continuing without .env file")
-	} else {
-		logger.Info("Loaded .env file")
-	}
-
 	var conf Config
 
 	data, err := os.ReadFile(path)

op-bindings/Makefile

-SHELL := /bin/bash
+SHELL := /usr/bin/env bash
 
 pkg := bindings
 monorepo-base := $(shell dirname $(realpath .))

op-chain-ops/crossdomain/testdata/trace.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 HASH=$1
 

op-challenger/scripts/alphabet/charlie.sh

-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 SOURCE_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)

op-challenger/scripts/alphabet/init_game.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

op-challenger/scripts/alphabet/mallory.sh

-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 SOURCE_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)

op-challenger/scripts/parallel.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 # set -x
 

op-challenger/scripts/visualize.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

packages/contracts-bedrock/scripts/slither.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 rm -rf artifacts forge-artifacts
 

packages/contracts-bedrock/scripts/verify-foundry-install.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 if ! command -v forge &> /dev/null
 then