From b2172f9621ed640a75a585a8c386663cf1aaa4a9 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Thu, 8 Sep 2022 11:13:54 +0200
Subject: [PATCH 1/7] Manifest: Resto.1.0

---
 manifest/main.ml                     | 2 +-
 opam/tezos-mockup-proxy.opam         | 2 +-
 opam/tezos-mockup.opam               | 2 +-
 opam/tezos-rpc-http-client-unix.opam | 2 +-
 opam/tezos-rpc-http-client.opam      | 2 +-
 opam/tezos-rpc-http-server.opam      | 4 ++--
 opam/tezos-rpc-http.opam             | 2 +-
 opam/tezos-rpc.opam                  | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 650c9323551d..66fe6814cfdf 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -293,7 +293,7 @@ let qcheck_core = external_lib "qcheck-core" V.True
 
 let re = external_lib ~js_compatible:true "re" V.(at_least "1.7.2")
 
-let resto_version = V.(at_least "0.10" && less_than "1.0")
+let resto_version = V.(at_least "1.0")
 
 let resto = external_lib ~js_compatible:true "resto" resto_version
 
diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam
index 8be49e5df536..1e1fe32fddb0 100644
--- a/opam/tezos-mockup-proxy.opam
+++ b/opam/tezos-mockup-proxy.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-client-base"
   "tezos-protocol-environment"
   "tezos-rpc-http"
-  "resto-cohttp-self-serving-client" { >= "0.10" & < "1.0" }
+  "resto-cohttp-self-serving-client" { >= "1.0" }
   "tezos-rpc-http-client"
   "tezos-shell-services"
   "uri" { >= "2.2.0" }
diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam
index 39bfaf29438d..e0e8eb524ba6 100644
--- a/opam/tezos-mockup.opam
+++ b/opam/tezos-mockup.opam
@@ -12,7 +12,7 @@ depends: [
   "tezos-base"
   "tezos-client-base"
   "tezos-mockup-proxy"
-  "resto-cohttp-self-serving-client" { >= "0.10" & < "1.0" }
+  "resto-cohttp-self-serving-client" { >= "1.0" }
   "tezos-rpc"
   "tezos-p2p-services"
   "tezos-p2p"
diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam
index e7791ac00d30..b728543e1d8d 100644
--- a/opam/tezos-rpc-http-client-unix.opam
+++ b/opam/tezos-rpc-http-client-unix.opam
@@ -12,7 +12,7 @@ depends: [
   "tezos-stdlib-unix"
   "tezos-base"
   "cohttp-lwt-unix" { >= "2.2.0" }
-  "resto-cohttp-client" { >= "0.10" & < "1.0" }
+  "resto-cohttp-client" { >= "1.0" }
   "tezos-rpc-http-client"
 ]
 build: [
diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam
index 85248e3c6f87..060aaa04d272 100644
--- a/opam/tezos-rpc-http-client.opam
+++ b/opam/tezos-rpc-http-client.opam
@@ -10,7 +10,7 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "resto-cohttp-client" { >= "0.10" & < "1.0" }
+  "resto-cohttp-client" { >= "1.0" }
   "tezos-rpc-http"
 ]
 build: [
diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam
index 664be09e9928..777f8ab3c0bc 100644
--- a/opam/tezos-rpc-http-server.opam
+++ b/opam/tezos-rpc-http-server.opam
@@ -11,8 +11,8 @@ depends: [
   "dune" { >= "3.0" }
   "tezos-base"
   "tezos-stdlib-unix"
-  "resto-cohttp-server" { >= "0.10" & < "1.0" }
-  "resto-acl" { >= "0.10" & < "1.0" }
+  "resto-cohttp-server" { >= "1.0" }
+  "resto-acl" { >= "1.0" }
   "tezos-rpc"
   "tezos-rpc-http"
   "tezos-stdlib" {with-test}
diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam
index 04b6cff8eab0..f2f4c80538bc 100644
--- a/opam/tezos-rpc-http.opam
+++ b/opam/tezos-rpc-http.opam
@@ -10,7 +10,7 @@ license: "MIT"
 depends: [
   "dune" { >= "3.0" }
   "tezos-base"
-  "resto-cohttp" { >= "0.10" & < "1.0" }
+  "resto-cohttp" { >= "1.0" }
   "uri" { >= "2.2.0" }
 ]
 build: [
diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam
index 5b2a9e42bb17..bce9eefe83e6 100644
--- a/opam/tezos-rpc.opam
+++ b/opam/tezos-rpc.opam
@@ -11,8 +11,8 @@ depends: [
   "dune" { >= "3.0" }
   "data-encoding" { >= "0.6" & < "0.7" }
   "tezos-error-monad"
-  "resto" { >= "0.10" & < "1.0" }
-  "resto-directory" { >= "0.10" & < "1.0" }
+  "resto" { >= "1.0" }
+  "resto-directory" { >= "1.0" }
   "uri" { >= "2.2.0" }
 ]
 build: [
-- 
GitLab


From 631545aef5a055467e3cb15a0cac737801a08647 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Wed, 5 Oct 2022 14:21:25 +0200
Subject: [PATCH 2/7] Build: Update opam hash

---
 .gitlab/ci/templates.yml | 2 +-
 scripts/version.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/templates.yml b/.gitlab/ci/templates.yml
index 57a04fcdc738..1e14b3fdbe53 100644
--- a/.gitlab/ci/templates.yml
+++ b/.gitlab/ci/templates.yml
@@ -2,7 +2,7 @@ variables:
   # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR
   # in GitLab namespaces `nomadic-labs` and `tezos`
   ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh`
-  build_deps_image_version: 575ab3679d48a9ffe1823859374692b8dd134d08
+  build_deps_image_version: df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2
   build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository"
   GIT_STRATEGY: fetch
   GIT_DEPTH: "1"
diff --git a/scripts/version.sh b/scripts/version.sh
index ac0925c6adf4..57350db7585a 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -25,7 +25,7 @@ export full_opam_repository_tag=5b15e5ee8adbd7522032018e1694f547555ba2b6
 ## opam_repository is an additional, tezos-specific opam repository.
 ## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.ym
 export opam_repository_url=https://gitlab.com/tezos/opam-repository
-export opam_repository_tag=575ab3679d48a9ffe1823859374692b8dd134d08
+export opam_repository_tag=df8d0aa9d9a08a49cf97f27e58662c10fb3f70f2
 export opam_repository_git=$opam_repository_url.git
 export opam_repository=$opam_repository_git\#$opam_repository_tag
 
-- 
GitLab


From e217d8755a0be5b7ec299b9a542798d5029f65d2 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 19 Aug 2022 13:43:07 +0200
Subject: [PATCH 3/7] lib_rpc_http: Use redirects from Resto.1.0

---
 src/lib_rpc_http/RPC_client.ml         | 10 +++++++--
 src/lib_rpc_http/RPC_client_errors.ml  | 29 ++++++++++++++++++--------
 src/lib_rpc_http/RPC_client_errors.mli |  5 ++---
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/lib_rpc_http/RPC_client.ml b/src/lib_rpc_http/RPC_client.ml
index c41504147952..2078f48610e5 100644
--- a/src/lib_rpc_http/RPC_client.ml
+++ b/src/lib_rpc_http/RPC_client.ml
@@ -146,8 +146,6 @@ module Make (Client : Resto_cohttp_client.Client.CALL) = struct
     | ( `Conflict _ | `Error _ | `Forbidden _ | `Unauthorized _ | `Not_found _
       | `Gone _ ) as v ->
         return_ok v
-    | `Unexpected_status_code (`Moved_permanently, _) ->
-        request_failed meth uri Redirect_not_supported
     | `Unexpected_status_code (code, (content, _, media_type)) ->
         let media_type = Option.map Media_type.name media_type in
         let* content = Cohttp_lwt.Body.to_string content in
@@ -171,6 +169,10 @@ module Make (Client : Resto_cohttp_client.Client.CALL) = struct
     | `OCaml_exception msg -> request_failed meth uri (OCaml_exception msg)
     | `Unauthorized_host host ->
         request_failed meth uri (Unauthorized_host host)
+    | `Too_many_redirects msg ->
+        request_failed meth uri (Too_many_redirects msg)
+    | `Redirect_without_location msg ->
+        request_failed meth uri (Redirect_without_location msg)
 
   let handle_error (body, content_type, _) f =
     let open Lwt_syntax in
@@ -409,6 +411,10 @@ module Make (Client : Resto_cohttp_client.Client.CALL) = struct
     | `OCaml_exception msg -> request_failed meth uri (OCaml_exception msg)
     | `Unauthorized_host host ->
         request_failed meth uri (Unauthorized_host host)
+    | `Too_many_redirects msg ->
+        request_failed meth uri (Too_many_redirects msg)
+    | `Redirect_without_location msg ->
+        request_failed meth uri (Redirect_without_location msg)
 
   let call_streamed_service (type p q i o) accept ?logger ?headers ~base
       (service : (_, _, p, q, i, o) RPC_service.t) ~on_chunk ~on_close
diff --git a/src/lib_rpc_http/RPC_client_errors.ml b/src/lib_rpc_http/RPC_client_errors.ml
index 08d28b102e8a..9c9faf6c042b 100644
--- a/src/lib_rpc_http/RPC_client_errors.ml
+++ b/src/lib_rpc_http/RPC_client_errors.ml
@@ -49,7 +49,8 @@ type rpc_error =
   | OCaml_exception of string
   | Unauthorized_host of string option
   | Unauthorized_uri
-  | Redirect_not_supported
+  | Too_many_redirects of string
+  | Redirect_without_location of string
 
 type error +=
   | Request_failed of {meth : RPC_service.meth; uri : Uri.t; error : rpc_error}
@@ -167,10 +168,20 @@ let rpc_error_encoding =
         (function () -> Unauthorized_uri);
       case
         (Tag 11)
-        ~title:"Redirect not supported"
-        unit
-        (function Redirect_not_supported -> Some () | _ -> None)
-        (function () -> Redirect_not_supported);
+        ~title:"Too many redirects"
+        (obj2
+           (req "kind" (constant "too_many_redirects"))
+           (req "content" string))
+        (function Too_many_redirects msg -> Some ((), msg) | _ -> None)
+        (function (), msg -> Too_many_redirects msg);
+      case
+        (Tag 12)
+        ~title:"Redirect without location"
+        (obj2
+           (req "kind" (constant "redirect_without_location"))
+           (req "content" string))
+        (function Redirect_without_location msg -> Some ((), msg) | _ -> None)
+        (function (), msg -> Redirect_without_location msg);
     ]
 
 let pp_rpc_error ppf err =
@@ -249,10 +260,10 @@ let pp_rpc_error ppf err =
       Format.fprintf
         ppf
         "@[<v 2>The server doesn't authorize this endpoint (ACL filtering).@]"
-  | Redirect_not_supported ->
-      Format.fprintf
-        ppf
-        "@[<v 2>The client does not support following HTTP redirects yet.@]"
+  | Too_many_redirects msg ->
+      Format.fprintf ppf "@[<v 2>Too many redirects: %s.@]" msg
+  | Redirect_without_location msg ->
+      Format.fprintf ppf "@[<v 2>Redirect without location: %s.@]" msg
 
 let () =
   register_error_kind
diff --git a/src/lib_rpc_http/RPC_client_errors.mli b/src/lib_rpc_http/RPC_client_errors.mli
index 7260d85df6ae..3f28975fd96a 100644
--- a/src/lib_rpc_http/RPC_client_errors.mli
+++ b/src/lib_rpc_http/RPC_client_errors.mli
@@ -49,9 +49,8 @@ type rpc_error =
   | OCaml_exception of string
   | Unauthorized_host of string option
   | Unauthorized_uri
-  | Redirect_not_supported
-      (** Indicates that the endpoint returned a redirect, which the client does
-        not yet know how to follow. *)
+  | Too_many_redirects of string
+  | Redirect_without_location of string
 
 type error +=
   | Request_failed of {meth : RPC_service.meth; uri : Uri.t; error : rpc_error}
-- 
GitLab


From 7a3671184bfe0a93160ca75e4ca5ea7aea0e7eb5 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 16 Sep 2022 14:17:31 +0200
Subject: [PATCH 4/7] RPC servers: Use launch and init from Resto.1.0

---
 src/bin_dal_node/RPC_server.ml                | 10 ++-
 src/bin_node/node_run_command.ml              | 80 +++++++++----------
 src/bin_proxy_server/proxy_server_main_run.ml | 19 +++--
 src/bin_signer/http_daemon.ml                 |  9 ++-
 src/lib_rpc_http/RPC_middleware.ml            | 13 ++-
 src/lib_rpc_http/RPC_middleware.mli           |  7 +-
 src/lib_rpc_http/RPC_server.mli               | 25 ++++--
 src/proto_014_PtKathma/lib_tx_rollup/RPC.ml   | 17 ++--
 src/proto_015_PtLimaPt/lib_tx_rollup/RPC.ml   | 17 ++--
 .../bin_sc_rollup_node/RPC_server.ml          | 19 +++--
 src/proto_alpha/lib_tx_rollup/RPC.ml          | 17 ++--
 11 files changed, 135 insertions(+), 98 deletions(-)

diff --git a/src/bin_dal_node/RPC_server.ml b/src/bin_dal_node/RPC_server.ml
index 8af87431a331..01076976ec0a 100644
--- a/src/bin_dal_node/RPC_server.ml
+++ b/src/bin_dal_node/RPC_server.ml
@@ -109,15 +109,17 @@ let start configuration dir =
   let host = Ipaddr.V6.to_string rpc_addr in
   let node = `TCP (`Port rpc_port) in
   let acl = RPC_server.Acl.default rpc_addr in
+  let server =
+    RPC_server.init_server dir ~acl ~media_types:Media_type.all_media_types
+  in
   Lwt.catch
     (fun () ->
-      let* server =
+      let* () =
         RPC_server.launch
-          ~media_types:Media_type.all_media_types
           ~host
-          ~acl
+          server
+          ~callback:(RPC_server.resto_callback server)
           node
-          dir
       in
       return_ok server)
     fail_with_exn
diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml
index c5c276d8c40a..3a2aecd57ac3 100644
--- a/src/bin_node/node_run_command.ml
+++ b/src/bin_node/node_run_command.ml
@@ -404,53 +404,49 @@ let launch_rpc_server ~acl_policy ~media_types (config : Node_config_file.t)
   let cors_headers =
     sanitize_cors_headers ~default:["Content-Type"] rpc_config.cors_headers
   in
-  let metric_middleware =
-    let transform_callback callback connection request body =
-      let do_call () = callback connection request body in
-      let cohttp_meth = Cohttp.Request.meth request in
-      let uri = Cohttp.Request.uri request in
-      let path = Uri.path uri in
-      let decoded = Resto.Utils.decode_split_path path in
-      let*! description =
-        let* resto_meth =
-          match cohttp_meth with
-          | #Resto.meth as meth -> Lwt.return_ok meth
-          | _ -> Lwt.return_error @@ `Method_not_allowed []
-        in
-        let* uri_desc =
-          RPC_directory.lookup_uri_desc dir () resto_meth decoded
-        in
-        Lwt.return_ok (uri_desc, Resto.string_of_meth resto_meth)
+  let transform_callback callback connection request body =
+    let open Lwt_result_syntax in
+    let do_call () = callback connection request body in
+    let cohttp_meth = Cohttp.Request.meth request in
+    let uri = Cohttp.Request.uri request in
+    let path = Uri.path uri in
+    let decoded = Resto.Utils.decode_split_path path in
+    let*! description =
+      let* resto_meth =
+        match cohttp_meth with
+        | #Resto.meth as meth -> Lwt.return_ok meth
+        | _ -> Lwt.return_error @@ `Method_not_allowed []
       in
-      match description with
-      | Ok (uri, meth) ->
-          (* We update the metric only if the URI can succesfully
-             be matched in the directory tree. *)
-          Prometheus.Summary.(time (labels metric [uri; meth]) Sys.time do_call)
-      | Error _ ->
-          (* Otherwise, the call must be done anyway. *)
-          do_call ()
+      let* uri_desc = RPC_directory.lookup_uri_desc dir () resto_meth decoded in
+      Lwt.return_ok (uri_desc, Resto.string_of_meth resto_meth)
     in
-    let is_metric_collection_enable = List.is_empty config.metrics_addr in
-    if is_metric_collection_enable then None
-    else Some Resto_cohttp_server.Server.{transform_callback}
+    match description with
+    | Ok (uri, meth) ->
+        (* We update the metric only if the URI can succesfully
+           be matched in the directory tree. *)
+        Prometheus.Summary.(time (labels metric [uri; meth]) Sys.time do_call)
+    | Error _ ->
+        (* Otherwise, the call must be done anyway. *)
+        do_call ()
+  in
+  let cors =
+    RPC_server.
+      {
+        allowed_origins = rpc_config.cors_origins;
+        allowed_headers = cors_headers;
+      }
   in
+  let server =
+    RPC_server.init_server
+      ~cors
+      ~acl
+      ~media_types:(Media_type.Command_line.of_command_line media_types)
+      dir
+  in
+  let callback = transform_callback (RPC_server.resto_callback server) in
   Lwt.catch
     (fun () ->
-      let*! server =
-        RPC_server.launch
-          ~host
-          mode
-          dir
-          ~acl
-          ?middleware:metric_middleware
-          ~media_types:(Media_type.Command_line.of_command_line media_types)
-          ~cors:
-            {
-              allowed_origins = rpc_config.cors_origins;
-              allowed_headers = cors_headers;
-            }
-      in
+      let*! () = RPC_server.launch ~host server ~callback mode in
       return server)
     (function
       (* FIXME: https://gitlab.com/tezos/tezos/-/issues/1312
diff --git a/src/bin_proxy_server/proxy_server_main_run.ml b/src/bin_proxy_server/proxy_server_main_run.ml
index 44af1c9d3ee8..23ba6e23918f 100644
--- a/src/bin_proxy_server/proxy_server_main_run.ml
+++ b/src/bin_proxy_server/proxy_server_main_run.ml
@@ -63,19 +63,24 @@ let launch_rpc_server dir {address; port; tls_cert_and_key; forwarding_endpoint}
     | Some (cert, key) ->
         `TLS (`Crt_file_path cert, `Key_file_path key, `No_password, `Port port)
   in
+  let server =
+    Tezos_rpc_http_server.RPC_server.init_server
+      dir
+      ~media_types:Tezos_rpc_http.Media_type.all_media_types
+  in
   let middleware =
     Tezos_rpc_http_server.RPC_middleware.proxy_server_query_forwarder
       forwarding_endpoint
   in
+  let callback =
+    Tezos_rpc_http_server.RPC_server.resto_callback server |> middleware
+  in
   Lwt.catch
     (fun () ->
-      Lwt_result.ok
-      @@ Tezos_rpc_http_server.RPC_server.launch
-           ~host
-           mode
-           dir
-           ~middleware
-           ~media_types:Tezos_rpc_http.Media_type.all_media_types)
+      let*! () =
+        Tezos_rpc_http_server.RPC_server.launch ~host server ~callback mode
+      in
+      Lwt.return_ok server)
     (function
       | Unix.Unix_error (Unix.EADDRINUSE, "bind", "") ->
           tzfail (Proxy_server_RPC_Port_already_in_use [(address, port)])
diff --git a/src/bin_signer/http_daemon.ml b/src/bin_signer/http_daemon.ml
index 48f3801b9934..b40fe873e196 100644
--- a/src/bin_signer/http_daemon.ml
+++ b/src/bin_signer/http_daemon.ml
@@ -52,17 +52,20 @@ let run (cctxt : #Client_context.wallet) ~hosts ?magic_bytes
           return_some hashes
         else return_none)
   in
+  let server =
+    RPC_server.init_server ~media_types:Media_type.all_media_types dir
+  in
   Lwt.catch
     (fun () ->
       List.map
         (fun host ->
           let*! () = Events.(emit listening) host in
-          let*! _server =
+          let*! () =
             RPC_server.launch
               ~host:(Ipaddr.V6.to_string host)
+              server
+              ~callback:(RPC_server.resto_callback server)
               mode
-              dir
-              ~media_types:Media_type.all_media_types
           in
           Lwt_utils.never_ending ())
         hosts
diff --git a/src/lib_rpc_http/RPC_middleware.ml b/src/lib_rpc_http/RPC_middleware.ml
index c31c83f6b1ae..90b5b197b0eb 100644
--- a/src/lib_rpc_http/RPC_middleware.ml
+++ b/src/lib_rpc_http/RPC_middleware.ml
@@ -25,19 +25,17 @@
 
 let make_transform_callback forwarding_endpoint callback conn req body =
   let open Lwt_syntax in
-  let* answer = callback conn req body in
   let open Cohttp in
+  let* answer = callback conn req body in
   let uri = Request.uri req in
   let answer_has_not_found_status = function
     | `Expert (response, _) | `Response (response, _) ->
-        Cohttp.Response.status response = `Not_found
+        Response.status response = `Not_found
   in
   if answer_has_not_found_status answer then
     let overriding = Uri.to_string forwarding_endpoint ^ Uri.path uri in
-    let headers = Cohttp.Header.of_list [("Location", overriding)] in
-    let response =
-      Cohttp.Response.make ~status:`Moved_permanently ~headers ()
-    in
+    let headers = Header.of_list [("Location", overriding)] in
+    let response = Response.make ~status:`Moved_permanently ~headers () in
     Lwt.return
       (`Response
         ( response,
@@ -49,5 +47,4 @@ let make_transform_callback forwarding_endpoint callback conn req body =
   else Lwt.return answer
 
 let proxy_server_query_forwarder forwarding_endpoint =
-  Resto_cohttp_server.Server.
-    {transform_callback = make_transform_callback forwarding_endpoint}
+  make_transform_callback forwarding_endpoint
diff --git a/src/lib_rpc_http/RPC_middleware.mli b/src/lib_rpc_http/RPC_middleware.mli
index b071e1dbb84d..405721b22cf9 100644
--- a/src/lib_rpc_http/RPC_middleware.mli
+++ b/src/lib_rpc_http/RPC_middleware.mli
@@ -23,10 +23,11 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(** This module provides a middleware that is used by the proxy server to
+(** This module provides middlewares that is used by the RPC servers to
     forward unsupported RPCs to a full node. *)
 
-(** A Resto middleware that rewrites any queries that the proxy server cannot
+(** A Resto middleware that transform any callback to an other
+    that rewrites queries that the proxy server cannot
     handle and forwards them to the full node at the given [Uri.t]. *)
 val proxy_server_query_forwarder :
-  Uri.t -> Resto_cohttp_server.Server.middleware
+  Uri.t -> RPC_server.callback -> RPC_server.callback
diff --git a/src/lib_rpc_http/RPC_server.mli b/src/lib_rpc_http/RPC_server.mli
index 3ea2fe513d66..4d50adb7f58f 100644
--- a/src/lib_rpc_http/RPC_server.mli
+++ b/src/lib_rpc_http/RPC_server.mli
@@ -30,17 +30,30 @@ type cors = {allowed_headers : string list; allowed_origins : string list}
 (** A handle on the server worker. *)
 type server
 
-(** Promise a running RPC server.*)
-val launch :
-  ?host:string ->
+type callback =
+  Cohttp_lwt_unix.Server.conn ->
+  Cohttp.Request.t ->
+  Cohttp_lwt.Body.t ->
+  Cohttp_lwt_unix.Server.response_action Lwt.t
+
+val resto_callback : server -> callback
+
+(** Initializes a RPC server *)
+val init_server :
   ?cors:cors ->
   ?agent:string ->
   ?acl:Resto_acl.Acl.t ->
-  ?middleware:Resto_cohttp_server.Server.middleware ->
   media_types:Media_type.t list ->
-  Conduit_lwt_unix.server ->
   unit RPC_directory.t ->
-  server Lwt.t
+  server
+
+(** Promise [server].*)
+val launch :
+  ?host:string ->
+  server ->
+  ?callback:callback ->
+  Conduit_lwt_unix.server ->
+  unit Lwt.t
 
 (** Kill an RPC server. *)
 val shutdown : server -> unit Lwt.t
diff --git a/src/proto_014_PtKathma/lib_tx_rollup/RPC.ml b/src/proto_014_PtKathma/lib_tx_rollup/RPC.ml
index 6ea41409203c..db0562111799 100644
--- a/src/proto_014_PtKathma/lib_tx_rollup/RPC.ml
+++ b/src/proto_014_PtKathma/lib_tx_rollup/RPC.ml
@@ -780,19 +780,24 @@ let start_server configuration state =
   let cors_headers =
     sanitize_cors_headers ~default:["Content-Type"] cors_headers
   in
+  let server =
+    RPC_server.init_server
+      dir
+      ~acl
+      ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+      ~media_types:Media_type.all_media_types
+  in
   Lwt.catch
     (fun () ->
-      let*! rpc_server =
+      let*! () =
         RPC_server.launch
-          ~media_types:Media_type.all_media_types
           ~host
-          ~acl
-          ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+          server
+          ~callback:(RPC_server.resto_callback server)
           node
-          dir
       in
       let*! () = Event.(emit rpc_server_is_ready) rpc_addr in
-      return rpc_server)
+      return server)
     fail_with_exn
 
 let balance ctxt (block : block_id) ticket tz4 =
diff --git a/src/proto_015_PtLimaPt/lib_tx_rollup/RPC.ml b/src/proto_015_PtLimaPt/lib_tx_rollup/RPC.ml
index 4a76785610d4..c53a833bf64f 100644
--- a/src/proto_015_PtLimaPt/lib_tx_rollup/RPC.ml
+++ b/src/proto_015_PtLimaPt/lib_tx_rollup/RPC.ml
@@ -770,19 +770,24 @@ let start_server configuration state =
   let cors_headers =
     sanitize_cors_headers ~default:["Content-Type"] cors_headers
   in
+  let server =
+    RPC_server.init_server
+      dir
+      ~acl
+      ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+      ~media_types:Media_type.all_media_types
+  in
   Lwt.catch
     (fun () ->
-      let*! rpc_server =
+      let*! () =
         RPC_server.launch
-          ~media_types:Media_type.all_media_types
           ~host
-          ~acl
-          ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+          server
+          ~callback:(RPC_server.resto_callback server)
           node
-          dir
       in
       let*! () = Event.(emit rpc_server_is_ready) rpc_addr in
-      return rpc_server)
+      return server)
     fail_with_exn
 
 let balance ctxt (block : block_id) ticket tz4 =
diff --git a/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml b/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml
index a1edb191bb69..a218a7bc1138 100644
--- a/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml
+++ b/src/proto_alpha/bin_sc_rollup_node/RPC_server.ml
@@ -156,20 +156,25 @@ module Common = struct
         return state.num_ticks)
 
   let start configuration dir =
+    let open Lwt_result_syntax in
     let Configuration.{rpc_addr; rpc_port; _} = configuration in
     let rpc_addr = P2p_addr.of_string_exn rpc_addr in
     let host = Ipaddr.V6.to_string rpc_addr in
     let node = `TCP (`Port rpc_port) in
     let acl = RPC_server.Acl.default rpc_addr in
+    let server =
+      RPC_server.init_server dir ~acl ~media_types:Media_type.all_media_types
+    in
     Lwt.catch
       (fun () ->
-        RPC_server.launch
-          ~media_types:Media_type.all_media_types
-          ~host
-          ~acl
-          node
-          dir
-        >>= return)
+        let*! () =
+          RPC_server.launch
+            ~host
+            server
+            ~callback:(RPC_server.resto_callback server)
+            node
+        in
+        return server)
       fail_with_exn
 
   let shutdown = RPC_server.shutdown
diff --git a/src/proto_alpha/lib_tx_rollup/RPC.ml b/src/proto_alpha/lib_tx_rollup/RPC.ml
index 4a76785610d4..c53a833bf64f 100644
--- a/src/proto_alpha/lib_tx_rollup/RPC.ml
+++ b/src/proto_alpha/lib_tx_rollup/RPC.ml
@@ -770,19 +770,24 @@ let start_server configuration state =
   let cors_headers =
     sanitize_cors_headers ~default:["Content-Type"] cors_headers
   in
+  let server =
+    RPC_server.init_server
+      dir
+      ~acl
+      ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+      ~media_types:Media_type.all_media_types
+  in
   Lwt.catch
     (fun () ->
-      let*! rpc_server =
+      let*! () =
         RPC_server.launch
-          ~media_types:Media_type.all_media_types
           ~host
-          ~acl
-          ~cors:{allowed_headers = cors_headers; allowed_origins = cors_origins}
+          server
+          ~callback:(RPC_server.resto_callback server)
           node
-          dir
       in
       let*! () = Event.(emit rpc_server_is_ready) rpc_addr in
-      return rpc_server)
+      return server)
     fail_with_exn
 
 let balance ctxt (block : block_id) ticket tz4 =
-- 
GitLab


From 3e2717f5be5845df3b69340db80b8dd9cc8787bb Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 7 Oct 2022 16:23:06 +0200
Subject: [PATCH 5/7] Tezt: reset regression tests

---
 ...a_dir) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 ...r_rpc) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 ...a_dir) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 ...r_rpc) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 ...a_dir) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 ...r_rpc) RPC regression tests- contracts.out | 44 ++++++++++++++-----
 6 files changed, 198 insertions(+), 66 deletions(-)

diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
diff --git a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
diff --git a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
diff --git a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
diff --git a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 0eb272899232..20bc28aa3fac 100644
--- a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -52,28 +52,36 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
 { "balance": "99999393", "delegate": "[PUBLIC_KEY_HASH]",
@@ -96,21 +104,27 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
 { "balance": "0",
@@ -136,14 +150,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
@@ -347,14 +365,18 @@ Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+  
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
 Error:
   Rpc request failed:
      - meth: GET
      - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: The client does not support following HTTP redirects yet.
+     - error: Unexpected error 301:
+                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+  
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
   "key": {
-- 
GitLab


From cda77c9808a0557f353485f91cad45cdc476a3dd Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Fri, 7 Oct 2022 16:53:07 +0200
Subject: [PATCH 6/7] Tezt: fix wrong error message

---
 tezt/tests/synchronisation_heuristic.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tezt/tests/synchronisation_heuristic.ml b/tezt/tests/synchronisation_heuristic.ml
index 5c0eeab94a25..7299f3969014 100644
--- a/tezt/tests/synchronisation_heuristic.ml
+++ b/tezt/tests/synchronisation_heuristic.ml
@@ -207,7 +207,7 @@ let check_sync_state ?__LOC__ ?endpoint client expected_state =
   in
   Check.(sync_state.sync_state = expected_state)
     sync_state_typ
-    ~error_msg:"Expected node to be %L, was %R" ;
+    ~error_msg:"Expected node to be %R, was %L" ;
   unit
 
 (* Threshold 0, peer always bootstrapped. *)
-- 
GitLab


From de0ec741718a926bf99ffc75d74693f524adc021 Mon Sep 17 00:00:00 2001
From: Swann Moreau <evertedsphere@gmail.com>
Date: Thu, 29 Sep 2022 10:46:38 +0200
Subject: [PATCH 7/7] lib_rpc_http: follow redirects in client

---
 src/lib_rpc_http/RPC_client.ml                | 12 ++-
 ...a_dir) RPC regression tests- contracts.out | 88 +++++--------------
 ...r_rpc) RPC regression tests- contracts.out | 88 +++++--------------
 ...a_dir) RPC regression tests- contracts.out | 88 +++++--------------
 ...r_rpc) RPC regression tests- contracts.out | 88 +++++--------------
 ...a_dir) RPC regression tests- contracts.out | 88 +++++--------------
 ...r_rpc) RPC regression tests- contracts.out | 88 +++++--------------
 7 files changed, 143 insertions(+), 397 deletions(-)

