From d99caf1ad95ea00310718c9182e2cb98b487e0cc Mon Sep 17 00:00:00 2001
From: Etan Kissling <etan@status.im>
Date: Sun, 4 Jun 2023 18:46:00 +0200
Subject: [PATCH] fix `Access-Control-Allow-Origin` response (#5028)

Since #3976, CORS functionality is broken. Fix it to work again:

- Use `--rest-allowed-origin` instead of `--keymanager-allowed-origin`
  to specify CORS `Access-Control-Allow-Origin` header for beacon-APIs.

- Actually pass CORS config to `nim-presto` once more.
---
 beacon_chain/nimbus_beacon_node.nim   | 2 +-
 beacon_chain/nimbus_binary_common.nim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index 6aabf8220..3656aa96b 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -636,7 +636,7 @@ proc init*(T: type BeaconNode,
 
   let restServer = if config.restEnabled:
     RestServerRef.init(config.restAddress, config.restPort,
-                       config.keymanagerAllowedOrigin,
+                       config.restAllowedOrigin,
                        validateBeaconApiQueries,
                        config)
   else:
diff --git a/beacon_chain/nimbus_binary_common.nim b/beacon_chain/nimbus_binary_common.nim
index 0563fcd7d..8140d52f7 100644
--- a/beacon_chain/nimbus_binary_common.nim
+++ b/beacon_chain/nimbus_binary_common.nim
@@ -356,7 +356,7 @@ proc init*(T: type RestServerRef,
     maxRequestBodySize = config.restMaxRequestBodySize * 1024
 
   let res = try:
-    RestServerRef.new(RestRouter.init(validateFn),
+    RestServerRef.new(RestRouter.init(validateFn, allowedOrigin),
                       address, serverFlags = serverFlags,
                       httpHeadersTimeout = headersTimeout,
                       maxHeadersSize = maxHeadersSize,