Merge pull request #116 from CityOfZion/CU-86a5qpcbh

CU-86a5qpcbh-BS Lib - Update endpoint reference for Swaps to point to…
CityOfZion · Dec 2, 2024 · 610eca6 · 610eca6
2 parents 99d57b2 + 5abe0a6
commit 610eca6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/common/changes/@cityofzion/bs-swap/CU-86a5qpcbh_2024-11-29-13-08.json b/common/changes/@cityofzion/bs-swap/CU-86a5qpcbh_2024-11-29-13-08.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-swap",
+      "comment": "Remove the API key param",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-swap"
+}
diff --git a/packages/bs-swap/src/__tests__/SimpleSwapService.spec.ts b/packages/bs-swap/src/__tests__/SimpleSwapService.spec.ts
@@ -38,7 +38,6 @@ describe('SimpleSwapService', () => {
     }
 
     simpleSwapService = new SimpleSwapService({
-      apiKey: process.env.TEST_SIMPLE_SWAP_API_KEY!,
       blockchainServicesByName,
       chainsByServiceName: {
         neo3: ['neo3'],
@@ -309,8 +308,8 @@ describe('SimpleSwapService', () => {
 
   it('Should be able to set a valid address', async () => {
     await simpleSwapService.init()
-    const tokenUse = availableTokensToUse.value![0]
-    const tokenReceive = availableTokensToUse.value![1]
+    const tokenUse = availableTokensToUse.value![1]
+    const tokenReceive = availableTokensToUse.value![0]
     await simpleSwapService.setTokenToUse(tokenUse)
 
     const account = blockchainServicesByName.neo3.generateAccountFromKey(process.env.TEST_PRIVATE_KEY as string)

diff --git a/packages/bs-swap/src/apis/SimpleSwapApi.ts b/packages/bs-swap/src/apis/SimpleSwapApi.ts
@@ -15,13 +15,13 @@ export class SimpleSwapApi<BSName extends string = string> {
   #axios: AxiosInstance
   #allCurrenciesMap: Map<string, SimpleSwapApiCurrency<BSName>> = new Map()
 
-  constructor(apiKey: string) {
-    this.#axios = axios.create({ baseURL: 'https://api.simpleswap.io/v3', headers: { 'X-API-KEY': apiKey } })
+  constructor() {
+    this.#axios = axios.create({ baseURL: 'https://4b6s1fv9b6.execute-api.us-east-1.amazonaws.com/Prod' })
   }
 
   #getTokenFromCurrency(
     currency: SimpleSwapApiCurrencyResponse,
-    options: Omit<SimpleSwapServiceInitParams<BSName>, 'apiKey'>
+    options: SimpleSwapServiceInitParams<BSName>
   ): SimpleSwapApiCurrency<BSName> | undefined {
     if (!currency.ticker || !currency.network || !currency.image || !currency.name || !currency.validationAddress) {
       return
@@ -70,9 +70,7 @@ export class SimpleSwapApi<BSName extends string = string> {
     }
   }
 
-  async getCurrencies(
-    options: Omit<SimpleSwapServiceInitParams<BSName>, 'apiKey'>
-  ): Promise<SimpleSwapApiCurrency<BSName>[]> {
+  async getCurrencies(options: SimpleSwapServiceInitParams<BSName>): Promise<SimpleSwapApiCurrency<BSName>[]> {
     if (this.#allCurrenciesMap.size) {
       return Array.from(this.#allCurrenciesMap.values())
     }

diff --git a/packages/bs-swap/src/helpers/SimpleSwapServiceHelper.ts b/packages/bs-swap/src/helpers/SimpleSwapServiceHelper.ts
@@ -4,8 +4,8 @@ import { SimpleSwapApi } from '../apis/SimpleSwapApi'
 export class SimpleSwapServiceHelper<BSName extends string = string> implements SwapServiceHelper {
   #api: SimpleSwapApi<BSName>
 
-  constructor(apiKey: string) {
-    this.#api = new SimpleSwapApi(apiKey)
+  constructor() {
+    this.#api = new SimpleSwapApi()
   }
 
   async getStatus(id: string): Promise<SwapServiceStatusResponse> {

diff --git a/packages/bs-swap/src/services/SimpleSwapService.ts b/packages/bs-swap/src/services/SimpleSwapService.ts
@@ -43,7 +43,7 @@ export class SimpleSwapService<BSName extends string = string> implements SwapSe
 
   constructor(params: SimpleSwapServiceInitParams<BSName>) {
     this.eventEmitter = new EventEmitter() as TypedEmitter<SwapServiceEvents>
-    this.#api = new SimpleSwapApi(params.apiKey)
+    this.#api = new SimpleSwapApi()
     this.#blockchainServicesByName = params.blockchainServicesByName
     this.#chainsByServiceName = params.chainsByServiceName
   }

diff --git a/packages/bs-swap/src/types/simpleSwap.ts b/packages/bs-swap/src/types/simpleSwap.ts
@@ -1,7 +1,6 @@
 import { BlockchainService, SwapServiceToken } from '@cityofzion/blockchain-service'
 
 export type SimpleSwapServiceInitParams<BSName extends string = string> = {
-  apiKey: string
   blockchainServicesByName: Record<BSName, BlockchainService<BSName>>
   chainsByServiceName: Partial<Record<BSName, string[]>>
 }