From b978f86dce4b265db478fd5f601fdbffdf4d47dc Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Mon, 7 Mar 2022 21:23:48 +0500
Subject: [PATCH 001/206] Rename environment

---
 .buildkite/pipeline.yml         | 2 +-
 .buildkite/steps/build-image.sh | 6 +++---
 Dockerfile                      | 4 ++--
 proxy/docker-compose-test.yml   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5ac8aa1a5..314d851eb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,4 +26,4 @@ steps:
     command: ".buildkite/steps/publish-image.sh"
     if: |
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
-        (build.env("EVM_LOADER_BRANCH") == "develop" || build.env("EVM_LOADER_BRANCH") == null)
+        (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
diff --git a/.buildkite/steps/build-image.sh b/.buildkite/steps/build-image.sh
index dc1524165..b0f4e068d 100755
--- a/.buildkite/steps/build-image.sh
+++ b/.buildkite/steps/build-image.sh
@@ -4,16 +4,16 @@ set -euo pipefail
 REVISION=$(git rev-parse HEAD)
 
 set ${SOLANA_REVISION:=v1.8.12-testnet}
-set ${EVM_LOADER_REVISION:=latest}
+set ${NEON_EVM_COMMIT:=latest}
 
 # Refreshing neonlabsorg/solana:latest image is required to run .buildkite/steps/build-image.sh locally
 docker pull neonlabsorg/solana:${SOLANA_REVISION}
 
 # Refreshing neonlabsorg/evm_loader:latest image is required to run .buildkite/steps/build-image.sh locally
-docker pull neonlabsorg/evm_loader:${EVM_LOADER_REVISION}
+docker pull neonlabsorg/evm_loader:${NEON_EVM_COMMIT}
 
 docker build -t neonlabsorg/proxy:${REVISION} \
     --build-arg SOLANA_REVISION=${SOLANA_REVISION} \
-    --build-arg EVM_LOADER_REVISION=${EVM_LOADER_REVISION} \
+    --build-arg NEON_EVM_COMMIT=${NEON_EVM_COMMIT} \
     --build-arg PROXY_REVISION=${REVISION} \
     .
diff --git a/Dockerfile b/Dockerfile
index 05e0fbe74..2b36f97c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 ARG SOLANA_REVISION=v1.8.12-testnet
-ARG EVM_LOADER_REVISION=latest
+ARG NEON_EVM_COMMIT=latest
 
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS cli
 
-FROM neonlabsorg/evm_loader:${EVM_LOADER_REVISION} AS spl
+FROM neonlabsorg/evm_loader:${NEON_EVM_COMMIT} AS spl
 
 FROM ubuntu:20.04
 
diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml
index 6782a2e18..94a4fdc1f 100644
--- a/proxy/docker-compose-test.yml
+++ b/proxy/docker-compose-test.yml
@@ -26,7 +26,7 @@ services:
 
   evm_loader:
     container_name: evm_loader
-    image: neonlabsorg/evm_loader:${EVM_LOADER_REVISION:-latest}
+    image: neonlabsorg/evm_loader:${NEON_EVM_COMMIT:-latest}
     environment:
       - SOLANA_URL=http://solana:8899
     networks:

From d154dad05a8354768a17b1547d2dfc883f9ae102 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Mon, 7 Mar 2022 22:30:18 +0500
Subject: [PATCH 002/206] Print elf params

---
 proxy/environment.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/proxy/environment.py b/proxy/environment.py
index d8f936634..2a9d18ce9 100644
--- a/proxy/environment.py
+++ b/proxy/environment.py
@@ -1,3 +1,4 @@
+import logging
 import sys
 from decimal import Decimal
 import json
@@ -155,6 +156,8 @@ def read_elf_params(out_dict):
 
 ELF_PARAMS = {}
 read_elf_params(ELF_PARAMS)
+logger = logging.getLogger("neon.Proxy")
+logger.debug(f"ELF_PARAMS: {ELF_PARAMS}")
 COLLATERAL_POOL_BASE = ELF_PARAMS.get("NEON_POOL_BASE")
 ETH_TOKEN_MINT_ID: PublicKey = PublicKey(ELF_PARAMS.get("NEON_TOKEN_MINT"))
 EVM_BYTE_COST = int(ELF_PARAMS.get("NEON_EVM_BYTE_COST"))

From c8bdd2e44dcac9ab9acbab6eee507842a24ab005 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Mon, 7 Mar 2022 22:54:41 +0500
Subject: [PATCH 003/206] Reduce time waiting for proxy

---
 .buildkite/steps/deploy-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/steps/deploy-test.sh b/.buildkite/steps/deploy-test.sh
index 2d2a65b3e..30b49ea35 100755
--- a/.buildkite/steps/deploy-test.sh
+++ b/.buildkite/steps/deploy-test.sh
@@ -5,7 +5,7 @@ wait-for-proxy()
 {
   PROXY_URL="$1"
 
-  for i in {1..40}; do
+  for i in {1..2}; do
       if curl -s --header "Content-Type: application/json" --data '{"method":"eth_blockNumber","params":[],"id":93,"jsonrpc":"2.0"}' $PROXY_URL > /dev/null;
       then
         echo `date +%H:%M:%S`" proxy is available"

From 6c1089e258b8ebf3053e18ef560b3c1eb5ce0ea6 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Mon, 7 Mar 2022 23:16:28 +0500
Subject: [PATCH 004/206] Remove extra things

---
 proxy/environment.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/proxy/environment.py b/proxy/environment.py
index ff82b0e59..999fe8c84 100644
--- a/proxy/environment.py
+++ b/proxy/environment.py
@@ -172,8 +172,6 @@ def read_elf_params(out_dict):
 
 ELF_PARAMS = {}
 read_elf_params(ELF_PARAMS)
-logger = logging.getLogger("neon.Proxy")
-logger.debug(f"ELF_PARAMS: {ELF_PARAMS}")
 COLLATERAL_POOL_BASE = ELF_PARAMS.get("NEON_POOL_BASE")
 NEON_TOKEN_MINT: PublicKey = PublicKey(ELF_PARAMS.get("NEON_TOKEN_MINT"))
 HOLDER_MSG_SIZE = int(ELF_PARAMS.get("NEON_HOLDER_MSG_SIZE"))

From ce87fc8693923657c88d47d3ea896a11c253944a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Mon, 7 Mar 2022 23:44:21 +0500
Subject: [PATCH 005/206] Remove extra things

---
 .buildkite/steps/deploy-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/steps/deploy-test.sh b/.buildkite/steps/deploy-test.sh
index 558c1060c..d2f386ed3 100755
--- a/.buildkite/steps/deploy-test.sh
+++ b/.buildkite/steps/deploy-test.sh
@@ -5,7 +5,7 @@ wait-for-proxy()
 {
   PROXY_URL="$1"
 
-  for i in {1..2}; do
+  for i in {1..40}; do
       if curl -s --header "Content-Type: application/json" --data '{"method":"eth_blockNumber","params":[],"id":93,"jsonrpc":"2.0"}' $PROXY_URL > /dev/null;
       then
         echo `date +%H:%M:%S`" proxy is available"

From 2879c37b1df21afc975e36bfaf2e65497a4fbefb Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 13:47:21 +0500
Subject: [PATCH 006/206] Add docker step into buildkite

---
 .buildkite/pipeline.yml            |  6 ++++++
 docker-compose-full-test-suite.yml | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 docker-compose-full-test-suite.yml

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 314d851eb..13e6c0991 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,3 +27,9 @@ steps:
     if: |
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
+    plugins:
+      - docker-compose#v3.9.0:
+          run: full_test_suite
+          config:
+            - docker-compose-full-test-suite.yml
+
diff --git a/docker-compose-full-test-suite.yml b/docker-compose-full-test-suite.yml
new file mode 100644
index 000000000..b3e035e7c
--- /dev/null
+++ b/docker-compose-full-test-suite.yml
@@ -0,0 +1,22 @@
+version: "3"
+
+services:
+
+  full_test_suite:
+    container_name: full_test_suite
+    image: neonlabsorg/full_test_suite:develop
+    environment:
+      - NETWORK_NAME=night-stand
+      - PROXY_URL=http://proxy.night.stand.neontest.xyz/solana
+      - NETWORK_ID=111
+      - ADDRESS_FROM=
+      - ADDRESS_TO=
+      - PRIVATE_KEY=
+      - REQUEST_AMOUNT=995
+      - FAUCET_URL=http://proxy.night.stand.neontest.xyz/request_eth_token
+      - USE_FAUCET=true
+      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
+      - SOLANA_URL=http://proxy.night.stand.neontest.xyz/node-solana
+      - USERS_NUMBER=15
+      - JOBS_NUMBER=8
+    network_mode: host

From 2ea579b3cbe4fb1de4827db0a787054cd32c7c7e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 14:08:24 +0500
Subject: [PATCH 007/206] Add full test suite step

---
 .buildkite/pipeline.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 13e6c0991..857349a12 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -20,6 +20,16 @@ steps:
       - "airdropper.log"
       - "indexer.log"
 
+  - label: ":coverage: full test suite"
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true")
+    plugins:
+      - docker-compose#v3.9.0:
+        run: full_test_suite
+        config:
+          - docker-compose-full-test-suite.yml
+
   - wait
 
   - label: ":floppy_disk: publish image"
@@ -27,9 +37,5 @@ steps:
     if: |
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
-    plugins:
-      - docker-compose#v3.9.0:
-          run: full_test_suite
-          config:
-            - docker-compose-full-test-suite.yml
+
 

From f63001347c3718effff56a327fe408836a0dfd9a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 14:25:39 +0500
Subject: [PATCH 008/206] Correct full test suite

---
 .buildkite/pipeline.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 857349a12..aa0a57d51 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,11 +24,14 @@ steps:
     if: |
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true")
+    command: run-test.sh
     plugins:
       - docker-compose#v3.9.0:
         run: full_test_suite
         config:
           - docker-compose-full-test-suite.yml
+    env:
+      - TESTS_PASSED_THRESHOLD: 500
 
   - wait
 

From f560e8641a6fe21679b69c38963666bf27a80342 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 14:42:35 +0500
Subject: [PATCH 009/206] Correct full test suite again

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index aa0a57d51..f8b4f43e9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,9 +27,9 @@ steps:
     command: run-test.sh
     plugins:
       - docker-compose#v3.9.0:
-        run: full_test_suite
-        config:
-          - docker-compose-full-test-suite.yml
+          run: full_test_suite
+          config:
+            - docker-compose-full-test-suite.yml
     env:
       - TESTS_PASSED_THRESHOLD: 500
 

From 2d84d4ea551661dcc9dd63b61bb0cfc6bbeaa0ad Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 14:59:09 +0500
Subject: [PATCH 010/206] suppress deploy check

---
 .buildkite/pipeline.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f8b4f43e9..db8cd940b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,19 +6,19 @@ steps:
 
   - wait
 
-  - label: ":cop::skin-tone-2: deploy check"
-    command: ".buildkite/steps/deploy-test.sh"
-    timeout: 90
-    agents:
-       queue: "testing"
-    artifact_paths:
-      - "proxy.log"
-      - "solana.log"
-      - "measurements.log"
-      - "evm_loader.log"
-      - "faucet.log"
-      - "airdropper.log"
-      - "indexer.log"
+#  - label: ":cop::skin-tone-2: deploy check"
+#    command: ".buildkite/steps/deploy-test.sh"
+#    timeout: 90
+#    agents:
+#       queue: "testing"
+#    artifact_paths:
+#      - "proxy.log"
+#      - "solana.log"
+#      - "measurements.log"
+#      - "evm_loader.log"
+#      - "faucet.log"
+#      - "airdropper.log"
+#      - "indexer.log"
 
   - label: ":coverage: full test suite"
     if: |

From f67de2f3a89e76a89f2df98d516e71b5bbee5198 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:08:49 +0500
Subject: [PATCH 011/206] just echo if trigger_job

---
 .buildkite/pipeline.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index db8cd940b..f28e9faa6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,14 +24,14 @@ steps:
     if: |
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true")
-    command: run-test.sh
-    plugins:
-      - docker-compose#v3.9.0:
-          run: full_test_suite
-          config:
-            - docker-compose-full-test-suite.yml
-    env:
-      - TESTS_PASSED_THRESHOLD: 500
+    command: echo asdkljfkl asdjfkldasj;fkj
+#    plugins:
+#      - docker-compose#v3.9.0:
+#          run: full_test_suite
+#          config:
+#            - docker-compose-full-test-suite.yml
+#    env:
+#      - TESTS_PASSED_THRESHOLD: 500
 
   - wait
 

From a7a2330d672b948ffb79cbe9fe19cf112c47b3ce Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:12:53 +0500
Subject: [PATCH 012/206] try to fix condition

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f28e9faa6..c4a382dca 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -22,7 +22,7 @@ steps:
 
   - label: ":coverage: full test suite"
     if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft)
         (build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true")
     command: echo asdkljfkl asdjfkldasj;fkj
 #    plugins:

From a04ca0df4d998f8ffb16a60b9b630745fccaef16 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:13:59 +0500
Subject: [PATCH 013/206] try to fix condition

---
 .buildkite/pipeline.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c4a382dca..83df182f5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,7 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft)
-        (build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true")
+    if: build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true"
     command: echo asdkljfkl asdjfkldasj;fkj
 #    plugins:
 #      - docker-compose#v3.9.0:

From ed96c90b627c3b081142ffa7612c2d1d58e97ec1 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:15:59 +0500
Subject: [PATCH 014/206] Get rid off condition

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 83df182f5..500ff9774 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,7 +21,7 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true"
+#    if: build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true"
     command: echo asdkljfkl asdjfkldasj;fkj
 #    plugins:
 #      - docker-compose#v3.9.0:

From bf9b694ed483496c145158921e27ddcda9cf9206 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:17:18 +0500
Subject: [PATCH 015/206] if source == webhook

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 500ff9774..a1d68c114 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,7 +21,7 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-#    if: build.source == "trigger_job" && build.env("EVM_LOADER_FULL_TEST_SUITE") == "true"
+    if: build.source == "webhook"
     command: echo asdkljfkl asdjfkldasj;fkj
 #    plugins:
 #      - docker-compose#v3.9.0:

From dbce4edcac2c8afac81aab8e8d8cdf54d8a93486 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:19:07 +0500
Subject: [PATCH 016/206] Try again

---
 .buildkite/pipeline.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a1d68c114..f3707908a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,8 +21,10 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: build.source == "webhook"
-    command: echo asdkljfkl asdjfkldasj;fkj
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft)
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    command: echo "asdkljfkl asdjfkldasj;fkj"
 #    plugins:
 #      - docker-compose#v3.9.0:
 #          run: full_test_suite

From b31cf832b7aa2ff4fccd9e21589ac642f9fb531a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:22:19 +0500
Subject: [PATCH 017/206] Try again

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f3707908a..3576ef740 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -22,7 +22,7 @@ steps:
 
   - label: ":coverage: full test suite"
     if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft)
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     command: echo "asdkljfkl asdjfkldasj;fkj"
 #    plugins:

From 90ef427095b8f75ed41d840929a34f2d49490bcc Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 15:28:43 +0500
Subject: [PATCH 018/206] Enable full test suite )

---
 .buildkite/pipeline.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3576ef740..6f01b544d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,13 +25,13 @@ steps:
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     command: echo "asdkljfkl asdjfkldasj;fkj"
-#    plugins:
-#      - docker-compose#v3.9.0:
-#          run: full_test_suite
-#          config:
-#            - docker-compose-full-test-suite.yml
-#    env:
-#      - TESTS_PASSED_THRESHOLD: 500
+    plugins:
+      - docker-compose#v3.9.0:
+          run: full_test_suite
+          config:
+            - docker-compose-full-test-suite.yml
+    env:
+      - TESTS_PASSED_THRESHOLD: 500
 
   - wait
 

From 2f1531e28b1a3174977a7f72df7db1d9d3e9c427 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 17:52:03 +0500
Subject: [PATCH 019/206] Enable full test suite )

---
 .buildkite/pipeline.yml | 12 ++++++------
 ggbb.sh                 | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100755 ggbb.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6f01b544d..4a194b2c0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,12 +24,12 @@ steps:
     if: |
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-    command: echo "asdkljfkl asdjfkldasj;fkj"
-    plugins:
-      - docker-compose#v3.9.0:
-          run: full_test_suite
-          config:
-            - docker-compose-full-test-suite.yml
+#    plugins:
+#      - docker-compose#v3.9.0:
+#          run: full_test_suite
+#          config:
+#            - docker-compose-full-test-suite.yml
+    command: ./ggbb.sh && exit 1
     env:
       - TESTS_PASSED_THRESHOLD: 500
 
diff --git a/ggbb.sh b/ggbb.sh
new file mode 100755
index 000000000..16e6fc37f
--- /dev/null
+++ b/ggbb.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+
+cat << EOF
+24 passing (2m)
+
+`stdout` files found: 83. Processing ...
+
+Summarize result:
+
+    Failing - 33
+    Pending - 121
+    Passing - 934
+
+Total tests - 1088
+
+Test files without test result - 0:
+
+Fix allure results: 0
+The allure-results archive is creating at: /opt/allure-reports.tar
+
+EOF

From d1bc510160df0b1ad8f47cda6d674b6fd97275d6 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 17:53:19 +0500
Subject: [PATCH 020/206] Turn off the condition

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4a194b2c0..80b107e60 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
 #    plugins:
 #      - docker-compose#v3.9.0:
 #          run: full_test_suite

From 9f0a689db8fa6e6cb9f327bfd83dd2bc023cfb55 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:28:27 +0500
Subject: [PATCH 021/206] Introduce check threshold formula

---
 .buildkite/pipeline.yml | 4 ++--
 ggbb.sh                 | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 80b107e60..246914f42 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,9 +29,9 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh && exit 1
+    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs test ${FULL_TEST_THRESHOLD} -lt
     env:
-      - TESTS_PASSED_THRESHOLD: 500
+      - FULL_TEST_THRESHOLD: 500
 
   - wait
 
diff --git a/ggbb.sh b/ggbb.sh
index 16e6fc37f..41cb9734a 100755
--- a/ggbb.sh
+++ b/ggbb.sh
@@ -4,8 +4,6 @@
 cat << EOF
 24 passing (2m)
 
-`stdout` files found: 83. Processing ...
-
 Summarize result:
 
     Failing - 33

From 88341ee2fe6cbb74bf5877e6c233cf8c7699183a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:30:15 +0500
Subject: [PATCH 022/206] What's wrong

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 246914f42..f183c22d4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,7 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs test ${FULL_TEST_THRESHOLD} -lt
+    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
     env:
       - FULL_TEST_THRESHOLD: 500
 

From aa8870431cad99cd214c8e612e36b8bb45b801e8 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:32:47 +0500
Subject: [PATCH 023/206] Again

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f183c22d4..b6f4ccbb7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,7 +31,7 @@ steps:
 #            - docker-compose-full-test-suite.yml
     command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
     env:
-      - FULL_TEST_THRESHOLD: 500
+      FULL_TEST_THRESHOLD: 500
 
   - wait
 

From 8f5615fa2569dac661162d2323ac1a97a1d8a34e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:34:52 +0500
Subject: [PATCH 024/206]  again and again

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b6f4ccbb7..41da651c4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,8 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
+#    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
+    command: echo ${FULL_TEST_THRESHOLD}
     env:
       FULL_TEST_THRESHOLD: 500
 

From 3af7ef11a23049514070a546f88b44ac61e84c0e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:36:24 +0500
Subject: [PATCH 025/206]  again and again and again

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 41da651c4..2f5b289c0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,9 +30,9 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
 #    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
-    command: echo ${FULL_TEST_THRESHOLD}
+    command: echo ${GGBB}
     env:
-      FULL_TEST_THRESHOLD: 500
+      GGBB: "500"
 
   - wait
 

From 2a3eed5fbc61eec7ea5e999e67494d2a45b39261 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:37:41 +0500
Subject: [PATCH 026/206]  again and again and again

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2f5b289c0..0722a183e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,7 +30,7 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
 #    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
-    command: echo ${GGBB}
+    command: "echo $${GGBB}"
     env:
       GGBB: "500"
 

From 3d23ed5e27c334080920fd3086abb392c2ba8b34 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:42:25 +0500
Subject: [PATCH 027/206] unfold commands

---
 .buildkite/pipeline.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 0722a183e..148da5e2d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,10 +29,9 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-#    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo ${FULL_TEST_THRESHOLD} -lt
-    command: "echo $${GGBB}"
+    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo $${FULL_TEST_THRESHOLD} -lt
     env:
-      GGBB: "500"
+      FULL_TEST_THRESHOLD: 900
 
   - wait
 

From 62df1c4e9b2a8a31383076c2fcae479a25e22968 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:44:15 +0500
Subject: [PATCH 028/206] unfold commands

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 148da5e2d..4815f0d69 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,9 +29,9 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo $${FULL_TEST_THRESHOLD} -lt
+    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo $${FULL_TEST_THRESHOLD} -le
     env:
-      FULL_TEST_THRESHOLD: 900
+      FULL_TEST_THRESHOLD: 934
 
   - wait
 

From 7714affa8bfeea5238d6676bb61069d4af431556 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:45:41 +0500
Subject: [PATCH 029/206] Bad results check

---
 ggbb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ggbb.sh b/ggbb.sh
index 41cb9734a..04feb4a8e 100755
--- a/ggbb.sh
+++ b/ggbb.sh
@@ -8,7 +8,7 @@ Summarize result:
 
     Failing - 33
     Pending - 121
-    Passing - 934
+    Passing - 933
 
 Total tests - 1088
 

From 48f60260084e7b9f5484c94c3c23081751a59a10 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:46:51 +0500
Subject: [PATCH 030/206] Bad results check

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4815f0d69..55e0d47a5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,7 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs echo $${FULL_TEST_THRESHOLD} -le
+    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs test $${FULL_TEST_THRESHOLD} -le
     env:
       FULL_TEST_THRESHOLD: 934
 

From 000db508418e854ea17957b098a1dbd2e2daf2d6 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:51:28 +0500
Subject: [PATCH 031/206] Logging this check

---
 .buildkite/pipeline.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 55e0d47a5..63607bbde 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,11 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command: ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs test $${FULL_TEST_THRESHOLD} -le
+    commands:
+      - ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs export FULL_TEST_RESULT=
+      - echo Full test passing: $${FULL_TEST_RESULT}
+      - echo Full test threshold: $${FULL_TEST_THRESHOLD}
+      - test $${FULL_TEST_THRESHOLD} -le
     env:
       FULL_TEST_THRESHOLD: 934
 

From 03fd17cfdd7bf264bff8392331ee2d627263814e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 19:59:58 +0500
Subject: [PATCH 032/206] Logging this check

---
 .buildkite/pipeline.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 63607bbde..faf901ec2 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,10 +30,10 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
     commands:
-      - ./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0) | xargs export FULL_TEST_RESULT=
-      - echo Full test passing: $${FULL_TEST_RESULT}
-      - echo Full test threshold: $${FULL_TEST_THRESHOLD}
-      - test $${FULL_TEST_THRESHOLD} -le
+      - "./ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0) | xargs export FULL_TEST_RESULT="
+      - "echo Full test passing: $${FULL_TEST_RESULT}"
+      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
+      - "test $${FULL_TEST_THRESHOLD} -le"
     env:
       FULL_TEST_THRESHOLD: 934
 

From efec5c1652b3abbbec6a5ad343c2614fb9e0990d Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:01:10 +0500
Subject: [PATCH 033/206] Logging this check

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index faf901ec2..825cd133e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,7 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    commands:
+    command:
       - "./ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0) | xargs export FULL_TEST_RESULT="
       - "echo Full test passing: $${FULL_TEST_RESULT}"
       - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"

From e7e04891a9e82092ce729d932422b157c4114095 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:01:55 +0500
Subject: [PATCH 034/206] Logging this check

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 825cd133e..41e47cd32 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,9 +31,9 @@ steps:
 #            - docker-compose-full-test-suite.yml
     command:
       - "./ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0) | xargs export FULL_TEST_RESULT="
-      - "echo Full test passing: $${FULL_TEST_RESULT}"
-      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
-      - "test $${FULL_TEST_THRESHOLD} -le"
+#      - "echo Full test passing: $${FULL_TEST_RESULT}"
+#      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
+#      - "test $${FULL_TEST_THRESHOLD} -le"
     env:
       FULL_TEST_THRESHOLD: 934
 

