Dev to Main

.env.example

@@ -5,7 +5,8 @@ CONFIG_INDEXER_URL=https://dev.ponder.testnet.juicedollar.com/
 CONFIG_INDEXER_FALLBACK_URL=https://dev.ponder.testnet.juicedollar.com/
 CONFIG_CHAIN=testnet
 
-RPC_URL_MAINNET=https://rpc.testnet.juiceswap.com/
+RPC_URL_MAINNET=https://rpc.citrea.xyz
+RPC_URL_TESTNET=https://rpc.testnet.citrea.xyz
 
 COINGECKO_API_KEY=[API-KEY]
 

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Code Owners for JuiceDollar/api
+# These users must approve all pull requests to protected branches
+
+# Default owners for everything in the repo
+* @Danswar @TaprootFreak

.github/workflows/api-dev.yaml

@@ -8,7 +8,8 @@ on:
 env:
     DOCKER_TAGS: dfxswiss/juicedollar-api:beta
     AZURE_RESOURCE_GROUP: rg-dfx-api-dev
-    AZURE_CONTAINER_APP: ca-dfx-jdta-dev
+    AZURE_CONTAINER_APP_1: ca-dfx-jdta-dev
+    AZURE_CONTAINER_APP_2: ca-dfx-jdma-dev
     DEPLOY_INFO: ${{ github.ref_name }}-${{ github.sha }}
 
 jobs:
@@ -43,11 +44,17 @@ jobs:
               with:
                   creds: ${{ secrets.DFX_DEV_CREDENTIALS }}
 
-            - name: Update Azure Container App
+            - name: Update Azure Container App 1
               uses: azure/CLI@v2
               with:
                   inlineScript: |
-                      az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP }} --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_1 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
+
+            - name: Update Azure Container App 2
+              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 }}
 
             - name: Logout from Azure
               run: |

.github/workflows/api-prd.yaml

@@ -8,7 +8,8 @@ on:
 env:
     DOCKER_TAGS: dfxswiss/juicedollar-api:latest
     AZURE_RESOURCE_GROUP: rg-dfx-api-prd
-    AZURE_CONTAINER_APP: ca-dfx-jdta-prd
+    AZURE_CONTAINER_APP_1: ca-dfx-jdta-prd
+    AZURE_CONTAINER_APP_2: ca-dfx-jdma-prd
     DEPLOY_INFO: ${{ github.ref_name }}-${{ github.sha }}
 
 jobs:
@@ -43,11 +44,17 @@ jobs:
               with:
                   creds: ${{ secrets.DFX_PRD_CREDENTIALS }}
 
-            - name: Update Azure Container App
+            - name: Update Azure Container App 1
               uses: azure/CLI@v2
               with:
                   inlineScript: |
-                      az containerapp update --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_CONTAINER_APP }} --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_1 }} --image ${{ env.DOCKER_TAGS }} --set-env-vars DEPLOY_INFO=${{ env.DEPLOY_INFO }}
+
+            - name: Update Azure Container App 2
+              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 }}
 
             - name: Logout from Azure
               run: |

.github/workflows/ci.yaml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+    pull_request:
+        branches: [develop, main]
+    push:
+        branches: [develop, main]
+
+jobs:
+    build:
+        name: Build & Lint
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: '20'
+                  cache: 'yarn'
+
+            - name: Install dependencies
+              run: yarn install --frozen-lockfile
+
+            - name: Build
+              run: yarn build
+
+            - name: Lint
+              run: yarn lint
+              continue-on-error: true

LICENSE

@@ -1,9 +1,8 @@
 MIT License
 
 Copyright (c) 2024 frankencoin
-Copyright (c) 2024 samclassix
 Copyright (c) 2024 deuro
-Copyright (c) 2025 juicedollar
+Copyright (c) 2026 juicedollar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

api.config.ts

@@ -1,12 +1,14 @@
 import { Chain, createPublicClient, http } from 'viem';
 
 import { Logger } from '@nestjs/common';
-import { testnet } from 'chains';
+import { mainnet, testnet } from 'chains';
 import * as dotenv from 'dotenv';
 dotenv.config();
 
 // Verify environment
-if (process.env.RPC_URL_MAINNET === undefined) throw new Error('RPC_URL_MAINNET not available');
+const isMainnet = process.env.CONFIG_CHAIN === 'mainnet';
+if (isMainnet && process.env.RPC_URL_MAINNET === undefined) throw new Error('RPC_URL_MAINNET not available');
+if (!isMainnet && process.env.RPC_URL_TESTNET === undefined) throw new Error('RPC_URL_TESTNET not available');
 if (process.env.COINGECKO_API_KEY === undefined) throw new Error('COINGECKO_API_KEY not available');
 
 // Config type
