feat: merchant specific fees, TRON & BTC support, coin logos, and bug fixes
This commit is contained in:
@@ -45,22 +45,27 @@ export async function POST(request: Request) {
|
||||
return NextResponse.json({ success: false, error: `No temporary wallet found for ${walletType}` }, { status: 500 });
|
||||
}
|
||||
|
||||
// 3. Define Platform Address (Fetch from dynamic settings)
|
||||
const platformAddresses = await (async () => {
|
||||
const result = await db.query('SELECT key, value FROM system_settings WHERE key IN (\'sol_platform_address\', \'evm_platform_address\')');
|
||||
// 3. Define Platform Address & Fee (Fetch from dynamic settings)
|
||||
const settings = await (async () => {
|
||||
const result = await db.query('SELECT key, value FROM system_settings WHERE key IN (\'sol_platform_address\', \'evm_platform_address\', \'default_fee_percent\')');
|
||||
const map: Record<string, string> = {};
|
||||
result.rows.forEach(r => map[r.key] = r.value);
|
||||
return {
|
||||
sol: map.sol_platform_address || process.env.SOL_PLATFORM_ADDRESS || "5pLH1tqZhx8p8WpZ18yr28N42KXB3FXVPzZ9ceCtpBVe",
|
||||
evm: map.evm_platform_address || process.env.EVM_PLATFORM_ADDRESS || "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
|
||||
evm: map.evm_platform_address || process.env.EVM_PLATFORM_ADDRESS || "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
|
||||
fee: parseFloat(map.default_fee_percent || '1.0')
|
||||
};
|
||||
})();
|
||||
|
||||
const platformAddress = selectedNetwork === 'SOLANA' ? platformAddresses.sol : platformAddresses.evm;
|
||||
|
||||
const platformAddress = selectedNetwork === 'SOLANA' ? settings.sol : settings.evm;
|
||||
// 4. Define Merchant Address (Fetch from transaction's merchant)
|
||||
const merchantResult = await db.query('SELECT * FROM merchants WHERE id = $1', [transaction.merchant_id]);
|
||||
const merchant = merchantResult.rows[0];
|
||||
|
||||
// Prioritize merchant's specific fee, fallback to global setting
|
||||
const feePercent = merchant?.fee_percent !== undefined && merchant?.fee_percent !== null
|
||||
? parseFloat(merchant.fee_percent)
|
||||
: settings.fee;
|
||||
|
||||
let merchantAddress = merchant?.wallet_address || platformAddress;
|
||||
|
||||
@@ -95,7 +100,8 @@ export async function POST(request: Request) {
|
||||
tempWalletConfig.privateKey,
|
||||
merchantAddress,
|
||||
platformAddress,
|
||||
selectedToken
|
||||
selectedToken,
|
||||
feePercent
|
||||
);
|
||||
|
||||
if (!sweepResult.success) {
|
||||
|
||||
Reference in New Issue
Block a user