From f1f7eb8e5e02b703c8765dabdb4427fc8b158947 Mon Sep 17 00:00:00 2001
From: lukaw3d <lukajeran@oasislabs.com>
Date: Wed, 10 May 2023 01:14:49 +0200
Subject: [PATCH] Upgrade envoy from 1.21.3 to 1.26.1

---
 docker-compose-testnet.yml |  2 +-
 docker-compose.yml         |  2 +-
 docker/envoy.yaml          | 21 ++++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docker-compose-testnet.yml b/docker-compose-testnet.yml
index 0f51f8a97a..2e5ff042a1 100644
--- a/docker-compose-testnet.yml
+++ b/docker-compose-testnet.yml
@@ -20,7 +20,7 @@ services:
       - ./docker/genesis-testnet.json:/genesis.json:z
       - ./docker/oasis-explorer/config-testnet.json:/.secrets/config.json:z
   envoy:
-    image: docker.io/envoyproxy/envoy:v1.21.3
+    image: docker.io/envoyproxy/envoy:v1.26.1
     ports:
       - '127.0.0.1:42280:42280'
       - '127.0.0.1:42281:42281'
diff --git a/docker-compose.yml b/docker-compose.yml
index 730e871e0c..ca3cc58dbf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - ./docker/genesis-local.json:/genesis.json:z
       - ./docker/oasis-explorer/config-local.json:/.secrets/config.json:z
   envoy:
-    image: docker.io/envoyproxy/envoy:v1.21.3
+    image: docker.io/envoyproxy/envoy:v1.26.1
     ports:
       - '42280:42280'
       - '42281:42281'
diff --git a/docker/envoy.yaml b/docker/envoy.yaml
index ece7459f0c..8796096d8b 100644
--- a/docker/envoy.yaml
+++ b/docker/envoy.yaml
@@ -18,35 +18,39 @@ static_resources:
                       domains: ['*']
                       routes:
                         - match:
-                            safe_regex:
-                              google_re2:
-                                max_program_size: 1000000
-                              regex: '/oasis-core\.(NodeController/WaitReady|Registry/(GetNodes)|Staking/(TokenSymbol|ConsensusParameters|Account|DelegationsTo|DelegationsFor|DelegationInfosFor|DebondingDelegationInfosFor|GetEvents)|Beacon/(GetEpoch)|Consensus/(SubmitTx|EstimateGas|GetBlock|GetChainContext|GetTransactionsWithResults|GetGenesisDocument|WatchBlocks|GetSignerNonce))'
+                          safe_regex:
+                            regex: '/oasis-core\.(NodeController/WaitReady|Registry/(GetNodes)|Staking/(TokenSymbol|ConsensusParameters|Account|DelegationsTo|DelegationsFor|DelegationInfosFor|DebondingDelegationInfosFor|GetEvents)|Beacon/(GetEpoch)|Consensus/(SubmitTx|EstimateGas|GetBlock|GetChainContext|GetTransactionsWithResults|GetGenesisDocument|WatchBlocks|GetSignerNonce))'
                           route:
                             cluster: oasis_node_grpc
                             timeout: 0s
                             max_stream_duration:
                               grpc_timeout_header_max: 0s
                         - match:
-                            prefix: '/oasis-core'
+                          prefix: '/oasis-core'
                           direct_response:
                             status: 404
                             body:
                               inline_string: 'You have to list every method you use in the envoy matcher.'
                         - match:
-                            prefix: '/'
+                          prefix: '/'
                           route:
                             cluster: dev_static
                       cors:
-                        expose_headers: grpc-status,grpc-message
                         allow_origin_string_match:
-                          - prefix: '*'
+                          - exact: '*'
                         allow_headers: content-type,x-grpc-web,x-user-agent
+                        expose_headers: grpc-status,grpc-message,grpc-status-details-bin
                         max_age: '1728000'
                 http_filters:
                   - name: envoy.filters.http.grpc_web
+                    typed_config:
+                      '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
                   - name: envoy.filters.http.cors
+                    typed_config:
+                      '@type': type.googleapis.com/envoy.extensions.filters.http.cors.v3.Cors
                   - name: envoy.filters.http.router
+                    typed_config:
+                      '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
   clusters:
     - name: oasis_node_grpc
       connect_timeout: 15s
@@ -58,7 +62,6 @@ static_resources:
                   address:
                     pipe:
                       path: /node/data/internal.sock
-      http2_protocol_options: {}
     - name: dev_static
       connect_timeout: 0.25s
       load_assignment: