From e749aa387a9ecb414ad23bfe82cf6b7cfbc2cfa9 Mon Sep 17 00:00:00 2001
From: "Sewmina (server)" <sewmina7@gmail.com>
Date: Tue, 29 Oct 2024 20:36:31 +0800
Subject: [PATCH] refactored

---
 src/app.ts                    |  2 +-
 src/sol/operator.ts           |  0
 src/{sol.ts => sol/reader.ts} | 20 +++++++-------------
 src/sol/shared.ts             |  6 ++++++
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/sol/operator.ts
 rename src/{sol.ts => sol/reader.ts} (74%)
 create mode 100644 src/sol/shared.ts

diff --git a/src/app.ts b/src/app.ts
index c6dff13..e1aa0a9 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,7 +1,7 @@
 import express from 'express';
 import dotenv from 'dotenv';
 
-import { GetSolBalance, GetTicketsAccount, GetTicketsBalanceByTA, GetTokenAccount, GetTokenBalanceByTA } from "./sol";
+import { GetSolBalance, GetTicketsAccount, GetTicketsBalanceByTA, GetTokenAccount, GetTokenBalanceByTA } from "./sol/reader";
 
 
 dotenv.config();
diff --git a/src/sol/operator.ts b/src/sol/operator.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/sol.ts b/src/sol/reader.ts
similarity index 74%
rename from src/sol.ts
rename to src/sol/reader.ts
index c8e200c..fe060f6 100644
--- a/src/sol.ts
+++ b/src/sol/reader.ts
@@ -1,25 +1,19 @@
 import { PublicKey, Connection } from '@solana/web3.js';
-
-const TOKENS_MINT = new PublicKey('vcHyeKhk67CVumjzYV3m8cf6V8xcE85N9ay48pcyUpB');
-const TICKETS_MINT = new PublicKey('tktUDLZhFGb9VW9zDxZ7HYDFuBooEf8daZEvPbBY7at');
-
-const solana = new Connection("https://api.devnet.solana.com")
+import {connection, TICKETS_MINT, TOKENS_MINT} from './shared';
 
 
 
 export async function GetSolBalance(wallet){
-    const balance = await solana.getBalance(new PublicKey(wallet));
+    const balance = await connection.getBalance(new PublicKey(wallet));
 
     return balance;
 }
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-
-
 export async function GetTokenAccount(ownerAddress){
     const accountPublicKey = new PublicKey(ownerAddress);
-    const account = await solana.getTokenAccountsByOwner(accountPublicKey, {mint: TOKENS_MINT});
+    const account = await connection.getTokenAccountsByOwner(accountPublicKey, {mint: TOKENS_MINT});
     try{
         const tokenAddress = account.value[0].pubkey.toString();
         return tokenAddress;
@@ -42,11 +36,11 @@ export async function GetTokenBalanceByTA(tokenAccountAddress){
         return 0;
     }
     const tokenAccount = new PublicKey(tokenAccountAddress);
-    const info = await solana.getTokenAccountBalance(tokenAccount);
+    const info = await connection.getTokenAccountBalance(tokenAccount);
     if (info.value.uiAmount == null){
         return -1;
     }
-    console.log('Token Balance (using Solana-Web3.js): ', info.value.uiAmount);
+    console.log('Token Balance (using connection-Web3.js): ', info.value.uiAmount);
     return info.value.uiAmount;
 }
 
@@ -55,7 +49,7 @@ export async function GetTokenBalanceByTA(tokenAccountAddress){
 
 export async function GetTicketsAccount(ownerAddress){
     const accountPublicKey = new PublicKey(ownerAddress);
-    const account = await solana.getTokenAccountsByOwner(accountPublicKey, {mint: TICKETS_MINT});
+    const account = await connection.getTokenAccountsByOwner(accountPublicKey, {mint: TICKETS_MINT});
   
     try{
         const tokenAddress = account.value[0].pubkey.toString();
@@ -79,7 +73,7 @@ export async function GetTicketsBalanceByTA(tokenAccountAddress){
         return 0;
     }
     const tokenAccount = new PublicKey(tokenAccountAddress);
-    const info = await solana.getTokenAccountBalance(tokenAccount);
+    const info = await connection.getTokenAccountBalance(tokenAccount);
     if (info.value.uiAmount == null){
         return -1;
     }
diff --git a/src/sol/shared.ts b/src/sol/shared.ts
new file mode 100644
index 0000000..47b7c49
--- /dev/null
+++ b/src/sol/shared.ts
@@ -0,0 +1,6 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+
+export const TOKENS_MINT = new PublicKey('vcHyeKhk67CVumjzYV3m8cf6V8xcE85N9ay48pcyUpB');
+export const TICKETS_MINT = new PublicKey('tktUDLZhFGb9VW9zDxZ7HYDFuBooEf8daZEvPbBY7at');
+
+export const connection = new Connection("https://api.devnet.solana.com")
\ No newline at end of file