From 9b4ea434fc8374d3d5146e69d0ce42503031ecef Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:14:49 +0500
Subject: [PATCH 035/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 41e47cd32..09e1b2be6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,9 +29,9 @@ steps:
 #          run: full_test_suite
 #          config:
 #            - docker-compose-full-test-suite.yml
-    command:
-      - "./ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0) | xargs export FULL_TEST_RESULT="
-#      - "echo Full test passing: $${FULL_TEST_RESULT}"
+    commands:
+      - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - echo Full test passing: $${FULL_TEST_RESULT}
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"
     env:

From 45dccf926daa351fb11a65c427c5ccd8a91416aa Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:17:36 +0500
Subject: [PATCH 036/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 09e1b2be6..8e93a6560 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,8 +30,8 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
     commands:
-      - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - echo Full test passing: $${FULL_TEST_RESULT}
+      - "FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0))"
+      - "echo Full test passing: $${FULL_TEST_RESULT}"
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"
     env:

From afe2a1aaa7beeffce298f52f3b24d6a2b5d5a3fe Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:19:17 +0500
Subject: [PATCH 037/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8e93a6560..5829f55d5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,8 +30,8 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
     commands:
-      - "FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP \"(?<=Passing - )\d+\" || echo 0))"
-      - "echo Full test passing: $${FULL_TEST_RESULT}"
+      - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
+#      - "echo Full test passing: $${FULL_TEST_RESULT}"
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"
     env:

From f8b967ba8b0d503678e0f37862476b96da80ba55 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:20:41 +0500
Subject: [PATCH 038/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5829f55d5..37ce78048 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,7 +31,7 @@ steps:
 #            - docker-compose-full-test-suite.yml
     commands:
       - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
-#      - "echo Full test passing: $${FULL_TEST_RESULT}"
+      - echo Full test passing\: $${FULL_TEST_RESULT}
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"
     env:

From 888e865905f75ad6aba933f855abf5e89b90d365 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:22:22 +0500
Subject: [PATCH 039/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 37ce78048..d37ccf141 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -31,7 +31,7 @@ steps:
 #            - docker-compose-full-test-suite.yml
     commands:
       - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - echo Full test passing\: $${FULL_TEST_RESULT}
+      - echo Full test passing - $${FULL_TEST_RESULT}
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"
     env:

From 24ea81ce5d9599d088d4d61a7b37f297104b3489 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:23:52 +0500
Subject: [PATCH 040/206] get rid of pipe to assign env

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d37ccf141..e2b91186a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,7 +30,7 @@ steps:
 #          config:
 #            - docker-compose-full-test-suite.yml
     commands:
-      - FULL_TEST_RESULT=$(~/temp/ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - FULL_TEST_RESULT=$(./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
 #      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
 #      - "test $${FULL_TEST_THRESHOLD} -le"

From e6848ac52588c65d222275c3151accd533cb7333 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:46:44 +0500
Subject: [PATCH 041/206] uncomment test

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e2b91186a..9eadd28bd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -32,8 +32,8 @@ steps:
     commands:
       - FULL_TEST_RESULT=$(./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
-#      - "echo Full test threshold: $${FULL_TEST_THRESHOLD}"
-#      - "test $${FULL_TEST_THRESHOLD} -le"
+      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
+      - test $${FULL_TEST_THRESHOLD} -le
     env:
       FULL_TEST_THRESHOLD: 934
 

From d73eddc5c62c46f6452e5a7c81c3296686c4fb3c Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:48:55 +0500
Subject: [PATCH 042/206] uncomment test

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9eadd28bd..b9548b398 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -33,7 +33,7 @@ steps:
       - FULL_TEST_RESULT=$(./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
-      - test $${FULL_TEST_THRESHOLD} -le
+      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     env:
       FULL_TEST_THRESHOLD: 934
 

From a116345b5889b251b30f0a108465eba807fb350e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:52:32 +0500
Subject: [PATCH 043/206] uncomment test

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b9548b398..601c2f4a1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -33,6 +33,7 @@ steps:
       - FULL_TEST_RESULT=$(./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
+      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     env:
       FULL_TEST_THRESHOLD: 934

From fda5a2d44848adcaf22e7e7d2489a6e44dac57ce Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 20:52:45 +0500
Subject: [PATCH 044/206] uncomment test

---
 ggbb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ggbb.sh b/ggbb.sh
index 04feb4a8e..e001cc37f 100755
--- a/ggbb.sh
+++ b/ggbb.sh
@@ -8,7 +8,7 @@ Summarize result:
 
     Failing - 33
     Pending - 121
-    Passing - 933
+    Passing - 5555
 
 Total tests - 1088
 

From 458692949bb276d2dece003e7f18715a9555bf2d Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 21:22:24 +0500
Subject: [PATCH 045/206] add docker compose

---
 .buildkite/pipeline.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 601c2f4a1..dbc5f11e1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,13 +24,8 @@ steps:
 #    if: |
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-#    plugins:
-#      - docker-compose#v3.9.0:
-#          run: full_test_suite
-#          config:
-#            - docker-compose-full-test-suite.yml
     commands:
-      - FULL_TEST_RESULT=$(./ggbb.sh | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - FULL_TEST_RESULT=$(docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From e920cf518bd34a1a5b2cfcffdd379bf166532071 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 21:34:28 +0500
Subject: [PATCH 046/206] using tee

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index dbc5f11e1..9622b15ad 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,7 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - FULL_TEST_RESULT=$(docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - FULL_TEST_RESULT=$(docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix | tee /dev/stdout | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From d4ba31efea74cd3ac1f743bbf928dd2cd5775e16 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 21:43:26 +0500
Subject: [PATCH 047/206] Playing around output to stdout

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9622b15ad..37424183b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,8 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - FULL_TEST_RESULT=$(docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix | tee /dev/stdout | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix --name fts_${BUILDKITE_BUILD_NUMBER} | tee fts_output
+      - FULL_TEST_RESULT=$(cat fts_output | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From e5fe7e4b8d87d42e88880eee957aec2478a10b79 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 21:58:49 +0500
Subject: [PATCH 048/206] Simplify

---
 .buildkite/pipeline.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 37424183b..ac472b2d6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,8 +25,9 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker-compose -f docker-compose-full-test-suite.yml up --no-log-prefix --name fts_${BUILDKITE_BUILD_NUMBER} | tee fts_output
-      - FULL_TEST_RESULT=$(cat fts_output | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker-compose -f docker-compose-full-test-suite.yml up
+      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker rm full_test_suite
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From aa1fbd33f3612fa59d9b010c3b92e19a29bc028f Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 22:00:28 +0500
Subject: [PATCH 049/206] Remove with docker-compose

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ac472b2d6..ba30c3fab 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,7 +27,7 @@ steps:
     commands:
       - docker-compose -f docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker rm full_test_suite
+      - docker-compose -f docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From 89cd3b552c777c7ab510b977f8746fac3a779d58 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 22:33:35 +0500
Subject: [PATCH 050/206] merge pipes

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ba30c3fab..3e5407728 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,7 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker-compose -f docker-compose-full-test-suite.yml up
+      - docker-compose -f docker-compose-full-test-suite.yml up 2>&1
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker-compose -f docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
@@ -33,7 +33,7 @@ steps:
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     env:
-      FULL_TEST_THRESHOLD: 934
+      FULL_TEST_THRESHOLD: 1000
 
   - wait
 

From 4685136927d6f3396812ff7d8c4a804fcfb3700b Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Tue, 8 Mar 2022 23:26:41 +0500
Subject: [PATCH 051/206] Try to mix stderr and stdout

---
 .buildkite/pipeline.yml            | 2 +-
 docker-compose-full-test-suite.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3e5407728..4f98e8d28 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,7 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker-compose -f docker-compose-full-test-suite.yml up 2>&1
+      - docker-compose -f docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker-compose -f docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
diff --git a/docker-compose-full-test-suite.yml b/docker-compose-full-test-suite.yml
index b3e035e7c..c42e34e64 100644
--- a/docker-compose-full-test-suite.yml
+++ b/docker-compose-full-test-suite.yml
@@ -5,6 +5,7 @@ services:
   full_test_suite:
     container_name: full_test_suite
     image: neonlabsorg/full_test_suite:develop
+    entrypoint: ./run-test.sh 2>&1
     environment:
       - NETWORK_NAME=night-stand
       - PROXY_URL=http://proxy.night.stand.neontest.xyz/solana

From bce3e18e3dac853bfa9b1d131ba1d28d99878ddf Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 12:34:44 +0500
Subject: [PATCH 052/206] mode docker-compose-full-test-suite.yml into
 docker-compose

---
 .buildkite/pipeline.yml                                         | 2 +-
 .../docker-compose-full-test-suite.yml                          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename docker-compose-full-test-suite.yml => docker-compose/docker-compose-full-test-suite.yml (100%)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4f98e8d28..d6f8ec49d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,7 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker-compose -f docker-compose-full-test-suite.yml up
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker-compose -f docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
diff --git a/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
similarity index 100%
rename from docker-compose-full-test-suite.yml
rename to docker-compose/docker-compose-full-test-suite.yml

From c217dcd877f94334f2aee8f32398fb284e8288e6 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 13:02:22 +0500
Subject: [PATCH 053/206] mode docker-compose-full-test-suite.yml into
 docker-compose

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d6f8ec49d..afe624daf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))

From 1aa8bcb8fa72c4fd52daabb636ea7172982b4d50 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 13:57:53 +0500
Subject: [PATCH 054/206] spit and polish

---
 .buildkite/pipeline.yml |  2 +-
 ggbb.sh                 | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100755 ggbb.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index afe624daf..1f0f7b74f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -33,7 +33,7 @@ steps:
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     env:
-      FULL_TEST_THRESHOLD: 1000
+      FULL_TEST_THRESHOLD: 1700
 
   - wait
 
diff --git a/ggbb.sh b/ggbb.sh
deleted file mode 100755
index e001cc37f..000000000
--- a/ggbb.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-
-cat << EOF
-24 passing (2m)
-
-Summarize result:
-
-    Failing - 33
-    Pending - 121
-    Passing - 5555
-
-Total tests - 1088
-
-Test files without test result - 0:
-
-Fix allure results: 0
-The allure-results archive is creating at: /opt/allure-reports.tar
-
-EOF

From a0a1c03db5e33bd8fae7e8fb1b80698882640273 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 14:14:22 +0500
Subject: [PATCH 055/206] rollback environment.py

---
 proxy/environment.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/proxy/environment.py b/proxy/environment.py
index 999fe8c84..4e99de8ea 100644
--- a/proxy/environment.py
+++ b/proxy/environment.py
@@ -1,4 +1,3 @@
-import logging
 import sys
 from decimal import Decimal
 import json

From 330d24065cab8384eb3b0d83f9ccc91ffe341ba8 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 14:30:31 +0500
Subject: [PATCH 056/206] rollback environment.py

---
 .buildkite/pipeline.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1f0f7b74f..6148fc5ec 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,11 +27,14 @@ steps:
     commands:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker cp full_test_suite:/opt/allure-reports.tar ./
       - docker-compose -f docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
+    artifact_paths:
+      - allure-reports.tar
     env:
       FULL_TEST_THRESHOLD: 1700
 

From 2fb4fe29f52170aa40c9cd1224f44e89b05f3610 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 15:37:44 +0500
Subject: [PATCH 057/206] rollback environment.py

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6148fc5ec..f8339e22b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,7 +28,7 @@ steps:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp full_test_suite:/opt/allure-reports.tar ./
-      - docker-compose -f docker-compose-full-test-suite.yml rm -f
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
       - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}

From 0b0df91d010c6583f2728530bbabd767e95ef52f Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 15:51:55 +0500
Subject: [PATCH 058/206] rollback environment.py

---
 .buildkite/pipeline.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f8339e22b..e7bdb2611 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,18 +21,19 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp full_test_suite:/opt/allure-reports.tar ./
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FULL_TEST_RESULT}
-      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
-      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
-      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
+      - docker ps
+#      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+#      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
+#      - docker cp full_test_suite:/opt/allure-reports.tar ./
+#      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+#      - echo Full test passing - $${FULL_TEST_RESULT}
+#      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
+#      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
+#      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
     env:

From 446aa9b50b6408f4ce4a7d3cacf6a32b34c52457 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 15:54:58 +0500
Subject: [PATCH 059/206] rollback environment.py

---
 .buildkite/pipeline.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e7bdb2611..cc872dad8 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,8 +26,9 @@ steps:
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - docker ps
-#      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-#      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+      - docker logs full_test_suite
+      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
 #      - docker cp full_test_suite:/opt/allure-reports.tar ./
 #      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
 #      - echo Full test passing - $${FULL_TEST_RESULT}

From b66cda739921576abd49553df960197adc987c7f Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 16:11:18 +0500
Subject: [PATCH 060/206] uncoment code

---
 .buildkite/pipeline.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index cc872dad8..ebb33ebc1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,20 +21,20 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - docker ps
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - docker logs full_test_suite
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
-#      - docker cp full_test_suite:/opt/allure-reports.tar ./
-#      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-#      - echo Full test passing - $${FULL_TEST_RESULT}
-#      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
-#      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
-#      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
+      - docker cp full_test_suite:/opt/allure-reports.tar ./
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+      - echo Full test passing - $${FULL_TEST_RESULT}
+      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
+      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
+      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
     env:

From 2e480eb1f5d57ad3fd953bc5351584ac79139522 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 16:38:07 +0500
Subject: [PATCH 061/206] get rid of extra calls

---
 .buildkite/pipeline.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ebb33ebc1..f8339e22b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,9 +25,7 @@ steps:
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - docker ps
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - docker logs full_test_suite
       - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp full_test_suite:/opt/allure-reports.tar ./
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f

From 4c2b6260bd3b2aa761c6ee456c5700967ad83b4a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 16:44:16 +0500
Subject: [PATCH 062/206] get rid of extra calls

---
 docker-compose/docker-compose-full-test-suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index c42e34e64..12ebd25ca 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -5,7 +5,7 @@ services:
   full_test_suite:
     container_name: full_test_suite
     image: neonlabsorg/full_test_suite:develop
-    entrypoint: ./run-test.sh 2>&1
+    entrypoint: ./run-test.sh 2>/dev/null
     environment:
       - NETWORK_NAME=night-stand
       - PROXY_URL=http://proxy.night.stand.neontest.xyz/solana

From 9ae04abf70ba765d42e0b96daecc05908c2923d3 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:03:53 +0500
Subject: [PATCH 063/206] dynamic container name

---
 .buildkite/pipeline.yml                           | 12 +++++++-----
 docker-compose/docker-compose-full-test-suite.yml |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f8339e22b..12ac498bc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,13 +21,15 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
+      - export FTS_CONTAINER_NAME=fts_${BUILDKITE_BUILD_NUMBER}
+      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FULL_TEST_RESULT=$(docker logs full_test_suite | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp full_test_suite:/opt/allure-reports.tar ./
+      - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 12ebd25ca..88f6400e1 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
 
   full_test_suite:
-    container_name: full_test_suite
+    container_name: ${FTS_CONTAINER_NAME:-full_test_suite}
     image: neonlabsorg/full_test_suite:develop
     entrypoint: ./run-test.sh 2>/dev/null
     environment:

From b37e568656e7df9f28be4281b382ebf8cf602cc8 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:08:02 +0500
Subject: [PATCH 064/206] dynamic container name

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 12ac498bc..118ce155a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,6 +30,7 @@ steps:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
+      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}

From 5c84838870117c35e2be2bf2d1b5cad57e6d278d Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:15:22 +0500
Subject: [PATCH 065/206] FTS_CONTAINER_NAME

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 118ce155a..bae675ba5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,7 +25,6 @@ steps:
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
-      - export FTS_CONTAINER_NAME=fts_${BUILDKITE_BUILD_NUMBER}
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
@@ -38,8 +37,10 @@ steps:
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
+      - ${FTS_CONTAINER_NAME}
     env:
       FULL_TEST_THRESHOLD: 1700
+      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
 
   - wait
 

From 4074fea650310e1280c7951bcc5c38f224061c3a Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:28:48 +0500
Subject: [PATCH 066/206] Move up the environments

---
 .buildkite/pipeline.yml                           | 5 ++++-
 docker-compose/docker-compose-full-test-suite.yml | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index bae675ba5..2919692ce 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -41,7 +41,10 @@ steps:
     env:
       FULL_TEST_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-
+      PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
+      FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
+      SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
+      FULL_TEST_SUITE_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
   - wait
 
   - label: ":floppy_disk: publish image"
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 88f6400e1..cb829940f 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -4,20 +4,20 @@ services:
 
   full_test_suite:
     container_name: ${FTS_CONTAINER_NAME:-full_test_suite}
-    image: neonlabsorg/full_test_suite:develop
+    image: ${FULL_TEST_SUITE_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
       - NETWORK_NAME=night-stand
-      - PROXY_URL=http://proxy.night.stand.neontest.xyz/solana
+      - PROXY_URL=${PROXY_URL}
       - NETWORK_ID=111
       - ADDRESS_FROM=
       - ADDRESS_TO=
       - PRIVATE_KEY=
       - REQUEST_AMOUNT=995
-      - FAUCET_URL=http://proxy.night.stand.neontest.xyz/request_eth_token
+      - FAUCET_URL=${FAUCET_URL}
       - USE_FAUCET=true
       - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
-      - SOLANA_URL=http://proxy.night.stand.neontest.xyz/node-solana
+      - SOLANA_URL=${SOLANA_URL}
       - USERS_NUMBER=15
       - JOBS_NUMBER=8
     network_mode: host

From ee05286497d26dc3e38295fa29aa10598e8a2d20 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:44:46 +0500
Subject: [PATCH 067/206] Play around environment

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2919692ce..1eff9500b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,8 +28,8 @@ steps:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
-      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
+      - docker cp ${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
+      - docker logs ${FTS_CONTAINER_NAME} > ${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}

From 02e5cca3b605c9de788e7bcbfab63614392bd737 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:47:23 +0500
Subject: [PATCH 068/206] Play around environment

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1eff9500b..2919692ce 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,8 +28,8 @@ steps:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp ${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
-      - docker logs ${FTS_CONTAINER_NAME} > ${FTS_CONTAINER_NAME}.log
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
+      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}

From 79fc4ddd85edaba36bb7eb2b44cf3f27461fc48f Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:49:42 +0500
Subject: [PATCH 069/206] ${FTS_CONTAINER_NAME}.log

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2919692ce..4916d15c8 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -37,7 +37,7 @@ steps:
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
-      - ${FTS_CONTAINER_NAME}
+      - ${FTS_CONTAINER_NAME}.log
     env:
       FULL_TEST_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}

From 8e4e646e264f997639e545630b1112d187e1721e Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 17:52:19 +0500
Subject: [PATCH 070/206] ${FTS_CONTAINER_NAME}.log

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4916d15c8..d8e29c6cc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,6 +30,7 @@ steps:
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
       - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
+      - cat $${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}

From 9b903c47bca3515de8447fe1634553175bd782fe Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:08:24 +0500
Subject: [PATCH 071/206] docker logs

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d8e29c6cc..d0762dfb7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,8 @@ steps:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
-      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
+      - echo !!!!!!!!!!!!!!!!!!!!!!!!
+      - docker logs $${FTS_CONTAINER_NAME} | tee $${FTS_CONTAINER_NAME}.log
       - cat $${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}

From 48e08f7758ec3721293720a6e7e9c658328aac89 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:10:27 +0500
Subject: [PATCH 072/206] docker logs

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d0762dfb7..bb4235d24 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,9 +29,10 @@ steps:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
+      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
       - echo !!!!!!!!!!!!!!!!!!!!!!!!
-      - docker logs $${FTS_CONTAINER_NAME} | tee $${FTS_CONTAINER_NAME}.log
       - cat $${FTS_CONTAINER_NAME}.log
+      - echo !!!!!!!!!!!!!!!!!!!!!!!!
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}

From d5b652a5ebdb932aca77727363b8123aabd20759 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:12:13 +0500
Subject: [PATCH 073/206] docker logs

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index bb4235d24..ca4f42deb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,7 +29,7 @@ steps:
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
-      - docker logs $${FTS_CONTAINER_NAME} > $${FTS_CONTAINER_NAME}.log
+      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
       - echo !!!!!!!!!!!!!!!!!!!!!!!!
       - cat $${FTS_CONTAINER_NAME}.log
       - echo !!!!!!!!!!!!!!!!!!!!!!!!
@@ -40,7 +40,7 @@ steps:
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
-      - ${FTS_CONTAINER_NAME}.log
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
       FULL_TEST_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}

From 72c9e26eae73978aeb15d373d4f684932143f8e6 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:13:51 +0500
Subject: [PATCH 074/206] docker logs

---
 .buildkite/pipeline.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ca4f42deb..01aff7245 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -30,9 +30,6 @@ steps:
       - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-      - echo !!!!!!!!!!!!!!!!!!!!!!!!
-      - cat $${FTS_CONTAINER_NAME}.log
-      - echo !!!!!!!!!!!!!!!!!!!!!!!!
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FULL_TEST_RESULT}
       - echo Full test threshold - $${FULL_TEST_THRESHOLD}
@@ -40,7 +37,7 @@ steps:
       - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
-      - fts_${BUILDKITE_BUILD_NUMBER}.log
+      - ${FTS_CONTAINER_NAME}
     env:
       FULL_TEST_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}

From 3365f11a23af346e10accab43936a4b932d1c1be Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:25:25 +0500
Subject: [PATCH 075/206] docker logs

---
 .buildkite/pipeline.yml                       | 27 ++++++++++---------
 .../docker-compose-full-test-suite.yml        |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 01aff7245..2857fbd1e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -20,31 +20,32 @@ steps:
 #      - "airdropper.log"
 #      - "indexer.log"
 
-  - label: ":coverage: full test suite"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+  - label: ":coverage: full test suite (FTS)"
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FULL_TEST_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FULL_TEST_RESULT}
-      - echo Full test threshold - $${FULL_TEST_THRESHOLD}
-      - echo Check if $${FULL_TEST_RESULT} is greater or equeal $${FULL_TEST_THRESHOLD}
-      - test $${FULL_TEST_RESULT} -ge $${FULL_TEST_THRESHOLD}
+      - echo Full test passing - $${FTS_RESULT}
+      - echo Full test threshold - $${FTS_THRESHOLD}
+      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
     artifact_paths:
       - allure-reports.tar
-      - ${FTS_CONTAINER_NAME}
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
-      FULL_TEST_THRESHOLD: 1700
-      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FULL_TEST_SUITE_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+      FTS_THRESHOLD: 1700
+      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+
   - wait
 
   - label: ":floppy_disk: publish image"
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index cb829940f..9426c0b6d 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -4,7 +4,7 @@ services:
 
   full_test_suite:
     container_name: ${FTS_CONTAINER_NAME:-full_test_suite}
-    image: ${FULL_TEST_SUITE_IMAGE:-neonlabsorg/develop}
+    image: ${FTS_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
       - NETWORK_NAME=night-stand

From e5f86f868f66f8e66858f830af84601af769ada2 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:31:36 +0500
Subject: [PATCH 076/206] docker logs

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2857fbd1e..c31a9a257 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,7 +42,7 @@ steps:
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FTS_THRESHOLD: 1700
+      FTS_THRESHOLD: 200
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
       FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
 

From e217d40d5e099b75e3609a9f4c12b83aed302c99 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:45:44 +0500
Subject: [PATCH 077/206] checkout to fts develop image

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c31a9a257..399cf4e83 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,9 +42,9 @@ steps:
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FTS_THRESHOLD: 200
+      FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
 
   - wait
 

From 290d33e8e10d1735e53087ddb59d938e1f08a5d0 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 18:58:08 +0500
Subject: [PATCH 078/206] back to fake

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 399cf4e83..c31a9a257 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,9 +42,9 @@ steps:
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FTS_THRESHOLD: 1700
+      FTS_THRESHOLD: 200
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
 
   - wait
 

From 77e6f6c62115e53d345a71b71ee52ccd6c6a28fb Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 9 Mar 2022 19:16:13 +0500
Subject: [PATCH 079/206] bring fts to develop

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c31a9a257..399cf4e83 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,9 +42,9 @@ steps:
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FTS_THRESHOLD: 200
+      FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
 
   - wait
 

From d95ba7a545dbadcf3de49032339e2c8b426f889f Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 14:12:27 +0500
Subject: [PATCH 080/206] try the fts with wait-faucet

---
 .buildkite/pipeline.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 399cf4e83..82a06c996 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite (FTS)"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
@@ -44,7 +44,7 @@ steps:
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite-wait-faucet
 
   - wait
 

From 8bb2241443e4c795407f3b1986d76819fed7ab56 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 15:06:38 +0500
Subject: [PATCH 081/206] Request ammount

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 82a06c996..86cc6fde8 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -39,6 +39,7 @@ steps:
       - allure-reports.tar
       - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
+      REQUEST_AMOUNT: 995
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana

From a316493f6e20f44a14ffd3014209c5be7c23f172 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 15:34:14 +0500
Subject: [PATCH 082/206] Roll back

---
 .buildkite/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 86cc6fde8..82a06c996 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -39,7 +39,6 @@ steps:
       - allure-reports.tar
       - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
-      REQUEST_AMOUNT: 995
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana

From 994620b9e5994d97f0018468d4e71fdf42accad3 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 15:36:43 +0500
Subject: [PATCH 083/206] Roll back

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 82a06c996..adcc867bc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -36,7 +36,7 @@ steps:
       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
     artifact_paths:
-      - allure-reports.tar
+      - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana

From ff4f3d67999ae20aca39644a0bcd128755b6acf9 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 17:35:02 +0500
Subject: [PATCH 084/206] Allure report error

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index adcc867bc..3b6cdaf3a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,7 +28,7 @@ steps:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar ./
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
       - echo Full test passing - $${FTS_RESULT}

From 7ee5e95bfac4b13825e7b0a01a1e4d27f16ac027 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 10 Mar 2022 17:44:34 +0500
Subject: [PATCH 085/206] Increase request amount

---
 docker-compose/docker-compose-full-test-suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 9426c0b6d..00efbc8bb 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -13,7 +13,7 @@ services:
       - ADDRESS_FROM=
       - ADDRESS_TO=
       - PRIVATE_KEY=
-      - REQUEST_AMOUNT=995
+      - REQUEST_AMOUNT=20000
       - FAUCET_URL=${FAUCET_URL}
       - USE_FAUCET=true
       - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana

From d88a693695f0fdac98f4cb28ce24ff405d1299ea Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 11 Mar 2022 13:26:39 +0500
Subject: [PATCH 086/206] full_test_suite:583-full-test-suite

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3b6cdaf3a..b82b2ce1f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -44,7 +44,7 @@ steps:
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite-wait-faucet
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
 
   - wait
 

From 3ad49ab66a09f403a7044ae26d90ece8dd963262 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 11 Mar 2022 13:43:46 +0500
Subject: [PATCH 087/206] uncoment condition

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b82b2ce1f..b47b79a86 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite (FTS)"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up

From 2ebfbf49654ea788a1d2fc77bdf190835b6b2053 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 11 Mar 2022 14:07:04 +0500
Subject: [PATCH 088/206] comment condition

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b47b79a86..b82b2ce1f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite (FTS)"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up

From 0ec3c9e4fb0b5a90b9f87890802c6a5c8049f560 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 14:45:23 +0300
Subject: [PATCH 089/206] intro

---
 .buildkite/pipeline.yml  |   7 +-
 tf/build.sh              |  13 +++
 tf/destroy.sh            |  12 +++
 tf/main.tf               | 188 +++++++++++++++++++++++++++++++++++++++
 tf/output.tf             |   8 ++
 tf/proxy_init.sh         |  59 ++++++++++++
 tf/solana_init.sh        |  26 ++++++
 tf/terraform.auto.tfvars |   9 ++
 tf/vars.tf               |  31 +++++++
 9 files changed, 352 insertions(+), 1 deletion(-)
 create mode 100644 tf/build.sh
 create mode 100644 tf/destroy.sh
 create mode 100644 tf/main.tf
 create mode 100644 tf/output.tf
 create mode 100644 tf/proxy_init.sh
 create mode 100644 tf/solana_init.sh
 create mode 100644 tf/terraform.auto.tfvars
 create mode 100644 tf/vars.tf

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b82b2ce1f..150e8e504 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,6 +4,9 @@ steps:
       - ".buildkite/steps/build-image.sh"
       - ".buildkite/steps/upload-image.sh"
 
+  - label: ":terraform: build infrastructure"
+    command:
+      - "tf/build.sh"
   - wait
 
 #  - label: ":cop::skin-tone-2: deploy check"
@@ -54,4 +57,6 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-
+  - label: ":terraform: destroy infrastructure"
+    command:
+      - "tf/destroy.sh"
diff --git a/tf/build.sh b/tf/build.sh
new file mode 100644
index 000000000..da57d4924
--- /dev/null
+++ b/tf/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd tf
+
+export TF_VAR_branch=$BUILDKITE_BRANCH
+export TFSTATE_BUCKET="nl-ci-stands"
+export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
+export TFSTATE_REGION="us-east-2"
+export TF_VAR_neon_evm_revision=latest
+export TF_VAR_proxy_model_revision=latest
+export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
+terraform init $TF_BACKEND_CONFIG
+terraform apply --auto-approve=true
diff --git a/tf/destroy.sh b/tf/destroy.sh
new file mode 100644
index 000000000..15ba0ac15
--- /dev/null
+++ b/tf/destroy.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cd tf
+
+export TF_VAR_branch=$BUILDKITE_BRANCH
+export TFSTATE_BUCKET="nl-ci-stands"
+export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
+export TFSTATE_REGION="us-east-2"
+export TF_VAR_neon_evm_revision=latest
+export TF_VAR_proxy_model_revision=latest
+export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
+terraform destroy --auto-approve=true
diff --git a/tf/main.tf b/tf/main.tf
new file mode 100644
index 000000000..f9ddb0ed5
--- /dev/null
+++ b/tf/main.tf
@@ -0,0 +1,188 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 3.0"
+    }
+  }
+
+  backend "s3" {
+
+  }
+}
+
+provider "aws" {
+  region = "us-east-2"
+}
+
+data "aws_vpc" "default" {
+  default = true
+}
+
+data "aws_key_pair" "ci-stands" {
+  key_name = "ci-stands"
+}
+
+data "template_file" "solana_init" {
+  template = file("solana_init.sh")
+
+  vars = {
+    branch = "${var.branch}"
+  }
+}
+
+data "template_file" "proxy_init" {
+  template = file("proxy_init.sh")
+
+  vars = {
+    branch    = "${var.branch}"
+    revision  = "latest"
+    solana_ip = aws_instance.solana.private_ip
+  }
+}
+
+resource "aws_security_group" "test-stand-solana" {
+  name        = "${var.branch} - solana group for test stand"
+  description = "set of rules allow incoming traffic from ci test agents for OZ tests"
+  vpc_id      = data.aws_vpc.default.id
+
+  ingress {
+    description = "allow incoming from ci test agent to SOLANA"
+    from_port   = 0
+    to_port     = 65535
+    protocol    = "tcp"
+    cidr_blocks = var.allow_list
+
+  }
+
+  ingress {
+    description = "allow incoming from ci test agent to SOLANA"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+
+  }
+
+  egress {
+    from_port        = 0
+    to_port          = 0
+    protocol         = "-1"
+    cidr_blocks      = ["0.0.0.0/0"]
+    ipv6_cidr_blocks = ["::/0"]
+  }
+
+  tags = {
+    Name    = "${var.branch}-test-stand-solana"
+    purpose = "ci-oz-full-tests"
+  }
+}
+
+resource "aws_security_group" "test-stand-proxy" {
+  name        = "${var.branch} - proxy group for test stand"
+  description = "set of rules allow incoming traffic from ci test agents for OZ tests"
+  vpc_id      = data.aws_vpc.default.id
+
+  ingress {
+    description = "allow incoming from ci test agent to PROXY"
+    from_port   = 9090
+    to_port     = 9090
+    protocol    = "tcp"
+    cidr_blocks = var.allow_list
+
+  }
+
+  ingress {
+    description = "allow incoming from ci test agent to FAUCET"
+    from_port   = 3333
+    to_port     = 3333
+    protocol    = "tcp"
+    cidr_blocks = var.allow_list
+
+  }
+  ingress {
+    description = "allow incoming from ci test agent to SOLANA"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+
+  }
+
+  egress {
+    from_port        = 0
+    to_port          = 0
+    protocol         = "-1"
+    cidr_blocks      = ["0.0.0.0/0"]
+    ipv6_cidr_blocks = ["::/0"]
+  }
+
+  tags = {
+    Name    = "${var.branch}-test-stand-proxy"
+    purpose = "ci-oz-full-tests"
+  }
+}
+
+
+resource "aws_instance" "solana" {
+  instance_type          = var.instance_type
+  ami                    = var.ami
+  key_name               = data.aws_key_pair.ci-stands.key_name
+  vpc_security_group_ids = [aws_security_group.test-stand-solana.id]
+  subnet_id              = var.aws_subnet
+
+  ebs_block_device {
+    device_name = "/dev/sda1"
+    volume_size = 50
+  }
+
+  user_data = data.template_file.solana_init.rendered
+
+  tags = {
+    Name    = "${var.branch}-test-stand-solana"
+    purpose = "ci-oz-full-tests"
+  }
+
+}
+
+resource "aws_instance" "proxy" {
+  instance_type          = var.instance_type
+  ami                    = var.ami
+  key_name               = data.aws_key_pair.ci-stands.key_name
+  vpc_security_group_ids = [aws_security_group.test-stand-proxy.id]
+  subnet_id              = var.aws_subnet
+  ebs_block_device {
+    device_name = "/dev/sda1"
+    volume_size = 50
+  }
+  //user_data = data.template_file.proxy_init.rendered
+  tags = {
+    Name    = "${var.branch}-test-stand-proxy"
+    purpose = "ci-oz-full-tests"
+  }
+  depends_on = [
+    aws_instance.solana
+  ]
+
+  connection {
+    type        = "ssh"
+    user        = "ubuntu"
+    host        = aws_instance.proxy.public_ip
+    private_key = file("1")
+  }
+
+  provisioner "file" {
+    content     = data.template_file.proxy_init.rendered
+    destination = "/tmp/proxy_init.sh"
+  }
+
+  provisioner "remote-exec" {
+    inline = [
+      "echo '${aws_instance.solana.private_ip}' > /tmp/solana_host",
+      "chmod a+x /tmp/proxy_init.sh",
+      "sudo /tmp/proxy_init.sh"
+    ]
+  }
+}
+
+
diff --git a/tf/output.tf b/tf/output.tf
new file mode 100644
index 000000000..859b5d7bb
--- /dev/null
+++ b/tf/output.tf
@@ -0,0 +1,8 @@
+output "solana_ip" {
+  value = aws_instance.solana.public_ip
+}
+
+output "proxy_ip" {
+  value = aws_instance.proxy.public_ip
+}
+
diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
new file mode 100644
index 000000000..ad8b520e5
--- /dev/null
+++ b/tf/proxy_init.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+sudo apt-get remove docker docker-engine docker.io containerd runc
+sudo apt-get update
+sudo apt-get -y install ca-certificates curl gnupg lsb-release
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get -y install docker-ce docker-ce-cli containerd.io
+sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+cd /opt
+curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
+
+export REVISION=${revision}
+export SOLANA_URL=http:\/\/${solana_ip}:8899
+
+cat > docker-compose-test.override.yml <<EOF
+version: "3"
+
+services:
+  evm_loader:
+    container_name: evm_loader
+    #image: neonlabsorg/evm_loader:\$\{EVM_LOADER_REVISION:-latest\}
+    environment:
+      - SOLANA_URL=$SOLANA_URL
+    depends_on: []
+    networks:
+      - net
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh"
+  proxy:
+    environment:
+      - SOLANA_URL=$SOLANA_URL
+  faucet:
+    environment:
+      - SOLANA_URL=$SOLANA_URL
+  airdropper:
+    environment:
+      - SOLANA_URL=$SOLANA_URL
+  indexer:
+    environment:
+      - SOLANA_URL=$SOLANA_URL
+EOF
+
+
+SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v "solana")
+
+CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+MAX_COUNT=100
+CURRENT_ATTEMPT=1
+while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && $CURRENT_ATTEMPT -gt $MAX_COUNT ]]
+do
+  CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+  echo $CHECK_COMMAND >> /tmp/output.txt
+  echo "attempt: $CURRENT_ATTEMPT"
+  ((CURRENT_ATTEMPT=CURRENT_ATTEMPT+1))
+  sleep 2
+done;
+
+docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d $SERVICES
diff --git a/tf/solana_init.sh b/tf/solana_init.sh
new file mode 100644
index 000000000..1349bbf20
--- /dev/null
+++ b/tf/solana_init.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+sudo apt-get remove docker docker-engine docker.io containerd runc
+sudo apt-get update
+sudo apt-get -y install ca-certificates curl gnupg lsb-release
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get -y install docker-ce docker-ce-cli containerd.io
+sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+cd /opt
+curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
+cat > docker-compose-test.override.yml <<EOF
+version: "3"
+
+services:
+  solana:
+    ports:
+      - "8899:8899"
+      - "9900:9900"
+      - "8900:8900"
+      - "8001:8001"
+      - "8001-8009:8001-8009/udp"
+EOF
+docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d solana
+touch /tmp/startup_done
diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
new file mode 100644
index 000000000..93f19e6fb
--- /dev/null
+++ b/tf/terraform.auto.tfvars
@@ -0,0 +1,9 @@
+branch               = "develop"
+neon_evm_revision    = "latest"
+proxy_model_revision = "latest"
+
+
+aws_subnet           = "subnet-19f77872"
+allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
+instance_type        = "t3.large"
+ami                  = "ami-0fb653ca2d3203ac1"
diff --git a/tf/vars.tf b/tf/vars.tf
new file mode 100644
index 000000000..cd1865f5b
--- /dev/null
+++ b/tf/vars.tf
@@ -0,0 +1,31 @@
+// AWS specific
+variable "aws_subnet" {
+  type    = string
+  default = "default"
+}
+
+variable "allow_list" {
+  type = list(string)
+}
+
+variable "instance_type" {
+  type = string
+}
+
+variable "ami" {
+  type = string
+}
+
+// software sprcific
+variable "branch" {
+  type = string
+}
+
+variable "neon_evm_revision" {
+  type = string
+}
+
+variable "proxy_model_revision" {
+  type = string
+}
+

From e78e36093b281e42e5aa000be86b2fb086f456ac Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 11 Mar 2022 20:40:30 +0500
Subject: [PATCH 090/206] Bring full_test_suite onto "testing" agent

---
 .buildkite/pipeline.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b82b2ce1f..3b85abc49 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,9 +21,9 @@ steps:
 #      - "indexer.log"
 
   - label: ":coverage: full test suite (FTS)"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
@@ -45,6 +45,8 @@ steps:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
       FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+    agents:
+       queue: "testing"
 
   - wait
 

From 9fb9fa77cd2bb24bf171a01c41b50a198897abf0 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 19:02:10 +0300
Subject: [PATCH 091/206] upd creds

---
 .buildkite/pipeline.yml | 4 ++++
 tf/main.tf              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 150e8e504..d9883b5f7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,6 +5,8 @@ steps:
       - ".buildkite/steps/upload-image.sh"
 
   - label: ":terraform: build infrastructure"
+    agents:
+      queue: "testing"
     command:
       - "tf/build.sh"
   - wait
@@ -58,5 +60,7 @@ steps:
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
   - label: ":terraform: destroy infrastructure"
+    agents:
+      queue: "testing"
     command:
       - "tf/destroy.sh"
diff --git a/tf/main.tf b/tf/main.tf
index f9ddb0ed5..11ae91e2a 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -168,7 +168,7 @@ resource "aws_instance" "proxy" {
     type        = "ssh"
     user        = "ubuntu"
     host        = aws_instance.proxy.public_ip
-    private_key = file("1")
+    private_key = file("~/.ssh/ci-stands")
   }
 
   provisioner "file" {

From 7ef74d6e404aba696f5d58f64693105bb8e8c016 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 19:05:07 +0300
Subject: [PATCH 092/206] fix

---
 tf/destroy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 15ba0ac15..15f408de7 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -9,4 +9,5 @@ export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
+terraform init
 terraform destroy --auto-approve=true

From 60124c2e9d0ffd0acbf0995dd872257ebeb7d0e0 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 20:00:11 +0300
Subject: [PATCH 093/206] wip

---
 .buildkite/pipeline.yml | 62 ++++++++++++++++++++---------------------
 tf/build.sh             |  6 ++++
 tf/destroy.sh           |  3 ++
 3 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d9883b5f7..fce0c89e0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,39 +25,39 @@ steps:
 #      - "airdropper.log"
 #      - "indexer.log"
 
-  - label: ":coverage: full test suite (FTS)"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-    commands:
-      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FTS_RESULT}
-      - echo Full test threshold - $${FTS_THRESHOLD}
-      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-    artifact_paths:
-      - allure-reports.tar.gz
-      - fts_${BUILDKITE_BUILD_NUMBER}.log
-    env:
-      PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
-      FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
-      SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-      FTS_THRESHOLD: 1700
-      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+#   - label: ":coverage: full test suite (FTS)"
+# #    if: |
+# #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+# #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#     commands:
+#       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+#       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+#       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+#       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+#       - echo Full test passing - $${FTS_RESULT}
+#       - echo Full test threshold - $${FTS_THRESHOLD}
+#       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+#       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+#     artifact_paths:
+#       - allure-reports.tar.gz
+#       - fts_${BUILDKITE_BUILD_NUMBER}.log
+#     env:
+#       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
+#       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
+#       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
+#       FTS_THRESHOLD: 1700
+#       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+#       FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
 
-  - wait
+#   - wait
 
-  - label: ":floppy_disk: publish image"
-    command: ".buildkite/steps/publish-image.sh"
-    if: |
-        build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
-        (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
+#   - label: ":floppy_disk: publish image"
+#     command: ".buildkite/steps/publish-image.sh"
+#     if: |
+#         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
+#         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
   - label: ":terraform: destroy infrastructure"
     agents:
diff --git a/tf/build.sh b/tf/build.sh
index da57d4924..1322503a5 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -11,3 +11,9 @@ export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init $TF_BACKEND_CONFIG
 terraform apply --auto-approve=true
+
+terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-proxy-$BUILDKITE_COMMIT"
+terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-solana-$BUILDKITE_COMMIT"
+
+buildkite meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
+buildkite meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
diff --git a/tf/destroy.sh b/tf/destroy.sh
index 15f408de7..d4abb470b 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -11,3 +11,6 @@ export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init
 terraform destroy --auto-approve=true
+
+buildkite meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
+buildkite meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"

From ebf8ea0a0fb5fc121cc3fc84832555aac91077c1 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 20:06:38 +0300
Subject: [PATCH 094/206] typo

---
 tf/build.sh   | 4 ++--
 tf/destroy.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tf/build.sh b/tf/build.sh
index 1322503a5..4f768ff31 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -15,5 +15,5 @@ terraform apply --auto-approve=true
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-proxy-$BUILDKITE_COMMIT"
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-solana-$BUILDKITE_COMMIT"
 
-buildkite meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
-buildkite meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
diff --git a/tf/destroy.sh b/tf/destroy.sh
index d4abb470b..4fd41815a 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -12,5 +12,5 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 terraform init
 terraform destroy --auto-approve=true
 
-buildkite meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
-buildkite meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"

From 432bac780504c7501fa9d3a42aa1a5cd186a0a27 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 20:22:30 +0300
Subject: [PATCH 095/206] fix

---
 tf/destroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 4fd41815a..76ceca616 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -9,7 +9,7 @@ export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-terraform init
+terraform init $TF_BACKEND_CONFIG
 terraform destroy --auto-approve=true
 
 buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"

From dbe118d990c40df3ecc4e3497fce6313558dadca Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 20:48:18 +0300
Subject: [PATCH 096/206] wip

---
 .buildkite/pipeline.yml | 9 +++++++++
 tf/build.sh             | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fce0c89e0..8cdb00795 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,6 +25,15 @@ steps:
 #      - "airdropper.log"
 #      - "indexer.log"
 
+  - label: "Check variables"
+    command:
+      - "echo $$SOLANA_IP"
+      - "echo $$PROXY_IP"
+      - "env"
+    env:
+      SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"
+      PROXY_IP: "buildkite-agent meta-data get 'neon-tests-proxy-$$BUILDKITE_COMMIT'"
+
 #   - label: ":coverage: full test suite (FTS)"
 # #    if: |
 # #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
diff --git a/tf/build.sh b/tf/build.sh
index 4f768ff31..3f3b5327c 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -13,7 +13,7 @@ terraform init $TF_BACKEND_CONFIG
 terraform apply --auto-approve=true
 
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-proxy-$BUILDKITE_COMMIT"
-terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-solana-$BUILDKITE_COMMIT"
+terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "neon-tests-solana-$BUILDKITE_COMMIT"
 
 buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
 buildkite-agent meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"

From 600d6cafad788a84181f9c200466b4ed480cf815 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 20:59:22 +0300
Subject: [PATCH 097/206] wip

---
 .buildkite/pipeline.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8cdb00795..de1e70e86 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,9 +27,11 @@ steps:
 
   - label: "Check variables"
     command:
-      - "echo $$SOLANA_IP"
-      - "echo $$PROXY_IP"
-      - "env"
+      - echo "SOLANA_IP: $$SOLANA_IP"
+      - echo "PROXY_IP: $$PROXY_IP"
+      - export ZZ=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'`
+      - echo "ZZ $ZZ"
+
     env:
       SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"
       PROXY_IP: "buildkite-agent meta-data get 'neon-tests-proxy-$$BUILDKITE_COMMIT'"

From cb18d20d996a7fa653ce3297d46aecbc7f7b9453 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 21:07:58 +0300
Subject: [PATCH 098/206] wip

---
 .buildkite/pipeline.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index de1e70e86..6cf3ef994 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,10 +27,8 @@ steps:
 
   - label: "Check variables"
     command:
-      - echo "SOLANA_IP: $$SOLANA_IP"
-      - echo "PROXY_IP: $$PROXY_IP"
-      - export ZZ=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'`
-      - echo "ZZ $ZZ"
+      - env
+      - PROXY_URL=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'` && echo "PROXY_URL $PROXY_URL"
 
     env:
       SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"

From e9fd64c8ba7fc83f04711151a72d1cf6a90e68bf Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 21:20:34 +0300
Subject: [PATCH 099/206] wip

---
 .buildkite/pipeline.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6cf3ef994..ece7b11c5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,7 +28,8 @@ steps:
   - label: "Check variables"
     command:
       - env
-      - PROXY_URL=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'` && echo "PROXY_URL $PROXY_URL"
+      - PROXY_URL=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'`
+      - echo "PROXY_URL $$PROXY_URL"
 
     env:
       SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"

From b37c3cb193123c5a51875e3d80f43bec45104cfe Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 21:27:14 +0300
Subject: [PATCH 100/206] wip

---
 .buildkite/pipeline.yml | 2 +-
 tf/build.sh             | 8 ++++----
 tf/destroy.sh           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ece7b11c5..89f88ccfc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,7 +28,7 @@ steps:
   - label: "Check variables"
     command:
       - env
-      - PROXY_URL=`buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'`
+      - PROXY_URL=`buildkite-agent meta-data get 'PROXY_IP'`
       - echo "PROXY_URL $$PROXY_URL"
 
     env:
diff --git a/tf/build.sh b/tf/build.sh
index 3f3b5327c..c7098548b 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -12,8 +12,8 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 terraform init $TF_BACKEND_CONFIG
 terraform apply --auto-approve=true
 
-terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "neon-tests-proxy-$BUILDKITE_COMMIT"
-terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "neon-tests-solana-$BUILDKITE_COMMIT"
+terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
+terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
 
-buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
-buildkite-agent meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "PROXY_IP"
+buildkite-agent meta-data get "SOLANA_IP"
diff --git a/tf/destroy.sh b/tf/destroy.sh
index 76ceca616..da11f9923 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -12,5 +12,5 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 terraform init $TF_BACKEND_CONFIG
 terraform destroy --auto-approve=true
 
-buildkite-agent meta-data get "neon-tests-proxy-$BUILDKITE_COMMIT"
-buildkite-agent meta-data get "neon-tests-solana-$BUILDKITE_COMMIT"
+buildkite-agent meta-data get "PROXY_IP"
+buildkite-agent meta-data get "SOLANA_IP"

From 2f443c76ede7f2a0400785133aa5d549fd8d3d58 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 21:37:25 +0300
Subject: [PATCH 101/206] wip

---
 .buildkite/pipeline.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 89f88ccfc..b6fe45f65 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,9 +27,14 @@ steps:
 
   - label: "Check variables"
     command:
-      - env
-      - PROXY_URL=`buildkite-agent meta-data get 'PROXY_IP'`
+      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+      - PROXY_URL="http://$$PROXY_ADDR:9090/solana"
+      - FAUCET_URL="http://$$PROXY_ADDR:3333/request_neon"
+      - SOLANA_URL="http://$$SOLANA_ADDR:8899"
       - echo "PROXY_URL $$PROXY_URL"
+      - echo "FAUCET_URL $$FAUCET_URL"
+      - echo "SOLANA_URL $$SOLANA_URL"
 
     env:
       SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"

From 885a0ad3add4f9f9701c1a28dd88b5aae299c1bd Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 22:44:50 +0300
Subject: [PATCH 102/206] upd SG

---
 .buildkite/pipeline.yml |  4 ++--
 tf/main.tf              | 18 ++++++++++++++----
 tf/proxy_init.sh        |  4 ++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b6fe45f65..d5adc3d3a 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -29,8 +29,8 @@ steps:
     command:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-      - PROXY_URL="http://$$PROXY_ADDR:9090/solana"
-      - FAUCET_URL="http://$$PROXY_ADDR:3333/request_neon"
+      - PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+      - FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
       - SOLANA_URL="http://$$SOLANA_ADDR:8899"
       - echo "PROXY_URL $$PROXY_URL"
       - echo "FAUCET_URL $$FAUCET_URL"
diff --git a/tf/main.tf b/tf/main.tf
index 11ae91e2a..2f4c5ef1a 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -41,8 +41,13 @@ data "template_file" "proxy_init" {
   }
 }
 
+resource "random_id" "test-stand-solana" {
+  byte_length = 4
+  prefix      = "test-stand-solana-"
+}
+
 resource "aws_security_group" "test-stand-solana" {
-  name        = "${var.branch} - solana group for test stand"
+  name        = random_id.test-stand-solana.hex
   description = "set of rules allow incoming traffic from ci test agents for OZ tests"
   vpc_id      = data.aws_vpc.default.id
 
@@ -78,15 +83,20 @@ resource "aws_security_group" "test-stand-solana" {
   }
 }
 
+resource "random_id" "test-stand-proxy" {
+  byte_length = 4
+  prefix      = "test-stand-solana-"
+}
+
 resource "aws_security_group" "test-stand-proxy" {
-  name        = "${var.branch} - proxy group for test stand"
+  name        = random_id.test-stand-proxy.hex
   description = "set of rules allow incoming traffic from ci test agents for OZ tests"
   vpc_id      = data.aws_vpc.default.id
 
   ingress {
     description = "allow incoming from ci test agent to PROXY"
     from_port   = 9090
-    to_port     = 9090
+    to_port     = 9091
     protocol    = "tcp"
     cidr_blocks = var.allow_list
 
@@ -95,7 +105,7 @@ resource "aws_security_group" "test-stand-proxy" {
   ingress {
     description = "allow incoming from ci test agent to FAUCET"
     from_port   = 3333
-    to_port     = 3333
+    to_port     = 3334
     protocol    = "tcp"
     cidr_blocks = var.allow_list
 
diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index ad8b520e5..9261b26c7 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -30,9 +30,13 @@ services:
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL
+    ports:
+      - 9091:9090
   faucet:
     environment:
       - SOLANA_URL=$SOLANA_URL
+    ports:
+      - 3334:3333
   airdropper:
     environment:
       - SOLANA_URL=$SOLANA_URL

From d35af722675b2b80d1be582a0c87e0b713872bb0 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 22:51:29 +0300
Subject: [PATCH 103/206] enable tests

---
 .buildkite/pipeline.yml | 70 +++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d5adc3d3a..fa7462f70 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -25,54 +25,42 @@ steps:
 #      - "airdropper.log"
 #      - "indexer.log"
 
-  - label: "Check variables"
-    command:
+
+  - label: ":coverage: full test suite (FTS)"
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
       - PROXY_URL="http://$$PROXY_ADDR:9091/solana"
       - FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - SOLANA_URL="http://$$SOLANA_ADDR:8899"
-      - echo "PROXY_URL $$PROXY_URL"
-      - echo "FAUCET_URL $$FAUCET_URL"
-      - echo "SOLANA_URL $$SOLANA_URL"
-
+      - SOLANA_URL="http://$$SOLANA_ADDR:8899"    
+      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+      - echo Full test passing - $${FTS_RESULT}
+      - echo Full test threshold - $${FTS_THRESHOLD}
+      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+    artifact_paths:
+      - allure-reports.tar.gz
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
-      SOLANA_IP: "buildkite-agent meta-data get 'neon-tests-solana-$$BUILDKITE_COMMIT'"
-      PROXY_IP: "buildkite-agent meta-data get 'neon-tests-proxy-$$BUILDKITE_COMMIT'"
+      FTS_THRESHOLD: 1700
+      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
 
-#   - label: ":coverage: full test suite (FTS)"
-# #    if: |
-# #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-# #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-#     commands:
-#       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-#       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-#       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-#       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-#       - echo Full test passing - $${FTS_RESULT}
-#       - echo Full test threshold - $${FTS_THRESHOLD}
-#       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-#       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-#     artifact_paths:
-#       - allure-reports.tar.gz
-#       - fts_${BUILDKITE_BUILD_NUMBER}.log
-#     env:
-#       PROXY_URL: http://proxy.night.stand.neontest.xyz/solana
-#       FAUCET_URL: http://proxy.night.stand.neontest.xyz/request_eth_token
-#       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
-#       FTS_THRESHOLD: 1700
-#       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-#       FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
-
-#   - wait
+  - wait
 
-#   - label: ":floppy_disk: publish image"
-#     command: ".buildkite/steps/publish-image.sh"
-#     if: |
-#         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
-#         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
+  - label: ":floppy_disk: publish image"
+    command: ".buildkite/steps/publish-image.sh"
+    if: |
+        build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
+        (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
   - label: ":terraform: destroy infrastructure"
     agents:

From ba6750e064e30f8f50d63bf34f517af93da35965 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 22:58:59 +0300
Subject: [PATCH 104/206] wip

---
 .buildkite/pipeline.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index fa7462f70..51e1f07df 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,7 +35,10 @@ steps:
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
       - PROXY_URL="http://$$PROXY_ADDR:9091/solana"
       - FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - SOLANA_URL="http://$$SOLANA_ADDR:8899"    
+      - SOLANA_URL="http://$$SOLANA_ADDR:8899"
+      - echo $$PROXY_URL
+      - echo $$FAUCET_URL
+      - echo $$SOLANA_URL
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))

From 332c031db5879dbfb3c7fd611cb0cdf2b71c1e89 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 11 Mar 2022 23:04:28 +0300
Subject: [PATCH 105/206] wip

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 51e1f07df..c603f0a97 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -33,9 +33,9 @@ steps:
     commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-      - PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-      - FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - SOLANA_URL="http://$$SOLANA_ADDR:8899"
+      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
+      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
       - echo $$PROXY_URL
       - echo $$FAUCET_URL
       - echo $$SOLANA_URL

From 54de5ed925414271903f673cd68412e934de1695 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Sat, 12 Mar 2022 13:29:41 +0500
Subject: [PATCH 106/206] Use full_test_suite:develop

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 3b85abc49..bcf0716f5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -44,7 +44,7 @@ steps:
       SOLANA_URL: http://proxy.night.stand.neontest.xyz/node-solana
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
     agents:
        queue: "testing"
 

From 9c9447bed20e18527568131181cce63ab1ba05e1 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Sat, 12 Mar 2022 11:43:55 +0300
Subject: [PATCH 107/206] wip

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e2963fa04..0d92387ac 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,9 +27,9 @@ steps:
 
 
   - label: ":coverage: full test suite (FTS)"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`

From 991cc46714f319426e93aacaed06a8cce93efb35 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Sat, 12 Mar 2022 12:01:57 +0300
Subject: [PATCH 108/206] wip

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 0d92387ac..8453bb797 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -72,3 +72,4 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
+    allow_dependency_failure: true

From fde5590a0c0c15e1805bac6927e166dbee87feda Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Sat, 12 Mar 2022 13:05:37 +0300
Subject: [PATCH 109/206] wip

---
 .buildkite/pipeline.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8453bb797..1b398efee 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,6 +27,7 @@ steps:
 
 
   - label: ":coverage: full test suite (FTS)"
+    key: "full_tests"
 #    if: |
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
@@ -72,4 +73,5 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
+    depends_on: "full_tests"
     allow_dependency_failure: true

From 76b68aa7b7eb368eb5ff56f69ec51165530f90d5 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 08:16:37 +0300
Subject: [PATCH 110/206] debug

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1b398efee..23dcdf4a5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -73,5 +73,5 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
-    depends_on: "full_tests"
-    allow_dependency_failure: true
+#    depends_on: "full_tests"
+#    allow_dependency_failure: true

From ecb4831b4e76dcff3bd279f2bb326917ef2efcbb Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 10:11:18 +0300
Subject: [PATCH 111/206] remove unused port

---
 proxy/docker-compose-test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml
index 77a460438..f13fb4a8e 100644
--- a/proxy/docker-compose-test.yml
+++ b/proxy/docker-compose-test.yml
@@ -8,8 +8,6 @@ services:
       SOLANA_URL: http://solana:8899
       RUST_LOG: solana_runtime::system_instruction_processor=trace,solana_runtime::message_processor=debug,solana_bpf_loader=debug,solana_rbpf=debug
     hostname: solana
-    ports:
-      - 127.0.0.1:8899:8899
     expose:
       - "8899"
       - "9900"

From 92d207bd4dcad6c692d4d26fb6f361e543c28d89 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 10:49:49 +0300
Subject: [PATCH 112/206] wip

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4fb95eed7..a4ecea4a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG EVM_LOADER_REVISION=develop
 
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS cli
 
-FROM neonlabsorg/evm_loader:${NEON_EVM_COMMIT} AS spl
+FROM neonlabsorg/evm_loader:${EVM_LOADER_REVISION} AS spl
 
 FROM ubuntu:20.04
 

From 38edd9adaefb9e66e88ed156dd4f163115c31571 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 10:51:27 +0300
Subject: [PATCH 113/206] wip

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a4ecea4a4..86eac9bf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG SOLANA_REVISION=v1.8.12-testnet
-ARG EVM_LOADER_REVISION=develop
+ARG EVM_LOADER_REVISION=latest
 
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS cli
 

From c677de9027806b32be8508e929a91f1fdf27fdce Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 11:24:38 +0300
Subject: [PATCH 114/206] wip

---
 tf/output.tf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tf/output.tf b/tf/output.tf
index 859b5d7bb..42fb8f370 100644
--- a/tf/output.tf
+++ b/tf/output.tf
@@ -6,3 +6,6 @@ output "proxy_ip" {
   value = aws_instance.proxy.public_ip
 }
 
+output "branch" {
+  value = var.branch
+}

From 9e6af0645547af0893e4df66f3b785c960cb9b2f Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 11:25:56 +0300
Subject: [PATCH 115/206] wip

---
 tf/terraform.auto.tfvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
index 93f19e6fb..91fb576b2 100644
--- a/tf/terraform.auto.tfvars
+++ b/tf/terraform.auto.tfvars
@@ -1,4 +1,4 @@
-branch               = "develop"
+#branch               = "develop"
 neon_evm_revision    = "latest"
 proxy_model_revision = "latest"
 

From 509d49b9e57e4ab3666509c2672a68728a844515 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 11:34:01 +0300
Subject: [PATCH 116/206] wip

---
 tf/proxy_init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 9261b26c7..3ce4b43e8 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -35,6 +35,7 @@ services:
   faucet:
     environment:
       - SOLANA_URL=$SOLANA_URL
+      - NEON_ETH_MAX_AMOUNT=50000
     ports:
       - 3334:3333
   airdropper:

From c59129bcd60a4a414cac8aa1408ea6151d714ab6 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 12:04:49 +0300
Subject: [PATCH 117/206] wip

---
 tf/proxy_init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 3ce4b43e8..67312ec55 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -62,3 +62,5 @@ do
 done;
 
 docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d $SERVICES
+
+docker rm -f solana

From b2144cc5fec1341a3a60df386caf085cbff1fadd Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 12:25:11 +0300
Subject: [PATCH 118/206] change instance type

---
 tf/main.tf               | 4 ++--
 tf/terraform.auto.tfvars | 3 ++-
 tf/vars.tf               | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tf/main.tf b/tf/main.tf
index 2f4c5ef1a..3ae1f660d 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -135,7 +135,7 @@ resource "aws_security_group" "test-stand-proxy" {
 
 
 resource "aws_instance" "solana" {
-  instance_type          = var.instance_type
+  instance_type          = var.solana_instance_type
   ami                    = var.ami
   key_name               = data.aws_key_pair.ci-stands.key_name
   vpc_security_group_ids = [aws_security_group.test-stand-solana.id]
@@ -156,7 +156,7 @@ resource "aws_instance" "solana" {
 }
 
 resource "aws_instance" "proxy" {
-  instance_type          = var.instance_type
+  instance_type          = var.proxy_instance_type
   ami                    = var.ami
   key_name               = data.aws_key_pair.ci-stands.key_name
   vpc_security_group_ids = [aws_security_group.test-stand-proxy.id]
diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
index 91fb576b2..3ecd7f748 100644
--- a/tf/terraform.auto.tfvars
+++ b/tf/terraform.auto.tfvars
@@ -5,5 +5,6 @@ proxy_model_revision = "latest"
 
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
-instance_type        = "t3.large"
+solana_instance_type = "t3.large"
+proxy_instance_type  = "t3.xlarge"
 ami                  = "ami-0fb653ca2d3203ac1"
diff --git a/tf/vars.tf b/tf/vars.tf
index cd1865f5b..3210acccd 100644
--- a/tf/vars.tf
+++ b/tf/vars.tf
@@ -8,7 +8,11 @@ variable "allow_list" {
   type = list(string)
 }
 
-variable "instance_type" {
+variable "solana_instance_type" {
+  type = string
+}
+
+variable "proxy_instance_type" {
   type = string
 }
 

From f959e8219002bd3ba767c6b75fc7d37e2c42f443 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 14:16:00 +0300
Subject: [PATCH 119/206] wip

---
 tf/proxy_init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 67312ec55..4f2f4b4a2 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -26,7 +26,7 @@ services:
     depends_on: []
     networks:
       - net
-    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh"
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /spl/bin/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL

From c11abaa22ac28ca0fef0acc6aecaa2b649369ece Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 14:30:20 +0300
Subject: [PATCH 120/206] fix path

---
 tf/proxy_init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 4f2f4b4a2..af6ad46ef 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -26,7 +26,7 @@ services:
     depends_on: []
     networks:
       - net
-    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /spl/bin/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL

From 9b0b67684f69c71ce1bd75b357aaaef676e17f90 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 15:20:06 +0300
Subject: [PATCH 121/206] wip

---
 tf/proxy_init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index af6ad46ef..766c47af9 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -47,6 +47,7 @@ services:
 EOF
 
 
+
 SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v "solana")
 
 CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`

From 5dd2ec9bfea70ea54d7f70fa7850fa9976f08fa6 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 15:29:21 +0300
Subject: [PATCH 122/206] wip

---
 tf/proxy_init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 766c47af9..82aa955e3 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -38,6 +38,7 @@ services:
       - NEON_ETH_MAX_AMOUNT=50000
     ports:
       - 3334:3333
+    entrypoint: /spl/bin/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
       - SOLANA_URL=$SOLANA_URL

From 3dba0fddf194e7c3906d0935870f3c5f1529808a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Mon, 14 Mar 2022 15:41:29 +0300
Subject: [PATCH 123/206] wip

---
 tf/proxy_init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 82aa955e3..f23c13953 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -36,6 +36,8 @@ services:
     environment:
       - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
+      - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
+      - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU      
     ports:
       - 3334:3333
     entrypoint: /spl/bin/faucet --config /opt/proxy/faucet.conf run

From 6a68eaec9aa3c444d049380ee3127d80398d99e6 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 08:43:25 +0300
Subject: [PATCH 124/206] artifacts

---
 .buildkite/pipeline.yml | 92 +++++++++++++++++++++--------------------
 tf/destroy.sh           | 12 ++++++
 2 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 65451398e..8481aa3dd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,50 +26,50 @@ steps:
 #      - "indexer.log"
 
 
-  - label: ":coverage: full test suite (FTS)"
-    key: "full_tests"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-    commands:
-      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
-      - echo $$PROXY_URL
-      - echo $$FAUCET_URL
-      - echo $$SOLANA_URL
-      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FTS_RESULT}
-      - echo Full test threshold - $${FTS_THRESHOLD}
-      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-    artifact_paths:
-      - allure-reports.tar.gz
-      - fts_${BUILDKITE_BUILD_NUMBER}.log
-    env:
-      FTS_THRESHOLD: 1700
-      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:develop
-    agents:
-       queue: "testing"
-    artifact_paths:
-      - "proxy.log"
-      - "solana.log"
-      - "measurements.log"
-      - "evm_loader.log"
-      - "dbcreation.log"
-      - "faucet.log"
-      - "airdropper.log"
-      - "indexer.log"
+#   - label: ":coverage: full test suite (FTS)"
+#     key: "full_tests"
+# #    if: |
+# #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+# #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+#     commands:
+#       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+#       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+#       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+#       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
+#       - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
+#       - echo $$PROXY_URL
+#       - echo $$FAUCET_URL
+#       - echo $$SOLANA_URL
+#       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+#       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+#       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+#       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+#       - echo Full test passing - $${FTS_RESULT}
+#       - echo Full test threshold - $${FTS_THRESHOLD}
+#       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+#       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+#     artifact_paths:
+#       - allure-reports.tar.gz
+#       - fts_${BUILDKITE_BUILD_NUMBER}.log
+#     env:
+#       FTS_THRESHOLD: 1700
+#       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+#       FTS_IMAGE: neonlabsorg/full_test_suite:develop
+#     agents:
+#        queue: "testing"
+#     artifact_paths:
+#       - "proxy.log"
+#       - "solana.log"
+#       - "measurements.log"
+#       - "evm_loader.log"
+#       - "dbcreation.log"
+#       - "faucet.log"
+#       - "airdropper.log"
+#       - "indexer.log"
 
-  - wait
+#   - wait
 
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"
@@ -82,5 +82,7 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
-#    depends_on: "full_tests"
-#    allow_dependency_failure: true
+    depends_on: "full_tests"
+    allow_dependency_failure: true
+    artifact_paths:
+      - "./tf/logs/solana.log"
diff --git a/tf/destroy.sh b/tf/destroy.sh
index da11f9923..200278b78 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -2,6 +2,18 @@
 
 cd tf
 
+### Receive artefacts
+export SSH_KEY="~/.ssh/ci-stands"
+export ARTIFACTS_LOGS="./logs"
+mkdir -p $ARTIFACTS_LOGS
+
+# solana
+export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
+ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log'
+scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
+
+# proxy
+
 export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"

From 6bd5b62307eed008ba67989e4fa8b1dc7df21bca Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 08:48:13 +0300
Subject: [PATCH 125/206] enable required step

---
 .buildkite/pipeline.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8481aa3dd..784572f74 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,13 +26,13 @@ steps:
 #      - "indexer.log"
 
 
-#   - label: ":coverage: full test suite (FTS)"
-#     key: "full_tests"
-# #    if: |
-# #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-# #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-#     commands:
-#       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+   - label: ":coverage: full test suite (FTS)"
+     key: "full_tests"
+#    if: |
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+     commands:
+       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
 #       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
 #       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
 #       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"

From 8809fde45f9982bca11c44126c4a43a49aad5a26 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 08:50:51 +0300
Subject: [PATCH 126/206] wip

---
 .buildkite/pipeline.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 784572f74..4c2933270 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,13 +26,13 @@ steps:
 #      - "indexer.log"
 
 
-   - label: ":coverage: full test suite (FTS)"
-     key: "full_tests"
+#   - label: ":coverage: full test suite (FTS)"
+#     key: "full_tests"
 #    if: |
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-     commands:
-       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+#     commands:
+#       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
 #       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
 #       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
 #       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
@@ -82,7 +82,7 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
-    depends_on: "full_tests"
+#    depends_on: "full_tests"
     allow_dependency_failure: true
     artifact_paths:
       - "./tf/logs/solana.log"

From cc853d17a2c48ebc1164e906182b755beddfb5c3 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 09:00:49 +0300
Subject: [PATCH 127/206] wip

---
 tf/destroy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 200278b78..5354fe629 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -9,6 +9,7 @@ mkdir -p $ARTIFACTS_LOGS
 
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
+ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
 ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log'
 scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
 

From 0045faa732e4c32a9a323cf9638d6b658434cf8b Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 09:21:43 +0300
Subject: [PATCH 128/206] proxy artefacts

---
 .buildkite/pipeline.yml |  2 +-
 tf/destroy.sh           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4c2933270..2f65ca1dd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -85,4 +85,4 @@ steps:
 #    depends_on: "full_tests"
     allow_dependency_failure: true
     artifact_paths:
-      - "./tf/logs/solana.log"
+      - "./tf/logs/*"
diff --git a/tf/destroy.sh b/tf/destroy.sh
index 5354fe629..1d1eb7a9a 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -14,7 +14,20 @@ ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log'
 scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
 
 # proxy
+export REMOTE_HOST=`buildkite-agent meta-data get "PROXY_IP"`
+ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
+declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "faucet" "airdropper")
+
+for service in "${services[@]}"
+do
+   echo "$servce"
+   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log"
+   scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/$service.log $ARTIFACTS_LOGS
+done
+
+
 
+### Clean infrastructure by terraform
 export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
@@ -25,5 +38,6 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 terraform init $TF_BACKEND_CONFIG
 terraform destroy --auto-approve=true
 
+# info
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"

From 82847a37eb3828a761b11047a9d89d2f719060eb Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 10:44:45 +0300
Subject: [PATCH 129/206] redirect stderr

---
 tf/destroy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 1d1eb7a9a..c48c7d366 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -10,7 +10,7 @@ mkdir -p $ARTIFACTS_LOGS
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
-ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log'
+ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log 2>&1'
 scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
 
 # proxy
@@ -21,7 +21,7 @@ declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "fau
 for service in "${services[@]}"
 do
    echo "$servce"
-   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log"
+   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log 2>&1"
    scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/$service.log $ARTIFACTS_LOGS
 done
 

From 77429f576e0e00fef3c2b0bca10aa4caac0164b2 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 10:58:16 +0300
Subject: [PATCH 130/206] enable test step

---
 .buildkite/pipeline.yml | 82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2f65ca1dd..1f8e7859e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,50 +26,50 @@ steps:
 #      - "indexer.log"
 
 
-#   - label: ":coverage: full test suite (FTS)"
-#     key: "full_tests"
+   - label: ":coverage: full test suite (FTS)"
+     key: "full_tests"
 #    if: |
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-#     commands:
-#       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-#       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-#       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-#       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-#       - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
-#       - echo $$PROXY_URL
-#       - echo $$FAUCET_URL
-#       - echo $$SOLANA_URL
-#       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-#       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-#       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-#       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-#       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-#       - echo Full test passing - $${FTS_RESULT}
-#       - echo Full test threshold - $${FTS_THRESHOLD}
-#       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-#       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-#     artifact_paths:
-#       - allure-reports.tar.gz
-#       - fts_${BUILDKITE_BUILD_NUMBER}.log
-#     env:
-#       FTS_THRESHOLD: 1700
-#       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-#       FTS_IMAGE: neonlabsorg/full_test_suite:develop
-#     agents:
-#        queue: "testing"
-#     artifact_paths:
-#       - "proxy.log"
-#       - "solana.log"
-#       - "measurements.log"
-#       - "evm_loader.log"
-#       - "dbcreation.log"
-#       - "faucet.log"
-#       - "airdropper.log"
-#       - "indexer.log"
+     commands:
+       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
+       - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
+       - echo $$PROXY_URL
+       - echo $$FAUCET_URL
+       - echo $$SOLANA_URL
+       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+       - echo Full test passing - $${FTS_RESULT}
+       - echo Full test threshold - $${FTS_THRESHOLD}
+       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+     artifact_paths:
+       - allure-reports.tar.gz
+       - fts_${BUILDKITE_BUILD_NUMBER}.log
+     env:
+       FTS_THRESHOLD: 1700
+       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+       FTS_IMAGE: neonlabsorg/full_test_suite:develop
+     agents:
+        queue: "testing"
+     artifact_paths:
+       - "proxy.log"
+       - "solana.log"
+       - "measurements.log"
+       - "evm_loader.log"
+       - "dbcreation.log"
+       - "faucet.log"
+       - "airdropper.log"
+       - "indexer.log"
 
-#   - wait
+   - wait
 
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"
@@ -82,7 +82,7 @@ steps:
       queue: "testing"
     command:
       - "tf/destroy.sh"
-#    depends_on: "full_tests"
+    depends_on: "full_tests"
     allow_dependency_failure: true
     artifact_paths:
       - "./tf/logs/*"

From 3938e6a20ac9d88b2ebd9a1103600cdcf46b9458 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 10:59:29 +0300
Subject: [PATCH 131/206] typo

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1f8e7859e..26b69ce4d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -69,7 +69,7 @@ steps:
        - "airdropper.log"
        - "indexer.log"
 
-   - wait
+  - wait
 
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"

From ea7b59fa79faff59737fa9173ebc5a1804074312 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 11:00:31 +0300
Subject: [PATCH 132/206] typo

---
 .buildkite/pipeline.yml | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 26b69ce4d..f5c9203eb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -26,48 +26,48 @@ steps:
 #      - "indexer.log"
 
 
-   - label: ":coverage: full test suite (FTS)"
-     key: "full_tests"
+  - label: ":coverage: full test suite (FTS)"
+    key: "full_tests"
 #    if: |
 #        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
 #        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
-     commands:
-       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-       - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
-       - echo $$PROXY_URL
-       - echo $$FAUCET_URL
-       - echo $$SOLANA_URL
-       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-       - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-       - echo Full test passing - $${FTS_RESULT}
-       - echo Full test threshold - $${FTS_THRESHOLD}
-       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-     artifact_paths:
-       - allure-reports.tar.gz
-       - fts_${BUILDKITE_BUILD_NUMBER}.log
-     env:
-       FTS_THRESHOLD: 1700
-       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-       FTS_IMAGE: neonlabsorg/full_test_suite:develop
-     agents:
-        queue: "testing"
-     artifact_paths:
-       - "proxy.log"
-       - "solana.log"
-       - "measurements.log"
-       - "evm_loader.log"
-       - "dbcreation.log"
-       - "faucet.log"
-       - "airdropper.log"
-       - "indexer.log"
+    commands:
+      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
+      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
+      - echo $$PROXY_URL
+      - echo $$FAUCET_URL
+      - echo $$SOLANA_URL
+      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+      - echo Full test passing - $${FTS_RESULT}
+      - echo Full test threshold - $${FTS_THRESHOLD}
+      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+    artifact_paths:
+      - allure-reports.tar.gz
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
+    env:
+      FTS_THRESHOLD: 1700
+      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+    agents:
+       queue: "testing"
+    artifact_paths:
+      - "proxy.log"
+      - "solana.log"
+      - "measurements.log"
+      - "evm_loader.log"
+      - "dbcreation.log"
+      - "faucet.log"
+      - "airdropper.log"
+      - "indexer.log"
 
   - wait
 

From e8c9696ac5b11e7512344ac4ee9620d04281359a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 14:58:29 +0300
Subject: [PATCH 133/206] faucet

---
 tf/proxy_init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index f23c13953..23e206ca4 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -33,6 +33,7 @@ services:
     ports:
       - 9091:9090
   faucet:
+    image: neonlabsorg/faucet:latest
     environment:
       - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
@@ -40,7 +41,7 @@ services:
       - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU      
     ports:
       - 3334:3333
-    entrypoint: /spl/bin/faucet --config /opt/proxy/faucet.conf run
+    entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
       - SOLANA_URL=$SOLANA_URL

From 3d30b36e59b0808876245a470aa41beb5906d4cb Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 15:26:22 +0300
Subject: [PATCH 134/206] wip

---
 tf/proxy_init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 23e206ca4..f97a154ee 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -35,6 +35,7 @@ services:
   faucet:
     image: neonlabsorg/faucet:latest
     environment:
+      - FAUCET_RPC_BIND=0.0.0.0
       - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io

From a76732afdafb7b30f9007c0c837a396f77febd94 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 15:37:26 +0300
Subject: [PATCH 135/206] debug

---
 .buildkite/pipeline.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f5c9203eb..eb9a03fd6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -77,12 +77,12 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  - label: ":terraform: destroy infrastructure"
-    agents:
-      queue: "testing"
-    command:
-      - "tf/destroy.sh"
-    depends_on: "full_tests"
-    allow_dependency_failure: true
-    artifact_paths:
-      - "./tf/logs/*"
+  # - label: ":terraform: destroy infrastructure"
+  #   agents:
+  #     queue: "testing"
+  #   command:
+  #     - "tf/destroy.sh"
+  #   depends_on: "full_tests"
+  #   allow_dependency_failure: true
+  #   artifact_paths:
+  #     - "./tf/logs/*"

From 048830736b36c7042414bf5cd011355b3af65299 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 16:33:28 +0300
Subject: [PATCH 136/206] wip

---
 tf/proxy_init.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index f97a154ee..17f490422 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -36,10 +36,16 @@ services:
     image: neonlabsorg/faucet:latest
     environment:
       - FAUCET_RPC_BIND=0.0.0.0
+      - FAUCET_RPC_PORT=3333
       - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
-      - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU      
+      - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU   
+      - FAUCET_RPC_ALLOWED_ORIGINS=["https://neonswap.live"]
+      - FAUCET_WEB3_ENABLE=false
+      - FAUCET_SOLANA_ENABLE=true
+      - NEON_TOKEN_MINT_DECIMALS=9
+      - NEON_OPERATOR_KEYFILE=/opt/faucet/id.json
     ports:
       - 3334:3333
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run

From 5f4f39e99e0c0a65740727198ca13929058d4c02 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 15 Mar 2022 17:10:22 +0300
Subject: [PATCH 137/206] Add SOLANA_COMMITMENT

---
 tf/proxy_init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 17f490422..8f8697c36 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -46,6 +46,7 @@ services:
       - FAUCET_SOLANA_ENABLE=true
       - NEON_TOKEN_MINT_DECIMALS=9
       - NEON_OPERATOR_KEYFILE=/opt/faucet/id.json
+      - SOLANA_COMMITMENT=finalized
     ports:
       - 3334:3333
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run

From cff095203fd197565fa1f3cdc0c85aab28cf4fe0 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 10:54:56 +0300
Subject: [PATCH 138/206] Enable cleaning step

---
 .buildkite/pipeline.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index eb9a03fd6..f5c9203eb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -77,12 +77,12 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  # - label: ":terraform: destroy infrastructure"
-  #   agents:
-  #     queue: "testing"
-  #   command:
-  #     - "tf/destroy.sh"
-  #   depends_on: "full_tests"
-  #   allow_dependency_failure: true
-  #   artifact_paths:
-  #     - "./tf/logs/*"
+  - label: ":terraform: destroy infrastructure"
+    agents:
+      queue: "testing"
+    command:
+      - "tf/destroy.sh"
+    depends_on: "full_tests"
+    allow_dependency_failure: true
+    artifact_paths:
+      - "./tf/logs/*"

From 86cecc703bc81696368c61eb8fa6846c035757c3 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 12:23:50 +0300
Subject: [PATCH 139/206] wip

---
 tf/proxy_init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 8f8697c36..1e8148cc8 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -26,7 +26,7 @@ services:
     depends_on: []
     networks:
       - net
-    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL

From e7ddf254c7757b39fccc911c2d285809372b0c8c Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 12:55:55 +0300
Subject: [PATCH 140/206] wip

---
 tf/proxy_init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 1e8148cc8..801024fac 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -26,7 +26,7 @@ services:
     depends_on: []
     networks:
       - net
-    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 100000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL

From bda6d6009ea664eb72f0a8e9c559cf9edacbc5e4 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 13:35:16 +0300
Subject: [PATCH 141/206] debug

---
 .buildkite/pipeline.yml | 18 +++++++++---------
 tf/proxy_init.sh        |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f5c9203eb..eb9a03fd6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -77,12 +77,12 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  - label: ":terraform: destroy infrastructure"
-    agents:
-      queue: "testing"
-    command:
-      - "tf/destroy.sh"
-    depends_on: "full_tests"
-    allow_dependency_failure: true
-    artifact_paths:
-      - "./tf/logs/*"
+  # - label: ":terraform: destroy infrastructure"
+  #   agents:
+  #     queue: "testing"
+  #   command:
+  #     - "tf/destroy.sh"
+  #   depends_on: "full_tests"
+  #   allow_dependency_failure: true
+  #   artifact_paths:
+  #     - "./tf/logs/*"
diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 801024fac..8f8697c36 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -26,7 +26,7 @@ services:
     depends_on: []
     networks:
       - net
-    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 100000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
+    command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
       - SOLANA_URL=$SOLANA_URL

From cf7209201123e831b5b3eb495f3b0b82d1ce65cc Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 14:56:01 +0300
Subject: [PATCH 142/206] debug

---
 tf/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tf/build.sh b/tf/build.sh
index c7098548b..97692a3ea 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -17,3 +17,6 @@ terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data s
 
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
+
+
+sleep 180

From 9fa4281c60fcd672eee3eb069e65ff64adf87698 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 15:09:44 +0300
Subject: [PATCH 143/206] testdrive

---
 .buildkite/pipeline.yml  | 18 +++++++++---------
 tf/terraform.auto.tfvars |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index eb9a03fd6..f5c9203eb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -77,12 +77,12 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  # - label: ":terraform: destroy infrastructure"
-  #   agents:
-  #     queue: "testing"
-  #   command:
-  #     - "tf/destroy.sh"
-  #   depends_on: "full_tests"
-  #   allow_dependency_failure: true
-  #   artifact_paths:
-  #     - "./tf/logs/*"
+  - label: ":terraform: destroy infrastructure"
+    agents:
+      queue: "testing"
+    command:
+      - "tf/destroy.sh"
+    depends_on: "full_tests"
+    allow_dependency_failure: true
+    artifact_paths:
+      - "./tf/logs/*"
diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
index 3ecd7f748..541837f0c 100644
--- a/tf/terraform.auto.tfvars
+++ b/tf/terraform.auto.tfvars
@@ -5,6 +5,6 @@ proxy_model_revision = "latest"
 
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
-solana_instance_type = "t3.large"
+solana_instance_type = "t3.xlarge"
 proxy_instance_type  = "t3.xlarge"
 ami                  = "ami-0fb653ca2d3203ac1"

From ab84e08f9b6be10f8195961f820348f529eb8afd Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 15:27:44 +0300
Subject: [PATCH 144/206] solana tune

---
 tf/solana_init.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tf/solana_init.sh b/tf/solana_init.sh
index 1349bbf20..046a75a70 100644
--- a/tf/solana_init.sh
+++ b/tf/solana_init.sh
@@ -5,6 +5,28 @@ sudo apt-get -y install ca-certificates curl gnupg lsb-release
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
+
+sudo bash -c "cat >/etc/sysctl.d/20-solana-udp-buffers.conf <<EOF
+# Increase UDP buffer size
+net.core.rmem_default = 134217728
+net.core.rmem_max = 134217728
+net.core.wmem_default = 134217728
+net.core.wmem_max = 134217728
+EOF"
+sysctl -p /etc/sysctl.d/20-solana-udp-buffers.conf
+
+sudo bash -c "cat >/etc/sysctl.d/20-solana-mmaps.conf <<EOF
+# Increase memory mapped files limit
+vm.max_map_count = 1000000
+EOF"
+sysctl -p /etc/sysctl.d/20-solana-mmaps.conf
+
+bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
+# Increase process file descriptor count limit
+* - nofile 1000000
+EOF"
+
+
 sudo apt-get -y install docker-ce docker-ce-cli containerd.io
 sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose

From 94af2b53b6b7235c0904030c111b40fef194b936 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 18:26:54 +0300
Subject: [PATCH 145/206] debug

---
 tf/build.sh              | 2 --
 tf/destroy.sh            | 4 ++--
 tf/terraform.auto.tfvars | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tf/build.sh b/tf/build.sh
index 97692a3ea..57b446898 100644
--- a/tf/build.sh
+++ b/tf/build.sh
@@ -18,5 +18,3 @@ terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data s
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
 
-
-sleep 180
diff --git a/tf/destroy.sh b/tf/destroy.sh
index c48c7d366..43e9b7649 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -35,8 +35,8 @@ export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-terraform init $TF_BACKEND_CONFIG
-terraform destroy --auto-approve=true
+#terraform init $TF_BACKEND_CONFIG
+#terraform destroy --auto-approve=true
 
 # info
 buildkite-agent meta-data get "PROXY_IP"
diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
index 541837f0c..09e7e6341 100644
--- a/tf/terraform.auto.tfvars
+++ b/tf/terraform.auto.tfvars
@@ -5,6 +5,6 @@ proxy_model_revision = "latest"
 
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
-solana_instance_type = "t3.xlarge"
-proxy_instance_type  = "t3.xlarge"
+solana_instance_type = "t3.large"
+proxy_instance_type  = "t3.large"
 ami                  = "ami-0fb653ca2d3203ac1"

From 6f0322cd38d272a8bb0a991a5caac5903d83ff96 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 18:47:22 +0300
Subject: [PATCH 146/206] wip

---
 tf/destroy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 43e9b7649..48e50b2e5 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -38,6 +38,7 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 #terraform init $TF_BACKEND_CONFIG
 #terraform destroy --auto-approve=true
 
+
 # info
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"

From fd0cb9959034773351ab5f4f7d0ec17571f61768 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 18:50:17 +0300
Subject: [PATCH 147/206] wip

---
 tf/destroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tf/destroy.sh b/tf/destroy.sh
index 48e50b2e5..8b3ac8977 100644
--- a/tf/destroy.sh
+++ b/tf/destroy.sh
@@ -35,7 +35,7 @@ export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-#terraform init $TF_BACKEND_CONFIG
+terraform init $TF_BACKEND_CONFIG
 #terraform destroy --auto-approve=true
 
 

From fa3d60d43093728b88fcfd880f4ed614c9365f9e Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 16 Mar 2022 20:38:50 +0300
Subject: [PATCH 148/206] confirmed

---
 tf/proxy_init.sh         | 2 +-
 tf/terraform.auto.tfvars | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 8f8697c36..3e1923f4b 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -46,7 +46,7 @@ services:
       - FAUCET_SOLANA_ENABLE=true
       - NEON_TOKEN_MINT_DECIMALS=9
       - NEON_OPERATOR_KEYFILE=/opt/faucet/id.json
-      - SOLANA_COMMITMENT=finalized
+      - SOLANA_COMMITMENT=confirmed
     ports:
       - 3334:3333
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
diff --git a/tf/terraform.auto.tfvars b/tf/terraform.auto.tfvars
index 09e7e6341..3ecd7f748 100644
--- a/tf/terraform.auto.tfvars
+++ b/tf/terraform.auto.tfvars
@@ -6,5 +6,5 @@ proxy_model_revision = "latest"
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
 solana_instance_type = "t3.large"
-proxy_instance_type  = "t3.large"
+proxy_instance_type  = "t3.xlarge"
 ami                  = "ami-0fb653ca2d3203ac1"

From 9b950fcff52dcfba67dfee616ed5864b6cd97a58 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Thu, 17 Mar 2022 09:40:45 +0300
Subject: [PATCH 149/206] test

---
 .buildkite/pipeline.yml | 2 +-
 tf/proxy_init.sh        | 2 +-
 tf/solana_init.sh       | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f5c9203eb..945569b7d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -36,7 +36,7 @@ steps:
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
+      - export SOLANA_URL="http://$$SOLANA_ADDR:8898"
       - echo $$PROXY_URL
       - echo $$FAUCET_URL
       - echo $$SOLANA_URL
diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index 3e1923f4b..b9af5030a 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -12,7 +12,7 @@ cd /opt
 curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
 
 export REVISION=${revision}
-export SOLANA_URL=http:\/\/${solana_ip}:8899
+export SOLANA_URL=http:\/\/${solana_ip}:8898
 
 cat > docker-compose-test.override.yml <<EOF
 version: "3"
diff --git a/tf/solana_init.sh b/tf/solana_init.sh
index 046a75a70..3f50d717c 100644
--- a/tf/solana_init.sh
+++ b/tf/solana_init.sh
@@ -38,11 +38,7 @@ version: "3"
 services:
   solana:
     ports:
-      - "8899:8899"
-      - "9900:9900"
-      - "8900:8900"
-      - "8001:8001"
-      - "8001-8009:8001-8009/udp"
+      - 8898:8899
 EOF
 docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d solana
 touch /tmp/startup_done

From a15be0988c31d18473ef3745daa1b43cf7a8ed1b Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Thu, 17 Mar 2022 09:46:01 +0300
Subject: [PATCH 150/206] Revert "test"

This reverts commit 9b950fcff52dcfba67dfee616ed5864b6cd97a58.
---
 .buildkite/pipeline.yml | 2 +-
 tf/proxy_init.sh        | 2 +-
 tf/solana_init.sh       | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 945569b7d..f5c9203eb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -36,7 +36,7 @@ steps:
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
       - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
       - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - export SOLANA_URL="http://$$SOLANA_ADDR:8898"
+      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
       - echo $$PROXY_URL
       - echo $$FAUCET_URL
       - echo $$SOLANA_URL
diff --git a/tf/proxy_init.sh b/tf/proxy_init.sh
index b9af5030a..3e1923f4b 100644
--- a/tf/proxy_init.sh
+++ b/tf/proxy_init.sh
@@ -12,7 +12,7 @@ cd /opt
 curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
 
 export REVISION=${revision}
-export SOLANA_URL=http:\/\/${solana_ip}:8898
+export SOLANA_URL=http:\/\/${solana_ip}:8899
 
 cat > docker-compose-test.override.yml <<EOF
 version: "3"
diff --git a/tf/solana_init.sh b/tf/solana_init.sh
index 3f50d717c..046a75a70 100644
--- a/tf/solana_init.sh
+++ b/tf/solana_init.sh
@@ -38,7 +38,11 @@ version: "3"
 services:
   solana:
     ports:
-      - 8898:8899
+      - "8899:8899"
+      - "9900:9900"
+      - "8900:8900"
+      - "8001:8001"
+      - "8001-8009:8001-8009/udp"
 EOF
 docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d solana
 touch /tmp/startup_done

From 831b3783acd0fea9ebbaf6c01cf4d5c1a7d020cd Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 18 Mar 2022 12:12:09 +0400
Subject: [PATCH 151/206] Comment extra steps

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f5c9203eb..f98b735e8 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -41,6 +41,7 @@ steps:
       - echo $$FAUCET_URL
       - echo $$SOLANA_URL
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+      - docker image rm -f ${FTS_IMAGE}
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./

From 2f7f154e395bbe4cd28da0bd83ed0fec235d8634 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Fri, 18 Mar 2022 12:16:24 +0400
Subject: [PATCH 152/206] Comment extra steps

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f98b735e8..6a2955624 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -41,7 +41,7 @@ steps:
       - echo $$FAUCET_URL
       - echo $$SOLANA_URL
       - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-      - docker image rm -f ${FTS_IMAGE}
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
       - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
       - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
       - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./

From 03ffaea1473a97bd914da9f1c083d67681e0fcf3 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 18 Mar 2022 13:08:16 +0300
Subject: [PATCH 153/206] refactoring

---
 .buildkite/pipeline.yml                       |  4 ++--
 {tf => .buildkite/steps/tf}/build.sh          |  9 +++++++--
 {tf => .buildkite/steps/tf}/destroy.sh        |  8 +++++---
 {tf => .buildkite/steps/tf}/main.tf           |  8 ++++----
 {tf => .buildkite/steps/tf}/output.tf         |  0
 {tf => .buildkite/steps/tf}/proxy_init.sh     | 20 ++++++++++++++++++-
 {tf => .buildkite/steps/tf}/solana_init.sh    | 13 +++++++++++-
 .../steps/tf}/terraform.auto.tfvars           |  0
 {tf => .buildkite/steps/tf}/vars.tf           |  0
 9 files changed, 49 insertions(+), 13 deletions(-)
 rename {tf => .buildkite/steps/tf}/build.sh (90%)
 rename {tf => .buildkite/steps/tf}/destroy.sh (95%)
 rename {tf => .buildkite/steps/tf}/main.tf (95%)
 rename {tf => .buildkite/steps/tf}/output.tf (100%)
 rename {tf => .buildkite/steps/tf}/proxy_init.sh (90%)
 rename {tf => .buildkite/steps/tf}/solana_init.sh (90%)
 rename {tf => .buildkite/steps/tf}/terraform.auto.tfvars (100%)
 rename {tf => .buildkite/steps/tf}/vars.tf (100%)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6a2955624..1126e96b4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -8,7 +8,7 @@ steps:
     agents:
       queue: "testing"
     command:
-      - "tf/build.sh"
+      - ".buildkite/steps/tf/build.sh"
   - wait
 
 #  - label: ":cop::skin-tone-2: deploy check"
@@ -86,4 +86,4 @@ steps:
     depends_on: "full_tests"
     allow_dependency_failure: true
     artifact_paths:
-      - "./tf/logs/*"
+      - ".buildkite/steps/tf/logs/*"
diff --git a/tf/build.sh b/.buildkite/steps/tf/build.sh
similarity index 90%
rename from tf/build.sh
rename to .buildkite/steps/tf/build.sh
index 57b446898..0a26c10f7 100644
--- a/tf/build.sh
+++ b/.buildkite/steps/tf/build.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
-cd tf
+cd .buildkite/steps/tf
 
+
+# Terraform part
 export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
@@ -12,9 +14,12 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 terraform init $TF_BACKEND_CONFIG
 terraform apply --auto-approve=true
 
+
+# Get IPs
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
 terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
 
+
+# Save IPs for next steps
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
-
diff --git a/tf/destroy.sh b/.buildkite/steps/tf/destroy.sh
similarity index 95%
rename from tf/destroy.sh
rename to .buildkite/steps/tf/destroy.sh
index 8b3ac8977..eda18852a 100644
--- a/tf/destroy.sh
+++ b/.buildkite/steps/tf/destroy.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 
-cd tf
+cd .buildkite/steps/tf
+
 
 ### Receive artefacts
 export SSH_KEY="~/.ssh/ci-stands"
 export ARTIFACTS_LOGS="./logs"
 mkdir -p $ARTIFACTS_LOGS
 
+
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
 ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log 2>&1'
 scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
 
+
 # proxy
 export REMOTE_HOST=`buildkite-agent meta-data get "PROXY_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
@@ -26,7 +29,6 @@ do
 done
 
 
-
 ### Clean infrastructure by terraform
 export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
@@ -36,7 +38,7 @@ export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init $TF_BACKEND_CONFIG
-#terraform destroy --auto-approve=true
+terraform destroy --auto-approve=true
 
 
 # info
diff --git a/tf/main.tf b/.buildkite/steps/tf/main.tf
similarity index 95%
rename from tf/main.tf
rename to .buildkite/steps/tf/main.tf
index 3ae1f660d..1c372cc32 100644
--- a/tf/main.tf
+++ b/.buildkite/steps/tf/main.tf
@@ -7,7 +7,7 @@ terraform {
   }
 
   backend "s3" {
-
+    // Must be set from environment
   }
 }
 
@@ -61,7 +61,7 @@ resource "aws_security_group" "test-stand-solana" {
   }
 
   ingress {
-    description = "allow incoming from ci test agent to SOLANA"
+    description = "allow incoming from world to SOLANA"
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
@@ -111,7 +111,7 @@ resource "aws_security_group" "test-stand-proxy" {
 
   }
   ingress {
-    description = "allow incoming from ci test agent to SOLANA"
+    description = "allow incoming from world to PROXY"
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
@@ -165,7 +165,7 @@ resource "aws_instance" "proxy" {
     device_name = "/dev/sda1"
     volume_size = 50
   }
-  //user_data = data.template_file.proxy_init.rendered
+
   tags = {
     Name    = "${var.branch}-test-stand-proxy"
     purpose = "ci-oz-full-tests"
diff --git a/tf/output.tf b/.buildkite/steps/tf/output.tf
similarity index 100%
rename from tf/output.tf
rename to .buildkite/steps/tf/output.tf
diff --git a/tf/proxy_init.sh b/.buildkite/steps/tf/proxy_init.sh
similarity index 90%
rename from tf/proxy_init.sh
rename to .buildkite/steps/tf/proxy_init.sh
index 3e1923f4b..fb9834fff 100644
--- a/tf/proxy_init.sh
+++ b/.buildkite/steps/tf/proxy_init.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+
+# Install docker
 sudo apt-get remove docker docker-engine docker.io containerd runc
 sudo apt-get update
 sudo apt-get -y install ca-certificates curl gnupg lsb-release
@@ -6,14 +9,24 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
 sudo apt-get -y install docker-ce docker-ce-cli containerd.io
+
+
+# Install docker-compose
 sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
+
+
+# Get docker-compose file
 cd /opt
 curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
 
+
+# Set required environment variables
 export REVISION=${revision}
 export SOLANA_URL=http:\/\/${solana_ip}:8899
 
+
+# Generate docker-compose override file
 cat > docker-compose-test.override.yml <<EOF
 version: "3"
 
@@ -59,9 +72,11 @@ services:
 EOF
 
 
-
+# Get list of services
 SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v "solana")
 
+
+# Check if Solana is available, max attepts is 100(each for 2 seconds)
 CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
 MAX_COUNT=100
 CURRENT_ATTEMPT=1
@@ -74,6 +89,9 @@ do
   sleep 2
 done;
 
+
+# Up all services
 docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d $SERVICES
 
+# Remove unused(solana is required by evm_loader in docker-compose file)
 docker rm -f solana
diff --git a/tf/solana_init.sh b/.buildkite/steps/tf/solana_init.sh
similarity index 90%
rename from tf/solana_init.sh
rename to .buildkite/steps/tf/solana_init.sh
index 046a75a70..0206938d3 100644
--- a/tf/solana_init.sh
+++ b/.buildkite/steps/tf/solana_init.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+
+# Install docker
 sudo apt-get remove docker docker-engine docker.io containerd runc
 sudo apt-get update
 sudo apt-get -y install ca-certificates curl gnupg lsb-release
@@ -6,6 +9,8 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
 
+
+# Tune instance for Solana requirements(must be applied before start services)
 sudo bash -c "cat >/etc/sysctl.d/20-solana-udp-buffers.conf <<EOF
 # Increase UDP buffer size
 net.core.rmem_default = 134217728
@@ -27,9 +32,13 @@ bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
 EOF"
 
 
+# Install docker-compose
 sudo apt-get -y install docker-ce docker-ce-cli containerd.io
 sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
+
+
+# Receive docker-compose file and create override file
 cd /opt
 curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
 cat > docker-compose-test.override.yml <<EOF
@@ -44,5 +53,7 @@ services:
       - "8001:8001"
       - "8001-8009:8001-8009/udp"
 EOF
+
+
+# wake up Solana
 docker-compose -f docker-compose-test.yml -f docker-compose-test.override.yml up -d solana
-touch /tmp/startup_done
diff --git a/tf/terraform.auto.tfvars b/.buildkite/steps/tf/terraform.auto.tfvars
similarity index 100%
rename from tf/terraform.auto.tfvars
rename to .buildkite/steps/tf/terraform.auto.tfvars
diff --git a/tf/vars.tf b/.buildkite/steps/tf/vars.tf
similarity index 100%
rename from tf/vars.tf
rename to .buildkite/steps/tf/vars.tf

From 20b0c545c07642949f133030cbf84b0a53761623 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 18 Mar 2022 13:47:03 +0300
Subject: [PATCH 154/206] typo

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1126e96b4..0bb963ecf 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -82,7 +82,7 @@ steps:
     agents:
       queue: "testing"
     command:
-      - "tf/destroy.sh"
+      - ".buildkite/steps/tf/destroy.sh"
     depends_on: "full_tests"
     allow_dependency_failure: true
     artifact_paths:

From b43719e06d649b8dd55f4a55e6d09228a2df8a71 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 18 Mar 2022 16:05:35 +0300
Subject: [PATCH 155/206] enable basic logic

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 0bb963ecf..d693c8921 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,9 +28,9 @@ steps:
 
   - label: ":coverage: full test suite (FTS)"
     key: "full_tests"
-#    if: |
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`

From f118b79956957dcd47ebcdb2e9fc6ced380e27cd Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 18 Mar 2022 16:19:43 +0300
Subject: [PATCH 156/206] add dependences

---
 .buildkite/pipeline.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d693c8921..005429b9c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,6 +5,7 @@ steps:
       - ".buildkite/steps/upload-image.sh"
 
   - label: ":terraform: build infrastructure"
+    key: "create_infrastructure"
     agents:
       queue: "testing"
     command:
@@ -83,7 +84,9 @@ steps:
       queue: "testing"
     command:
       - ".buildkite/steps/tf/destroy.sh"
-    depends_on: "full_tests"
+    depends_on: 
+      - "full_tests"
+      - "create_infrastructure"
     allow_dependency_failure: true
     artifact_paths:
       - ".buildkite/steps/tf/logs/*"

From d9c5aa561be61053ec075f97cf154674c1d677fd Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Fri, 18 Mar 2022 16:27:05 +0300
Subject: [PATCH 157/206] playground for if

---
 .buildkite/pipeline.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 005429b9c..60f52c5c9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,6 +6,9 @@ steps:
 
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
+    if: &main_if |
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:
@@ -29,9 +32,7 @@ steps:
 
   - label: ":coverage: full test suite (FTS)"
     key: "full_tests"
-    if: |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
+    if: *main_if
     commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
       - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
@@ -82,6 +83,7 @@ steps:
   - label: ":terraform: destroy infrastructure"
     agents:
       queue: "testing"
+    if: *main_if
     command:
       - ".buildkite/steps/tf/destroy.sh"
     depends_on: 

From e91b5c6e1cd8d12c4346b09899f75847e7d57366 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 11:19:38 +0300
Subject: [PATCH 158/206] refactoring

---
 .buildkite/pipeline.yml                       | 40 +++++++++----------
 .../steps/{tf => full_test_suite}/main.tf     | 10 ++---
 .../steps/{tf => full_test_suite}/output.tf   |  0
 .../{tf => full_test_suite}/proxy_init.sh     |  2 -
 .../{tf => full_test_suite}/solana_init.sh    |  8 ++--
 .../terraform-build.sh}                       |  4 +-
 .../terraform-destroy.sh}                     |  2 +-
 .../terraform.auto.tfvars                     |  2 -
 .../steps/{tf => full_test_suite}/vars.tf     |  0
 9 files changed, 30 insertions(+), 38 deletions(-)
 rename .buildkite/steps/{tf => full_test_suite}/main.tf (99%)
 rename .buildkite/steps/{tf => full_test_suite}/output.tf (100%)
 rename .buildkite/steps/{tf => full_test_suite}/proxy_init.sh (97%)
 rename .buildkite/steps/{tf => full_test_suite}/solana_init.sh (88%)
 rename .buildkite/steps/{tf/build.sh => full_test_suite/terraform-build.sh} (91%)
 rename .buildkite/steps/{tf/destroy.sh => full_test_suite/terraform-destroy.sh} (97%)
 rename .buildkite/steps/{tf => full_test_suite}/terraform.auto.tfvars (91%)
 rename .buildkite/steps/{tf => full_test_suite}/vars.tf (100%)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 60f52c5c9..4d2eb1b1b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -12,26 +12,27 @@ steps:
     agents:
       queue: "testing"
     command:
-      - ".buildkite/steps/tf/build.sh"
+      - ".buildkite/steps/full_test_suite/terraform-build.sh"
+
   - wait
 
-#  - label: ":cop::skin-tone-2: deploy check"
-#    command: ".buildkite/steps/deploy-test.sh"
-#    timeout: 90
-#    agents:
-#       queue: "testing"
-#    artifact_paths:
-#      - "proxy.log"
-#      - "solana.log"
-#      - "measurements.log"
-#      - "evm_loader.log"
-#      - "faucet.log"
-#      - "airdropper.log"
-#      - "indexer.log"
+  - label: ":cop::skin-tone-2: deploy check"
+    command: ".buildkite/steps/deploy-test.sh"
+    timeout: 90
+    agents:
+       queue: "testing"
+    artifact_paths:
+      - "proxy.log"
+      - "solana.log"
+      - "measurements.log"
+      - "evm_loader.log"
+      - "faucet.log"
+      - "airdropper.log"
+      - "indexer.log"
 
 
   - label: ":coverage: full test suite (FTS)"
-    key: "full_tests"
+    key: "full_test_suite"
     if: *main_if
     commands:
       - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
@@ -53,9 +54,6 @@ steps:
       - echo Full test threshold - $${FTS_THRESHOLD}
       - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
       - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
-    artifact_paths:
-      - allure-reports.tar.gz
-      - fts_${BUILDKITE_BUILD_NUMBER}.log
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
@@ -71,6 +69,8 @@ steps:
       - "faucet.log"
       - "airdropper.log"
       - "indexer.log"
+      - allure-reports.tar.gz
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
 
   - wait
 
@@ -85,9 +85,9 @@ steps:
       queue: "testing"
     if: *main_if
     command:
-      - ".buildkite/steps/tf/destroy.sh"
+      - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
     depends_on: 
-      - "full_tests"
+      - "full_test_suite"
       - "create_infrastructure"
     allow_dependency_failure: true
     artifact_paths:
diff --git a/.buildkite/steps/tf/main.tf b/.buildkite/steps/full_test_suite/main.tf
similarity index 99%
rename from .buildkite/steps/tf/main.tf
rename to .buildkite/steps/full_test_suite/main.tf
index 1c372cc32..47ee444e2 100644
--- a/.buildkite/steps/tf/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -57,7 +57,6 @@ resource "aws_security_group" "test-stand-solana" {
     to_port     = 65535
     protocol    = "tcp"
     cidr_blocks = var.allow_list
-
   }
 
   ingress {
@@ -66,7 +65,6 @@ resource "aws_security_group" "test-stand-solana" {
     to_port     = 22
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
-
   }
 
   egress {
@@ -85,7 +83,7 @@ resource "aws_security_group" "test-stand-solana" {
 
 resource "random_id" "test-stand-proxy" {
   byte_length = 4
-  prefix      = "test-stand-solana-"
+  prefix      = "test-stand-proxy-"
 }
 
 resource "aws_security_group" "test-stand-proxy" {
@@ -99,7 +97,6 @@ resource "aws_security_group" "test-stand-proxy" {
     to_port     = 9091
     protocol    = "tcp"
     cidr_blocks = var.allow_list
-
   }
 
   ingress {
@@ -108,15 +105,14 @@ resource "aws_security_group" "test-stand-proxy" {
     to_port     = 3334
     protocol    = "tcp"
     cidr_blocks = var.allow_list
-
   }
+
   ingress {
     description = "allow incoming from world to PROXY"
     from_port   = 22
     to_port     = 22
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
-
   }
 
   egress {
@@ -152,7 +148,6 @@ resource "aws_instance" "solana" {
     Name    = "${var.branch}-test-stand-solana"
     purpose = "ci-oz-full-tests"
   }
-
 }
 
 resource "aws_instance" "proxy" {
@@ -170,6 +165,7 @@ resource "aws_instance" "proxy" {
     Name    = "${var.branch}-test-stand-proxy"
     purpose = "ci-oz-full-tests"
   }
+
   depends_on = [
     aws_instance.solana
   ]
diff --git a/.buildkite/steps/tf/output.tf b/.buildkite/steps/full_test_suite/output.tf
similarity index 100%
rename from .buildkite/steps/tf/output.tf
rename to .buildkite/steps/full_test_suite/output.tf
diff --git a/.buildkite/steps/tf/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
similarity index 97%
rename from .buildkite/steps/tf/proxy_init.sh
rename to .buildkite/steps/full_test_suite/proxy_init.sh
index fb9834fff..d54c97345 100644
--- a/.buildkite/steps/tf/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -33,10 +33,8 @@ version: "3"
 services:
   evm_loader:
     container_name: evm_loader
-    #image: neonlabsorg/evm_loader:\$\{EVM_LOADER_REVISION:-latest\}
     environment:
       - SOLANA_URL=$SOLANA_URL
-    depends_on: []
     networks:
       - net
     command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
diff --git a/.buildkite/steps/tf/solana_init.sh b/.buildkite/steps/full_test_suite/solana_init.sh
similarity index 88%
rename from .buildkite/steps/tf/solana_init.sh
rename to .buildkite/steps/full_test_suite/solana_init.sh
index 0206938d3..01da2624e 100644
--- a/.buildkite/steps/tf/solana_init.sh
+++ b/.buildkite/steps/full_test_suite/solana_init.sh
@@ -11,7 +11,7 @@ sudo apt-get update
 
 
 # Tune instance for Solana requirements(must be applied before start services)
-sudo bash -c "cat >/etc/sysctl.d/20-solana-udp-buffers.conf <<EOF
+sudo bash -c "cat >/etc/sysctl.d/20-solana-udp-buffers.conf<<EOF
 # Increase UDP buffer size
 net.core.rmem_default = 134217728
 net.core.rmem_max = 134217728
@@ -20,13 +20,13 @@ net.core.wmem_max = 134217728
 EOF"
 sysctl -p /etc/sysctl.d/20-solana-udp-buffers.conf
 
-sudo bash -c "cat >/etc/sysctl.d/20-solana-mmaps.conf <<EOF
+sudo bash -c "cat >/etc/sysctl.d/20-solana-mmaps.conf<<EOF
 # Increase memory mapped files limit
 vm.max_map_count = 1000000
 EOF"
 sysctl -p /etc/sysctl.d/20-solana-mmaps.conf
 
-bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
+bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf<<EOF
 # Increase process file descriptor count limit
 * - nofile 1000000
 EOF"
@@ -41,7 +41,7 @@ sudo chmod +x /usr/local/bin/docker-compose
 # Receive docker-compose file and create override file
 cd /opt
 curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/proxy/docker-compose-test.yml
-cat > docker-compose-test.override.yml <<EOF
+cat > docker-compose-test.override.yml<<EOF
 version: "3"
 
 services:
diff --git a/.buildkite/steps/tf/build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
similarity index 91%
rename from .buildkite/steps/tf/build.sh
rename to .buildkite/steps/full_test_suite/terraform-build.sh
index 0a26c10f7..7bb0fbd4b 100644
--- a/.buildkite/steps/tf/build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd .buildkite/steps/tf
+cd .buildkite/steps/full_test_suite
 
 
 # Terraform part
@@ -11,7 +11,7 @@ export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-terraform init $TF_BACKEND_CONFIG
+terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
 
diff --git a/.buildkite/steps/tf/destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
similarity index 97%
rename from .buildkite/steps/tf/destroy.sh
rename to .buildkite/steps/full_test_suite/terraform-destroy.sh
index eda18852a..69228ea67 100644
--- a/.buildkite/steps/tf/destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd .buildkite/steps/tf
+cd .buildkite/steps/full_test_suite
 
 
 ### Receive artefacts
diff --git a/.buildkite/steps/tf/terraform.auto.tfvars b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
similarity index 91%
rename from .buildkite/steps/tf/terraform.auto.tfvars
rename to .buildkite/steps/full_test_suite/terraform.auto.tfvars
index 3ecd7f748..d117dc899 100644
--- a/.buildkite/steps/tf/terraform.auto.tfvars
+++ b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
@@ -1,8 +1,6 @@
-#branch               = "develop"
 neon_evm_revision    = "latest"
 proxy_model_revision = "latest"
 
-
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
 solana_instance_type = "t3.large"
diff --git a/.buildkite/steps/tf/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
similarity index 100%
rename from .buildkite/steps/tf/vars.tf
rename to .buildkite/steps/full_test_suite/vars.tf

From 6899c868cbbc11bf38e32bdb9b5730b5d17556d6 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 11:32:15 +0300
Subject: [PATCH 159/206] wip

---
 .buildkite/pipeline.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4d2eb1b1b..8a299e039 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,8 +7,9 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &main_if |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+        true
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:

From 2c57db5df1fe0eb6986c305b938727208680ba72 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 12:14:02 +0300
Subject: [PATCH 160/206] wip

---
 .buildkite/pipeline.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8a299e039..14ce93e6b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -62,14 +62,14 @@ steps:
     agents:
        queue: "testing"
     artifact_paths:
-      - "proxy.log"
-      - "solana.log"
-      - "measurements.log"
-      - "evm_loader.log"
-      - "dbcreation.log"
-      - "faucet.log"
-      - "airdropper.log"
-      - "indexer.log"
+      - proxy.log
+      - solana.log
+      - measurements.log
+      - evm_loader.log
+      - dbcreation.log
+      - faucet.log
+      - airdropper.log
+      - indexer.log
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
@@ -92,4 +92,4 @@ steps:
       - "create_infrastructure"
     allow_dependency_failure: true
     artifact_paths:
-      - ".buildkite/steps/tf/logs/*"
+      - ".buildkite/steps/full_test_suite/logs/*"

From 12e0d76416f0a05885db664459018b3062edba6c Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 12:21:52 +0300
Subject: [PATCH 161/206] wip

---
 .buildkite/hooks/pre-exit                           | 8 ++++++++
 .buildkite/steps/full_test_suite/terraform-build.sh | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100755 .buildkite/hooks/pre-exit

diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
new file mode 100755
index 000000000..5e2d798ed
--- /dev/null
+++ b/.buildkite/hooks/pre-exit
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ "$BUILDKITE_STEP_KEY" == "full_test_suite" ]]
+then
+  ./buildkite/steps/full_test_suite/terraform-destroy.sh
+else
+  exit 0
+fi
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 7bb0fbd4b..b41fbe0dc 100644
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -23,3 +23,7 @@ terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data s
 # Save IPs for next steps
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
+
+
+# Create flag
+buildkite-agent meta-data set "INFRASTRUCTURE_CREATED" "YES"

From aa33e0c9cc3276877ec3446eeddc092063496e2a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 12:40:45 +0300
Subject: [PATCH 162/206] wip

---
 .buildkite/hooks/pre-exit |  9 ++++++---
 .buildkite/pipeline.yml   | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
index 5e2d798ed..c09125206 100755
--- a/.buildkite/hooks/pre-exit
+++ b/.buildkite/hooks/pre-exit
@@ -2,7 +2,10 @@
 
 if [[ "$BUILDKITE_STEP_KEY" == "full_test_suite" ]]
 then
-  ./buildkite/steps/full_test_suite/terraform-destroy.sh
-else
-  exit 0
+    buildkite-agent meta-data exists "INFRASTRUCTURE_CREATED"
+    if [ $? -eq 0 ]; then
+        ./buildkite/steps/full_test_suite/terraform-destroy.sh
+    else
+        echo "nothing to destroy"
+    fi
 fi
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 14ce93e6b..ea60d04e6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -81,15 +81,15 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  - label: ":terraform: destroy infrastructure"
-    agents:
-      queue: "testing"
-    if: *main_if
-    command:
-      - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
-    depends_on: 
-      - "full_test_suite"
-      - "create_infrastructure"
-    allow_dependency_failure: true
-    artifact_paths:
-      - ".buildkite/steps/full_test_suite/logs/*"
+  # - label: ":terraform: destroy infrastructure"
+  #   agents:
+  #     queue: "testing"
+  #   if: *main_if
+  #   command:
+  #     - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
+  #   depends_on: 
+  #     - "full_test_suite"
+  #     - "create_infrastructure"
+  #   allow_dependency_failure: true
+  #   artifact_paths:
+  #     - ".buildkite/steps/full_test_suite/logs/*"

From 79bcc2daddc7d82b9b6b2f7b953e9c8e0c0e30a1 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 13:28:29 +0300
Subject: [PATCH 163/206] typo

---
 .buildkite/hooks/pre-exit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
index c09125206..3a3b327f5 100755
--- a/.buildkite/hooks/pre-exit
+++ b/.buildkite/hooks/pre-exit
@@ -4,7 +4,7 @@ if [[ "$BUILDKITE_STEP_KEY" == "full_test_suite" ]]
 then
     buildkite-agent meta-data exists "INFRASTRUCTURE_CREATED"
     if [ $? -eq 0 ]; then
-        ./buildkite/steps/full_test_suite/terraform-destroy.sh
+        ./.buildkite/steps/full_test_suite/terraform-destroy.sh
     else
         echo "nothing to destroy"
     fi

From 2c548305588378e0f36c17c3e8bb9a315e4c95f7 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 13:52:41 +0300
Subject: [PATCH 164/206] wip

---
 .buildkite/pipeline.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ea60d04e6..bdb88c56c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -17,19 +17,19 @@ steps:
 
   - wait
 
-  - label: ":cop::skin-tone-2: deploy check"
-    command: ".buildkite/steps/deploy-test.sh"
-    timeout: 90
-    agents:
-       queue: "testing"
-    artifact_paths:
-      - "proxy.log"
-      - "solana.log"
-      - "measurements.log"
-      - "evm_loader.log"
-      - "faucet.log"
-      - "airdropper.log"
-      - "indexer.log"
+  # - label: ":cop::skin-tone-2: deploy check"
+  #   command: ".buildkite/steps/deploy-test.sh"
+  #   timeout: 90
+  #   agents:
+  #      queue: "testing"
+  #   artifact_paths:
+  #     - "proxy.log"
+  #     - "solana.log"
+  #     - "measurements.log"
+  #     - "evm_loader.log"
+  #     - "faucet.log"
+  #     - "airdropper.log"
+  #     - "indexer.log"
 
 
   - label: ":coverage: full test suite (FTS)"

From d7442bfc9df78b2b4d7bc4c3a306cb603ab265f7 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 14:54:31 +0300
Subject: [PATCH 165/206] update attrubites

---
 .buildkite/steps/full_test_suite/proxy_init.sh        | 0
 .buildkite/steps/full_test_suite/solana_init.sh       | 0
 .buildkite/steps/full_test_suite/terraform-build.sh   | 0
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .buildkite/steps/full_test_suite/proxy_init.sh
 mode change 100644 => 100755 .buildkite/steps/full_test_suite/solana_init.sh
 mode change 100644 => 100755 .buildkite/steps/full_test_suite/terraform-build.sh
 mode change 100644 => 100755 .buildkite/steps/full_test_suite/terraform-destroy.sh

diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
old mode 100644
new mode 100755
diff --git a/.buildkite/steps/full_test_suite/solana_init.sh b/.buildkite/steps/full_test_suite/solana_init.sh
old mode 100644
new mode 100755
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
old mode 100644
new mode 100755
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
old mode 100644
new mode 100755

From 92182eb7a24449867367d16e75dfae9e404b952b Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 15:19:00 +0300
Subject: [PATCH 166/206] wip

---
 .buildkite/hooks/pre-exit | 11 ---------
 .buildkite/pipeline.yml   | 50 +++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100755 .buildkite/hooks/pre-exit

diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
deleted file mode 100755
index 3a3b327f5..000000000
--- a/.buildkite/hooks/pre-exit
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [[ "$BUILDKITE_STEP_KEY" == "full_test_suite" ]]
-then
-    buildkite-agent meta-data exists "INFRASTRUCTURE_CREATED"
-    if [ $? -eq 0 ]; then
-        ./.buildkite/steps/full_test_suite/terraform-destroy.sh
-    else
-        echo "nothing to destroy"
-    fi
-fi
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index bdb88c56c..14ce93e6b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -17,19 +17,19 @@ steps:
 
   - wait
 
-  # - label: ":cop::skin-tone-2: deploy check"
-  #   command: ".buildkite/steps/deploy-test.sh"
-  #   timeout: 90
-  #   agents:
-  #      queue: "testing"
-  #   artifact_paths:
-  #     - "proxy.log"
-  #     - "solana.log"
-  #     - "measurements.log"
-  #     - "evm_loader.log"
-  #     - "faucet.log"
-  #     - "airdropper.log"
-  #     - "indexer.log"
+  - label: ":cop::skin-tone-2: deploy check"
+    command: ".buildkite/steps/deploy-test.sh"
+    timeout: 90
+    agents:
+       queue: "testing"
+    artifact_paths:
+      - "proxy.log"
+      - "solana.log"
+      - "measurements.log"
+      - "evm_loader.log"
+      - "faucet.log"
+      - "airdropper.log"
+      - "indexer.log"
 
 
   - label: ":coverage: full test suite (FTS)"
@@ -81,15 +81,15 @@ steps:
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-  # - label: ":terraform: destroy infrastructure"
-  #   agents:
-  #     queue: "testing"
-  #   if: *main_if
-  #   command:
-  #     - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
-  #   depends_on: 
-  #     - "full_test_suite"
-  #     - "create_infrastructure"
-  #   allow_dependency_failure: true
-  #   artifact_paths:
-  #     - ".buildkite/steps/full_test_suite/logs/*"
+  - label: ":terraform: destroy infrastructure"
+    agents:
+      queue: "testing"
+    if: *main_if
+    command:
+      - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
+    depends_on: 
+      - "full_test_suite"
+      - "create_infrastructure"
+    allow_dependency_failure: true
+    artifact_paths:
+      - ".buildkite/steps/full_test_suite/logs/*"

From 395495ad98a1c2dea6910199f48589c5a6a7e5ea Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 16:30:25 +0300
Subject: [PATCH 167/206] Braces

---
 .buildkite/pipeline.yml                       | 26 ++++-----------
 .../steps/full_test_suite/proxy_init.sh       | 16 ++++------
 .../full_test_suite/run_full_test_suite.sh    | 32 +++++++++++++++++++
 .../steps/full_test_suite/terraform-build.sh  |  7 ++--
 .../full_test_suite/terraform-destroy.sh      | 17 +++++-----
 5 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100755 .buildkite/steps/full_test_suite/run_full_test_suite.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 14ce93e6b..e6a88a6d4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,6 +4,7 @@ steps:
       - ".buildkite/steps/build-image.sh"
       - ".buildkite/steps/upload-image.sh"
 
+
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &main_if |
@@ -15,8 +16,10 @@ steps:
     command:
       - ".buildkite/steps/full_test_suite/terraform-build.sh"
 
+
   - wait
 
+
   - label: ":cop::skin-tone-2: deploy check"
     command: ".buildkite/steps/deploy-test.sh"
     timeout: 90
@@ -36,25 +39,7 @@ steps:
     key: "full_test_suite"
     if: *main_if
     commands:
-      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
-      - echo $$PROXY_URL
-      - echo $$FAUCET_URL
-      - echo $$SOLANA_URL
-      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FTS_RESULT}
-      - echo Full test threshold - $${FTS_THRESHOLD}
-      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+      - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
@@ -73,14 +58,17 @@ steps:
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
+
   - wait
 
+
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"
     if: |
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
+
   - label: ":terraform: destroy infrastructure"
     agents:
       queue: "testing"
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index d54c97345..76e84ad57 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -34,13 +34,13 @@ services:
   evm_loader:
     container_name: evm_loader
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
     networks:
       - net
     command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
     ports:
       - 9091:9090
   faucet:
@@ -48,7 +48,7 @@ services:
     environment:
       - FAUCET_RPC_BIND=0.0.0.0
       - FAUCET_RPC_PORT=3333
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
       - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU   
@@ -63,10 +63,10 @@ services:
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
   indexer:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
 EOF
 
 
@@ -75,14 +75,12 @@ SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v
 
 
 # Check if Solana is available, max attepts is 100(each for 2 seconds)
-CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+CHECK_COMMAND=`curl ${SOLANA_URL} -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
 MAX_COUNT=100
 CURRENT_ATTEMPT=1
-while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && $CURRENT_ATTEMPT -gt $MAX_COUNT ]]
+while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && ${CURRENT_ATTEMPT} -gt ${MAX_COUNT} ]]
 do
   CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
-  echo $CHECK_COMMAND >> /tmp/output.txt
-  echo "attempt: $CURRENT_ATTEMPT"
   ((CURRENT_ATTEMPT=CURRENT_ATTEMPT+1))
   sleep 2
 done;
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
new file mode 100755
index 000000000..c47627347
--- /dev/null
+++ b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# External addresses from previous step
+PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+
+# Create envirinment variables for tests
+export PROXY_URL="http://${PROXY_ADDR}:9091/solana"
+export FAUCET_URL="http://${PROXY_ADDR}:3334/request_neon"
+export SOLANA_URL="http://${SOLANA_ADDR}:8899"
+
+# Check variables
+echo "External URL for proxy service: ${PROXY_URL}"
+echo "External URL for faucet: ${FAUCET_URL}"
+echo "External URL for solana: ${SOLANA_URL}"
+
+# Start tests
+echo Full test suite container name - ${FTS_CONTAINER_NAME}
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+FTS_RESULT=$(docker logs ${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+# Retreive logs
+docker cp ${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+docker logs ${FTS_CONTAINER_NAME} > ./${FTS_CONTAINER_NAME}.log
+# Clean resources
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+
+# Results
+echo Full test passing - ${FTS_RESULT}
+echo Full test threshold - ${FTS_THRESHOLD}
+echo Check if ${FTS_RESULT} is greater or equeal ${FTS_THRESHOLD}
+test ${FTS_RESULT} -ge ${FTS_THRESHOLD}
\ No newline at end of file
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index b41fbe0dc..6f57f8a28 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
+set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
 
 # Terraform part
-export TF_VAR_branch=$BUILDKITE_BRANCH
+export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
@@ -23,7 +24,3 @@ terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data s
 # Save IPs for next steps
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
-
-
-# Create flag
-buildkite-agent meta-data set "INFRASTRUCTURE_CREATED" "YES"
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 69228ea67..024a5076b 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
@@ -6,38 +7,38 @@ cd .buildkite/steps/full_test_suite
 ### Receive artefacts
 export SSH_KEY="~/.ssh/ci-stands"
 export ARTIFACTS_LOGS="./logs"
-mkdir -p $ARTIFACTS_LOGS
+mkdir -p ${ARTIFACTS_LOGS}
 
 
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
-ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log 2>&1'
-scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
+ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} 'sudo docker logs solana > /tmp/solana.log 2>&1'
+scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/solana.log $ARTIFACTS_LOGS
 
 
 # proxy
 export REMOTE_HOST=`buildkite-agent meta-data get "PROXY_IP"`
-ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
+ssh-keyscan -H ${REMOTE_HOST} >> ~/.ssh/known_hosts
 declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "faucet" "airdropper")
 
 for service in "${services[@]}"
 do
    echo "$servce"
-   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log 2>&1"
-   scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/$service.log $ARTIFACTS_LOGS
+   ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} "sudo docker logs $service > /tmp/$service.log 2>&1"
+   scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/${service}.log ${ARTIFACTS_LOGS}
 done
 
 
 ### Clean infrastructure by terraform
-export TF_VAR_branch=$BUILDKITE_BRANCH
+export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-terraform init $TF_BACKEND_CONFIG
+terraform init ${TF_BACKEND_CONFIG}
 terraform destroy --auto-approve=true
 
 

From f8e17fb058435fdfe0c894cb6ee0931b02bd8310 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 16:44:56 +0300
Subject: [PATCH 168/206] wip

---
 .buildkite/steps/full_test_suite/proxy_init.sh   | 16 ++++++++--------
 .../steps/full_test_suite/terraform-build.sh     | 11 +++--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 76e84ad57..3a8f1eb1c 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -23,7 +23,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 
 # Set required environment variables
 export REVISION=${revision}
-export SOLANA_URL=http:\/\/${solana_ip}:8899
+export SOLANA_URL=http:\/\/$solana_ip:8899
 
 
 # Generate docker-compose override file
@@ -34,13 +34,13 @@ services:
   evm_loader:
     container_name: evm_loader
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
     networks:
       - net
     command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
     ports:
       - 9091:9090
   faucet:
@@ -48,7 +48,7 @@ services:
     environment:
       - FAUCET_RPC_BIND=0.0.0.0
       - FAUCET_RPC_PORT=3333
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
       - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU   
@@ -63,10 +63,10 @@ services:
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
   indexer:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
 EOF
 
 
@@ -75,10 +75,10 @@ SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v
 
 
 # Check if Solana is available, max attepts is 100(each for 2 seconds)
-CHECK_COMMAND=`curl ${SOLANA_URL} -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
 MAX_COUNT=100
 CURRENT_ATTEMPT=1
-while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && ${CURRENT_ATTEMPT} -gt ${MAX_COUNT} ]]
+while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && $CURRENT_ATTEMPT -gt $MAX_COUNT ]]
 do
   CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
   ((CURRENT_ATTEMPT=CURRENT_ATTEMPT+1))
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 6f57f8a28..1597b035e 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -9,18 +9,13 @@ export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
-export TF_VAR_neon_evm_revision=latest
-export TF_VAR_proxy_model_revision=latest
+export TF_VAR_neon_evm_revision=${NEON_EVM_COMMIT:-latest}
+export TF_VAR_proxy_model_revision=${BUILDKITE_COMMIT:-latest}
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
 
-# Get IPs
+# Save IPs for next steps
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
 terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
-
-
-# Save IPs for next steps
-buildkite-agent meta-data get "PROXY_IP"
-buildkite-agent meta-data get "SOLANA_IP"

From 6a96892ba9af366291a05c23ae127c74b092ecdc Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:18:35 +0300
Subject: [PATCH 169/206] Revert "wip"

This reverts commit f8e17fb058435fdfe0c894cb6ee0931b02bd8310.
---
 .buildkite/steps/full_test_suite/proxy_init.sh   | 16 ++++++++--------
 .../steps/full_test_suite/terraform-build.sh     | 11 ++++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 3a8f1eb1c..76e84ad57 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -23,7 +23,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 
 # Set required environment variables
 export REVISION=${revision}
-export SOLANA_URL=http:\/\/$solana_ip:8899
+export SOLANA_URL=http:\/\/${solana_ip}:8899
 
 
 # Generate docker-compose override file
@@ -34,13 +34,13 @@ services:
   evm_loader:
     container_name: evm_loader
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
     networks:
       - net
     command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
     ports:
       - 9091:9090
   faucet:
@@ -48,7 +48,7 @@ services:
     environment:
       - FAUCET_RPC_BIND=0.0.0.0
       - FAUCET_RPC_PORT=3333
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
       - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU   
@@ -63,10 +63,10 @@ services:
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
   indexer:
     environment:
-      - SOLANA_URL=$SOLANA_URL
+      - SOLANA_URL=${SOLANA_URL}
 EOF
 
 
@@ -75,10 +75,10 @@ SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v
 
 
 # Check if Solana is available, max attepts is 100(each for 2 seconds)
-CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+CHECK_COMMAND=`curl ${SOLANA_URL} -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
 MAX_COUNT=100
 CURRENT_ATTEMPT=1
-while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && $CURRENT_ATTEMPT -gt $MAX_COUNT ]]
+while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && ${CURRENT_ATTEMPT} -gt ${MAX_COUNT} ]]
 do
   CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
   ((CURRENT_ATTEMPT=CURRENT_ATTEMPT+1))
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 1597b035e..6f57f8a28 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -9,13 +9,18 @@ export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
-export TF_VAR_neon_evm_revision=${NEON_EVM_COMMIT:-latest}
-export TF_VAR_proxy_model_revision=${BUILDKITE_COMMIT:-latest}
+export TF_VAR_neon_evm_revision=latest
+export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
 
-# Save IPs for next steps
+# Get IPs
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
 terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
+
+
+# Save IPs for next steps
+buildkite-agent meta-data get "PROXY_IP"
+buildkite-agent meta-data get "SOLANA_IP"

From 97fe37eeae6dd57757cea065763a5bb1106719ca Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:18:47 +0300
Subject: [PATCH 170/206] Revert "Braces"

This reverts commit 395495ad98a1c2dea6910199f48589c5a6a7e5ea.
---
 .buildkite/pipeline.yml                       | 26 +++++++++++----
 .../steps/full_test_suite/proxy_init.sh       | 16 ++++++----
 .../full_test_suite/run_full_test_suite.sh    | 32 -------------------
 .../steps/full_test_suite/terraform-build.sh  |  7 ++--
 .../full_test_suite/terraform-destroy.sh      | 17 +++++-----
 5 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 100755 .buildkite/steps/full_test_suite/run_full_test_suite.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e6a88a6d4..14ce93e6b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,7 +4,6 @@ steps:
       - ".buildkite/steps/build-image.sh"
       - ".buildkite/steps/upload-image.sh"
 
-
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &main_if |
@@ -16,10 +15,8 @@ steps:
     command:
       - ".buildkite/steps/full_test_suite/terraform-build.sh"
 
-
   - wait
 
-
   - label: ":cop::skin-tone-2: deploy check"
     command: ".buildkite/steps/deploy-test.sh"
     timeout: 90
@@ -39,7 +36,25 @@ steps:
     key: "full_test_suite"
     if: *main_if
     commands:
-      - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
+      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
+      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
+      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
+      - echo $$PROXY_URL
+      - echo $$FAUCET_URL
+      - echo $$SOLANA_URL
+      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
+      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+      - echo Full test passing - $${FTS_RESULT}
+      - echo Full test threshold - $${FTS_THRESHOLD}
+      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
+      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
@@ -58,17 +73,14 @@ steps:
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
-
   - wait
 
-
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"
     if: |
         build.branch =~ /^(master|develop|^ci-.+|v[0-9]+\.[0-9]+\..+)$$/ &&
         (build.env("NEON_EVM_BRANCH") == "develop" || build.env("NEON_EVM_BRANCH") == null)
 
-
   - label: ":terraform: destroy infrastructure"
     agents:
       queue: "testing"
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 76e84ad57..d54c97345 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -34,13 +34,13 @@ services:
   evm_loader:
     container_name: evm_loader
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
     networks:
       - net
     command: bash -c "create-test-accounts.sh 1 && deploy-evm.sh && /opt/spl-token create-account HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU && /opt/spl-token mint HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU 1000000000 --owner /opt/evm_loader-keypair.json -- HX14J4Pp9CgSbWP13Dtpm8VLJpNxMYffLtRCRGsx7Edv"
   proxy:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
     ports:
       - 9091:9090
   faucet:
@@ -48,7 +48,7 @@ services:
     environment:
       - FAUCET_RPC_BIND=0.0.0.0
       - FAUCET_RPC_PORT=3333
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
       - NEON_ETH_MAX_AMOUNT=50000
       - EVM_LOADER=53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io
       - NEON_TOKEN_MINT=HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU   
@@ -63,10 +63,10 @@ services:
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
   indexer:
     environment:
-      - SOLANA_URL=${SOLANA_URL}
+      - SOLANA_URL=$SOLANA_URL
 EOF
 
 
@@ -75,12 +75,14 @@ SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -v
 
 
 # Check if Solana is available, max attepts is 100(each for 2 seconds)
-CHECK_COMMAND=`curl ${SOLANA_URL} -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
 MAX_COUNT=100
 CURRENT_ATTEMPT=1
-while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && ${CURRENT_ATTEMPT} -gt ${MAX_COUNT} ]]
+while [[ "$CHECK_COMMAND" != "{\"jsonrpc\":\"2.0\",\"result\":\"ok\",\"id\":1}" && $CURRENT_ATTEMPT -gt $MAX_COUNT ]]
 do
   CHECK_COMMAND=`curl $SOLANA_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1, "method":"getHealth"}'`
