From 0a982afeb81151180faf1c0cd5b324427d5e2fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 10 Oct 2024 19:13:39 -0300 Subject: [PATCH] flake: bump dependencies and go v1.23 --- flake.lock | 18 +++++++++--------- integration-tests/go.mod | 6 +++--- integration-tests/go.sum | 8 ++++---- integration-tests/smoke/ocr2_test.go | 4 ++-- shell.nix | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 83b94c04..1a578722 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724206841, - "narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=", + "lastModified": 1728527353, + "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61", + "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac", "type": "github" }, "original": { diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 8011a2bd..6336a04f 100644 --- 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 index d30c84e7..eb947164 100644 --- 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 index ffe72e0a..8616f61a 100644 --- 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/shell.nix b/shell.nix index 8dc91829..a852720e 100644 --- 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 = ''