diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 0b712e69e..bd80df8a8 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19
+          go-version: 1.21.6
 
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 029f60b35..a8e4399dc 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21.6
         id: go
       - run: go version
 
diff --git a/core/vm/interface.go b/core/vm/interface.go
index 6ce7ca4be..9b82449b1 100644
--- a/core/vm/interface.go
+++ b/core/vm/interface.go
@@ -79,7 +79,6 @@ type StateDB interface {
 	AddLog(*types.Log)
 	AddPreimage(common.Hash, []byte)
 
-	ForEachStorage(common.Address, func(common.Hash, common.Hash) bool) error
 	GetStateSpecimen() *types.StateSpecimen
 }
 
diff --git a/internal/ethapi/multicall_api.go b/internal/ethapi/multicall_api.go
index 82bdc9bbc..530d76ba0 100644
--- a/internal/ethapi/multicall_api.go
+++ b/internal/ethapi/multicall_api.go
@@ -59,15 +59,7 @@ func (s *BlockChainAPI) Multicall(ctx context.Context, commonCallArgs Transactio
 			// get a new instance of the EVM to be used once
 			// ethapi's vmError callback always returns nil, so it is dropped here
 			//GetEVM(ctx context.Context, msg *core.Message, state *state.StateDB, header *types.Header, vmConfig *vm.Config, blockCtx *vm.BlockContext) (*vm.EVM, func() error)
-			evm, getVmErr := s.b.GetEVM(ctx, msg, state, header, nil, nil)
-			vmErr := getVmErr()
-
-			if vmErr != nil {
-				// if we cannot retrieve the an EVM for any message, that failure
-				// implies a fault in the node as a whole, so we should give up on
-				// processing the entire request
-				return nil, vmErr
-			}
+			evm := s.b.GetEVM(ctx, msg, state, header, nil, nil)
 
 			execResult, applyMsgErr := core.ApplyMessage(evm, msg, gp)
 
diff --git a/params/version.go b/params/version.go
index 6d6dc1702..e92ad50fa 100644
--- a/params/version.go
+++ b/params/version.go
@@ -29,8 +29,8 @@ const (
 
 const (
 	BspVersionMajor = 1 // Major version component of the current release
-	BspVersionMinor = 5 // Minor version component of the current release
-	BspVersionPatch = 2 // Patch version component of the current release
+	BspVersionMinor = 6 // Minor version component of the current release
+	BspVersionPatch = 0 // Patch version component of the current release
 )
 
 // Version holds the textual version string.