response: adjust response type & payload based on milkomedaDeployment…

… set & move enum to shared
dcSpark · Jun 2, 2023 · 9914cc8 · 9914cc8
1 parent bdb4a93
commit 9914cc8
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 23 deletions.
diff --git a/server/config/default.ts b/server/config/default.ts
@@ -1,4 +1,5 @@
 import dotenv from "dotenv";
+import { MilkomedaDeployment } from "../../shared/types";
 
 dotenv.config();
 

diff --git a/server/src/contract.ts b/server/src/contract.ts
@@ -9,7 +9,7 @@ import type { MilkomedaStargateAsset } from "../../shared/types";
 import CONFIG from "../config/default";
 
 export type TokensRegistry = {
-    minLovelace: string;
+    minMainTokenValue: string;
     assets: MilkomedaStargateAsset[];
     wrappingFee: string;
     unwrappingFee: string;
@@ -129,7 +129,7 @@ export class SidechainContract {
         const toADAFeeGWei = await contract.getUnwrappingFee();
 
         const tokenRegistry: TokensRegistry = {
-            minLovelace: adaMinValue ?? "2000000",
+            minMainTokenValue: adaMinValue ?? "2000000",
             assets: assetsDetails,
             wrappingFee: fromADAFeeLovelace,
             unwrappingFee: toADAFeeGWei,

diff --git a/server/src/index.ts b/server/src/index.ts
@@ -9,7 +9,8 @@ import type { TokensRegistry } from "./contract";
 import { contract } from "./contract";
 import type { CacheOption } from "./cache";
 import { CacheKeys, cacheManager } from "./cache";
-import type { MilkomedaStargateResponse } from "../../shared/types";
+import type { MilkomedaStargateA1Response, MilkomedaStargateC1Response, MilkomedaStargateResponse } from "../../shared/types";
+import { MilkomedaDeployment } from "../../shared/types"
 import { milkomedaNetworks } from "@dcspark/milkomeda-js-sdk";
 import CONFIG from "../config/default";
 
@@ -62,7 +63,6 @@ const isAddressAllowed = async (req: Request, res: Response) => {
 const getSidechainContract = (): string => {
     let sidechainContract = "";
 
-    // not sure how it's distinguished on the deployments side, so used process.env.MAINNET integrated in the config for now
     switch (CONFIG.API.mainnet) {
         case "TRUE": {
             sidechainContract = milkomedaNetworks["c1-mainnet"].sidechainContract;
@@ -84,19 +84,45 @@ const stargate = async (req: Request, res: Response) => {
         const tokenRegistry = (await cacheManager.get(CacheKeys.TOKEN_REGISTRY)) as TokensRegistry;
         const sidechainContract = getSidechainContract();
 
-        const response: MilkomedaStargateResponse = {
-            current_address: stargateAddress,
-            sidechain_address: sidechainContract,
-            ttl_expiry: new Date().setHours(24, 0, 0, 0),
-            ada: {
-                minLovelace: tokenRegistry.minLovelace,
-                fromADAFeeLovelace: tokenRegistry.wrappingFee,
-                toADAFeeGWei: tokenRegistry.unwrappingFee,
-                cardanoDecimals: 6,
-                milkomedaDecimals: 18,
-            },
-            assets: tokenRegistry.assets,
-        };
+        let response: MilkomedaStargateResponse;
+        switch(CONFIG.API.milkomedaDeployment) {
+            case MilkomedaDeployment.A1: {
+                response = {
+                    current_address: stargateAddress,
+                    sidechain_address: sidechainContract,
+                    ttl_expiry: new Date().setHours(24, 0, 0, 0),
+                    algo: {
+                        minMicroAlgo: tokenRegistry.minMainTokenValue,
+                        fromAlgoFeeMicroAlgo: tokenRegistry.wrappingFee,
+                        toAlgoFeeGWei: tokenRegistry.unwrappingFee,
+                        algorandDecimals: 6,
+                        milkomedaDecimals: 18,
+                    },
+                    assets: tokenRegistry.assets,
+                } as MilkomedaStargateA1Response;
+                break;
+            }
+
+            // To make sure we keep current deployments set compatible, we set C1 as a default one as well as an option
+            // case MilkomedaDeployment.C1:
+            default: {
+                response = {
+                    current_address: stargateAddress,
+                    sidechain_address: sidechainContract,
+                    ttl_expiry: new Date().setHours(24, 0, 0, 0),
+                    ada: {
+                        minLovelace: tokenRegistry.minMainTokenValue,
+                        fromADAFeeLovelace: tokenRegistry.wrappingFee,
+                        toADAFeeGWei: tokenRegistry.unwrappingFee,
+                        cardanoDecimals: 6,
+                        milkomedaDecimals: 18,
+                    },
+                    assets: tokenRegistry.assets,
+                } as MilkomedaStargateC1Response;
+                break;
+            }
+        }
+
         res.send(response);
         return;
     } catch (e) {

diff --git a/server/types/globals/index.d.ts b/server/types/globals/index.d.ts
@@ -15,9 +15,4 @@ interface ConfigType {
     };
 }
 
-enum MilkomedaDeployment {
-    A1 = "A1",
-    C1 = "C1"
-}
-
 declare module "copy-webpack-plugin";
diff --git a/shared/types.ts b/shared/types.ts
@@ -8,7 +8,9 @@ export type MilkomedaStargateAsset = {
   milkomedaDecimals: number;
   tokenSymbol: string;
 };
-export type MilkomedaStargateResponse = {
+export type MilkomedaStargateResponse = MilkomedaStargateC1Response | MilkomedaStargateA1Response;
+
+export type MilkomedaStargateC1Response = {
   current_address: string;
   sidechain_address: string;
   ttl_expiry: number;
@@ -21,3 +23,22 @@ export type MilkomedaStargateResponse = {
   };
   assets: Array<MilkomedaStargateAsset>;
 };
+
+export type MilkomedaStargateA1Response = {
+  current_address: string;
+  sidechain_address: string;
+  ttl_expiry: number;
+  algo: {
+    minMicroAlgo: string;
+    fromAlgoFeeMicroAlgo: string;
+    toAlgoFeeGWei: string;
+    algorandDecimals: number;
+    milkomedaDecimals: number;
+  };
+  assets: Array<MilkomedaStargateAsset>;
+};
+
+export enum MilkomedaDeployment {
+  A1 = "A1",
+  C1 = "C1"
+}