From 591cdf88f32acd216eaedf03fb1cba8e60b57e80 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Sat, 9 Nov 2019 15:14:06 +0300
Subject: [PATCH] Added binance_net network in docker configs, updated
 validator configs

---
 demo/validator1/.env.development              | 10 ++++---
 demo/validator2/.env.development              | 10 ++++---
 demo/validator3/.env.development              | 10 ++++---
 package.json                                  |  4 ---
 src/binance-testnet/run.sh                    | 27 +++++++++++++++++--
 src/oracle/docker-compose-test.yml            |  5 ++++
 .../binanceSend/.env.development              |  2 +-
 7 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/demo/validator1/.env.development b/demo/validator1/.env.development
index 6335b08..2987613 100644
--- a/demo/validator1/.env.development
+++ b/demo/validator1/.env.development
@@ -7,9 +7,13 @@ HOME_MAX_FETCH_RANGE_SIZE=10
 SIDE_RPC_URL=http://ganache_side:8545
 SIDE_SHARED_DB_ADDRESS=0xd5fE0D28e058D375b0b038fFbB446Da37E85fFdc
 
-FOREIGN_URL=https://testnet-dex.binance.org/
-FOREIGN_CHAIN_ID=Binance-Chain-Nile
-FOREIGN_ASSET=KFT-94F
+#FOREIGN_URL=https://testnet-dex.binance.org/
+#FOREIGN_CHAIN_ID=Binance-Chain-Nile
+#FOREIGN_ASSET=KFT-94F
+FOREIGN_URL=http://node:8000
+FOREIGN_CHAIN_ID=Binance-Dev
+FOREIGN_ASSET=DEV-996
+
 FOREIGN_FETCH_MAX_TIME_INTERVAL=60000
 FOREIGN_FETCH_INTERVAL=5000
 FOREIGN_FETCH_BLOCK_TIME_OFFSET=10000
diff --git a/demo/validator2/.env.development b/demo/validator2/.env.development
index 305ec1d..d250505 100644
--- a/demo/validator2/.env.development
+++ b/demo/validator2/.env.development
@@ -7,9 +7,13 @@ HOME_MAX_FETCH_RANGE_SIZE=10
 SIDE_RPC_URL=http://ganache_side:8545
 SIDE_SHARED_DB_ADDRESS=0xd5fE0D28e058D375b0b038fFbB446Da37E85fFdc
 
-FOREIGN_URL=https://testnet-dex.binance.org/
-FOREIGN_CHAIN_ID=Binance-Chain-Nile
-FOREIGN_ASSET=KFT-94F
+#FOREIGN_URL=https://testnet-dex.binance.org/
+#FOREIGN_CHAIN_ID=Binance-Chain-Nile
+#FOREIGN_ASSET=KFT-94F
+FOREIGN_URL=http://node:8000
+FOREIGN_CHAIN_ID=Binance-Dev
+FOREIGN_ASSET=DEV-996
+
 FOREIGN_FETCH_MAX_TIME_INTERVAL=60000
 FOREIGN_FETCH_INTERVAL=5000
 FOREIGN_FETCH_BLOCK_TIME_OFFSET=10000
diff --git a/demo/validator3/.env.development b/demo/validator3/.env.development
index 7025ee3..6ee1766 100644
--- a/demo/validator3/.env.development
+++ b/demo/validator3/.env.development
@@ -7,9 +7,13 @@ HOME_MAX_FETCH_RANGE_SIZE=10
 SIDE_RPC_URL=http://ganache_side:8545
 SIDE_SHARED_DB_ADDRESS=0xd5fE0D28e058D375b0b038fFbB446Da37E85fFdc
 
