[Upgrade] Go-Ethereum release v1.9.8

rpc/handler.go

@@ -374,7 +374,11 @@ func (h *handler) handleSubscribe(cp *callProc, msg *jsonrpcMessage) *jsonrpcMes
 
 // runMethod runs the Go callback for an RPC method.
 func (h *handler) runMethod(ctx context.Context, msg *jsonrpcMessage, callb *callback, args []reflect.Value) *jsonrpcMessage {
-	result, err := callb.call(ctx, msg.Method, args)
+	//Quorum
+	//Pass the request ID to the method as part of the context, in case the method needs it later
+	contextWithId := context.WithValue(ctx, "id", &msg.ID)
+	//End-Quorum
+	result, err := callb.call(contextWithId, msg.Method, args)
 	if err != nil {
 		return msg.errorResponse(err)
 	}

rpc/server_test.go

@@ -239,3 +239,38 @@ func (s *stubAuthenticationManager) Authenticate(_ context.Context, _ string) (*
 func (s *stubAuthenticationManager) IsEnabled(_ context.Context) (bool, error) {
 	return s.isEnabled, s.stubErr
 }
+
+// This test checks that the `ID` from the RPC call is passed to the handler method
+func TestServerContextIdCaptured(t *testing.T) {
+	server := newTestServer()
+	defer server.Stop()
+
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal("can't listen:", err)
+	}
+	defer listener.Close()
+	go server.ServeListener(listener)
+
+	var (
+		request  = `{"jsonrpc":"2.0","id":1,"method":"test_echoCtxId"}` + "\n"
+		wantResp = `{"jsonrpc":"2.0","id":1,"result":1}` + "\n"
+	)
+	conn, err := net.Dial("tcp", listener.Addr().String())
+	if err != nil {
+		t.Fatal("can't dial:", err)
+	}
+	defer conn.Close()
+	// Write the request, then half-close the connection so the server stops reading.
+	conn.Write([]byte(request))
+	conn.(*net.TCPConn).CloseWrite()
+	// Now try to get the response.
+	buf := make([]byte, 2000)
+	n, err := conn.Read(buf)
+	if err != nil {
+		t.Fatal("read error:", err)
+	}
+	if !bytes.Equal(buf[:n], []byte(wantResp)) {
+		t.Fatalf("wrong response: %s", buf[:n])
+	}
+}

rpc/testservice_test.go

@@ -73,6 +73,10 @@ func (s *testService) EchoWithCtx(ctx context.Context, str string, i int, args *
 	return echoResult{str, i, args}
 }
 
+func (s *testService) EchoCtxId(ctx context.Context) interface{} {
+	return ctx.Value("id")
+}
+
 func (s *testService) Sleep(ctx context.Context, duration time.Duration) {
 	time.Sleep(duration)
 }