+  echo $CHECK_COMMAND >> /tmp/output.txt
+  echo "attempt: $CURRENT_ATTEMPT"
   ((CURRENT_ATTEMPT=CURRENT_ATTEMPT+1))
   sleep 2
 done;
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
deleted file mode 100755
index c47627347..000000000
--- a/.buildkite/steps/full_test_suite/run_full_test_suite.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# External addresses from previous step
-PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-
-# Create envirinment variables for tests
-export PROXY_URL="http://${PROXY_ADDR}:9091/solana"
-export FAUCET_URL="http://${PROXY_ADDR}:3334/request_neon"
-export SOLANA_URL="http://${SOLANA_ADDR}:8899"
-
-# Check variables
-echo "External URL for proxy service: ${PROXY_URL}"
-echo "External URL for faucet: ${FAUCET_URL}"
-echo "External URL for solana: ${SOLANA_URL}"
-
-# Start tests
-echo Full test suite container name - ${FTS_CONTAINER_NAME}
-docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
-docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-FTS_RESULT=$(docker logs ${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-# Retreive logs
-docker cp ${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-docker logs ${FTS_CONTAINER_NAME} > ./${FTS_CONTAINER_NAME}.log
-# Clean resources
-docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-
-# Results
-echo Full test passing - ${FTS_RESULT}
-echo Full test threshold - ${FTS_THRESHOLD}
-echo Check if ${FTS_RESULT} is greater or equeal ${FTS_THRESHOLD}
-test ${FTS_RESULT} -ge ${FTS_THRESHOLD}
\ No newline at end of file
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 6f57f8a28..b41fbe0dc 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
-set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
 
 # Terraform part
-export TF_VAR_branch=${BUILDKITE_BRANCH}
+export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
@@ -24,3 +23,7 @@ terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data s
 # Save IPs for next steps
 buildkite-agent meta-data get "PROXY_IP"
 buildkite-agent meta-data get "SOLANA_IP"
+
+
+# Create flag
+buildkite-agent meta-data set "INFRASTRUCTURE_CREATED" "YES"
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 024a5076b..69228ea67 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
@@ -7,38 +6,38 @@ cd .buildkite/steps/full_test_suite
 ### Receive artefacts
 export SSH_KEY="~/.ssh/ci-stands"
 export ARTIFACTS_LOGS="./logs"
-mkdir -p ${ARTIFACTS_LOGS}
+mkdir -p $ARTIFACTS_LOGS
 
 
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
-ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} 'sudo docker logs solana > /tmp/solana.log 2>&1'
-scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/solana.log $ARTIFACTS_LOGS
+ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log 2>&1'
+scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
 
 
 # proxy
 export REMOTE_HOST=`buildkite-agent meta-data get "PROXY_IP"`
-ssh-keyscan -H ${REMOTE_HOST} >> ~/.ssh/known_hosts
+ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
 declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "faucet" "airdropper")
 
 for service in "${services[@]}"
 do
    echo "$servce"
-   ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} "sudo docker logs $service > /tmp/$service.log 2>&1"
-   scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/${service}.log ${ARTIFACTS_LOGS}
+   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log 2>&1"
+   scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/$service.log $ARTIFACTS_LOGS
 done
 
 
 ### Clean infrastructure by terraform
