deep-stack/sol-mem-gen
3
0
Fork 0
forked from mito-systems/sol-mem-gen
Code Pull Requests Activity

Use bn.js to handle big numbers

Browse Source
This commit is contained in:
Adw8 2025-01-28 18:34:03 +05:30
parent 8b5dbb46fa
commit 53bd18f031
7 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -12,6 +12,7 @@
"@google/generative-ai": "^0.21.0",
"@solana/spl-token": "^0.3.8",
"@solana/web3.js": "^1.78.4",
"bn.js": "^5.2.0",
"next": "13.5.4",
"openai": "^4.77.0",
"react": "^18",

1
package.json
View File

@ -13,6 +13,7 @@
"@google/generative-ai": "^0.21.0",
"@solana/spl-token": "^0.3.8",
"@solana/web3.js": "^1.78.4",
"bn.js": "^5.2.0",
"next": "13.5.4",
"openai": "^4.77.0",
"react": "^18",

9
src/app/api/flux/route.ts
View File

@ -1,4 +1,6 @@
import { NextRequest, NextResponse } from 'next/server'
import BN from 'bn.js';
import { fal } from "@fal-ai/client"
import { FLUX_MODELS } from '../../../services/fluxService'
import { initializeDataSource } from '../../../data-source'
@ -49,11 +51,10 @@ export async function POST(req: NextRequest): Promise<NextResponse> {
const MTMFor1USDC = await getUSDCToMTMQuote();
// TODO: Use bn.js for better precision
const scale = BigInt(100);
const scaledCost = BigInt(Math.round(model.cost * Number(scale)));
const scale = new BN(100);
const scaledCost = new BN(model.cost * 100);
const expectedAmount = (scaledCost * MTMFor1USDC) / scale;
const expectedAmount = scaledCost.mul(MTMFor1USDC).div(scale);
const isPaymentVerified = await verifyPayment(transactionSignature, expectedAmount)
if (!isPaymentVerified) {

33
src/app/page.tsx
View File

@ -1,6 +1,8 @@
'use client'
import React, { useState, useEffect } from 'react'
import BN from 'bn.js';
import WalletHeader from '../components/WalletHeader'
import AIServiceCard from '../components/AIServiceCard'
import { generateWithFlux, FluxGenerationResult, FLUX_MODELS } from '../services/fluxService'
@ -15,7 +17,7 @@ const Page: React.FC = (): React.ReactElement => {
type: null
})
const [MTMFor1USDC, setMTMFor1USDC] = useState<bigint>(BigInt(0));
const [MTMFor1USDC, setMTMFor1USDC] = useState<BN>(new BN(0));
useEffect(() => {
const fetchPrice = async () => {
@ -58,7 +60,7 @@ const Page: React.FC = (): React.ReactElement => {
}
};
const handleFluxGeneration = (modelId: string, cost: bigint) => {
const handleFluxGeneration = (modelId: string, cost: BN) => {
return async (prompt: string): Promise<FluxGenerationResult> => {
const { connected, publicKey, type } = walletState;
@ -116,31 +118,26 @@ const Page: React.FC = (): React.ReactElement => {
{/* Flux Models Grid */}
<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-6">
{FLUX_MODELS.map((model) => (
{FLUX_MODELS.map((model) => {
// Convert cost from number to BN
const costBN = new BN(model.cost * 100);
const mtmPriceBN = costBN.mul(MTMFor1USDC);
return (
<AIServiceCard
key={model.modelId}
title={model.name}
description={model.description}
isWalletConnected={walletState.connected}
// TODO: Use bn.js for better precision
onGenerate={handleFluxGeneration(
model.modelId,
(() => {
const scale = BigInt(100); // Scaling factor
const scaledCost = BigInt(Math.round(model.cost * Number(scale)));
const scaledResult = (scaledCost * MTMFor1USDC) / scale;
return scaledResult;
})()
// Calculate scaled cost directly in bn.js
mtmPriceBN.div(new BN(100))
)}
// TODO: Use bn.js for better precision
mtmPrice={(() => {
const scale = BigInt(100);
const scaledCost = BigInt(Math.round(model.cost * Number(scale)));
return (scaledCost * MTMFor1USDC) / scale;
})()}
mtmPrice={mtmPriceBN.div(new BN(100))}
/>
))}
);
})}
{/* Coming Soon Card */}
<div className="relative bg-gray-800/50 backdrop-blur-lg rounded-2xl shadow-xl border border-gray-700/50 overflow-hidden group">
<div className="absolute inset-0 bg-gradient-to-br from-yellow-500/10 to-orange-500/10 opacity-50"></div>

7
src/components/AIServiceCard.tsx
View File

@ -1,13 +1,14 @@
'use client'
import React, { useState } from 'react'
import BN from 'bn.js';
interface AIServiceCardProps {
title: string
description: string
isWalletConnected: boolean
onGenerate: (prompt: string) => Promise<{ imageUrl?: string, error?: string }>
mtmPrice: bigint
mtmPrice: BN
}
interface GenerationState {
@ -81,7 +82,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
</h2>
<p className="text-gray-400 mt-2">{description}</p>
<div className="mt-2 inline-block px-3 py-1 bg-green-500/20 rounded-full text-green-300 text-sm">
Cost: {mtmPrice ? (mtmPrice / BigInt(10 ** 6)).toString() : '...'} MTM
Cost: {mtmPrice ? mtmPrice.div(new BN(10).pow(new BN(6))).toString() : '...'} MTM
</div>
</div>
@ -105,7 +106,7 @@ const AIServiceCard: React.FC<AIServiceCardProps> = ({
transition-all duration-200 shadow-lg hover:shadow-green-500/25
disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:shadow-none"
>
{generationState.loading ? 'Processing...' : `Pay ${mtmPrice ? (mtmPrice / BigInt(10 ** 6)).toString() : '...'} MTM & Generate`}
{generationState.loading ? 'Processing...' : `Pay ${mtmPrice ? mtmPrice.div(new BN(10).pow(new BN(6))).toString() : '...'} MTM & Generate`}
</button>
</div>

15
src/services/paymentService.ts
View File

@ -1,4 +1,5 @@
import assert from 'assert';
import BN from 'bn.js';
import { Connection, PublicKey, Transaction } from '@solana/web3.js'
import {
@ -50,7 +51,7 @@ async function findAssociatedTokenAddress(
)[0]
}
export async function getUSDCToMTMQuote() {
export async function getUSDCToMTMQuote(): Promise<BN> {
const url = `https://api.jup.ag/price/v2?ids=${USDC_MINT}&vsToken=${MTM_TOKEN_MINT}`;
const response = await fetch(url);
@ -61,9 +62,8 @@ export async function getUSDCToMTMQuote() {
const quoteResponse = await response.json();
// TODO: Use bn.js for better precision
const priceFromAPI = Number(quoteResponse['data'][USDC_MINT]['price'])* (10 ** 6);
const price = BigInt(Number(priceFromAPI.toFixed(0)));
const priceFromAPI = Number(quoteResponse['data'][USDC_MINT]['price']).toFixed(6);
const price = new BN(priceFromAPI.toString().replace('.', ''));
return price;
}
@ -73,7 +73,7 @@ interface WalletAdapter {
export async function processMTMPayment(
walletPublicKey: string,
tokenAmount: bigint,
tokenAmount: BN,
walletType: WalletType
): Promise<PaymentResult> {
try {
@ -145,14 +145,15 @@ export async function processMTMPayment(
)
}
const tokens = tokenAmount / BigInt(10 ** 6);
const tokens = tokenAmount.div(new BN(10).pow(new BN(6)));
console.log('TA:', tokenAmount.toString())
transaction.add(
createTransferInstruction(
senderATA,
receiverATA,
senderPublicKey,
tokens * BigInt(10 ** 6)
tokens.mul(new BN(10).pow(new BN(6)))
)
)

19
src/utils/verifyPayment.ts
View File

@ -1,4 +1,5 @@
import assert from 'assert';
import BN from 'bn.js';
import { Connection } from '@solana/web3.js';
import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
@ -46,7 +47,7 @@ export async function markSignatureAsUsed(transactionSignature: string): Promise
export async function verifyPayment(
transactionSignature: string,
expectedAmount: bigint,
expectedAmount: BN,
): Promise<boolean> {
try {
// Check if the signature is already used
@ -71,17 +72,21 @@ export async function verifyPayment(
const { info } = parsed;
const { amount } = info;
const transactionAmount = BigInt(amount);
const expectedAmountInMicroTokens = expectedAmount;
console.log('Parsed transfer instruction:', parsed);
console.log('Transfer info:', info);
console.log('Transfer amount:', amount);
const lowerBound = expectedAmountInMicroTokens * BigInt(9) / BigInt(10);
const upperBound = expectedAmountInMicroTokens * BigInt(11) / BigInt(10);
const transactionAmount = new BN(amount);
const lowerBound = expectedAmount.mul(new BN(9)).div(new BN(10));
const upperBound = expectedAmount.mul(new BN(11)).div(new BN(10));
// transaction within the appropriate range
if (transactionAmount >= lowerBound && transactionAmount <= upperBound) {
if (transactionAmount.gte(lowerBound) && transactionAmount.lte(upperBound)) {
console.log('Transaction amount is within the expected range.');
return true;
}
console.log('Transaction amount is not within the expected range.');
// TODO: Handle difference between paid amount and token price during verification being greater than 10%
return false;
} catch (error) {
console.error('Verification error:', error);