@@ -40,10 +42,10 @@ export const CONFIG: ConfigType = {
 	indexer: process.env.CONFIG_INDEXER_URL,
 	indexerFallback: process.env.CONFIG_INDEXER_FALLBACK_URL,
 	coingeckoApiKey: process.env.COINGECKO_API_KEY,
-	chain: testnet,
+	chain: isMainnet ? mainnet : testnet,
 	network: {
 		mainnet: process.env.RPC_URL_MAINNET,
-		testnet: process.env.RPC_URL_MAINNET,
+		testnet: process.env.RPC_URL_TESTNET,
 	},
 	telegram: {
 		botToken: process.env.TELEGRAM_BOT_TOKEN,
@@ -72,7 +74,7 @@ process.env.NTBA_FIX_350 = 'true';
 export const VIEM_CHAIN = CONFIG.chain;
 export const VIEM_CONFIG = createPublicClient({
 	chain: VIEM_CHAIN,
-	transport: http(CONFIG.network.mainnet),
+	transport: http(isMainnet ? CONFIG.network.mainnet : CONFIG.network.testnet),
 	batch: {
 		multicall: {
 			wait: 200,

chains.ts

@@ -12,15 +12,14 @@ export const testnet = defineChain({
 	},
 });
 
-// Juice Mainnet - To define later, same as testnet for now
 export const mainnet = defineChain({
-	id: 62831,
+	id: 4114,
 	name: 'Mainnet',
 	nativeCurrency: { name: 'cBTC', symbol: 'cBTC', decimals: 18 },
 	rpcUrls: {
-		default: { http: ['https://rpc.testnet.citrea.xyz'] },
+		default: { http: ['https://rpc.citrea.xyz'] },
 	},
 	blockExplorers: {
-		default: { name: 'Juice Explorer', url: 'https://explorer.testnet.citrea.xyz' },
+		default: { name: 'Citrea Explorer', url: 'https://explorer.citrea.xyz' },
 	},
 });

ecosystem/ecosystem.collateral.service.ts

@@ -85,8 +85,7 @@ export class EcosystemCollateralService {
 
 		const protocolStablecoinAddress = this.pricesService.getMint()?.address;
 		if (!protocolStablecoinAddress) return null;
-		const protocolStablecoinPrice = prices[protocolStablecoinAddress.toLowerCase()]?.price?.usd as number;
-		if (!protocolStablecoinPrice) return null;
+		if (!prices[protocolStablecoinAddress.toLowerCase()]?.price?.usd) return null;
 
 		const ecosystemTotalValueLocked: PriceQueryCurrencies = {};
 		const map: { [key: Address]: ApiEcosystemCollateralStatsItem } = {};
@@ -106,7 +105,6 @@ export class EcosystemCollateralService {
 			const totalBalanceNumUsd = parseInt(formatUnits(totalBalance, c.decimals)) * price;
 			const totalValueLocked: PriceQueryCurrencies = {
 				usd: totalBalanceNumUsd,
-				eur: totalBalanceNumUsd / protocolStablecoinPrice,
 			};
 
 			// upsert ecosystemTotalValueLocked usd
@@ -116,13 +114,6 @@ export class EcosystemCollateralService {
 				ecosystemTotalValueLocked.usd += totalValueLocked.usd;
 			}
 
-			// upsert ecosystemTotalValueLocked eur
-			if (!ecosystemTotalValueLocked.eur) {
-				ecosystemTotalValueLocked.eur = totalValueLocked.eur;
-			} else {
-				ecosystemTotalValueLocked.eur += totalValueLocked.eur;
-			}
-
 			// upsert map
 			map[c.address.toLowerCase() as Address] = {
 				address: c.address,
@@ -142,7 +133,6 @@ export class EcosystemCollateralService {
 				totalValueLocked,
 				price: {
 					usd: price,
-					eur: Math.round((price / protocolStablecoinPrice) * 100) / 100,
 				},
 			};
 		}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@juicedollar/api",
-	"version": "0.0.1",
+	"version": "1.1.0",
 	"private": false,
 	"license": "MIT",
 	"homepage": "https://api.juicedollar.com",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@apollo/client": "^3.10.5",
-		"@juicedollar/jusd": "1.0.6",
+		"@juicedollar/jusd": "^1.1.0",
 		"@nestjs/common": "^10.0.0",
 		"@nestjs/config": "^3.2.3",
 		"@nestjs/core": "^10.0.0",

positions/positions.service.ts

@@ -45,6 +45,7 @@ export class PositionsService {
 			expiration: cached.expiration,
 			reserveContribution: cached.reserveContribution,
 			annualInterestPPM: cached.annualInterestPPM,
+			principal: cached.principal,
 		};
 	}
 

positions/positions.types.ts

@@ -129,4 +129,5 @@ export type ApiPositionDefault = {
 	expiration: number;
 	reserveContribution: number;
 	annualInterestPPM: number;
+	principal: string;
 };

prices/prices.controller.ts

@@ -49,14 +49,6 @@ export class PricesController {
 		return this.pricesService.getCollateral();
 	}
 
-	@Get('eur')
-	@ApiResponse({
-		description: 'Returns the price of EUR in USD',
-	})
-	getEuroPrice(): Promise<PriceQueryCurrencies> {
-		return this.pricesService.getEuroPrice();
-	}
-
 	@Get('poolshares')
 	@ApiResponse({
 		description: `Returns the current price of the ${POOL_SHARES_SYMBOL} token`,