upgrade olekukonko/tablewriter; rm replace

core/cmd/bridge_commands.go

@@ -58,8 +58,7 @@ func (p *BridgePresenter) RenderTable(rt RendererTable) error {
 		p.FriendlyConfirmations(),
 		p.OutgoingToken,
 	})
-	render("Bridge", table)
-	return nil
+	return render("Bridge", table)
 }
 
 type BridgePresenters []BridgePresenter
@@ -75,8 +74,7 @@ func (ps BridgePresenters) RenderTable(rt RendererTable) error {
 		})
 	}
 
-	render("Bridges", table)
-	return nil
+	return render("Bridges", table)
 }
 
 // IndexBridges returns all bridges.

core/cmd/cosmos_transaction_commands.go

@@ -56,8 +56,7 @@ func (p *CosmosMsgPresenter) RenderTable(rt RendererTable) error {
 		hash,
 	})
 
-	render(fmt.Sprintf("Cosmos Message %v", p.ID), table)
-	return nil
+	return render(fmt.Sprintf("Cosmos Message %v", p.ID), table)
 }
 
 // CosmosSendNativeToken transfers coins from the node's account to a specified address.

core/cmd/evm_transaction_commands.go

@@ -80,8 +80,7 @@ func (p *EthTxPresenter) RenderTable(rt RendererTable) error {
 		p.State,
 	})
 
-	render(fmt.Sprintf("Ethereum Transaction %v", p.Hash.Hex()), table)
-	return nil
+	return render(fmt.Sprintf("Ethereum Transaction %v", p.Hash.Hex()), table)
 }
 
 type EthTxPresenters []EthTxPresenter
@@ -100,8 +99,7 @@ func (ps EthTxPresenters) RenderTable(rt RendererTable) error {
 		})
 	}
 
-	render("Ethereum Transactions", table)
-	return nil
+	return render("Ethereum Transactions", table)
 }
 
 // IndexTransactions returns the list of transactions in descending order,

core/cmd/external_initiator_commands.go

@@ -34,8 +34,7 @@ type ExternalInitiatorPresenter struct {
 func (eip *ExternalInitiatorPresenter) RenderTable(rt RendererTable) error {
 	table := rt.newTable([]string{"ID", "Name", "URL", "AccessKey", "OutgoingToken", "CreatedAt", "UpdatedAt"})
 	table.Append(eip.ToRow())
-	render("External Initiator:", table)
-	return nil
+	return render("External Initiator:", table)
 }
 
 func (eip *ExternalInitiatorPresenter) ToRow() []string {
@@ -61,8 +60,7 @@ func (eips *ExternalInitiatorPresenters) RenderTable(rt RendererTable) error {
 	for _, eip := range *eips {
 		table.Append(eip.ToRow())
 	}
-	render("External Initiators:", table)
-	return nil
+	return render("External Initiators:", table)
 }
 
 // IndexExternalInitiators lists external initiators

core/cmd/jobs_commands.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 
@@ -192,29 +194,31 @@ func (p JobPresenter) FriendlyCreatedAt() string {
 // RenderTable implements TableRenderer
 func (p *JobPresenter) RenderTable(rt RendererTable) error {
 	table := rt.newTable([]string{"ID", "Name", "Type", "Tasks", "Created At"})
-	table.SetAutoMergeCells(true)
+	table.Configure(func(cfg *tablewriter.Config) {
+		cfg.Behavior.Compact.Merge = tw.MergeHorizontal
+	})
 	for _, r := range p.ToRows() {
 		table.Append(r)
 	}
 
-	render("Jobs", table)
-	return nil
+	return render("Jobs", table)
 }
 
 type JobPresenters []JobPresenter
 
 // RenderTable implements TableRenderer
 func (ps JobPresenters) RenderTable(rt RendererTable) error {
 	table := rt.newTable([]string{"ID", "Name", "Type", "Tasks", "Created At"})
-	table.SetAutoMergeCells(true)
+	table.Configure(func(cfg *tablewriter.Config) {
+		cfg.Behavior.Compact.Merge = tw.MergeHorizontal
+	})
 	for _, p := range ps {
 		for _, r := range p.ToRows() {
 			table.Append(r)
 		}
 	}
 
-	render("Jobs (V2)", table)
-	return nil
+	return render("Jobs (V2)", table)
 }
 
 // ListJobs lists all jobs

core/cmd/renderer.go

@@ -6,6 +6,8 @@ import (
 	"strings"
 
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	webpresenters "github.com/smartcontractkit/chainlink/v2/core/web/presenters"
@@ -78,8 +80,7 @@ func (rt RendererTable) renderLogPkgConfig(serviceLevelLog webpresenters.Service
 		})
 	}
 
-	render("ServiceLogConfig", table)
-	return nil
+	return render("ServiceLogConfig", table)
 }
 
 func (rt RendererTable) renderVRFKeys(keys []VRFKeyPresenter) error {
@@ -98,14 +99,20 @@ func (rt RendererTable) renderVRFKeys(keys []VRFKeyPresenter) error {
 	return nil
 }
 
-func render(name string, table *tablewriter.Table) {
-	table.SetRowLine(true)
-	table.SetColumnSeparator("║")
-	table.SetRowSeparator("═")
-	table.SetCenterSeparator("╬")
+func render(name string, table *tablewriter.Table) error {
+	symbols := tw.NewSymbolCustom("double-line").
+		WithColumn("║").
+		WithRow("═").
+		WithCenter("╬")
 
 	fmt.Println("╔ " + name)
-	table.Render()
+	return table.Options(
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(
+				tw.Rendition{Symbols: symbols},
+			),
+		),
+	).Render()
 }
 
 func renderList(fields []string, items [][]string, writer io.Writer) {
@@ -151,13 +158,12 @@ func (rt RendererTable) renderExternalInitiatorAuthentication(eia webpresenters.
 		eia.OutgoingToken,
 		eia.OutgoingSecret,
 	})
-	render("External Initiator Credentials:", table)
-	return nil
+	return render("External Initiator Credentials:", table)
 }
 
 func (rt RendererTable) newTable(headers []string) *tablewriter.Table {
 	table := tablewriter.NewWriter(rt)
-	table.SetHeader(headers)
+	table.Header(headers)
 	return table
 }
 
@@ -176,6 +182,5 @@ func (rt RendererTable) renderPipelineRun(run webpresenters.PipelineRunResource)
 	}
 	table.Append(row)
 
