[BCF-2506] Fix: id instead of legacy evmChainId in errors verbatim (#…

…10314)
smartcontractkit · Sep 14, 2023 · 77dfb66 · 77dfb66
1 parent 1745eab
commit 77dfb66
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/core/cmd/evm_transaction_commands.go b/core/cmd/evm_transaction_commands.go
@@ -133,7 +133,7 @@ func (s *Shell) ShowTransaction(c *cli.Context) (err error) {
 // SendEther transfers ETH from the node's account to a specified address.
 func (s *Shell) SendEther(c *cli.Context) (err error) {
 	if c.NArg() < 3 {
-		return s.errorOut(errors.New("three arguments expected: amount, fromAddress and toAddress"))
+		return s.errorOut(errors.New("the following arguments expected: (chain) id (in multi-chain setup), amount, fromAddress and toAddress"))
 	}
 
 	var amount assets.Eth

diff --git a/core/cmd/shell_remote_test.go b/core/cmd/shell_remote_test.go
@@ -131,7 +131,7 @@ func TestShell_ReplayBlocks(t *testing.T) {
 
 	require.NoError(t, set.Set("evm-chain-id", "12345678"))
 	c = cli.NewContext(nil, set, nil)
-	assert.ErrorContains(t, client.ReplayFromBlock(c), "evmChainID does not match any local chains")
+	assert.ErrorContains(t, client.ReplayFromBlock(c), "chain id does not match any local chains")
 
 	require.NoError(t, set.Set("evm-chain-id", "0"))
 	c = cli.NewContext(nil, set, nil)

diff --git a/core/web/common.go b/core/web/common.go
@@ -9,9 +9,9 @@ import (
 )
 
 var (
-	ErrMissingChainID = errors.New("evmChainID does not match any local chains")
-	ErrInvalidChainID = errors.New("invalid evmChainID")
-	ErrMultipleChains = errors.New("more than one chain available, you must specify evmChainID parameter")
+	ErrMissingChainID = errors.New("chain id does not match any local chains")
+	ErrInvalidChainID = errors.New("invalid chain id")
+	ErrMultipleChains = errors.New("more than one chain available, you must specify chain id parameter")
 )
 
 func getChain(legacyChains evm.LegacyChainContainer, chainIDstr string) (chain evm.Chain, err error) {

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -20,6 +20,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  All nodes will have to remove the following configuration field: `ExplorerURL`
 
 ### Fixed
+- Unauthenticated users executing CLI commands previously generated a confusing error log, which is now removed:
+```[ERROR] Error in transaction, rolling back: session missing or expired, please login again pg/transaction.go:118 ```
+- Fixed a bug that was preventing job runs to be displayed when the job `chainID` was disabled.
+- `chainlink txs evm create` returns a transaction hash for the attempted transaction in the CLI. Previously only the sender, recipient and `unstarted` state were returned.
+- Fixed a bug when when `evmChainId` is requested instead of `id` or `evm-chain-id` in CLI error verbatim
+
+## 2.5.0 - UNRELEASED
+=======
 
 - Unauthenticated users executing CLI commands previously generated a confusing error log, which is now removed:
   ```
@@ -37,8 +45,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- unreleasedstop -->
 
-## 2.5.0 - 2023-09-13
-
 ### Upcoming Required Configuration Change
 
 - Starting in 2.6.0, chainlink nodes will no longer allow insecure configuration for production builds. Any TOML configuration that sets the following line will fail validation checks in `node start` or `node validate`: