Make RequestHook storage non-atomic

rpc/client.go

@@ -74,7 +74,7 @@ type BatchElem struct {
 
 // Client represents a connection to an RPC server.
 type Client struct {
-	RequestHook atomic.Pointer[RequestHook]
+	requestHook RequestHook
 
 	idgen    func() ID // for subscriptions
 	isHTTP   bool      // connection type: http, ws or ipc
@@ -302,7 +302,7 @@ func (c *Client) CallContext(ctx context.Context, result interface{}, method str
 	}
 	op := &requestOp{ids: []json.RawMessage{msg.ID}, resp: make(chan *jsonrpcMessage, 1)}
 
-	resultHook := c.requestHook(msg)
+	resultHook := c.onRequest(msg)
 	if c.isHTTP {
 		err = c.sendHTTP(ctx, op, msg)
 	} else {
@@ -374,7 +374,7 @@ func (c *Client) BatchCallContext(ctx context.Context, b []BatchElem) error {
 	resultHooks := make([]ResultHook, len(msgs))
 	responsesForHooks := make([]interface{}, len(msgs))
 	for i, msg := range msgs {
-		resultHooks[i] = c.requestHook(msg)
+		resultHooks[i] = c.onRequest(msg)
 	}
 
 	var err error

rpc/client_arbitrum.go

@@ -51,6 +51,15 @@ func DialTransport(ctx context.Context, rawUrl string, transport *http.Transport
 	return rpcClient, nil
 }
 
+func DialContextWithRequestHook(ctx context.Context, url string, hook RequestHook) (*Client, error) {
+	client, err := DialContext(ctx, url)
+	if err != nil {
+		return nil, err
+	}
+	client.requestHook = hook
+	return client, nil
+}
+
 type RequestHook interface {
 	OnRequest(request interface{}) ResultHook
 }
@@ -64,11 +73,11 @@ type noopResultHook struct{}
 func (h noopResultHook) OnResult(interface{}, error) {
 }
 
-func (c *Client) requestHook(request interface{}) ResultHook {
-	hooks := c.RequestHook.Load()
+func (c *Client) onRequest(request interface{}) ResultHook {
+	hooks := c.requestHook
 	var respHooks ResultHook
 	if hooks != nil {
-		respHooks = (*hooks).OnRequest(request)
+		respHooks = hooks.OnRequest(request)
 	}
 	if respHooks == nil {
 		respHooks = noopResultHook{}