-export TF_VAR_branch=${BUILDKITE_BRANCH}
+export TF_VAR_branch=$BUILDKITE_BRANCH
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=latest
 export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-terraform init ${TF_BACKEND_CONFIG}
+terraform init $TF_BACKEND_CONFIG
 terraform destroy --auto-approve=true
 
 

From e1c31dd99dfc2e584bb8cf9cf5f15b0afa639c06 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:20:46 +0300
Subject: [PATCH 171/206] wip

---
 .buildkite/pipeline.yml                       | 24 +++-----------
 .../full_test_suite/run_full_test_suite.sh    | 32 +++++++++++++++++++
 2 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100755 .buildkite/steps/full_test_suite/run_full_test_suite.sh

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 14ce93e6b..025a54ba6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -15,8 +15,10 @@ steps:
     command:
       - ".buildkite/steps/full_test_suite/terraform-build.sh"
 
+
   - wait
 
+
   - label: ":cop::skin-tone-2: deploy check"
     command: ".buildkite/steps/deploy-test.sh"
     timeout: 90
@@ -36,25 +38,7 @@ steps:
     key: "full_test_suite"
     if: *main_if
     commands:
-      - PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
-      - SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
-      - export PROXY_URL="http://$$PROXY_ADDR:9091/solana"
-      - export FAUCET_URL="http://$$PROXY_ADDR:3334/request_neon"
-      - export SOLANA_URL="http://$$SOLANA_ADDR:8899"
-      - echo $$PROXY_URL
-      - echo $$FAUCET_URL
-      - echo $$SOLANA_URL
-      - echo Full test suite container name - $${FTS_CONTAINER_NAME}
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
-      - FTS_RESULT=$(docker logs $${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
-      - docker cp $${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
-      - docker logs $${FTS_CONTAINER_NAME} > ./$${FTS_CONTAINER_NAME}.log
-      - docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
-      - echo Full test passing - $${FTS_RESULT}
-      - echo Full test threshold - $${FTS_THRESHOLD}
-      - echo Check if $${FTS_RESULT} is greater or equeal $${FTS_THRESHOLD}
-      - test $${FTS_RESULT} -ge $${FTS_THRESHOLD}
+      - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
@@ -73,8 +57,10 @@ steps:
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
+
   - wait
 
+
   - label: ":floppy_disk: publish image"
     command: ".buildkite/steps/publish-image.sh"
     if: |
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
new file mode 100755
index 000000000..c47627347
--- /dev/null
+++ b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# External addresses from previous step
+PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
+SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
+
+# Create envirinment variables for tests
+export PROXY_URL="http://${PROXY_ADDR}:9091/solana"
+export FAUCET_URL="http://${PROXY_ADDR}:3334/request_neon"
+export SOLANA_URL="http://${SOLANA_ADDR}:8899"
+
+# Check variables
+echo "External URL for proxy service: ${PROXY_URL}"
+echo "External URL for faucet: ${FAUCET_URL}"
+echo "External URL for solana: ${SOLANA_URL}"
+
+# Start tests
+echo Full test suite container name - ${FTS_CONTAINER_NAME}
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml pull
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml up
+FTS_RESULT=$(docker logs ${FTS_CONTAINER_NAME} | (grep -oP "(?<=Passing - )\d+" || echo 0))
+# Retreive logs
+docker cp ${FTS_CONTAINER_NAME}:/opt/allure-reports.tar.gz ./
+docker logs ${FTS_CONTAINER_NAME} > ./${FTS_CONTAINER_NAME}.log
+# Clean resources
+docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
+
+# Results
+echo Full test passing - ${FTS_RESULT}
+echo Full test threshold - ${FTS_THRESHOLD}
+echo Check if ${FTS_RESULT} is greater or equeal ${FTS_THRESHOLD}
+test ${FTS_RESULT} -ge ${FTS_THRESHOLD}
\ No newline at end of file

From 9190857b31ca5cabccdfe96e81f8cee77f23f0b5 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:35:04 +0300
Subject: [PATCH 172/206] typo

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 025a54ba6..ddb34584e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -38,7 +38,7 @@ steps:
     key: "full_test_suite"
     if: *main_if
     commands:
-      - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
+      - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}

From 5d4a10ca79c43e858a6e0afe8046c9d26b76fc41 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:49:18 +0300
Subject: [PATCH 173/206] wip

---
 .buildkite/pipeline.yml                       | 72 +++++++++----------
 .../steps/full_test_suite/terraform-build.sh  | 15 +---
 .../full_test_suite/terraform-destroy.sh      | 10 +--
 .../full_test_suite/terraform.auto.tfvars     |  4 +-
 4 files changed, 46 insertions(+), 55 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ddb34584e..b0e8ddd47 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -19,46 +19,46 @@ steps:
   - wait
 
 
-  - label: ":cop::skin-tone-2: deploy check"
-    command: ".buildkite/steps/deploy-test.sh"
-    timeout: 90
-    agents:
-       queue: "testing"
-    artifact_paths:
-      - "proxy.log"
-      - "solana.log"
-      - "measurements.log"
-      - "evm_loader.log"
-      - "faucet.log"
-      - "airdropper.log"
-      - "indexer.log"
+  # - label: ":cop::skin-tone-2: deploy check"
+  #   command: ".buildkite/steps/deploy-test.sh"
+  #   timeout: 90
+  #   agents:
+  #      queue: "testing"
+  #   artifact_paths:
+  #     - "proxy.log"
+  #     - "solana.log"
+  #     - "measurements.log"
+  #     - "evm_loader.log"
+  #     - "faucet.log"
+  #     - "airdropper.log"
+  #     - "indexer.log"
 
 
-  - label: ":coverage: full test suite (FTS)"
-    key: "full_test_suite"
-    if: *main_if
-    commands:
-      - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
-    env:
-      FTS_THRESHOLD: 1700
-      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:develop
-    agents:
-       queue: "testing"
-    artifact_paths:
-      - proxy.log
-      - solana.log
-      - measurements.log
-      - evm_loader.log
-      - dbcreation.log
-      - faucet.log
-      - airdropper.log
-      - indexer.log
-      - allure-reports.tar.gz
-      - fts_${BUILDKITE_BUILD_NUMBER}.log
+  # - label: ":coverage: full test suite (FTS)"
+  #   key: "full_test_suite"
+  #   if: *main_if
+  #   commands:
+  #     - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
+  #   env:
+  #     FTS_THRESHOLD: 1700
+  #     FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+  #     FTS_IMAGE: neonlabsorg/full_test_suite:develop
+  #   agents:
+  #      queue: "testing"
+  #   artifact_paths:
+  #     - proxy.log
+  #     - solana.log
+  #     - measurements.log
+  #     - evm_loader.log
+  #     - dbcreation.log
+  #     - faucet.log
+  #     - airdropper.log
+  #     - indexer.log
+  #     - allure-reports.tar.gz
+  #     - fts_${BUILDKITE_BUILD_NUMBER}.log
 
 
-  - wait
+  # - wait
 
 
   - label: ":floppy_disk: publish image"
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index b41fbe0dc..dba0b1623 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -4,12 +4,12 @@ cd .buildkite/steps/full_test_suite
 
 
 # Terraform part
-export TF_VAR_branch=$BUILDKITE_BRANCH
+export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
-export TF_VAR_neon_evm_revision=latest
-export TF_VAR_proxy_model_revision=latest
+export TF_VAR_neon_evm_revision=${NEON_EVM_COMMIT:-latest}
+export TF_VAR_proxy_model_revision=${BUILDKITE_COMMIT:-latest}
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
@@ -18,12 +18,3 @@ terraform apply --auto-approve=true
 # Get IPs
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
 terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
-
-
-# Save IPs for next steps
-buildkite-agent meta-data get "PROXY_IP"
-buildkite-agent meta-data get "SOLANA_IP"
-
-
-# Create flag
-buildkite-agent meta-data set "INFRASTRUCTURE_CREATED" "YES"
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 69228ea67..c5aabaecd 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -12,8 +12,8 @@ mkdir -p $ARTIFACTS_LOGS
 # solana
 export REMOTE_HOST=`buildkite-agent meta-data get "SOLANA_IP"`
 ssh-keyscan -H $REMOTE_HOST >> ~/.ssh/known_hosts
-ssh -i $SSH_KEY ubuntu@$REMOTE_HOST 'sudo docker logs solana > /tmp/solana.log 2>&1'
-scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/solana.log $ARTIFACTS_LOGS
+ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} 'sudo docker logs solana > /tmp/solana.log 2>&1'
+scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/solana.log ${ARTIFACTS_LOGS}
 
 
 # proxy
@@ -24,13 +24,13 @@ declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "fau
 for service in "${services[@]}"
 do
    echo "$servce"
-   ssh -i $SSH_KEY ubuntu@$REMOTE_HOST "sudo docker logs $service > /tmp/$service.log 2>&1"
-   scp -i $SSH_KEY ubuntu@$REMOTE_HOST:/tmp/$service.log $ARTIFACTS_LOGS
+   ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} "sudo docker logs $service > /tmp/$service.log 2>&1"
+   scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/$service.log ${ARTIFACTS_LOGS}
 done
 
 
 ### Clean infrastructure by terraform