diff --git a/src/lib_rpc_http/RPC_client.ml b/src/lib_rpc_http/RPC_client.ml
index 2078f48610e5..6466d2e374dc 100644
--- a/src/lib_rpc_http/RPC_client.ml
+++ b/src/lib_rpc_http/RPC_client.ml
@@ -139,7 +139,17 @@ module Make (Client : Resto_cohttp_client.Client.CALL) = struct
   let generic_call ?headers ?accept ?body ?media meth uri :
       (content, content) RPC_context.rest_result Lwt.t =
     let open Lwt_syntax in
-    let* r = Client.generic_call meth ?headers ?accept ?body ?media uri in
+    let* r =
+      Client.generic_call
+        meth
+        ?headers
+        ?accept
+        ?body
+        ?media
+        ~redirect_behaviour:
+          (Resto_cohttp_client.Client.Follow_redirects {limit = 20})
+        uri
+    in
     match r with
     | `Ok (Some v) -> return_ok (`Ok v)
     | `Ok None -> request_failed meth uri Empty_answer
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
diff --git a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
diff --git a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Kathmandu- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
diff --git a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_data_dir) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
diff --git a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out
index 20bc28aa3fac..4fbd5e0f6a1f 100644
--- a/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out	
+++ b/tezt/tests/expected/RPC_test.ml/Lima- (mode proxy_server_rpc) RPC regression tests- contracts.out	
@@ -48,39 +48,23 @@
 null
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/delegate"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]'
@@ -100,30 +84,18 @@ Error:
 "[PUBLIC_KEY_HASH]"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/entrypoints"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/script"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/storage"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]'
@@ -146,21 +118,13 @@ Error:
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
@@ -361,21 +325,13 @@ null
 "0"
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/counter"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key'
-Error:
-  Rpc request failed:
-     - meth: GET
-     - uri: http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key
-     - error: Unexpected error 301:
-                "tezos-proxy-server: request unsupported for proxy server, redirecting to node endpoint at http://localhost:[PORT]/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/manager_key"
+Fatal error:
+  No service found at this URL
   
 
 ./octez-client rpc post '/chains/main/blocks/head/context/contracts/[CONTRACT_HASH]/big_map_get' with '{
-- 
GitLab