From c2867a6ab1bee35f12479b2261bea58f2bfa2a08 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Fri, 30 Jan 2026 18:11:45 +0100 Subject: [PATCH] fixed chain arb rpc url --- .dockerignore | 2 ++ Makefile | 7 +++---- ci/dev/{ => mongo-key}/mongo.key | 0 ci/scripts/chain_gateway/deploy.sh | 2 +- docker-compose.dev.yml | 12 ++++++------ .../widgets/payment_info_section.dart | 2 +- frontend/pweb/pubspec.yaml | 2 +- version | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 .dockerignore rename ci/dev/{ => mongo-key}/mongo.key (100%) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..240c7e5a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +ci/dev/mongo.key* + diff --git a/Makefile b/Makefile index 55bac58b..236f48b6 100644 --- a/Makefile +++ b/Makefile @@ -52,11 +52,10 @@ help: # First-time initialization init: @echo "$(GREEN)Initializing development environment...$(NC)" - @if [ ! -f ci/dev/mongo.key ]; then \ + @if [ ! -f ci/dev/mongo-key/mongo.key ]; then \ echo "$(YELLOW)Generating MongoDB keyfile...$(NC)"; \ - openssl rand -base64 756 | tr -d '\n' > ci/dev/mongo.key; \ - chown 999:999 ci/dev/mongo.key; \ - chmod 400 ci/dev/mongo.key; \ + openssl rand -base64 756 | tr -d '\n' > ci/dev/mongo-key/mongo.key; \ + chmod 400 ci/dev/mongo-key/mongo.key; \ fi @if [ ! -f .env.dev ]; then \ echo "$(YELLOW)Creating .env.dev with default values...$(NC)"; \ diff --git a/ci/dev/mongo.key b/ci/dev/mongo-key/mongo.key similarity index 100% rename from ci/dev/mongo.key rename to ci/dev/mongo-key/mongo.key diff --git a/ci/scripts/chain_gateway/deploy.sh b/ci/scripts/chain_gateway/deploy.sh index 5827d722..fa89c68a 100755 --- a/ci/scripts/chain_gateway/deploy.sh +++ b/ci/scripts/chain_gateway/deploy.sh @@ -56,7 +56,7 @@ CHAIN_GATEWAY_VAULT_SECRET_PATH="${CHAIN_GATEWAY_VAULT_SECRET_PATH:?missing CHAI export CHAIN_GATEWAY_MONGO_USER="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_MONGO_SECRET_PATH}" user)" export CHAIN_GATEWAY_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_MONGO_SECRET_PATH}" password)" -export CHAIN_GATEWAY_RPC_URL="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_RPC_SECRET_PATH}" tron_rpc_url)" +export CHAIN_GATEWAY_RPC_URL="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_RPC_SECRET_PATH}" arbitrum_rpc_url)" export CHAIN_GATEWAY_SERVICE_WALLET_KEY="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_WALLET_SECRET_PATH}" private_key)" export CHAIN_GATEWAY_SERVICE_WALLET_ADDRESS="$(./ci/vlt kv_get kv "${CHAIN_GATEWAY_WALLET_SECRET_PATH}" address || true)" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c7fcd3e8..ae4d2e26 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -73,13 +73,13 @@ services: restart: unless-stopped command: > mongod --replSet dev-rs --bind_ip_all --auth - --keyFile /data/mongo.key --port 27017 + --keyFile /etc/mongo/mongo.key --port 27017 environment: MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD} volumes: - dev-mongo1-data:/data/db - - ./ci/dev/mongo.key:/data/mongo.key:ro + - ./ci/dev/mongo-key:/etc/mongo ports: - "27017:27017" networks: @@ -98,13 +98,13 @@ services: restart: unless-stopped command: > mongod --replSet dev-rs --bind_ip_all --auth - --keyFile /data/mongo.key --port 27017 + --keyFile /etc/mongo/mongo.key --port 27017 environment: MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD} volumes: - dev-mongo2-data:/data/db - - ./ci/dev/mongo.key:/data/mongo.key:ro + - ./ci/dev/mongo-key:/etc/mongo networks: - sendico-dev healthcheck: @@ -121,13 +121,13 @@ services: restart: unless-stopped command: > mongod --replSet dev-rs --bind_ip_all --auth - --keyFile /data/mongo.key --port 27017 + --keyFile /etc/mongo/mongo.key --port 27017 environment: MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER} MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD} volumes: - dev-mongo3-data:/data/db - - ./ci/dev/mongo.key:/data/mongo.key:ro + - ./ci/dev/mongo-key:/etc/mongo networks: - sendico-dev healthcheck: diff --git a/frontend/pweb/lib/pages/payment_methods/widgets/payment_info_section.dart b/frontend/pweb/lib/pages/payment_methods/widgets/payment_info_section.dart index 705b45e3..5dc42782 100644 --- a/frontend/pweb/lib/pages/payment_methods/widgets/payment_info_section.dart +++ b/frontend/pweb/lib/pages/payment_methods/widgets/payment_info_section.dart @@ -60,7 +60,7 @@ class PaymentInfoSection extends StatelessWidget { SizedBox(height: dimensions.paddingMedium), if (hasRecipient && methodsForSelectedType.length > 1) DropdownButtonFormField( - value: selectedMethod, + initialValue: selectedMethod, dropdownColor: Theme.of(context).colorScheme.onSecondary, decoration: InputDecoration( labelText: loc.paymentMethodDetails, diff --git a/frontend/pweb/pubspec.yaml b/frontend/pweb/pubspec.yaml index e4ad4c4a..1c75cfe8 100644 --- a/frontend/pweb/pubspec.yaml +++ b/frontend/pweb/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 2.3.1+408 +version: 2.4.0+488 environment: sdk: ^3.8.1 diff --git a/version b/version index a6254504..9183195a 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.4.0 \ No newline at end of file