flake: bump dependencies and go v1.23

smartcontractkit · Oct 11, 2024 · d7c803d · d7c803d
1 parent 2975d45
commit d7c803d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink-starknet/integration-tests
 
-go 1.22.7
+go 1.22.8
 
 require (
 	github.com/NethermindEth/juno v0.3.1
@@ -16,8 +16,8 @@ require (
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20241009122052-5e3515805bca
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.9
 	github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1
-	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241010184507-aadf78ecc5f7
-	github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241010184507-aadf78ecc5f7
+	github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241011113521-7a311a7bf77d
+	github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241011113521-7a311a7bf77d
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.28.0
 	go.uber.org/zap v1.27.0

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -1427,10 +1427,10 @@ github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 h1:2OxnPfvj
 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1/go.mod h1:afY3QmNgeR/VI1pRbGH8g3YXGy7C2RrFOwUzEFvL3L8=
 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0 h1:gfhfTn7HkbUHNooSF3c9vzQyN8meWJVGt6G/pNUbpYk=
 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0/go.mod h1:tqajhpUJA/9OaMCLitghBXjAgqYO4i27St0F4TUO3+M=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241010184507-aadf78ecc5f7 h1:7E/GXXrkLBMEeMvh/K/GT4lvVf6drsJa3u5Gmp3h1vo=
-github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241010184507-aadf78ecc5f7/go.mod h1:U0+jc0yhimHLQzrS7WjwUvP68vhgUrQ6hHUhId/dVdo=
-github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241010184507-aadf78ecc5f7 h1:znkZFdeds1fHYXEJbadAOcx1CbAlRgUhhp5P9KdF3XU=
-github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241010184507-aadf78ecc5f7/go.mod h1:xvEpp/amp1tA1lwgIE4qsvmleeUXfZJkPLS1DWqpLy4=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241011113521-7a311a7bf77d h1:F8wYItb6fNtjD0Zfx5+nS6FT2TG8Ak/lvzpqcKH6mYc=
+github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241011113521-7a311a7bf77d/go.mod h1:HImKjxBIYBiKQq/gXZ7SbhAyxh3n/6ClRYyv03wD4Yc=
+github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241011113521-7a311a7bf77d h1:lX3hGdUWBA0TaphWTBCLehkbdUAt7mI0l67SyEUF0Ag=
+github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241011113521-7a311a7bf77d/go.mod h1:NsYICUGTIgy4VpzDeu9yf5lA65wFQkHDXnf2cu1GCg8=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
 github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12 h1:NzZGjaqez21I3DU7objl3xExTH4fxYvzTqar8DC6360=

diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
@@ -7,12 +7,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/actions"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
+	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
-	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-starknet/integration-tests/common"
 	tc "github.com/smartcontractkit/chainlink-starknet/integration-tests/testconfig"

diff --git a/relayer/pkg/chainlink/relay.go b/relayer/pkg/chainlink/relay.go
@@ -8,6 +8,7 @@ import (
 	"math/big"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	relaytypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
 
@@ -34,12 +35,12 @@ func (r *relayer) Name() string {
 	return r.lggr.Name()
 }
 
-func (r *relayer) Start(context.Context) error {
-	return nil
+func (r *relayer) Start(ctx context.Context) error {
+	return r.chain.Start(ctx)
 }
 
 func (r *relayer) Close() error {
-	return nil
+	return r.chain.Close()
 }
 
 func (r *relayer) Ready() error {
@@ -49,7 +50,9 @@ func (r *relayer) Ready() error {
 func (r *relayer) Healthy() error { return nil }
 
 func (r *relayer) HealthReport() map[string]error {
-	return map[string]error{r.Name(): r.Healthy()}
+	hp := map[string]error{r.Name(): r.Healthy()}
+	services.CopyHealth(hp, r.chain.HealthReport())
+	return hp
 }
 
 func (r *relayer) NewChainWriter(_ context.Context, _ []byte) (relaytypes.ChainWriter, error) {

diff --git a/shell.nix b/shell.nix
@@ -5,7 +5,7 @@
   scriptDir,
 }:
 with pkgs; let
-  go = pkgs.go_1_21;
+  go = pkgs.go_1_23;
 
   mkShell' = mkShell.override {
     # juno requires building with clang, not gcc
@@ -17,8 +17,8 @@ in
       [
         stdenv.cc.cc.lib
         (rust-bin.stable.latest.default.override {extensions = ["rust-src"];})
-        nodejs-18_x
-        (yarn.override {nodejs = nodejs-18_x;})
+        nodejs_20
+        (yarn.override {nodejs = nodejs_20;})
         nodePackages.typescript
         nodePackages.typescript-language-server
         nodePackages.npm
@@ -46,7 +46,7 @@ in
     LD_LIBRARY_PATH = lib.makeLibraryPath [pkgs.zlib stdenv.cc.cc.lib]; # lib64
 
     GOROOT = "${go}/share/go";
-    CGO_ENABLED = 0;
+    CGO_ENABLED = 1;
     HELM_REPOSITORY_CONFIG = "${scriptDir}/.helm-repositories.yaml";
 
     shellHook = ''