-FOREIGN_URL=https://testnet-dex.binance.org/
-FOREIGN_CHAIN_ID=Binance-Chain-Nile
-FOREIGN_ASSET=KFT-94F
+#FOREIGN_URL=https://testnet-dex.binance.org/
+#FOREIGN_CHAIN_ID=Binance-Chain-Nile
+#FOREIGN_ASSET=KFT-94F
+FOREIGN_URL=http://node:8000
+FOREIGN_CHAIN_ID=Binance-Dev
+FOREIGN_ASSET=DEV-996
+
 FOREIGN_FETCH_MAX_TIME_INTERVAL=60000
 FOREIGN_FETCH_INTERVAL=5000
 FOREIGN_FETCH_BLOCK_TIME_OFFSET=10000
diff --git a/package.json b/package.json
index 38bf0fb..e954bd9 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,5 @@
   },
   "engines": {
     "node": ">=10.6.0"
-  },
-  "dependencies": {
-    "@binance-chain/javascript-sdk": "^2.16.1",
-    "@tendermint/amino-js": "^0.4.5"
   }
 }
diff --git a/src/binance-testnet/run.sh b/src/binance-testnet/run.sh
index a8ddf37..7216460 100755
--- a/src/binance-testnet/run.sh
+++ b/src/binance-testnet/run.sh
@@ -2,8 +2,31 @@
 
 set -e
 
+tbnbcli() {
+    echo 12345678 | docker exec -i binance-testnet_node_1 ./tbnbcli $@ --from node0 --node http://node:26657 --chain-id Binance-Dev --json
+}
+
+echo "Removing old environment"
+docker kill $(docker ps -a | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true
+docker rm $(docker ps -a | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true
+docker volume rm binance-testnet_marketdata > /dev/null 2>&1 || true
+
 docker network create binance_net > /dev/null 2>&1 || true
 
-docker build -t testnet-binaries .
+echo "Building required binaries"
+docker build -t testnet-binaries . > /dev/null 2>&1 || true
 
-docker-compose up --build
+echo "Running environment"
+docker-compose up --build -d
+
+sleep 2
+
+echo "Issuing test asset"
+ISSUED_LOG=$(tbnbcli token issue --symbol DEV --total-supply 1000000000000 --token-name "DEV Token" | jq .Response.log)
+TOKEN_SYMBOL=${ISSUED_LOG:(-8):7}
+echo "Issued $TOKEN_SYMBOL"
+
+sleep 2
+
+echo "Sending tokens to controlled address"
+tbnbcli token multi-send --transfers '[{"to":"tbnb1z7u9f8mcuwxanns9xa6qgjtlka0d392epc0m9x","amount":"1000000000000:BNB,1000000000000:'"$TOKEN_SYMBOL"'"}]'
\ No newline at end of file
diff --git a/src/oracle/docker-compose-test.yml b/src/oracle/docker-compose-test.yml
index d331ee7..c626a47 100644
--- a/src/oracle/docker-compose-test.yml
+++ b/src/oracle/docker-compose-test.yml
@@ -23,6 +23,7 @@ services:
       - test_network
       - blockchain_home
       - blockchain_side
+      - binance_net
   keygen:
     image: keygen-client
     build:
@@ -57,6 +58,7 @@ services:
       - '${SIGN_RESTART_PORT}:8001'
     networks:
       - test_network
+      - binance_net
   redis:
     image: redis
     build:
@@ -111,9 +113,12 @@ services:
       - '${PWD}/${TARGET_NETWORK}/keys:/keys'
     networks:
       - test_network
+      - binance_net
 networks:
   test_network:
   blockchain_side:
     external: true
   blockchain_home:
     external: true
+  binance_net:
+    external: true
diff --git a/src/test-services/binanceSend/.env.development b/src/test-services/binanceSend/.env.development
index 9660ff3..212c788 100644
--- a/src/test-services/binanceSend/.env.development
+++ b/src/test-services/binanceSend/.env.development
@@ -1,4 +1,4 @@
 FOREIGN_URL=https://testnet-dex.binance.org/
 FOREIGN_ASSET=KFT-94F
 
-#FOREIGN_PRIVATE_KEY is taken from src/test-services/.keys.development
+FOREIGN_PRIVATE_KEY=dd5ec5a7abe9d1fff21170ae591085f000fc6fd9ca0107fe047593f44e328e40