-export TF_VAR_branch=$BUILDKITE_BRANCH
+export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
diff --git a/.buildkite/steps/full_test_suite/terraform.auto.tfvars b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
index d117dc899..2fa398931 100644
--- a/.buildkite/steps/full_test_suite/terraform.auto.tfvars
+++ b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
@@ -1,5 +1,5 @@
-neon_evm_revision    = "latest"
-proxy_model_revision = "latest"
+#neon_evm_revision    = "latest"
+#proxy_model_revision = "latest"
 
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]

From 46da06620422b32f8f35d5cb4aca639c16cb1cd3 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 17:58:56 +0300
Subject: [PATCH 174/206] wip

---
 .buildkite/pipeline.yml                       | 72 +++++++++----------
 .../full_test_suite/run_full_test_suite.sh    |  1 +
 .../steps/full_test_suite/terraform-build.sh  |  1 +
 .../full_test_suite/terraform-destroy.sh      |  1 +
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b0e8ddd47..ddb34584e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -19,46 +19,46 @@ steps:
   - wait
 
 
-  # - label: ":cop::skin-tone-2: deploy check"
-  #   command: ".buildkite/steps/deploy-test.sh"
-  #   timeout: 90
-  #   agents:
-  #      queue: "testing"
-  #   artifact_paths:
-  #     - "proxy.log"
-  #     - "solana.log"
-  #     - "measurements.log"
-  #     - "evm_loader.log"
-  #     - "faucet.log"
-  #     - "airdropper.log"
-  #     - "indexer.log"
+  - label: ":cop::skin-tone-2: deploy check"
+    command: ".buildkite/steps/deploy-test.sh"
+    timeout: 90
+    agents:
+       queue: "testing"
+    artifact_paths:
+      - "proxy.log"
+      - "solana.log"
+      - "measurements.log"
+      - "evm_loader.log"
+      - "faucet.log"
+      - "airdropper.log"
+      - "indexer.log"
 
 
-  # - label: ":coverage: full test suite (FTS)"
-  #   key: "full_test_suite"
-  #   if: *main_if
-  #   commands:
-  #     - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
-  #   env:
-  #     FTS_THRESHOLD: 1700
-  #     FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-  #     FTS_IMAGE: neonlabsorg/full_test_suite:develop
-  #   agents:
-  #      queue: "testing"
-  #   artifact_paths:
-  #     - proxy.log
-  #     - solana.log
-  #     - measurements.log
-  #     - evm_loader.log
-  #     - dbcreation.log
-  #     - faucet.log
-  #     - airdropper.log
-  #     - indexer.log
-  #     - allure-reports.tar.gz
-  #     - fts_${BUILDKITE_BUILD_NUMBER}.log
+  - label: ":coverage: full test suite (FTS)"
+    key: "full_test_suite"
+    if: *main_if
+    commands:
+      - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
+    env:
+      FTS_THRESHOLD: 1700
+      FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+    agents:
+       queue: "testing"
+    artifact_paths:
+      - proxy.log
+      - solana.log
+      - measurements.log
+      - evm_loader.log
+      - dbcreation.log
+      - faucet.log
+      - airdropper.log
+      - indexer.log
+      - allure-reports.tar.gz
+      - fts_${BUILDKITE_BUILD_NUMBER}.log
 
 
-  # - wait
+  - wait
 
 
   - label: ":floppy_disk: publish image"
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
index c47627347..75f3b7c34 100755
--- a/.buildkite/steps/full_test_suite/run_full_test_suite.sh
+++ b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # External addresses from previous step
 PROXY_ADDR=`buildkite-agent meta-data get 'PROXY_IP'`
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index dba0b1623..6e86e6f6c 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index c5aabaecd..5b497b633 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 

