Merge pull request #41 from Akonobi1/dev

feature: add support for jupiter swaps

Author: mocolicious

.env.example

@@ -9,18 +9,18 @@ AUTH_PASSWORD_ENABLED=true
 # The role is optional and can be one of: Admin and User (default).
 # The email is optional and can be used to link an account to external providers.
 # The avatarUrl is optional and can be used to provision an avatar for the user
-AUTH_USERS="alice|Kinetic@alice1|Admin|alice@email.com|http://avatars.dicebear.com/api/open-peeps/aliceal.svg,bob||User|bob@gmail.com"
+AUTH_USERS="admin|kinetic|Admin|admin@example.com|http://avatars.example.com/admin.svg,bob||User|user@example.com"
 # Provision more apps by providing the mnemonic, secret key or byte array of the fee payer, name and optionally a logo URL.
-APP_1_FEE_PAYER_SECRET=UvfuF3FPqLyvS8xGjSu4AUfdsY5QvLdnin8SKBLAi3UqgbmEWCDshPY3UcxvBgRAqHLzh5Ni1eypLVZArsis6FF
-APP_1_NAME="App 1"
+APP_1_FEE_PAYER_SECRET=3HicmKK88kuwRcvwfiVWMbzTY9mnzmmGuNN4V9Dwn5gCpFYDPCWfR8WmHPAZP4S3DSTPQvNGB4SXdoheCrj49dgW
+APP_1_NAME="KInnected"
 #APP_1_LOGO_URL=""
 # Enabling the webhooks will enable the event and verify webhooks in debug mode.
 #APP_1_ENABLE_WEBHOOKS=true
 # Cache configurations, all TTL values are in seconds
 #CACHE_SOLANA_GET_LATEST_BLOCKHASH_TTL=5
 #CACHE_SOLANA_GET_TOKEN_ACCOUNTS_TTL=60
-#COOKIE_DOMAINS="localhost,local.kinetic.host,pages.dev"
-#COOKIE_NAME="__session"
+COOKIE_DOMAINS="local.kinetic.host,pages.dev"
+COOKIE_NAME="__session"
 # If you want to configure CORS, define a comma-separated list of urls here.
 # If you don't provide any domains, CORS will be bypassed (default).
 #CORS_ORIGINS=http://localhost:4200
@@ -51,38 +51,38 @@ DATABASE_URL="postgresql://prisma:prisma@localhost:5432/prisma?schema=kinetic"
 #GOOGLE_CLIENT_SECRET=x
 #GOOGLE_ENABLED=false
 # Secret used to sign JWT tokens (required)
-JWT_SECRET="KineticJwtSecret!"
+JWT_SECRET="KineticSecret!"
 # Configure the host where the API listens on.
 # Use 127.0.0.1 if you only want to allow connections from localhost.
 # Use 0.0.0.0 (default) when deploying to e.g. Heroku, Render or run in a Docker container.
-HOST=127.0.0.1
+HOST=0.0.0.0
 # Configure the port where the API listens on. 3000 is the default.
-#PORT=3000
+PORT=3000
 # Configure the logger https://ogma.jaymcdoniel.dev/
 #LOG_COLOR=true
 #LOG_JSON=false
 # ALL = 0, SILLY = 0, FINE = 1, VERBOSE = 1, DEBUG = 2, INFO = 3, LOG = 3, WARN = 4, ERROR = 5, FATAL = 6, OFF = 7
-LOG_LEVEL=ALL
+LOG_LEVEL=2
 # Queue settings
 QUEUE_CLOSE_ACCOUNT_CONCURRENCY=1
 QUEUE_CLOSE_ACCOUNT_START=false
 # Redis configuration
 REDIS_URL=redis://localhost:6379
 # SolanaLocal
-SOLANA_LOCAL_ENABLED=true
+#SOLANA_LOCAL_ENABLED=true
 #SOLANA_LOCAL_MINT_KIN=*MoGaMuJnB3k8zXjBYBnHxHG47vWcW3nyb7bFYvdVzek,5,Kin
-SOLANA_LOCAL_MINT_KIN_AIRDROP_SECRET=UvfuF3FPqLyvS8xGjSu4AUfdsY5QvLdnin8SKBLAi3UqgbmEWCDshPY3UcxvBgRAqHLzh5Ni1eypLVZArsis6FF
+#SOLANA_LOCAL_MINT_KIN_AIRDROP_SECRET=UvfuF3FPqLyvS8xGjSu4AUfdsY5QvLdnin8SKBLAi3UqgbmEWCDshPY3UcxvBgRAqHLzh5Ni1eypLVZArsis6FF
 #SOLANA_LOCAL_RPC_ENDPOINT=http://localhost:8899
 # SolanaDevnet
 #SOLANA_DEVNET_ENABLED=true
 #SOLANA_DEVNET_RPC_ENDPOINT=devnet
 #SOLANA_DEVNET_MINT_KIN=*KinDesK3dYWo3R2wDk6Ucaf31tvQCCSYyL8Fuqp33GX,5,Kin
 #SOLANA_DEVNET_MINT_KIN_AIRDROP_AMOUNT=1000
 #SOLANA_DEVNET_MINT_KIN_AIRDROP_MAX=50000
