update app name to bot and init services

.gitignore

@@ -38,4 +38,6 @@ testem.log
 .DS_Store
 Thumbs.db
 
-.nx/cache
+.nx/cache
+
+.env

.prettierrc

@@ -1,6 +1,6 @@
 {
 	"trailingComma": "all",
-	"printWidth": 100,
+	"printWidth": 80,
 	"useTabs": true,
 	"singleQuote": true,
 	"bracketSpacing": true,

apps/ddca/jest.config.ts → apps/bot/jest.config.ts

@@ -1,11 +1,14 @@
 /* eslint-disable */
 export default {
-	displayName: 'ddca',
+	displayName: 'bot',
 	preset: '../../jest.preset.js',
 	testEnvironment: 'node',
 	transform: {
-		'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+		'^.+\\.[tj]s$': [
+			'ts-jest',
+			{ tsconfig: '<rootDir>/tsconfig.spec.json' },
+		],
 	},
 	moduleFileExtensions: ['ts', 'js', 'html'],
-	coverageDirectory: '../../coverage/apps/ddca',
+	coverageDirectory: '../../coverage/apps/bot',
 }

apps/ddca/project.json → apps/bot/project.json

@@ -1,7 +1,7 @@
 {
-	"name": "ddca",
+	"name": "bot",
 	"$schema": "../../node_modules/nx/schemas/project-schema.json",
-	"sourceRoot": "apps/ddca/src",
+	"sourceRoot": "apps/bot/src",
 	"projectType": "application",
 	"targets": {
 		"build": {
@@ -11,11 +11,11 @@
 			"options": {
 				"target": "node",
 				"compiler": "tsc",
-				"outputPath": "dist/apps/ddca",
-				"main": "apps/ddca/src/main.ts",
-				"tsConfig": "apps/ddca/tsconfig.app.json",
-				"assets": ["apps/ddca/src/assets"],
-				"webpackConfig": "apps/ddca/webpack.config.js"
+				"outputPath": "dist/apps/bot",
+				"main": "apps/bot/src/main.ts",
+				"tsConfig": "apps/bot/tsconfig.app.json",
+				"assets": ["apps/bot/src/assets"],
+				"webpackConfig": "apps/bot/webpack.config.js"
 			},
 			"configurations": {
 				"development": {},
@@ -26,14 +26,14 @@
 			"executor": "@nx/js:node",
 			"defaultConfiguration": "development",
 			"options": {
-				"buildTarget": "ddca:build"
+				"buildTarget": "bot:build"
 			},
 			"configurations": {
 				"development": {
-					"buildTarget": "ddca:build:development"
+					"buildTarget": "bot:build:development"
 				},
 				"production": {
-					"buildTarget": "ddca:build:production"
+					"buildTarget": "bot:build:production"
 				}
 			}
 		},
@@ -45,7 +45,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "apps/ddca/jest.config.ts"
+				"jestConfig": "apps/bot/jest.config.ts"
 			}
 		}
 	},

apps/bot/src/app/app.config.ts

@@ -0,0 +1,12 @@
+import { Strategy } from '@jupjup/constants'
+import { parseUSDC } from '@jupjup/utils'
+
+export type AppConfig = {
+	tradingStrategy: Strategy
+	startingFundsUSDC: string
+}
+
+export const DEFAULT_CONFIG: AppConfig = {
+	tradingStrategy: Strategy.DDCA,
+	startingFundsUSDC: parseUSDC(10).result,
+}

apps/bot/src/app/app.module.ts

@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common'
+import { ConfigModule } from '@nestjs/config'
+import { ScheduleModule } from '@nestjs/schedule'
+
+import { AppService } from './app.service'
+import { TradingModule } from '../trading/trading.module'
+
+@Module({
+	imports: [
+		ConfigModule.forRoot({ isGlobal: true }),
+		ScheduleModule.forRoot(),
+		TradingModule,
+	],
+	controllers: [],
+	providers: [AppService],
+})
+export class AppModule {}

apps/ddca/src/app/app.service.spec.ts → apps/bot/src/app/app.service.spec.ts

@@ -2,7 +2,10 @@ import { Test } from '@nestjs/testing'
 
 import { AppService } from './app.service'
 
-import { SOLANA_NATIVE_SOL_ADDRESS, SOLANA_WEN_ADDRESS } from '@jupjup/constants'
+import {
+	SOLANA_NATIVE_SOL_ADDRESS,
+	SOLANA_WEN_ADDRESS,
+} from '@jupjup/constants'
 import { getQuote } from '@jupjup/jupiter-client'
 
 describe('AppService', () => {
@@ -16,7 +19,7 @@ describe('AppService', () => {
 		service = app.get<AppService>(AppService)
 	})
 
-	describe.only('getData', () => {
+	describe('getData', () => {
 		it('should get data from jupiter client', async () => {
 			expect(
 				await getQuote({

apps/bot/src/app/app.service.ts

@@ -0,0 +1,4 @@
+import { Injectable } from '@nestjs/common'
+
+@Injectable()
+export class AppService {}

apps/ddca/src/main.ts → apps/bot/src/main.ts

@@ -14,7 +14,9 @@ async function bootstrap() {
 	app.setGlobalPrefix(globalPrefix)
 	const port = process.env.PORT || 3000
 	await app.listen(port)
-	Logger.log(`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`)
+	Logger.log(
+		`🚀 Application is running on: http://localhost:${port}/${globalPrefix}`,
+	)
 }
 
 bootstrap()

apps/bot/src/trading/trading.controller.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from '@nestjs/testing'
+import { TradingController } from './trading.controller'
+
+describe('TradingController', () => {
+	let controller: TradingController
+
+	beforeEach(async () => {
+		const module: TestingModule = await Test.createTestingModule({
+			controllers: [TradingController],
+		}).compile()
+
+		controller = module.get<TradingController>(TradingController)
+	})
+
+	it('should be defined', () => {
+		expect(controller).toBeDefined()
+	})
+})

apps/bot/src/trading/trading.controller.ts

@@ -0,0 +1,4 @@
+import { Controller } from '@nestjs/common'
+
+@Controller('trading')
+export class TradingController {}

apps/bot/src/trading/trading.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common'
+import { ConfigModule } from '@nestjs/config'
+
+import { TradingService } from './trading.service'
+import { TradingController } from './trading.controller'
+
+@Module({
+	controllers: [TradingController],
+	providers: [TradingService],
+})
+export class TradingModule {}

apps/bot/src/trading/trading.service.spec.ts

@@ -0,0 +1,25 @@
+import { Test, TestingModule } from '@nestjs/testing'
+import { ConfigModule } from '@nestjs/config'
+import { ScheduleModule } from '@nestjs/schedule'
+
+import { TradingService } from './trading.service'
+
+describe('TradingService', () => {
+	let service: TradingService
+
+	beforeEach(async () => {
+		const module: TestingModule = await Test.createTestingModule({
+			providers: [TradingService],
+			imports: [
+				ConfigModule.forRoot({ isGlobal: true }),
+				ScheduleModule.forRoot(),
+			],
+		}).compile()
+
+		service = module.get<TradingService>(TradingService)
+	})
+
+	it('should be defined', () => {
+		expect(service).toBeDefined()
+	})
+})

apps/bot/src/trading/trading.service.ts

@@ -0,0 +1,26 @@
+import { Injectable, Logger } from '@nestjs/common'
+import { ConfigService } from '@nestjs/config'
+
+import { Connection, Keypair, VersionedTransaction } from '@solana/web3.js'
+import { Wallet } from '@coral-xyz/anchor'
+import bs58 from 'bs58'
+
+type RouteMap = Record<string, string[]>
+
+@Injectable()
+export class TradingService {
+	wallet: Wallet
+
+	constructor(private configService: ConfigService) {
+		// this is set in the monorepo root
+		const pk = this.configService.get('NX_SOLANA_PK') || ''
+
+		this.wallet = new Wallet(Keypair.fromSecretKey(bs58.decode(pk)))
+
+		const address = this.wallet.publicKey
+
+		Logger.log(
+			`Wallet at address ${address.toString()} loaded successfully!`,
+		)
+	}
+}

apps/ddca/tsconfig.spec.json → apps/bot/tsconfig.spec.json

@@ -5,5 +5,10 @@
 		"module": "commonjs",
 		"types": ["jest", "node"]
 	},
-	"include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+	"include": [
+		"jest.config.ts",
+		"src/**/*.test.ts",
+		"src/**/*.spec.ts",
+		"src/**/*.d.ts"
+	]
 }

libs/utils/src/index.ts

@@ -1 +1 @@
-export * from './lib/utils'
+export * from './lib/spl'

libs/utils/src/lib/spl.spec.ts

@@ -0,0 +1,30 @@
+import { parseUSDC } from './spl'
+
+describe('parseUSDC', () => {
+	it('should correctly parse a whole number amount', () => {
+		expect(parseUSDC(10).result).toBe('10000000')
+	})
+
+	it('should correctly parse floats', () => {
+		expect(parseUSDC(10.5).result).toBe('10500000')
+	})
+
+	it('should correctly handle zero', () => {
+		expect(parseUSDC(0).result).toBe('0')
+	})
+
+	it('should handle very large numbers', () => {
+		expect(parseUSDC(123456789.123456).result).toBe('123456789123456')
+	})
+
+	it('should throw an error for negative numbers', () => {
+		expect(parseUSDC(-1).error).toBe('Invalid input')
+	})
+
+	it('should throw an error for non-numeric inputs', () => {
+		// @ts-ignore
+		expect(parseUSDC('abc').error).toBe('Invalid input')
+		// @ts-ignore
+		expect(parseUSDC(undefined).error).toBe('Invalid input')
+	})
+})