Merge branch 'cudos-dev' into cudos-master

.vscode/tasks.json

@@ -8,6 +8,25 @@
             "type": "shell",
             "group": "build"
         },
+        //TENDERMINT load test
+        {
+            "label": "Run TENDERMINT LOAD TEST LOCAL in docker",
+            "command": "cd ./docker/tendermint-load-tester && docker-compose --env-file ./tendermint-load-tester.local.arg -f ./tendermint-load-tester.yml -p tendermint-load-tester up --build",
+            "type": "shell",
+            "group": "build"
+        },
+        {
+            "label": "Run TENDERMINT LOAD TEST PRIVATE in docker",
+            "command": "cd ./docker/tendermint-load-tester && docker-compose --env-file ./tendermint-load-tester.private.arg -f ./tendermint-load-tester.yml -p tendermint-load-tester up --build",
+            "type": "shell",
+            "group": "build"
+        },
+        {
+            "label": "Run TENDERMINT LOAD TEST PUBLIC in docker",
+            "command": "cd ./docker/tendermint-load-tester && docker-compose --env-file ./tendermint-load-tester.public.arg -f ./tendermint-load-tester.yml -p tendermint-load-tester up --build",
+            "type": "shell",
+            "group": "build"
+        },
         //hermes-ibc-relayer
         {
             "label": "Build HERMES-IBC-RELAYER BINARY BUILDER in docker",

docker/tendermint-load-tester/tendermint-load-tester.dockerfile

@@ -0,0 +1,25 @@
+FROM golang:buster
+
+ARG USER_ID
+ARG USER_NAME
+ARG GROUP_ID
+ARG GROUP_NAME
+ARG TESTER_HOME
+
+RUN if [ $USER_NAME != 'root' ]; then \
+        addgroup -gid ${GROUP_ID} $GROUP_NAME; \
+        adduser --disabled-password -gecos "" -uid ${USER_ID} -gid ${GROUP_ID} ${USER_NAME}; \
+    fi
+
+WORKDIR ${TESTER_HOME}
+
+RUN apt-get update
+
+RUN git clone https://github.com/informalsystems/tm-load-test.git TendermintLoadTester && \
+    cd TendermintLoadTester && \
+    git checkout v1.0.0 && \
+    make
+
+CMD ["/bin/bash", "-c", "./TendermintLoadTester/build/tm-load-test -c ${CONNECTIONS} -T ${DURATION} -r ${TX_RATE} -s ${TX_SIZE} \
+    --endpoints ${ENDPOINTS} \
+    --stats-output ${TESTER_HOME}/stats.csv"];

docker/tendermint-load-tester/tendermint-load-tester.env.example

@@ -0,0 +1,5 @@
+ENDPOINTS="ws://tm-endpoint1.somewhere.com:26657/websocket,ws://tm-endpoint2.somewhere.com:26657/websocket"
+CONNECTIONS=1
+DURATION=10
+TX_RATE=1000
+TX_SIZE=250

docker/tendermint-load-tester/tendermint-load-tester.local.arg

@@ -0,0 +1,2 @@
+TESTER_HOME=/usr/tendermint
+ENV_FILE=./tendermint-load-tester.local.env

docker/tendermint-load-tester/tendermint-load-tester.private.arg

@@ -0,0 +1,2 @@
+TESTER_HOME=/usr/tendermint
+ENV_FILE=./tendermint-load-tester.private.env

docker/tendermint-load-tester/tendermint-load-tester.public.arg

@@ -0,0 +1,2 @@
+TESTER_HOME=/usr/tendermint
+ENV_FILE=./tendermint-load-tester.public.env

docker/tendermint-load-tester/tendermint-load-tester.yml

@@ -0,0 +1,22 @@
+version: '3.1'
+
+networks:
+  shared-cudos-network:
+    name: shared-cudos-network
+
+services:
+  tendermint-load-tester:
+    image: tendermint-load-tester
+    container_name: tendermint-load-tester
+    build:
+      dockerfile: CudosBuilders/docker/tendermint-load-tester/tendermint-load-tester.dockerfile
+      context: ../../../
+      args:
+        USER_ID: "0"
+        USER_NAME: "root"
+        GROUP_ID: "0"
+        GROUP_NAME: "root"
+        TESTER_HOME: "$TESTER_HOME"
+    env_file: "$ENV_FILE"
+    networks:
+      - shared-cudos-network

tools-bash/updater/src/versions/genesis-0.5-0.6.sh

@@ -69,6 +69,9 @@ if [ "$NETWORK_DRESSREHEARSAL" = "true" ]; then
     result=$(jq ".chain_id = \"cudos-dressrehearsal-2\"" "$WORKING_MIGRATE_DIR/genesis.tmp.json")
     echo $result > "$WORKING_MIGRATE_DIR/genesis.tmp.json"
 
+    distributionAddress=$(getModuleAddress "$WORKING_MIGRATE_DIR/genesis.tmp.json" "distribution")
+    setAccountBalanceInAcudosWithoutAuthAccount "$WORKING_MIGRATE_DIR/genesis.tmp.json" "$distributionAddress" "18308656328740320386054741"
+
     setAccountBalanceInCudosAdmin "$WORKING_MIGRATE_DIR/genesis.tmp.json" "cudos19m4ez024zrquym4vsku7gj4z78mdhazera5q2s" "1"
 
     encodedDenoms=$(jq -r ".app_state.bank.supply[].denom | @base64" "$WORKING_MIGRATE_DIR/genesis.tmp.json");