-SOLANA_DEVNET_MINT_KIN_AIRDROP_SECRET=UvfuF3FPqLyvS8xGjSu4AUfdsY5QvLdnin8SKBLAi3UqgbmEWCDshPY3UcxvBgRAqHLzh5Ni1eypLVZArsis6FF
+#SOLANA_DEVNET_MINT_KIN_AIRDROP_SECRET=UvfuF3FPqLyvS8xGjSu4AUfdsY5QvLdnin8SKBLAi3UqgbmEWCDshPY3UcxvBgRAqHLzh5Ni1eypLVZArsis6FF
 # SolanaMainnet
-#SOLANA_MAINNET_RPC_ENDPOINT=mainnet
-SOLANA_MAINNET_ENABLED=false
+SOLANA_MAINNET_RPC_ENDPOINT=mainnet
+SOLANA_MAINNET_ENABLED=true
 # The URL of the Web UI, used to redirect to the Web UI after login.
 # In a typical deployment, this is the same as the API_URL with the '/api' suffix removed (the default).
 # This means you will probably only need to set this if you are running a local development setup.

.gitignore

@@ -4,6 +4,7 @@
 /dist
 /tmp
 /out-tsc
+/volumes
 
 # dependencies
 /node_modules

Dockerfile

@@ -63,7 +63,7 @@ RUN yarn install --production
 # - copy the dist folder from the builder image
 # - copy the node_modules folder from the node_modules image
 ################################################################################
-FROM base as final
+FROM base AS final
 
 #RUN apk --no-cache add krb5-libs
 

api-swagger.json

@@ -1280,6 +1280,19 @@
           },
           "tx": {
             "type": "string"
+          },
+          "isVersioned": {
+            "type": "boolean",
+            "default": false,
+            "description": "Indicates if this is a versioned transaction"
+          },
+          "addressLookupTableAccounts": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true,
+            "description": "Base58-encoded addresses of lookup tables required for versioned transactions"
           }
         },
         "required": ["commitment", "environment", "index", "mint", "lastValidBlockHeight", "tx"]
@@ -1488,4 +1501,4 @@
       }
     }
   }
-}
+}

docker-compose.yml

@@ -20,4 +20,4 @@ services:
     ports:
       - '6379:6379'
     volumes:
-      - ./tmp/redis:/data
+      - ./tmp/redis:/data

libs/api/core/data-access/src/lib/api-core.service.ts

@@ -37,7 +37,7 @@ export type AppEnvironment = AppEnv & {
 export class ApiCoreService extends PrismaClient implements OnModuleInit {
   private readonly logger = new Logger(ApiCoreService.name)
   readonly airdropConfig = new Map<string, Omit<AirdropConfig, 'connection'>>()
-
+  
   private getAppByEnvironmentIndexCounter: Counter
   private getAppByIndexCounter: Counter
 

libs/api/core/data-access/src/prisma/schema.prisma

@@ -155,6 +155,8 @@ model Transaction {
   destination             String?
   errors                  TransactionError[]
   feePayer                String?
+  isVersioned             Boolean @default(false)
+  addressLookupTables     Json?
   headers                 Json?
   ip                      String?
   lastValidBlockHeight    Int?

libs/api/kinetic/data-access/src/lib/api-kinetic.service.spec.ts

@@ -3,6 +3,7 @@ import { ApiSolanaDataAccessModule } from '@kin-kinetic/api/solana/data-access'
 import { ApiWebhookDataAccessModule } from '@kin-kinetic/api/webhook/data-access'
 import { Test } from '@nestjs/testing'
 import { ApiKineticService } from './api-kinetic.service'
+import { VersionedTransaction, Transaction } from '@solana/web3.js'
 
 describe('ApiKineticService', () => {
   let service: ApiKineticService
@@ -19,4 +20,56 @@ describe('ApiKineticService', () => {
   it('should be defined', () => {
     expect(service).toBeTruthy()
   })
+
+  // Add test for versioned transactions
+  it('should process versioned transactions', async () => {
+    // This is just a skeleton - you'll need to fill in with actual test data
+    const mockVersionedTx = {} as VersionedTransaction
+    const mockProcessParams = {
+      // Add required parameters for processTransaction
+      isVersioned: true,
+      solanaTransaction: mockVersionedTx,
+      // Add other required parameters...
+    }
+
+    // Mock any necessary service methods
+    jest.spyOn(service, 'getSolanaConnection').mockResolvedValue({
+      connection: {
+        sendRawTransaction: jest.fn().mockResolvedValue('mock-signature'),
+        // Mock other needed methods...
+      }
+    } as any)
+
+    // Add other necessary mocks...
+
+    // Call the service method
+    const result = await service.processTransaction(mockProcessParams as any)
+
+    // Add assertions
+    expect(result).toBeDefined()
+    // Add more specific assertions based on expected behavior
+  })
+
+  // Add test for handling address lookup tables
+  it('should resolve address lookup tables', async () => {
+    const mockAddresses = ['mock-address-1', 'mock-address-2']
+
+    // Mock necessary service methods
+    jest.spyOn(service, 'getSolanaConnection').mockResolvedValue({
+      connection: {
+        getAddressLookupTable: jest.fn().mockResolvedValue({
+          value: { state: { addresses: [] } }
+        }),
+        // Mock other needed methods...
+      }
+    } as any)
+
+    // Call the service method
+    const result = await service.getAddressLookupTableAccounts('mock-app-key', mockAddresses)
+
+    // Add assertions
+    expect(result).toBeDefined()
+    expect(Array.isArray(result)).toBe(true)
+    // Add more specific assertions
+  })
 })