Merge pull request 'removed dead vars' (#763) from dev-760 into main

Reviewed-on: #763

.woodpecker/gateway_tron.yml

@@ -4,7 +4,6 @@ matrix:
       TRON_GATEWAY_DOCKERFILE: ci/prod/compose/tron_gateway.dockerfile
       TRON_GATEWAY_MONGO_SECRET_PATH: sendico/db
       TRON_GATEWAY_RPC_SECRET_PATH: sendico/gateway/tron
-      TRON_GATEWAY_WALLET_SECRET_PATH: sendico/gateway/tron/wallet
       TRON_GATEWAY_VAULT_SECRET_PATH: sendico/gateway/tron/vault
 
 labels:

api/gateway/tron/config.dev.yml

@@ -53,11 +53,6 @@ chains:
       - symbol: USDT
         contract: "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"
 
-service_wallet:
-  chain: tron_nile
-  address_env: TRON_GATEWAY_SERVICE_WALLET_ADDRESS
-  private_key_env: TRON_GATEWAY_SERVICE_WALLET_KEY
-
 key_management:
   driver: vault
   settings:

api/gateway/tron/config.yml

@@ -53,11 +53,6 @@ chains:
       - symbol: USDT
         contract: "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
 
-service_wallet:
-  chain: tron_mainnet
-  address_env: TRON_GATEWAY_SERVICE_WALLET_ADDRESS
-  private_key_env: TRON_GATEWAY_SERVICE_WALLET_KEY
-
 key_management:
   driver: vault
   settings:

api/gateway/tron/internal/server/internal/serverimp.go

@@ -380,6 +380,13 @@ func parseGasTopUpRule(chainName, label string, cfg gasTopUpRuleConfig) (gateway
 }
 
 func resolveServiceWallet(logger mlogger.Logger, cfg serviceWalletConfig) gatewayshared.ServiceWallet {
+	if strings.TrimSpace(cfg.Chain) == "" &&
+		strings.TrimSpace(cfg.Address) == "" &&
+		strings.TrimSpace(cfg.AddressEnv) == "" &&
+		strings.TrimSpace(cfg.PrivateKeyEnv) == "" {
+		return gatewayshared.ServiceWallet{}
+	}
+
 	address := strings.TrimSpace(cfg.Address)
 	if address == "" && cfg.AddressEnv != "" {
 		address = strings.TrimSpace(os.Getenv(cfg.AddressEnv))

ci/prod/compose/tron_gateway.yml

@@ -48,8 +48,6 @@ services:
       TRON_GATEWAY_RPC_URL: ${TRON_GATEWAY_RPC_URL}
       TRON_GATEWAY_GRPC_URL: ${TRON_GATEWAY_GRPC_URL}
       TRON_GATEWAY_GRPC_TOKEN: ${TRON_GATEWAY_GRPC_TOKEN}
-      TRON_GATEWAY_SERVICE_WALLET_KEY: ${TRON_GATEWAY_SERVICE_WALLET_KEY}
-      TRON_GATEWAY_SERVICE_WALLET_ADDRESS: ${TRON_GATEWAY_SERVICE_WALLET_ADDRESS}
       TRON_GATEWAY_GRPC_PORT: ${TRON_GATEWAY_GRPC_PORT}
       TRON_GATEWAY_METRICS_PORT: ${TRON_GATEWAY_METRICS_PORT}
       VAULT_TOKEN_FILE: /run/vault/token

ci/prod/scripts/deploy/tron_gateway.sh

@@ -20,8 +20,6 @@ REQUIRED_SECRETS=(
   TRON_GATEWAY_MONGO_USER
   TRON_GATEWAY_MONGO_PASSWORD
   TRON_GATEWAY_RPC_URL
-  TRON_GATEWAY_SERVICE_WALLET_KEY
-  TRON_GATEWAY_SERVICE_WALLET_ADDRESS
   NATS_USER
   NATS_PASSWORD
   NATS_URL
@@ -48,8 +46,6 @@ TRON_GATEWAY_MONGO_PASSWORD_B64="$(b64enc "${TRON_GATEWAY_MONGO_PASSWORD}")"
 TRON_GATEWAY_RPC_URL_B64="$(b64enc "${TRON_GATEWAY_RPC_URL}")"
 TRON_GATEWAY_GRPC_URL_B64="$(b64enc "${TRON_GATEWAY_GRPC_URL:-}")"
 TRON_GATEWAY_GRPC_TOKEN_B64="$(b64enc "${TRON_GATEWAY_GRPC_TOKEN:-}")"
-TRON_GATEWAY_SERVICE_WALLET_KEY_B64="$(b64enc "${TRON_GATEWAY_SERVICE_WALLET_KEY}")"
-TRON_GATEWAY_SERVICE_WALLET_ADDRESS_B64="$(b64enc "${TRON_GATEWAY_SERVICE_WALLET_ADDRESS}")"
 TRON_GATEWAY_VAULT_ROLE_ID_B64="$(b64enc "${TRON_GATEWAY_VAULT_ROLE_ID:-}")"
 TRON_GATEWAY_VAULT_SECRET_ID_B64="$(b64enc "${TRON_GATEWAY_VAULT_SECRET_ID:-}")"
 NATS_USER_B64="$(b64enc "${NATS_USER}")"
@@ -91,8 +87,6 @@ ssh "${SSH_OPTS[@]}" "$REMOTE_TARGET" \
   TRON_GATEWAY_RPC_URL_B64="$TRON_GATEWAY_RPC_URL_B64" \
   TRON_GATEWAY_GRPC_URL_B64="$TRON_GATEWAY_GRPC_URL_B64" \
   TRON_GATEWAY_GRPC_TOKEN_B64="$TRON_GATEWAY_GRPC_TOKEN_B64" \
-  TRON_GATEWAY_SERVICE_WALLET_KEY_B64="$TRON_GATEWAY_SERVICE_WALLET_KEY_B64" \
-  TRON_GATEWAY_SERVICE_WALLET_ADDRESS_B64="$TRON_GATEWAY_SERVICE_WALLET_ADDRESS_B64" \
   TRON_GATEWAY_VAULT_ROLE_ID_B64="$TRON_GATEWAY_VAULT_ROLE_ID_B64" \
   TRON_GATEWAY_VAULT_SECRET_ID_B64="$TRON_GATEWAY_VAULT_SECRET_ID_B64" \
   NATS_USER_B64="$NATS_USER_B64" \
@@ -150,8 +144,6 @@ TRON_GATEWAY_MONGO_PASSWORD="$(decode_b64 "$TRON_GATEWAY_MONGO_PASSWORD_B64")"
 TRON_GATEWAY_RPC_URL="$(decode_b64 "$TRON_GATEWAY_RPC_URL_B64")"
 TRON_GATEWAY_GRPC_URL="$(decode_b64 "$TRON_GATEWAY_GRPC_URL_B64")"
 TRON_GATEWAY_GRPC_TOKEN="$(decode_b64 "$TRON_GATEWAY_GRPC_TOKEN_B64")"
-TRON_GATEWAY_SERVICE_WALLET_KEY="$(decode_b64 "$TRON_GATEWAY_SERVICE_WALLET_KEY_B64")"
-TRON_GATEWAY_SERVICE_WALLET_ADDRESS="$(decode_b64 "$TRON_GATEWAY_SERVICE_WALLET_ADDRESS_B64")"
 NATS_USER="$(decode_b64 "$NATS_USER_B64")"
 NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")"
 NATS_URL="$(decode_b64 "$NATS_URL_B64")"
@@ -165,7 +157,6 @@ fi
 
 export TRON_GATEWAY_MONGO_USER TRON_GATEWAY_MONGO_PASSWORD
 export TRON_GATEWAY_RPC_URL TRON_GATEWAY_GRPC_URL TRON_GATEWAY_GRPC_TOKEN
-export TRON_GATEWAY_SERVICE_WALLET_KEY TRON_GATEWAY_SERVICE_WALLET_ADDRESS
 export TRON_GATEWAY_VAULT_ROLE_ID TRON_GATEWAY_VAULT_SECRET_ID
 export NATS_USER NATS_PASSWORD NATS_URL
 if [[ -z "${TRON_GATEWAY_VAULT_ROLE_ID:-}" || -z "${TRON_GATEWAY_VAULT_SECRET_ID:-}" ]]; then

ci/prod/scripts/deploy/vault.sh

@@ -166,11 +166,6 @@ if [[ -f ../env/dev-vault-seed.env ]]; then
     rpc_url="$(decode_b64 "${TRON_GATEWAY_RPC_URL_B64:-}")" \
     grpc_url="$(decode_b64 "${TRON_GATEWAY_GRPC_URL_B64:-}")" \
     grpc_token="$(decode_b64 "${TRON_GATEWAY_GRPC_TOKEN_B64:-}")" >/dev/null
-
-  docker exec -e VAULT_ADDR=http://127.0.0.1:8200 -e VAULT_TOKEN="${ROOT_TOKEN}" dev-vault \
-    vault kv put -mount=kv sendico/gateway/tron/wallet \
-    private_key="$(decode_b64 "${TRON_GATEWAY_WALLET_PRIVATE_KEY_B64:-}")" \
-    address="$(decode_b64 "${TRON_GATEWAY_WALLET_ADDRESS_B64:-}")" >/dev/null
 fi
 
 docker exec -i dev-vault sh -lc "export VAULT_ADDR=http://127.0.0.1:8200 VAULT_TOKEN='${ROOT_TOKEN}'; vault policy write sendico-dev-apps -" <<'EOF'

ci/scripts/tron_gateway/deploy.sh

@@ -40,7 +40,6 @@ load_runtime_env_bundle "${TRON_GATEWAY_ENV_NAME}"
 
 TRON_GATEWAY_MONGO_SECRET_PATH="${TRON_GATEWAY_MONGO_SECRET_PATH:?missing TRON_GATEWAY_MONGO_SECRET_PATH}"
 TRON_GATEWAY_RPC_SECRET_PATH="${TRON_GATEWAY_RPC_SECRET_PATH:?missing TRON_GATEWAY_RPC_SECRET_PATH}"
-TRON_GATEWAY_WALLET_SECRET_PATH="${TRON_GATEWAY_WALLET_SECRET_PATH:?missing TRON_GATEWAY_WALLET_SECRET_PATH}"
 TRON_GATEWAY_VAULT_SECRET_PATH="${TRON_GATEWAY_VAULT_SECRET_PATH:?missing TRON_GATEWAY_VAULT_SECRET_PATH}"
 
 export TRON_GATEWAY_MONGO_USER="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_MONGO_SECRET_PATH}" user)"
@@ -50,9 +49,6 @@ export TRON_GATEWAY_RPC_URL="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv
 export TRON_GATEWAY_GRPC_URL="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_RPC_SECRET_PATH}" grpc_url || true)"
 export TRON_GATEWAY_GRPC_TOKEN="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_RPC_SECRET_PATH}" grpc_token || true)"
 
-export TRON_GATEWAY_SERVICE_WALLET_KEY="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_WALLET_SECRET_PATH}" private_key)"
-export TRON_GATEWAY_SERVICE_WALLET_ADDRESS="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_WALLET_SECRET_PATH}" address || true)"
-
 if [ "${CI_RUNTIME_ENV_NAME:-prod}" != "devserver" ]; then
   export TRON_GATEWAY_VAULT_ROLE_ID="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_VAULT_SECRET_PATH}" role_id)"
   export TRON_GATEWAY_VAULT_SECRET_ID="$(sh ci/scripts/common/runtime_kv_get.sh kv_get kv "${TRON_GATEWAY_VAULT_SECRET_PATH}" secret_id)"

ci/scripts/vault/deploy.sh

@@ -79,8 +79,6 @@ seed_field CHAIN_GATEWAY_WALLET_ADDRESS_B64 sendico/gateway/chain/wallet address
 seed_field TRON_GATEWAY_RPC_URL_B64 sendico/gateway/tron rpc_url
 seed_field TRON_GATEWAY_GRPC_URL_B64 sendico/gateway/tron grpc_url 1
 seed_field TRON_GATEWAY_GRPC_TOKEN_B64 sendico/gateway/tron grpc_token 1
-seed_field TRON_GATEWAY_WALLET_PRIVATE_KEY_B64 sendico/gateway/tron/wallet private_key
-seed_field TRON_GATEWAY_WALLET_ADDRESS_B64 sendico/gateway/tron/wallet address 1
 
 export DEV_VAULT_SEED_FILE="${SEED_FILE}"