diff --git a/execution/nodeInterface/virtual-contracts.go b/execution/nodeInterface/virtual-contracts.go
index d04be10857..d1a087cb80 100644
--- a/execution/nodeInterface/virtual-contracts.go
+++ b/execution/nodeInterface/virtual-contracts.go
@@ -50,7 +50,7 @@ func init() {
 	core.InterceptRPCMessage = func(
 		msg *core.Message,
 		ctx context.Context,
-		statedb *state.StateDB,
+		statedb vm.StateDB,
 		header *types.Header,
 		backend core.NodeInterfaceBackendAPI,
 		blockCtx *vm.BlockContext,
@@ -115,7 +115,7 @@ func init() {
 		return msg, nil, nil
 	}
 
-	core.InterceptRPCGasCap = func(gascap *uint64, msg *core.Message, header *types.Header, statedb *state.StateDB) {
+	core.InterceptRPCGasCap = func(gascap *uint64, msg *core.Message, header *types.Header, statedb vm.StateDB) {
 		if *gascap == 0 {
 			// It's already unlimited
 			return
diff --git a/go-ethereum b/go-ethereum
index 2515711014..a6072e220c 160000
--- a/go-ethereum
+++ b/go-ethereum
@@ -1 +1 @@
-Subproject commit 25157110146a7bb7afa73919f369fef3756761e2
+Subproject commit a6072e220cc4dc511e054a428e305cf506d7834f