diff --git a/src/common/store/telegram.ts b/src/common/store/telegram.ts
index 237c5b9..eb724b7 100644
--- a/src/common/store/telegram.ts
+++ b/src/common/store/telegram.ts
@@ -1,45 +1,50 @@
import { Reactive, reactive } from "vue";
import { TonConnectUI, TonConnectUiOptions, Account } from "@tonconnect/ui";
import { InitDataParsed, retrieveLaunchParams } from "@telegram-apps/sdk";
-import { Address, toNano, TonClient } from "@ton/ton";
+import { Address, Cell, fromNano, toNano, TonClient } from "@ton/ton";
import { HeadsOrTails } from "../../wrappers/HeadsOrTails";
import { TonConnectSender } from "../../wrappers/TonConnectSender";
interface Telegram {
walletAccount: Account | null | undefined;
tonConnectUI: TonConnectUI | null;
+ tonClient: TonClient | null;
initDataRaw: string | undefined | null;
initData: InitDataParsed | undefined | null;
init: () => Promise;
initTelegramData: () => void;
initWallet: () => Promise;
initConnectWalletButton: (buttonRootId: string | null) => Promise;
- playGame: (amount: number) => Promise;
+ initClient: () => Promise;
+ playGame: (amount: number) => Promise;
+ getData: () => Promise<{ min_bet: string; max_bet: string } | null>;
+ getWalletBalance: () => Promise;
}
export const Telegram: Reactive = reactive({
walletAccount: null,
tonConnectUI: null,
+ tonClient: null,
initData: null,
initDataRaw: null,
async init() {
this.initTelegramData();
this.initWallet();
+ this.initClient();
},
initTelegramData() {
- const launchParams = retrieveLaunchParams();
-
- this.initDataRaw = launchParams.initDataRaw;
- this.initData = launchParams.initData;
+ try {
+ const launchParams = retrieveLaunchParams();
+ this.initDataRaw = launchParams.initDataRaw;
+ this.initData = launchParams.initData;
+ } catch (e) {
+ console.log('not in telegram app');
+ }
},
async initWallet() {
await this.tonConnectUI?.getWallets();
- console.log(this.tonConnectUI);
-
this.walletAccount = this.tonConnectUI?.account;
-
- console.log(this.walletAccount);
},
async initConnectWalletButton(buttonRootId: string | null) {
this.tonConnectUI = new TonConnectUI({
@@ -55,8 +60,6 @@ export const Telegram: Reactive = reactive({
} as TonConnectUiOptions;
this.tonConnectUI.onModalStateChange(async (state) => {
- console.log(state);
-
if (
state.status === "closed" &&
state.closeReason === "wallet-selected"
@@ -66,17 +69,44 @@ export const Telegram: Reactive = reactive({
});
this.tonConnectUI.onStatusChange((status) => {
- if(!status) {
+ if (!status) {
this.walletAccount = null;
}
});
-
- console.log(this.tonConnectUI);
+ },
+ async initClient() {
+ this.tonClient = new TonClient({
+ endpoint: "https://toncenter.com/api/v2/jsonRPC",
+ });
},
async playGame(amount: number) {
const collectionAddress = import.meta.env.VITE_TON_CONTRACT_ADDRESS;
const address = Address.parse(collectionAddress);
+ const contractProvider = this.tonClient?.open(
+ HeadsOrTails.createFromAddress(address)
+ );
+
+ if (this.tonConnectUI) {
+ const tonConnectSender = new TonConnectSender(this.tonConnectUI);
+
+ await contractProvider?.sendBet(tonConnectSender, toNano(amount));
+
+ const cell = Cell.fromBase64(
+ tonConnectSender.lastTransactionResponse?.boc ?? ""
+ );
+ const buffer = cell.hash();
+ const hashHex = buffer.toString("hex");
+
+ return hashHex;
+ }
+
+ return null;
+ },
+ async getData() {
+ const collectionAddress = import.meta.env.VITE_TON_CONTRACT_ADDRESS;
+ const address = Address.parse(collectionAddress);
+
const tonClient = new TonClient({
endpoint: "https://toncenter.com/api/v2/jsonRPC",
});
@@ -86,10 +116,29 @@ export const Telegram: Reactive = reactive({
);
if (this.tonConnectUI) {
- return await contractProvider.sendBet(
- new TonConnectSender(this.tonConnectUI),
- toNano(amount)
+ const data = (await contractProvider.getData()).beginParse();
+ data.loadAddress();
+ const min_bet = fromNano(data.loadCoins());
+ const max_bet = fromNano(data.loadCoins());
+
+ return {
+ min_bet,
+ max_bet,
+ };
+ }
+
+ return null;
+ },
+ async getWalletBalance() {
+ try {
+ const balance = await this.tonClient?.getBalance(
+ Address.parse(this.walletAccount?.address ?? "")
);
+ return fromNano(balance ?? 0);
+ } catch (error) {
+ console.error("Error fetching wallet balance:", error);
}
+
+ return null;
},
});
diff --git a/src/components/common/Button.vue b/src/components/common/Button.vue
index cc9a48b..fdf3d02 100644
--- a/src/components/common/Button.vue
+++ b/src/components/common/Button.vue
@@ -31,7 +31,7 @@ const click = () => {
-
\ No newline at end of file
diff --git a/src/components/common/MoneyBackground.vue b/src/components/common/MoneyBackground.vue
new file mode 100644
index 0000000..3124322
--- /dev/null
+++ b/src/components/common/MoneyBackground.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/modals/Modal.vue b/src/components/modals/Modal.vue
index 38ba8b7..b2f78d7 100644
--- a/src/components/modals/Modal.vue
+++ b/src/components/modals/Modal.vue
@@ -1,5 +1,4 @@
@@ -58,47 +98,72 @@ onMounted(async () => {
-
+
+
+
-
- 
- 
+
+
+
+
Your balance
+
+
+
+
+
+ {{ currentBalance }} TON
+
+
+
+
+
Connect your TON wallet to play
@@ -109,8 +174,8 @@ onMounted(async () => {
{{ modalDescription }}
diff --git a/src/main.ts b/src/main.ts index b5bcb2f..f50ebb7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ import { createApp } from "vue"; -import { createWebHistory, createRouter } from "vue-router"; +import { createWebHashHistory, createRouter } from "vue-router"; import WebApp from "@twa-dev/sdk"; import Vue3TouchEvents, { type Vue3TouchEventsOptions, @@ -25,7 +25,7 @@ const routes = [ ]; const router = createRouter({ - history: createWebHistory(getBasePath()), + history: createWebHashHistory(getBasePath()), routes, }); diff --git a/src/wrappers/TonConnectSender.ts b/src/wrappers/TonConnectSender.ts index 0601c66..539e0c8 100644 --- a/src/wrappers/TonConnectSender.ts +++ b/src/wrappers/TonConnectSender.ts @@ -1,10 +1,12 @@ import { Address, beginCell, Sender, SenderArguments, SendMode, storeStateInit } from "@ton/ton"; -import { TonConnectUI } from "@tonconnect/ui"; +import { SendTransactionResponse, TonConnectUI } from "@tonconnect/ui"; export class TonConnectSender implements Sender { #provider: TonConnectUI; readonly address?: Address; + lastTransactionResponse?: SendTransactionResponse; + constructor(provider: TonConnectUI) { this.#provider = provider; if (provider.wallet) this.address = Address.parseRaw(provider.wallet?.account.address); @@ -16,7 +18,7 @@ export class TonConnectSender implements Sender { throw new Error("Deployer sender does not support `sendMode` other than `PAY_GAS_SEPARATELY`"); } - await this.#provider.sendTransaction({ + this.lastTransactionResponse = await this.#provider.sendTransaction({ validUntil: Date.now() + 5 * 60 * 1000, messages: [ {