From 29c3e5566e9689a3c65f35ac33e1b512c29b2b5f Mon Sep 17 00:00:00 2001 From: abs2023 Date: Wed, 4 Dec 2024 09:54:48 -0500 Subject: [PATCH 1/2] reset reating-config.json.example for cloned operation --- .github/workflows/build.yml | 1 + .github/workflows/proxy-router.main.env | 1 + .github/workflows/proxy-router.test.env | 1 + proxy-router/.env.example | 1 + proxy-router/.env.example.win | 1 + proxy-router/.gitignore | 3 ++- .../{rating-config.json => rating-config.json.example} | 0 7 files changed, 7 insertions(+), 1 deletion(-) rename proxy-router/{rating-config.json => rating-config.json.example} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b62cac8..94184fef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,7 @@ jobs: --form "ref=${{ env.gitlab_branch }}" \ --form "variables[SOURCE_REPO]=${{ github.repository }}" \ --form "variables[SOURCE_BRANCH]=${{ github.ref_name }}" \ + --form "variables[GITHUB_VFULL]=${{ env.VFULL }}" \ --form "variables[GITHUB_TAG]=${{ env.TAG_NAME }}") # Parse JSON response using jq diff --git a/.github/workflows/proxy-router.main.env b/.github/workflows/proxy-router.main.env index 31e5eaa8..d786c36e 100644 --- a/.github/workflows/proxy-router.main.env +++ b/.github/workflows/proxy-router.main.env @@ -23,6 +23,7 @@ PROXY_ADDRESS=0.0.0.0:3333 WEB_ADDRESS=0.0.0.0:8082 WEB_PUBLIC_URL=http://localhost:8082 MODELS_CONFIG_PATH= +RATING_CONFIG_PATH= ETH_NODE_USE_SUBSCRIPTIONS=false ETH_NODE_ADDRESS= ETH_NODE_LEGACY_TX=false diff --git a/.github/workflows/proxy-router.test.env b/.github/workflows/proxy-router.test.env index 69950f53..5adf136f 100644 --- a/.github/workflows/proxy-router.test.env +++ b/.github/workflows/proxy-router.test.env @@ -23,6 +23,7 @@ PROXY_ADDRESS=0.0.0.0:3333 WEB_ADDRESS=0.0.0.0:8082 WEB_PUBLIC_URL=http://localhost:8082 MODELS_CONFIG_PATH= +RATING_CONFIG_PATH= ETH_NODE_USE_SUBSCRIPTIONS=false ETH_NODE_ADDRESS= ETH_NODE_LEGACY_TX=false diff --git a/proxy-router/.env.example b/proxy-router/.env.example index c15ead37..d7aa6ebe 100644 --- a/proxy-router/.env.example +++ b/proxy-router/.env.example @@ -24,6 +24,7 @@ PROXY_ADDRESS=0.0.0.0:3333 WEB_ADDRESS=0.0.0.0:8082 WEB_PUBLIC_URL=http://localhost:8082 MODELS_CONFIG_PATH= +RATING_CONFIG_PATH= ETH_NODE_USE_SUBSCRIPTIONS=false ETH_NODE_ADDRESS= ETH_NODE_LEGACY_TX=false diff --git a/proxy-router/.env.example.win b/proxy-router/.env.example.win index 45a0ece4..452bd4a6 100644 --- a/proxy-router/.env.example.win +++ b/proxy-router/.env.example.win @@ -24,6 +24,7 @@ PROXY_ADDRESS=0.0.0.0:3333 WEB_ADDRESS=0.0.0.0:8082 WEB_PUBLIC_URL=http://localhost:8082 MODELS_CONFIG_PATH= +RATING_CONFIG_PATH= ETH_NODE_USE_SUBSCRIPTIONS=false ETH_NODE_ADDRESS= ETH_NODE_LEGACY_TX=false diff --git a/proxy-router/.gitignore b/proxy-router/.gitignore index e77303d8..57b9093e 100644 --- a/proxy-router/.gitignore +++ b/proxy-router/.gitignore @@ -10,4 +10,5 @@ bin data* -models-config.json \ No newline at end of file +models-config.json +rating-config.json \ No newline at end of file diff --git a/proxy-router/rating-config.json b/proxy-router/rating-config.json.example similarity index 100% rename from proxy-router/rating-config.json rename to proxy-router/rating-config.json.example From 9d76e5f3f5fba9a0b74bc74ace2f2d44d50dcf05 Mon Sep 17 00:00:00 2001 From: abs2023 Date: Wed, 4 Dec 2024 10:03:09 -0500 Subject: [PATCH 2/2] update default ui-desktop .env.example --- ui-desktop/.env.example | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/ui-desktop/.env.example b/ui-desktop/.env.example index 42d956a3..8f68da8d 100644 --- a/ui-desktop/.env.example +++ b/ui-desktop/.env.example @@ -1,16 +1,32 @@ +# This file is used to set the environment variables for the cicd workflow +# Contract and Token current as of 11/5/2024 + +# MAINNET VALUES +CHAIN_ID=42161 +DIAMOND_ADDRESS=0xDE819AaEE474626E3f34Ef0263373357e5a6C71b +DISPLAY_NAME=Arbitrum +EXPLORER_URL=https://arbiscan.io/tx/{{hash}} +TOKEN_ADDRESS=0x092bAaDB7DEf4C3981454dD9c0A0D7FF07bCFc86 +DEV_TOOLS=false +SYMBOL_ETH=ETH +SYMBOL_COIN=MOR + +# TESTNET VALUES +#CHAIN_ID=421614 +#DIAMOND_ADDRESS=0xb8C55cD613af947E73E262F0d3C54b7211Af16CF +#DISPLAY_NAME=Sepolia Arbitrum +#EXPLORER_URL=https://sepolia.arbiscan.io/tx/{{hash}} +#TOKEN_ADDRESS=0x34a285a1b1c166420df5b6630132542923b5b27e +#DEV_TOOLS=true +#SYMBOL_ETH=ETH +#SYMBOL_COIN=MOR + +# COMMON BYPASS_AUTH=false -CHAIN_ID=421614 DEBUG=false DEFAULT_SELLER_CURRENCY=BTC -DEV_TOOLS=true -DIAMOND_ADDRESS=0xb8C55cD613af947E73E262F0d3C54b7211Af16CF -DISPLAY_NAME=Sepolia Arbitrum -EXPLORER_URL=https://sepolia.arbiscan.io/tx/{{hash}} IGNORE_DEBUG_LOGS=false PROXY_WEB_DEFAULT_PORT=8082 SENTRY_DSN= -SYMBOL_ETH=ETH -SYMBOL_COIN=MOR -TOKEN_ADDRESS=0x34a285a1b1c166420df5b6630132542923b5b27e TRACKING_ID= -FAILOVER_ENABLED= \ No newline at end of file +FAILOVER_ENABLED=