Post merge fixes

smartcontractkit · Apr 5, 2024 · 58da34a · 58da34a
1 parent e11c0d0
commit 58da34a
Show file tree

Hide file tree

Showing 81 changed files with 670 additions and 494 deletions.
diff --git a/contracts/foundry-lib/forge-std b/contracts/foundry-lib/forge-std
diff --git a/core/chains/evm/logpoller/disabled.go b/core/chains/evm/logpoller/disabled.go
@@ -25,10 +25,6 @@ func (disabled) Healthy() error {
 
 func (disabled) Close() error { return ErrDisabled }
 
-func (disabled) Healthy() error {
-	return ErrDisabled
-}
-
 func (disabled) Ready() error { return ErrDisabled }
 
 func (disabled) HealthReport() map[string]error {

diff --git a/core/chains/evm/logpoller/observability_test.go b/core/chains/evm/logpoller/observability_test.go
@@ -126,34 +126,35 @@ func TestCountersAreProperlyPopulatedForWrites(t *testing.T) {
 }
 
 func TestCounterAreProperlyPopulatedForDeletes(t *testing.T) {
+	ctx := testutils.Context(t)
 	orm := createObservedORM(t, 420)
 	logs := generateRandomLogs(420, 20)
 
 	for _, log := range logs {
-		err := orm.InsertLogsWithBlock([]Log{log}, NewLogPollerBlock(utils.RandomBytes32(), log.BlockNumber, time.Now(), 0))
+		err := orm.InsertLogsWithBlock(ctx, []Log{log}, NewLogPollerBlock(utils.RandomBytes32(), log.BlockNumber, time.Now(), 0))
 		require.NoError(t, err)
 	}
 
 	// Delete 5 logs
-	removed, err := orm.DeleteBlocksBefore(logs[4].BlockNumber, 100)
+	removed, err := orm.DeleteBlocksBefore(ctx, logs[4].BlockNumber, 100)
 	require.NoError(t, err)
 	assert.Equal(t, int64(5), removed)
 	assert.Equal(t, float64(5), testutil.ToFloat64(orm.datasetSize.WithLabelValues("420", "DeleteBlocksBefore", "delete")))
 
 	// Delete 1 more log
-	removed, err = orm.DeleteBlocksBefore(logs[5].BlockNumber, 100)
+	removed, err = orm.DeleteBlocksBefore(ctx, logs[5].BlockNumber, 100)
 	require.NoError(t, err)
 	assert.Equal(t, int64(1), removed)
 	assert.Equal(t, float64(1), testutil.ToFloat64(orm.datasetSize.WithLabelValues("420", "DeleteBlocksBefore", "delete")))
 
 	// Delete all
-	removed, err = orm.DeleteBlocksBefore(logs[len(logs)-1].BlockNumber, 0)
+	removed, err = orm.DeleteBlocksBefore(ctx, logs[len(logs)-1].BlockNumber, 0)
 	require.NoError(t, err)
 	assert.Equal(t, int64(14), removed)
 	assert.Equal(t, float64(14), testutil.ToFloat64(orm.datasetSize.WithLabelValues("420", "DeleteBlocksBefore", "delete")))
 
 	// Nothing to be deleted
-	removed, err = orm.DeleteBlocksBefore(math.MaxInt, 0)
+	removed, err = orm.DeleteBlocksBefore(ctx, math.MaxInt, 0)
 	require.NoError(t, err)
 	assert.Equal(t, int64(0), removed)
 	assert.Equal(t, float64(0), testutil.ToFloat64(orm.datasetSize.WithLabelValues("420", "DeleteBlocksBefore", "delete")))

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
@@ -18,20 +18,23 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pelletier/go-toml/v2 v2.1.1
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.17.0
 	github.com/shopspring/decimal v1.3.1
+	github.com/smartcontractkit/chain-selectors v1.0.13
 	github.com/smartcontractkit/chainlink-automation v1.0.2
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240404141006-77085a02ce25
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20240326191951-2bbe9382d052
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.15.0
+	github.com/spf13/cobra v1.7.0
+	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.9.0
 	github.com/umbracle/ethgo v0.1.3
 	github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722
 	github.com/urfave/cli v1.22.14
 	go.dedis.ch/kyber/v3 v3.1.0
+	go.uber.org/multierr v1.11.0
 )
 
 require (
@@ -81,7 +84,7 @@ require (
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cometbft/cometbft v0.37.2 // indirect
-	github.com/cometbft/cometbft-db v0.7.0 // indirect
+	github.com/cometbft/cometbft-db v0.8.0 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/consensys/gnark-crypto v0.12.1 // indirect
@@ -91,8 +94,8 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect
-	github.com/cosmos/ibc-go/v7 v7.0.1 // indirect
-	github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect
+	github.com/cosmos/ibc-go/v7 v7.2.0 // indirect
+	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
@@ -211,6 +214,7 @@ require (
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/linxGnu/grocksdb v1.7.16 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -236,7 +240,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/pressly/goose/v3 v3.16.0 // indirect
@@ -255,7 +258,6 @@ require (
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/smartcontractkit/chain-selectors v1.0.10 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 // indirect
@@ -264,15 +266,15 @@ require (
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/supranational/blst v0.3.11 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
-	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
 	github.com/test-go/testify v1.1.4 // indirect
@@ -306,7 +308,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.3.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
+0 −1		.gitattributes
+3 −0		.gitmodules
+1 −1		README.md
+1 −1		foundry.toml
+1 −0		lib/ds-test
+1 −1		package.json
+0 −635		scripts/vm.py
+225 −518		src/StdAssertions.sol
+5 −19		src/StdChains.sol
+2 −2		src/StdCheats.sol
+11 −7		src/StdJson.sol
+106 −201		src/StdStorage.sol
+0 −179		src/StdToml.sol
+33 −61		src/StdUtils.sol
+4 −4		src/Test.sol
+458 −1,353		src/Vm.sol
+0 −234		src/mocks/MockERC20.sol
+0 −235		src/mocks/MockERC721.sol
+909 −39		test/StdAssertions.t.sol
+30 −31		test/StdChains.t.sol
+11 −19		test/StdCheats.t.sol
+1 −3		test/StdError.t.sol
+0 −49		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+11 −159		test/StdStorage.t.sol
+0 −49		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+0 −8		test/fixtures/test.json
+0 −6		test/fixtures/test.toml
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol