Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/api-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
env:
DOCKER_TAGS: dfxswiss/juicedollar-api:beta
AZURE_RESOURCE_GROUP: rg-dfx-api-dev
AZURE_CONTAINER_APP_1: ca-dfx-jdta-dev
AZURE_CONTAINER_APP_2: ca-dfx-jdma-dev
AZURE_CONTAINER_APP_TESTNET: ca-dfx-jdta-dev
AZURE_CONTAINER_APP_MAINNET: ca-dfx-jdma-dev
DEPLOY_INFO: ${{ github.ref_name }}-${{ github.sha }}

jobs:
Expand Down Expand Up @@ -44,17 +44,17 @@ jobs:
with:
creds: ${{ secrets.DFX_DEV_CREDENTIALS }}

- name: Update Azure Container App 1
- name: Update Azure Container App (testnet)
uses: azure/CLI@v2
with:
inlineScript: |
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_1 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_TESTNET }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}

- name: Update Azure Container App 2
- name: Update Azure Container App (mainnet)
uses: azure/CLI@v2
with:
inlineScript: |
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_2 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_MAINNET }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}

- name: Logout from Azure
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/api-prd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
env:
DOCKER_TAGS: dfxswiss/juicedollar-api:latest
AZURE_RESOURCE_GROUP: rg-dfx-api-prd
AZURE_CONTAINER_APP_1: ca-dfx-jdta-prd
AZURE_CONTAINER_APP_2: ca-dfx-jdma-prd
AZURE_CONTAINER_APP_TESTNET: ca-dfx-jdta-prd
AZURE_CONTAINER_APP_MAINNET: ca-dfx-jdma-prd
DEPLOY_INFO: ${{ github.ref_name }}-${{ github.sha }}

jobs:
Expand Down Expand Up @@ -44,17 +44,17 @@ jobs:
with:
creds: ${{ secrets.DFX_PRD_CREDENTIALS }}

- name: Update Azure Container App 1
- name: Update Azure Container App (testnet)
uses: azure/CLI@v2
with:
inlineScript: |
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_1 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_TESTNET }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}

- name: Update Azure Container App 2
- name: Update Azure Container App (mainnet)
uses: azure/CLI@v2
with:
inlineScript: |
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_2 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP_MAINNET }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}

- name: Logout from Azure
run: |
Expand Down
32 changes: 18 additions & 14 deletions api.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export type ConfigType = {
botToken: string;
groupsJson: string;
imagesDir: string;
};
} | null;
twitter: {
accessToken: string;
accessSecret: string;
appKey: string;
appSecret: string;
imagesDir: string;
};
} | null;
};

// Create config
Expand All @@ -47,18 +47,22 @@ export const CONFIG: ConfigType = {
mainnet: process.env.RPC_URL_MAINNET,
testnet: process.env.RPC_URL_TESTNET,
},
telegram: {
botToken: process.env.TELEGRAM_BOT_TOKEN,
groupsJson: process.env.TELEGRAM_GROUPS_JSON,
imagesDir: process.env.TELEGRAM_IMAGES_DIR,
},
twitter: {
appKey: process.env.TWITTER_CLIENT_APP_KEY,
appSecret: process.env.TWITTER_CLIENT_APP_SECRET,
accessToken: process.env.TWITTER_ACCESS_TOKEN,
accessSecret: process.env.TWITTER_ACCESS_SECRET,
imagesDir: process.env.TWITTER_IMAGES_DIR,
},
telegram: process.env.TELEGRAM_BOT_TOKEN
? {
botToken: process.env.TELEGRAM_BOT_TOKEN,
groupsJson: process.env.TELEGRAM_GROUPS_JSON,
imagesDir: process.env.TELEGRAM_IMAGES_DIR,
}
: null,
twitter: process.env.TWITTER_CLIENT_APP_KEY
? {
appKey: process.env.TWITTER_CLIENT_APP_KEY,
appSecret: process.env.TWITTER_CLIENT_APP_SECRET,
accessToken: process.env.TWITTER_ACCESS_TOKEN,
accessSecret: process.env.TWITTER_ACCESS_SECRET,
imagesDir: process.env.TWITTER_IMAGES_DIR,
}
: null,
};

export function logConfig() {
Expand Down
8 changes: 4 additions & 4 deletions chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ export const testnet = defineChain({
name: 'Testnet',
nativeCurrency: { name: 'cBTC', symbol: 'cBTC', decimals: 18 },
rpcUrls: {
default: { http: ['https://rpc.testnet.citrea.xyz'] },
default: { http: ['https://rpc.testnet.citreascan.com'] },
},
blockExplorers: {
default: { name: 'Juice Explorer', url: 'https://explorer.testnet.citrea.xyz' },
default: { name: 'CitreaScan', url: 'https://testnet.citreascan.com' },
},
});

Expand All @@ -17,9 +17,9 @@ export const mainnet = defineChain({
name: 'Mainnet',
nativeCurrency: { name: 'cBTC', symbol: 'cBTC', decimals: 18 },
rpcUrls: {
default: { http: ['https://rpc.citrea.xyz'] },
default: { http: ['https://rpc.citreascan.com'] },
},
blockExplorers: {
default: { name: 'Citrea Explorer', url: 'https://explorer.citrea.xyz' },
default: { name: 'CitreaScan', url: 'https://citreascan.com' },
},
});
Loading
Loading