-	render("Pipeline Run", table)
-	return nil
+	return render("Pipeline Run", table)
 }

core/cmd/solana_transaction_commands.go

@@ -54,8 +54,7 @@ func (p *SolanaMsgPresenter) RenderTable(rt RendererTable) error {
 		strconv.FormatUint(p.Amount, 10),
 	})
 
-	render(fmt.Sprintf("Solana Message %v", p.ID), table)
-	return nil
+	return render(fmt.Sprintf("Solana Message %v", p.ID), table)
 }
 
 // SolanaSendSol transfers sol from the node's account to a specified address.

core/scripts/chaincli/handler/ocr2_config.go

@@ -13,6 +13,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 
@@ -98,7 +100,7 @@ func configFromBlock(bl *types.Block, addr common.Address, detail keeper_registr
 	return nil, errors.New("public config not found")
 }
 
-func printConfigValues(config *confighelper.PublicConfig) {
+func printConfigValues(config *confighelper.PublicConfig) error {
 	data := [][]string{}
 
 	data = append(data, []string{"DeltaProgress", config.DeltaProgress.String()})
@@ -127,9 +129,11 @@ func printConfigValues(config *confighelper.PublicConfig) {
 	}
 
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"Field", "Value"})
+	table.Header([]string{"Field", "Value"})
 	// table.SetFooter([]string{"", "", "Total", "$146.93"}) // Add Footer
-	table.SetBorder(false) // Set Border to false
-	table.AppendBulk(data) // Add Bulk Data
-	table.Render()
+	table.Options(tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{Borders: tw.BorderNone})))
+	if err := table.Bulk(data); err != nil { // Add Bulk Data
+		return err
+	}
+	return table.Render()
 }

core/scripts/chaincli/handler/report.go

@@ -18,6 +18,8 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
@@ -128,13 +130,13 @@ func OCR2AutomationReports(hdlr *baseHandler, txs []string) error {
 	})
 
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"Hash", "ChainID", "Block", "Error", "From", "To", "Keys", "CheckBlocks"})
+	table.Header([]string{"Hash", "ChainID", "Block", "Error", "From", "To", "Keys", "CheckBlocks"})
 	// table.SetFooter([]string{"", "", "Total", "$146.93"}) // Add Footer
-	table.SetBorder(false) // Set Border to false
-	table.AppendBulk(data) // Add Bulk Data
-	table.Render()
-
-	return nil
+	table.Options(tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{Borders: tw.BorderNone})))
+	if err = table.Bulk(data); err != nil { // Add Bulk Data
+		return err
+	}
+	return table.Render()
 }
 
 func getTransactionDetailForHashes(hdlr *baseHandler, txs []string) ([]*map[string]any, []error, error) {

core/scripts/go.mod

@@ -454,6 +454,8 @@ require (
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
 	github.com/oklog/run v1.2.0 // indirect
 	github.com/oklog/ulid/v2 v2.1.1 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
+	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/open-policy-agent/opa v1.14.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -482,6 +484,7 @@ require (
 	github.com/prometheus/procfs v0.20.1 // indirect
 	github.com/prometheus/prometheus v0.311.3 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/rs/cors v1.11.1 // indirect
@@ -704,8 +707,6 @@ replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlin
 // yet, so we pin to v0.1.0 which has both the old aliases and the new compression API.
 replace github.com/moby/go-archive v0.2.0 => github.com/moby/go-archive v0.1.0
 
-replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5
-
 // Exclude Juno's placeholder dependency. It is only intended to be resolved via
 // Juno's local replace directive and is not used directly by chainlink
 exclude github.com/starknet-io/starknet-p2pspecs v0.0.0-00010101000000-000000000000

go.mod

@@ -321,6 +321,8 @@ require (
 	github.com/oapi-codegen/runtime v1.1.2 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
 	github.com/oklog/run v1.2.0 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
+	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/onsi/ginkgo/v2 v2.27.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
 	github.com/pb33f/ordered-map/v2 v2.3.1 // indirect
@@ -332,6 +334,7 @@ require (
 	github.com/pion/transport/v4 v4.0.2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/procfs v0.20.1 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/rs/zerolog v1.35.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -422,8 +425,6 @@ tool github.com/smartcontractkit/chainlink-common/pkg/loop/cmd/loopinstall
 
 tool github.com/smartcontractkit/chainlink-common/script/cmd/dependabot
 
-replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5
-
 // Exclude Juno's placeholder dependency. It is only intended to be resolved via
 // Juno's local replace directive and is not used directly by chainlink
 exclude github.com/starknet-io/starknet-p2pspecs v0.0.0-00010101000000-000000000000