From 0a69ab39cd3f86f2b4c0979239c0c8da5a3da600 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Tue, 22 Mar 2022 18:57:12 +0300
Subject: [PATCH 175/206] typo

---
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 5b497b633..3e85e684f 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -24,7 +24,7 @@ declare -a services=("evm_loader" "postgres" "dbcreation" "indexer" "proxy" "fau
 
 for service in "${services[@]}"
 do
-   echo "$servce"
+   echo "$service"
    ssh -i ${SSH_KEY} ubuntu@${REMOTE_HOST} "sudo docker logs $service > /tmp/$service.log 2>&1"
    scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/$service.log ${ARTIFACTS_LOGS}
 done

From 825d7ed3a54d4e5d9374fd9ab69f9ff419810e1d Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 09:29:03 +0300
Subject: [PATCH 176/206] rename

---
 .buildkite/pipeline.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ddb34584e..52740b970 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,10 +6,9 @@ steps:
 
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
-    if: &main_if |
-        true
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+    if: &is_fts_enabled |
+      (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+      (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:
@@ -36,7 +35,7 @@ steps:
 
   - label: ":coverage: full test suite (FTS)"
     key: "full_test_suite"
-    if: *main_if
+    if: *is_fts_enabled
     commands:
       - ".buildkite/steps/full_test_suite/run_full_test_suite.sh"
     env:
@@ -70,7 +69,7 @@ steps:
   - label: ":terraform: destroy infrastructure"
     agents:
       queue: "testing"
-    if: *main_if
+    if: *is_fts_enabled
     command:
       - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
     depends_on: 

From ec95ca397044a49fda3b7c02d4dfa1d348df7799 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 09:55:32 +0300
Subject: [PATCH 177/206] wip

---
 .buildkite/pipeline.yml         | 4 ++--
 .buildkite/steps/build-image.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 52740b970..7d34f6ca7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,8 +7,8 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &is_fts_enabled |
-      (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-      (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:
diff --git a/.buildkite/steps/build-image.sh b/.buildkite/steps/build-image.sh
index b0f4e068d..dc1524165 100755
--- a/.buildkite/steps/build-image.sh
+++ b/.buildkite/steps/build-image.sh
@@ -4,16 +4,16 @@ set -euo pipefail
 REVISION=$(git rev-parse HEAD)
 
 set ${SOLANA_REVISION:=v1.8.12-testnet}
-set ${NEON_EVM_COMMIT:=latest}
+set ${EVM_LOADER_REVISION:=latest}
 
 # Refreshing neonlabsorg/solana:latest image is required to run .buildkite/steps/build-image.sh locally
 docker pull neonlabsorg/solana:${SOLANA_REVISION}
 
 # Refreshing neonlabsorg/evm_loader:latest image is required to run .buildkite/steps/build-image.sh locally
-docker pull neonlabsorg/evm_loader:${NEON_EVM_COMMIT}
+docker pull neonlabsorg/evm_loader:${EVM_LOADER_REVISION}
 
 docker build -t neonlabsorg/proxy:${REVISION} \
     --build-arg SOLANA_REVISION=${SOLANA_REVISION} \
-    --build-arg NEON_EVM_COMMIT=${NEON_EVM_COMMIT} \
+    --build-arg EVM_LOADER_REVISION=${EVM_LOADER_REVISION} \
     --build-arg PROXY_REVISION=${REVISION} \
     .

From c79cb0c738fbd551994ed702d704f7084073014f Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 10:48:47 +0300
Subject: [PATCH 178/206] wip

---
 .buildkite/steps/build-image.sh | 6 +++---
 Dockerfile                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.buildkite/steps/build-image.sh b/.buildkite/steps/build-image.sh
index dc1524165..b0f4e068d 100755
--- a/.buildkite/steps/build-image.sh
+++ b/.buildkite/steps/build-image.sh
@@ -4,16 +4,16 @@ set -euo pipefail
 REVISION=$(git rev-parse HEAD)
 
 set ${SOLANA_REVISION:=v1.8.12-testnet}
-set ${EVM_LOADER_REVISION:=latest}
+set ${NEON_EVM_COMMIT:=latest}
 
 # Refreshing neonlabsorg/solana:latest image is required to run .buildkite/steps/build-image.sh locally
 docker pull neonlabsorg/solana:${SOLANA_REVISION}
 
 # Refreshing neonlabsorg/evm_loader:latest image is required to run .buildkite/steps/build-image.sh locally
-docker pull neonlabsorg/evm_loader:${EVM_LOADER_REVISION}
+docker pull neonlabsorg/evm_loader:${NEON_EVM_COMMIT}
 
 docker build -t neonlabsorg/proxy:${REVISION} \
     --build-arg SOLANA_REVISION=${SOLANA_REVISION} \
-    --build-arg EVM_LOADER_REVISION=${EVM_LOADER_REVISION} \
+    --build-arg NEON_EVM_COMMIT=${NEON_EVM_COMMIT} \
     --build-arg PROXY_REVISION=${REVISION} \
     .
diff --git a/Dockerfile b/Dockerfile
index 76fb0270b..906ea8a3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 ARG SOLANA_REVISION=v1.8.12-testnet
-ARG EVM_LOADER_REVISION=latest
+ARG NEON_EVM_COMMIT=latest
 
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS cli
 
-FROM neonlabsorg/evm_loader:${EVM_LOADER_REVISION} AS spl
+FROM neonlabsorg/evm_loader:${NEON_EVM_COMMIT} AS spl
 
 FROM ubuntu:20.04
 

From 1e486b174c71372ed4a29d5258ed51f9abf84300 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 11:41:36 +0300
Subject: [PATCH 179/206] ports

---
 .buildkite/steps/full_test_suite/proxy_init.sh          | 2 +-
 .buildkite/steps/full_test_suite/run_full_test_suite.sh | 2 +-
 .buildkite/steps/full_test_suite/terraform-build.sh     | 2 +-
 .buildkite/steps/full_test_suite/terraform.auto.tfvars  | 3 ---
 proxy/docker-compose-test.yml                           | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index d54c97345..4e3901db9 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -59,7 +59,7 @@ services:
       - NEON_OPERATOR_KEYFILE=/opt/faucet/id.json
       - SOLANA_COMMITMENT=confirmed
     ports:
-      - 3334:3333
+      - 3333:3333
     entrypoint: /opt/faucet/faucet --config /opt/proxy/faucet.conf run
   airdropper:
     environment:
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
index 75f3b7c34..e3bf2feb1 100755
--- a/.buildkite/steps/full_test_suite/run_full_test_suite.sh
+++ b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
@@ -7,7 +7,7 @@ SOLANA_ADDR=`buildkite-agent meta-data get 'SOLANA_IP'`
 
 # Create envirinment variables for tests
 export PROXY_URL="http://${PROXY_ADDR}:9091/solana"
-export FAUCET_URL="http://${PROXY_ADDR}:3334/request_neon"
+export FAUCET_URL="http://${PROXY_ADDR}:3333/request_neon"
 export SOLANA_URL="http://${SOLANA_ADDR}:8899"
 
 # Check variables
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 6e86e6f6c..7d6c177b1 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -7,7 +7,7 @@ cd .buildkite/steps/full_test_suite
 # Terraform part
 export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
-export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
+export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_VAR_neon_evm_revision=${NEON_EVM_COMMIT:-latest}
 export TF_VAR_proxy_model_revision=${BUILDKITE_COMMIT:-latest}
diff --git a/.buildkite/steps/full_test_suite/terraform.auto.tfvars b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
index 2fa398931..7db5a2d5a 100644
--- a/.buildkite/steps/full_test_suite/terraform.auto.tfvars
+++ b/.buildkite/steps/full_test_suite/terraform.auto.tfvars
@@ -1,6 +1,3 @@
-#neon_evm_revision    = "latest"
-#proxy_model_revision = "latest"
-
 aws_subnet           = "subnet-19f77872"
 allow_list           = ["172.31.0.0/16", "3.15.140.214/32", "18.219.70.113/32", "3.21.100.174/32", "3.137.181.30/32", "3.136.233.33/32", "142.132.171.62/32"]
 solana_instance_type = "t3.large"
diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml
index f13fb4a8e..9abb07321 100644
--- a/proxy/docker-compose-test.yml
+++ b/proxy/docker-compose-test.yml
@@ -131,7 +131,7 @@ services:
       TEST_FAUCET_INIT_NEON_BALANCE: 100000
     hostname: faucet
     ports:
-      - 127.0.0.1:3333:3333
+      - 3333
     expose:
       - "3333"
     networks:

From 0e910fbd79f554313746c2f9ae72e054dd53636a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 11:58:04 +0300
Subject: [PATCH 180/206] force run

---
 .buildkite/pipeline.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7d34f6ca7..4ae72dda5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,8 +7,9 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &is_fts_enabled |
-        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+        true
+#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:

From 63bd6daa220bca74f686ceba6c1aa2ab0fd745bc Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 13:39:26 +0300
Subject: [PATCH 181/206] Remove unused artifacts

---
 .buildkite/pipeline.yml                          |  8 --------
 .../docker-compose-full-test-suite.yml           | 16 ++++++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4ae72dda5..93fb6f3b7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -46,14 +46,6 @@ steps:
     agents:
        queue: "testing"
     artifact_paths:
-      - proxy.log
-      - solana.log
-      - measurements.log
-      - evm_loader.log
-      - dbcreation.log
-      - faucet.log
-      - airdropper.log
-      - indexer.log
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 00efbc8bb..60608cb0e 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -7,17 +7,13 @@ services:
     image: ${FTS_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
-      - NETWORK_NAME=night-stand
+      - NETWORK_NAME=${NETWORK_NAME}
       - PROXY_URL=${PROXY_URL}
-      - NETWORK_ID=111
-      - ADDRESS_FROM=
-      - ADDRESS_TO=
-      - PRIVATE_KEY=
-      - REQUEST_AMOUNT=20000
+      - NETWORK_ID=${NETWORK_ID}
+      - REQUEST_AMOUNT=${REQUEST_AMOUNT}
       - FAUCET_URL=${FAUCET_URL}
-      - USE_FAUCET=true
-      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
+      - USE_FAUCET=${USE_FAUCET}
       - SOLANA_URL=${SOLANA_URL}
-      - USERS_NUMBER=15
-      - JOBS_NUMBER=8
+      - USERS_NUMBER=${USERS_NUMBER}
+      - JOBS_NUMBER=${JOBS_NUMBER}
     network_mode: host

From d104c0bbec068da2548d8464b70f87d93977f73e Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 14:06:22 +0300
Subject: [PATCH 182/206] Show IPs

---
 .buildkite/steps/full_test_suite/terraform-build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 7d6c177b1..8f0a886ba 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -19,3 +19,8 @@ terraform apply --auto-approve=true
 # Get IPs
 terraform output --json | jq -r '.proxy_ip.value' | buildkite-agent meta-data set "PROXY_IP"
 terraform output --json | jq -r '.solana_ip.value' | buildkite-agent meta-data set "SOLANA_IP"
+
+
+# Show IPs
+buildkite-agent meta-data get 'PROXY_IP'
+buildkite-agent meta-data get 'SOLANA_IP'

From e0e35190841798a0f24ddb85218c4d77c0dac4a9 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 14:12:45 +0300
Subject: [PATCH 183/206] Revert "Remove unused artifacts"

This reverts commit 63bd6daa220bca74f686ceba6c1aa2ab0fd745bc.
---
 .buildkite/pipeline.yml                          |  8 ++++++++
 .../docker-compose-full-test-suite.yml           | 16 ++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 93fb6f3b7..4ae72dda5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -46,6 +46,14 @@ steps:
     agents:
        queue: "testing"
     artifact_paths:
+      - proxy.log
+      - solana.log
+      - measurements.log
+      - evm_loader.log
+      - dbcreation.log
+      - faucet.log
+      - airdropper.log
+      - indexer.log
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 60608cb0e..00efbc8bb 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -7,13 +7,17 @@ services:
     image: ${FTS_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
-      - NETWORK_NAME=${NETWORK_NAME}
+      - NETWORK_NAME=night-stand
       - PROXY_URL=${PROXY_URL}
-      - NETWORK_ID=${NETWORK_ID}
-      - REQUEST_AMOUNT=${REQUEST_AMOUNT}
+      - NETWORK_ID=111
+      - ADDRESS_FROM=
+      - ADDRESS_TO=
+      - PRIVATE_KEY=
+      - REQUEST_AMOUNT=20000
       - FAUCET_URL=${FAUCET_URL}
-      - USE_FAUCET=${USE_FAUCET}
+      - USE_FAUCET=true
+      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
       - SOLANA_URL=${SOLANA_URL}
-      - USERS_NUMBER=${USERS_NUMBER}
-      - JOBS_NUMBER=${JOBS_NUMBER}
+      - USERS_NUMBER=15
+      - JOBS_NUMBER=8
     network_mode: host

From e5eb73f05287964b11383a8a323381c675ce836a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 14:18:45 +0300
Subject: [PATCH 184/206] Remove unused artifacts

---
 .buildkite/pipeline.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4ae72dda5..93fb6f3b7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -46,14 +46,6 @@ steps:
     agents:
        queue: "testing"
     artifact_paths:
-      - proxy.log
-      - solana.log
-      - measurements.log
-      - evm_loader.log
-      - dbcreation.log
-      - faucet.log
-      - airdropper.log
-      - indexer.log
       - allure-reports.tar.gz
       - fts_${BUILDKITE_BUILD_NUMBER}.log
 

From 2a6ef9041999f921726016c48b86ce90f94fb5cf Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 15:19:51 +0300
Subject: [PATCH 185/206] Enable filter

---
 .buildkite/pipeline.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 93fb6f3b7..b92ee44a7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,9 +7,8 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &is_fts_enabled |
-        true
-#        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-#        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+        (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
     agents:
       queue: "testing"
     command:

From f487a6395162687c624249370db8ac1ce686e3b2 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 15:35:12 +0300
Subject: [PATCH 186/206] wip

---
 .buildkite/pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b92ee44a7..57d244e4f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -15,6 +15,7 @@ steps:
       - ".buildkite/steps/full_test_suite/terraform-build.sh"
 
 
+
   - wait
 
 

From 9a6a3383e3c30e9ee614059395ec9e3688d94cab Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 15:46:35 +0300
Subject: [PATCH 187/206] Revert "wip"

This reverts commit f487a6395162687c624249370db8ac1ce686e3b2.
---
 .buildkite/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 57d244e4f..b92ee44a7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -15,7 +15,6 @@ steps:
       - ".buildkite/steps/full_test_suite/terraform-build.sh"
 
 
-
   - wait
 
 

From 0565fb034ee37366f076649c36ec1cc973d26107 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <andrey@scalr.com>
Date: Wed, 23 Mar 2022 16:18:59 +0300
Subject: [PATCH 188/206] Refactoring

---
 .buildkite/pipeline.yml                         |  6 ++++++
 .../docker-compose-full-test-suite.yml          | 17 +++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index b92ee44a7..f6cb2c508 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,6 +42,12 @@ steps:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
       FTS_IMAGE: neonlabsorg/full_test_suite:develop
+      NETWORK_NAME: night-stand
+      NETWORK_ID: 111
+      REQUEST_AMOUNT: 20000
+      USE_FAUCET: true
+      USERS_NUMBER: 15
+      JOBS_NUMBER: 8
     agents:
        queue: "testing"
     artifact_paths:
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 00efbc8bb..84b852329 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -7,17 +7,14 @@ services:
     image: ${FTS_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
-      - NETWORK_NAME=night-stand
+      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
+      - NETWORK_NAME=${NETWORK_NAME}
       - PROXY_URL=${PROXY_URL}
-      - NETWORK_ID=111
-      - ADDRESS_FROM=
-      - ADDRESS_TO=
-      - PRIVATE_KEY=
-      - REQUEST_AMOUNT=20000
+      - NETWORK_ID=${NETWORK_ID}
+      - REQUEST_AMOUNT=${REQUEST_AMOUNT}
       - FAUCET_URL=${FAUCET_URL}
-      - USE_FAUCET=true
-      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
+      - USE_FAUCET=${USE_FAUCET}
       - SOLANA_URL=${SOLANA_URL}
-      - USERS_NUMBER=15
-      - JOBS_NUMBER=8
+      - USERS_NUMBER=${USERS_NUMBER}
+      - JOBS_NUMBER=${JOBS_NUMBER}
     network_mode: host

From 3170eb0ef4d9c6ede4c594c8db1784f53f80edfe Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Wed, 23 Mar 2022 17:13:29 +0300
Subject: [PATCH 189/206] small changes

---
 .buildkite/pipeline.yml                           | 2 +-
 docker-compose/docker-compose-full-test-suite.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f6cb2c508..5e72c9529 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -42,7 +42,7 @@ steps:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
       FTS_IMAGE: neonlabsorg/full_test_suite:develop
-      NETWORK_NAME: night-stand
+      NETWORK_NAME: full-test-suite-${BUILDKITE_BUILD_NUMBER}
       NETWORK_ID: 111
       REQUEST_AMOUNT: 20000
       USE_FAUCET: true
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 84b852329..60608cb0e 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -7,7 +7,6 @@ services:
     image: ${FTS_IMAGE:-neonlabsorg/develop}
     entrypoint: ./run-test.sh 2>/dev/null
     environment:
-      - SOLANA_EXPLORER=https://explorer.solana.com/?cluster=custom&customUrl=http://proxy.night.stand.neontest.xyz/node-solana
       - NETWORK_NAME=${NETWORK_NAME}
       - PROXY_URL=${PROXY_URL}
       - NETWORK_ID=${NETWORK_ID}

From ad2eeacb6d861d5d7ae9178dec9738705214ae54 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 23 Mar 2022 21:33:52 +0400
Subject: [PATCH 190/206] Renaming

---
 .buildkite/pipeline.yml                           | 8 ++++----
 docker-compose/docker-compose-full-test-suite.yml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5e72c9529..a8b63ebe0 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -8,7 +8,7 @@ steps:
     key: "create_infrastructure"
     if: &is_fts_enabled |
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
-        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")    
+        (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     agents:
       queue: "testing"
     command:
@@ -46,8 +46,8 @@ steps:
       NETWORK_ID: 111
       REQUEST_AMOUNT: 20000
       USE_FAUCET: true
-      USERS_NUMBER: 15
-      JOBS_NUMBER: 8
+      FTS_USERS_NUMBER: 15
+      FTS_JOBS_NUMBER: 8
     agents:
        queue: "testing"
     artifact_paths:
@@ -70,7 +70,7 @@ steps:
     if: *is_fts_enabled
     command:
       - ".buildkite/steps/full_test_suite/terraform-destroy.sh"
-    depends_on: 
+    depends_on:
       - "full_test_suite"
       - "create_infrastructure"
     allow_dependency_failure: true
diff --git a/docker-compose/docker-compose-full-test-suite.yml b/docker-compose/docker-compose-full-test-suite.yml
index 60608cb0e..de6f1c656 100644
--- a/docker-compose/docker-compose-full-test-suite.yml
+++ b/docker-compose/docker-compose-full-test-suite.yml
@@ -5,7 +5,7 @@ services:
   full_test_suite:
     container_name: ${FTS_CONTAINER_NAME:-full_test_suite}
     image: ${FTS_IMAGE:-neonlabsorg/develop}
-    entrypoint: ./run-test.sh 2>/dev/null
+    entrypoint: ./run-full-test-suite.sh 2>/dev/null
     environment:
       - NETWORK_NAME=${NETWORK_NAME}
       - PROXY_URL=${PROXY_URL}
@@ -14,6 +14,6 @@ services:
       - FAUCET_URL=${FAUCET_URL}
       - USE_FAUCET=${USE_FAUCET}
       - SOLANA_URL=${SOLANA_URL}
-      - USERS_NUMBER=${USERS_NUMBER}
-      - JOBS_NUMBER=${JOBS_NUMBER}
+      - FTS_USERS_NUMBER=${FTS_USERS_NUMBER}
+      - FTS_JOBS_NUMBER=${FTS_JOBS_NUMBER}
     network_mode: host

From 4f05ffbf6f279a0583abb31198d4d60fcf012556 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 23 Mar 2022 22:17:39 +0400
Subject: [PATCH 191/206] Get rid of useless tf variables

---
 .buildkite/steps/full_test_suite/terraform-build.sh   | 2 --
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 2 --
 .buildkite/steps/full_test_suite/vars.tf              | 9 ---------
 3 files changed, 13 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 8f0a886ba..91e7355cf 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -9,8 +9,6 @@ export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
-export TF_VAR_neon_evm_revision=${NEON_EVM_COMMIT:-latest}
-export TF_VAR_proxy_model_revision=${BUILDKITE_COMMIT:-latest}
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 3e85e684f..6d2611ffd 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -35,8 +35,6 @@ export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
-export TF_VAR_neon_evm_revision=latest
-export TF_VAR_proxy_model_revision=latest
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 terraform init $TF_BACKEND_CONFIG
 terraform destroy --auto-approve=true
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index 3210acccd..560e922f1 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -24,12 +24,3 @@ variable "ami" {
 variable "branch" {
   type = string
 }
-
-variable "neon_evm_revision" {
-  type = string
-}
-
-variable "proxy_model_revision" {
-  type = string
-}
-

From 3e977e96a05e6121e053e00b35e9e86383d63eff Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 23 Mar 2022 23:17:05 +0400
Subject: [PATCH 192/206] check generating keys

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a8b63ebe0..24b6cfb82 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -41,7 +41,7 @@ steps:
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
       NETWORK_NAME: full-test-suite-${BUILDKITE_BUILD_NUMBER}
       NETWORK_ID: 111
       REQUEST_AMOUNT: 20000

From 60580f6a11568f8983745c52105939b57f531e2b Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 23 Mar 2022 23:33:54 +0400
Subject: [PATCH 193/206] rename variable USER_NUMBER, FTS_JOBS_NUMBER

---
 .buildkite/pipeline.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 24b6cfb82..5bbb53b38 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -41,13 +41,13 @@ steps:
     env:
       FTS_THRESHOLD: 1700
       FTS_CONTAINER_NAME: fts_${BUILDKITE_BUILD_NUMBER}
-      FTS_IMAGE: neonlabsorg/full_test_suite:583-full-test-suite
+      FTS_IMAGE: neonlabsorg/full_test_suite:develop
+      FTS_USERS_NUMBER: 15
+      FTS_JOBS_NUMBER: 8
       NETWORK_NAME: full-test-suite-${BUILDKITE_BUILD_NUMBER}
       NETWORK_ID: 111
       REQUEST_AMOUNT: 20000
       USE_FAUCET: true
-      FTS_USERS_NUMBER: 15
-      FTS_JOBS_NUMBER: 8
     agents:
        queue: "testing"
     artifact_paths:

From 71e3adcd944566491c97e1b0b8195bdf4b4ef832 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Wed, 23 Mar 2022 23:41:03 +0400
Subject: [PATCH 194/206] Log reading elf params

---
 proxy/environment.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proxy/environment.py b/proxy/environment.py
index d43647ba1..e4af279a5 100644
--- a/proxy/environment.py
+++ b/proxy/environment.py
@@ -150,11 +150,14 @@ def version(self):
             raise
 
 
-def read_elf_params(out_dict):
+@logged_group("neon.Proxy")
+def read_elf_params(out_dict, *, logger):
+    logger.debug("Read ELF params")
     for param in neon_cli().call("neon-elf-params").splitlines():
         if param.startswith('NEON_') and '=' in param:
             v = param.split('=')
             out_dict[v[0]] = v[1]
+            logger.debug(f"ELF param: {v[0]}: {v[1]}")
 
 
 ELF_PARAMS = {}

From c5c540a5677722d78dde2b15326af2e65cfa61d5 Mon Sep 17 00:00:00 2001
From: rozhkovdmitrii <rozhkovdmitrii@yandex.ru>
Date: Thu, 24 Mar 2022 09:50:41 +0400
Subject: [PATCH 195/206] rename variable USER_NUMBER, FTS_JOBS_NUMBER

---
 .buildkite/pipeline.yml                                 | 1 +
 .buildkite/steps/full_test_suite/run_full_test_suite.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5bbb53b38..a79ab6076 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -28,6 +28,7 @@ steps:
       - "solana.log"
       - "measurements.log"
       - "evm_loader.log"
+      - "dbcreation.log"
       - "faucet.log"
       - "airdropper.log"
       - "indexer.log"
diff --git a/.buildkite/steps/full_test_suite/run_full_test_suite.sh b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
index e3bf2feb1..9c1945195 100755
--- a/.buildkite/steps/full_test_suite/run_full_test_suite.sh
+++ b/.buildkite/steps/full_test_suite/run_full_test_suite.sh
@@ -30,4 +30,4 @@ docker-compose -f docker-compose/docker-compose-full-test-suite.yml rm -f
 echo Full test passing - ${FTS_RESULT}
 echo Full test threshold - ${FTS_THRESHOLD}
 echo Check if ${FTS_RESULT} is greater or equeal ${FTS_THRESHOLD}
-test ${FTS_RESULT} -ge ${FTS_THRESHOLD}
\ No newline at end of file
+test ${FTS_RESULT} -ge ${FTS_THRESHOLD}

From 14da72ff574e8345122daa453ca4f53541144f4b Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 09:03:31 +0300
Subject: [PATCH 196/206] Fix proxy revision

---
 .buildkite/steps/full_test_suite/main.tf            | 2 +-
 .buildkite/steps/full_test_suite/terraform-build.sh | 3 +++
 .buildkite/steps/full_test_suite/vars.tf            | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.buildkite/steps/full_test_suite/main.tf b/.buildkite/steps/full_test_suite/main.tf
index 47ee444e2..ebede1536 100644
--- a/.buildkite/steps/full_test_suite/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -36,7 +36,7 @@ data "template_file" "proxy_init" {
 
   vars = {
     branch    = "${var.branch}"
-    revision  = "latest"
+    revision  = "${var.revision}"
     solana_ip = aws_instance.solana.private_ip
   }
 }
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 91e7355cf..3f2cbf79c 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,6 +3,8 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
+NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
+PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
 export TF_VAR_branch=${BUILDKITE_BRANCH}
@@ -10,6 +12,7 @@ export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
+export TF_VAR_revision=${PROXY_MODEL_COMMIT}
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index 560e922f1..77443634c 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -24,3 +24,8 @@ variable "ami" {
 variable "branch" {
   type = string
 }
+
+
+variable "revision" {
+  type = string
+}

From 6b73bb838bb84d908f0a26e344e82a7539355963 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 09:50:54 +0300
Subject: [PATCH 197/206] fix vars

---
 .buildkite/steps/full_test_suite/terraform-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 3f2cbf79c..cbd3b83b4 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,8 +3,8 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
-NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
-PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
+export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
+export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
 export TF_VAR_branch=${BUILDKITE_BRANCH}

From 199f296a1b653948e37099ecf928af5ffe8a6c85 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 10:05:02 +0300
Subject: [PATCH 198/206] var neon_evm_commit

---
 .buildkite/steps/full_test_suite/main.tf            | 7 ++++---
 .buildkite/steps/full_test_suite/proxy_init.sh      | 1 +
 .buildkite/steps/full_test_suite/terraform-build.sh | 2 +-
 .buildkite/steps/full_test_suite/vars.tf            | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/main.tf b/.buildkite/steps/full_test_suite/main.tf
index ebede1536..b1c9bd4f3 100644
--- a/.buildkite/steps/full_test_suite/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -35,9 +35,10 @@ data "template_file" "proxy_init" {
   template = file("proxy_init.sh")
 
   vars = {
-    branch    = "${var.branch}"
-    revision  = "${var.revision}"
-    solana_ip = aws_instance.solana.private_ip
+    branch          = "${var.branch}"
+    revision        = "${var.revision}"
+    solana_ip       = aws_instance.solana.private_ip
+    neon_evm_commit = "${var.neon_evm_commit}"
   }
 }
 
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 4e3901db9..94587537e 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -24,6 +24,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 # Set required environment variables
 export REVISION=${revision}
 export SOLANA_URL=http:\/\/${solana_ip}:8899
+export NEON_EVM_COMMIT=${neon_evm_commit}
 
 
 # Generate docker-compose override file
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index cbd3b83b4..8e58ef7e1 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,7 +3,6 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
-export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
@@ -13,6 +12,7 @@ export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 export TF_VAR_revision=${PROXY_MODEL_COMMIT}
+export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT:-latest}
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index 77443634c..a9d0ecda2 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -29,3 +29,9 @@ variable "branch" {
 variable "revision" {
   type = string
 }
+
+
+variable "neon_evm_commit" {
+  type = string
+}
+

From 05d58f943201afc4d8a1268bd83cf53453273756 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 10:56:09 +0300
Subject: [PATCH 199/206] Rename revision

---
 .buildkite/steps/full_test_suite/main.tf            | 8 ++++----
 .buildkite/steps/full_test_suite/proxy_init.sh      | 2 +-
 .buildkite/steps/full_test_suite/terraform-build.sh | 5 +++--
 .buildkite/steps/full_test_suite/vars.tf            | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/main.tf b/.buildkite/steps/full_test_suite/main.tf
index b1c9bd4f3..bab653f3b 100644
--- a/.buildkite/steps/full_test_suite/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -35,10 +35,10 @@ data "template_file" "proxy_init" {
   template = file("proxy_init.sh")
 
   vars = {
-    branch          = "${var.branch}"
-    revision        = "${var.revision}"
-    solana_ip       = aws_instance.solana.private_ip
-    neon_evm_commit = "${var.neon_evm_commit}"
+    branch             = "${var.branch}"
+    proxy_model_commit = "${var.proxy_model_commit}"
+    solana_ip          = aws_instance.solana.private_ip
+    neon_evm_commit    = "${var.neon_evm_commit}"
   }
 }
 
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 94587537e..8d7a44799 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -22,7 +22,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 
 
 # Set required environment variables
-export REVISION=${revision}
+export REVISION=${proxy_model_commit}
 export SOLANA_URL=http:\/\/${solana_ip}:8899
 export NEON_EVM_COMMIT=${neon_evm_commit}
 
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 8e58ef7e1..d5ead7da1 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
+export NEON_EVM_COMMIT=${BUILDKITE_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
@@ -11,8 +12,8 @@ export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-export TF_VAR_revision=${PROXY_MODEL_COMMIT}
-export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT:-latest}
+export TF_VAR_proxy_model_commit=${PROXY_MODEL_COMMIT}
+export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index a9d0ecda2..190b233de 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -26,7 +26,7 @@ variable "branch" {
 }
 
 
-variable "revision" {
+variable "proxy_model_commit" {
   type = string
 }
 

From 652061065ebe4815268190df8e1fc0775d2ee557 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 11:00:40 +0300
Subject: [PATCH 200/206] Revert "Rename revision"

This reverts commit 05d58f943201afc4d8a1268bd83cf53453273756.
---
 .buildkite/steps/full_test_suite/main.tf            | 8 ++++----
 .buildkite/steps/full_test_suite/proxy_init.sh      | 2 +-
 .buildkite/steps/full_test_suite/terraform-build.sh | 5 ++---
 .buildkite/steps/full_test_suite/vars.tf            | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/main.tf b/.buildkite/steps/full_test_suite/main.tf
index bab653f3b..b1c9bd4f3 100644
--- a/.buildkite/steps/full_test_suite/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -35,10 +35,10 @@ data "template_file" "proxy_init" {
   template = file("proxy_init.sh")
 
   vars = {
-    branch             = "${var.branch}"
-    proxy_model_commit = "${var.proxy_model_commit}"
-    solana_ip          = aws_instance.solana.private_ip
-    neon_evm_commit    = "${var.neon_evm_commit}"
+    branch          = "${var.branch}"
+    revision        = "${var.revision}"
+    solana_ip       = aws_instance.solana.private_ip
+    neon_evm_commit = "${var.neon_evm_commit}"
   }
 }
 
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 8d7a44799..94587537e 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -22,7 +22,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 
 
 # Set required environment variables
-export REVISION=${proxy_model_commit}
+export REVISION=${revision}
 export SOLANA_URL=http:\/\/${solana_ip}:8899
 export NEON_EVM_COMMIT=${neon_evm_commit}
 
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index d5ead7da1..8e58ef7e1 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,7 +3,6 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
-export NEON_EVM_COMMIT=${BUILDKITE_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
@@ -12,8 +11,8 @@ export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-export TF_VAR_proxy_model_commit=${PROXY_MODEL_COMMIT}
-export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
+export TF_VAR_revision=${PROXY_MODEL_COMMIT}
+export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT:-latest}
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index 190b233de..a9d0ecda2 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -26,7 +26,7 @@ variable "branch" {
 }
 
 
-variable "proxy_model_commit" {
+variable "revision" {
   type = string
 }
 

From 15c52a5209d1dd79652c471c021d6b8b0fce520a Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 11:56:53 +0300
Subject: [PATCH 201/206] variables

---
 .buildkite/steps/full_test_suite/terraform-build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 8e58ef7e1..43c1bda58 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
+export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 # Terraform part
@@ -12,7 +13,7 @@ export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 export TF_VAR_revision=${PROXY_MODEL_COMMIT}
-export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT:-latest}
+export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 

From 79dea5c10a75c5812abd738b9255f117cf19b5ef Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 12:08:06 +0300
Subject: [PATCH 202/206] debug

---
 .buildkite/steps/full_test_suite/terraform-build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 43c1bda58..f87764a7e 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,6 +3,8 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
+env
+
 export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
@@ -14,6 +16,9 @@ export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
 export TF_VAR_revision=${PROXY_MODEL_COMMIT}
 export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
+
+env
+
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 

From fcbd0584fbdd2f28c60a396c1a457bcb43ca12e3 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 13:19:39 +0300
Subject: [PATCH 203/206] destroy

---
 .buildkite/steps/full_test_suite/terraform-build.sh   | 4 ----
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index f87764a7e..1c9855a90 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -3,8 +3,6 @@ set -euo pipefail
 
 cd .buildkite/steps/full_test_suite
 
-env
-
 export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
 export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
@@ -17,8 +15,6 @@ export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-co
 export TF_VAR_revision=${PROXY_MODEL_COMMIT}
 export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
 
-env
-
 terraform init ${TF_BACKEND_CONFIG}
 terraform apply --auto-approve=true
 
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 6d2611ffd..fbc8f2df6 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -29,9 +29,11 @@ do
    scp -i ${SSH_KEY} ubuntu@${REMOTE_HOST}:/tmp/$service.log ${ARTIFACTS_LOGS}
 done
 
+export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
 
 ### Clean infrastructure by terraform
 export TF_VAR_branch=${BUILDKITE_BRANCH}
+export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"

From 609946700fc9b0b7cda99dab5a4d94ddcfd1067f Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 14:03:06 +0300
Subject: [PATCH 204/206] destroy

---
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index fbc8f2df6..60307e749 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -30,10 +30,12 @@ do
 done
 
 export NEON_EVM_COMMIT=${NEON_EVM_COMMIT:-latest}
+export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 
 ### Clean infrastructure by terraform
 export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
+export TF_VAR_revision=${PROXY_MODEL_COMMIT}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"

From bcbdfd3ce2e401135839f7bbf84cbf84d3266877 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 19:14:05 +0300
Subject: [PATCH 205/206] revision

---
 .buildkite/pipeline.yml                               | 1 +
 .buildkite/steps/full_test_suite/main.tf              | 8 ++++----
 .buildkite/steps/full_test_suite/proxy_init.sh        | 2 +-
 .buildkite/steps/full_test_suite/terraform-build.sh   | 2 +-
 .buildkite/steps/full_test_suite/terraform-destroy.sh | 2 +-
 .buildkite/steps/full_test_suite/vars.tf              | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a79ab6076..104effb62 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,6 +7,7 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &is_fts_enabled |
+        true ||
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     agents:
diff --git a/.buildkite/steps/full_test_suite/main.tf b/.buildkite/steps/full_test_suite/main.tf
index b1c9bd4f3..bab653f3b 100644
--- a/.buildkite/steps/full_test_suite/main.tf
+++ b/.buildkite/steps/full_test_suite/main.tf
@@ -35,10 +35,10 @@ data "template_file" "proxy_init" {
   template = file("proxy_init.sh")
 
   vars = {
-    branch          = "${var.branch}"
-    revision        = "${var.revision}"
-    solana_ip       = aws_instance.solana.private_ip
-    neon_evm_commit = "${var.neon_evm_commit}"
+    branch             = "${var.branch}"
+    proxy_model_commit = "${var.proxy_model_commit}"
+    solana_ip          = aws_instance.solana.private_ip
+    neon_evm_commit    = "${var.neon_evm_commit}"
   }
 }
 
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 94587537e..8d7a44799 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -22,7 +22,7 @@ curl -O https://raw.githubusercontent.com/neonlabsorg/proxy-model.py/${branch}/p
 
 
 # Set required environment variables
-export REVISION=${revision}
+export REVISION=${proxy_model_commit}
 export SOLANA_URL=http:\/\/${solana_ip}:8899
 export NEON_EVM_COMMIT=${neon_evm_commit}
 
diff --git a/.buildkite/steps/full_test_suite/terraform-build.sh b/.buildkite/steps/full_test_suite/terraform-build.sh
index 1c9855a90..4500fd9c1 100755
--- a/.buildkite/steps/full_test_suite/terraform-build.sh
+++ b/.buildkite/steps/full_test_suite/terraform-build.sh
@@ -12,7 +12,7 @@ export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-${BUILDKITE_COMMIT}"
 export TFSTATE_REGION="us-east-2"
 export TF_BACKEND_CONFIG="-backend-config="bucket=${TFSTATE_BUCKET}" -backend-config="key=${TFSTATE_KEY}" -backend-config="region=${TFSTATE_REGION}""
-export TF_VAR_revision=${PROXY_MODEL_COMMIT}
+export TF_VAR_proxy_model_commit=${PROXY_MODEL_COMMIT}
 export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
 
 terraform init ${TF_BACKEND_CONFIG}
diff --git a/.buildkite/steps/full_test_suite/terraform-destroy.sh b/.buildkite/steps/full_test_suite/terraform-destroy.sh
index 60307e749..bef80b5d1 100755
--- a/.buildkite/steps/full_test_suite/terraform-destroy.sh
+++ b/.buildkite/steps/full_test_suite/terraform-destroy.sh
@@ -35,7 +35,7 @@ export PROXY_MODEL_COMMIT=${BUILDKITE_COMMIT}
 ### Clean infrastructure by terraform
 export TF_VAR_branch=${BUILDKITE_BRANCH}
 export TF_VAR_neon_evm_commit=${NEON_EVM_COMMIT}
-export TF_VAR_revision=${PROXY_MODEL_COMMIT}
+export TF_VAR_proxy_model_commit=${PROXY_MODEL_COMMIT}
 export TFSTATE_BUCKET="nl-ci-stands"
 export TFSTATE_KEY="tests/test-$BUILDKITE_COMMIT"
 export TFSTATE_REGION="us-east-2"
diff --git a/.buildkite/steps/full_test_suite/vars.tf b/.buildkite/steps/full_test_suite/vars.tf
index a9d0ecda2..190b233de 100644
--- a/.buildkite/steps/full_test_suite/vars.tf
+++ b/.buildkite/steps/full_test_suite/vars.tf
@@ -26,7 +26,7 @@ variable "branch" {
 }
 
 
-variable "revision" {
+variable "proxy_model_commit" {
   type = string
 }
 

From 95eda88ba3d50c4b461daac2b91c2f256e403b17 Mon Sep 17 00:00:00 2001
From: Andrey Voloshin <vo@neonlabs.org>
Date: Thu, 24 Mar 2022 19:56:30 +0300
Subject: [PATCH 206/206] conditional

---
 .buildkite/pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 104effb62..a79ab6076 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,7 +7,6 @@ steps:
   - label: ":terraform: build infrastructure"
     key: "create_infrastructure"
     if: &is_fts_enabled |
-        true ||
         (build.pull_request.base_branch == "develop" && !build.pull_request.draft) ||
         (build.source == "trigger_job" && build.env("NEON_EVM_FULL_TEST_SUITE") == "true")
     agents: