Merge pull request #37 from smartcontractkit/yn-logs-5

Update core image

Author: yashnevatia

Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE=local_chainlink
 
-FROM golang:1.24.2-bullseye as buildplugins
+FROM golang:1.24.5-bullseye as buildplugins
 RUN go version
 
 WORKDIR /build

relayer/cmd/chainlink-tron/default.nix

@@ -18,7 +18,7 @@ in
     ];
 
     # pin the vendor hash (update using 'pkgs.lib.fakeHash')
-    vendorHash = "sha256-d7uPn6jiFjgpK7foLEXObdfFO6l2M3R5AU6anRKvqsw=";
+    vendorHash = "sha256-SCl9rzV1LAN+0DTVDXCthin/VwR/rCNaz4WdxcpCPJY=";
 
     # postInstall script to write version and rev to share folder
     postInstall = ''

relayer/plugin/relayer.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"os"
 	"strings"
 
 	"github.com/fbsobreira/gotron-sdk/pkg/address"
@@ -77,6 +78,7 @@ func NewRelayer(cfg *config.TOMLConfig, lggr logger.Logger, keystore core.Keysto
 		RetentionPeriod:   cfg.RetentionPeriod(),
 		ReapInterval:      cfg.ReapInterval(),
 	})
+	lggr.Debugw("TronTxm instance created", "chainID", id, "instance_pointer", fmt.Sprintf("%p", txmgr), "relayer_pid", os.Getpid(), "core_pid", os.Getppid())
 
 	balanceMonitor := monitor.NewBalanceMonitor(id, cfg, lggr, keystore, func() (monitor.BalanceClient, error) {
 		return client.SolidityClient(), nil

relayer/utils.go

@@ -30,9 +30,16 @@ func PublicKeyToTronAddress(pubKey string) (address.Address, error) {
 		return nil, fmt.Errorf("public key cannot be empty")
 	}
 
+	// Try Base58 first
+	addr, err := address.StringToAddress(pubKey)
+	if err == nil {
+		return addr, nil
+	}
+
+	// Otherwise, treat as pubkey
 	pubKeyBytes, err := hex.DecodeString(pubKey)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("invalid pubkey: %w", err)
 	}
 	hash := sha3.NewLegacyKeccak256()
 	hash.Write(pubKeyBytes[1:]) // remove the 0x04 format identifier prefix

relayer/utils_test.go

@@ -3,6 +3,7 @@ package relayer_test
 import (
 	"testing"
 
+	"github.com/fbsobreira/gotron-sdk/pkg/address"
 	"github.com/fbsobreira/gotron-sdk/pkg/http/common"
 	"github.com/stretchr/testify/require"
 
@@ -95,3 +96,39 @@ func TestByteArrToStr(t *testing.T) {
 	str := relayer.ByteArrayToStr(b)
 	require.Equal(t, "[0x010203,0x040506]", str)
 }
+
+func TestPublicKeyToTronAddress(t *testing.T) {
+	tests := []struct {
+		name       string
+		input      string
+		expectErr  bool
+		verifyFunc func(addr address.Address) bool
+	}{
+		{
+			name:      "valid tron base58 address",
+			input:     "TRvVjWF1XHh2Tw5rVcRvrc9ZwDtWGqBp9v", // any valid address
+			expectErr: false,
+			verifyFunc: func(addr address.Address) bool {
+				return addr.String() == "TRvVjWF1XHh2Tw5rVcRvrc9ZwDtWGqBp9v"
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			addr, err := relayer.PublicKeyToTronAddress(tt.input)
+
+			if tt.expectErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotNil(t, addr)
+
+			if tt.verifyFunc != nil {
+				require.True(t, tt.verifyFunc(addr), "unexpected address result: %s", addr.String())
+			}
+		})
+	}
+}

scripts/build/Dockerfile.build.nix

@@ -2,7 +2,7 @@
 # syntax = docker/dockerfile:1.4
 
 # Takes Chainlink core as a base image and layers in plugins
-ARG BASE_IMAGE=public.ecr.aws/chainlink/chainlink:2.26.0
+ARG BASE_IMAGE=public.ecr.aws/chainlink/chainlink:2.28.0
 # Build the 'default' pkg if not set
 ARG NIX_BUILD_PKG=default