kylefang/bro-sdk
1
0
Fork 0
mirror of https://github.com/Brotocol-xyz/bro-sdk.git synced 2026-01-12 06:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: final received token incorrect on some EVM chains

Browse Source
This commit is contained in:
c4605
2025-04-11 11:57:54 +02:00
parent 8cadc3bf9c
commit f95f263e76
2 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/stacksUtils/createBridgeOrderFromBitcoin.ts
View File

@@ -1,7 +1,6 @@
import { unwrapResponse } from "clarity-codegen"
import { getTerminatingStacksTokenContractAddress } from "../evmUtils/peggingHelpers"
import { addressToBuffer } from "../utils/addressHelpers"
import { last } from "../utils/arrayHelpers"
import {
KnownRoute_FromBitcoin,
KnownRoute_FromBitcoin_ToBRC20,
@@ -261,21 +260,15 @@ async function createBridgeOrderFromBitcoinImpl(
return undefined
}
// prettier-ignore
const swappedToStacksTokenAddress = (
swapInfo == null ? undefined :
swapInfo.via === "ALEX" ? last(swapInfo.swapPools).toTokenAddress :
swapInfo.via === "evmDexAggregator" ?
await getTerminatingStacksTokenContractAddress(
sdkContext,
{
const tokenOutStacksAddress =
(KnownChainId.isEVMChain(info.toChain) &&
KnownTokenId.isEVMToken(info.toToken)
? await getTerminatingStacksTokenContractAddress(sdkContext, {
stacksChain: transitStacksChain,
evmChain: swapInfo.evmChain,
evmToken: swapInfo.toEVMToken,
}
) :
(checkNever(swapInfo), undefined)
) ?? bridgedToStacksTokenAddress
evmChain: info.toChain,
evmToken: info.toToken,
})
: undefined) ?? bridgedToStacksTokenAddress
let data: undefined | Uint8Array
if (swapInfo == null) {
@@ -287,8 +280,8 @@ async function createBridgeOrderFromBitcoinImpl(
from: info.fromAddressBuffer,
to: info.toAddressBuffer,
"chain-id": targetChainId,
token: `${swappedToStacksTokenAddress.deployerAddress}.${swappedToStacksTokenAddress.contractName}`,
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
token: `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractBaseCallInfo.executeOptions,
@@ -306,7 +299,7 @@ async function createBridgeOrderFromBitcoinImpl(
"min-amount-out": numberToStacksContractNumber(
swapInfo.minimumAmountsToReceive,
),
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractSwapCallInfo.executeOptions,
@@ -349,9 +342,9 @@ async function createBridgeOrderFromBitcoinImpl(
"min-amount-out": numberToStacksContractNumber(
swapInfo.minimumAmountsToReceive,
),
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"swap-token-in": `${swapFromTokenStacksAddress.deployerAddress}.${swapFromTokenStacksAddress.contractName}`,
"swap-token-out": `${swapToTokenStacksAddress.deployerAddress}.${swapToTokenStacksAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractAggCallInfo.executeOptions,
@@ -369,8 +362,8 @@ async function createBridgeOrderFromBitcoinImpl(
return {
tokenOutTrait: {
deployerAddress: bridgedToStacksTokenAddress.deployerAddress,
contractName: bridgedToStacksTokenAddress.contractName,
deployerAddress: tokenOutStacksAddress.deployerAddress,
contractName: tokenOutStacksAddress.contractName,
},
data: data!,
}

35
src/stacksUtils/createBridgeOrderFromMeta.ts
View File

@@ -1,7 +1,6 @@
import { unwrapResponse } from "clarity-codegen"
import { getTerminatingStacksTokenContractAddress } from "../evmUtils/peggingHelpers"
import { addressToBuffer } from "../utils/addressHelpers"
import { last } from "../utils/arrayHelpers"
import {
KnownRoute_FromMeta,
KnownRoute_FromMeta_ToBitcoin,
@@ -257,21 +256,15 @@ async function createBridgeOrderFromMetaImpl(
return undefined
}
// prettier-ignore
const swappedToStacksTokenAddress = (
swapInfo == null ? undefined :
swapInfo.via === "ALEX" ? last(swapInfo.swapPools).toTokenAddress :
swapInfo.via === "evmDexAggregator" ?
await getTerminatingStacksTokenContractAddress(
sdkContext,
{
const tokenOutStacksAddress =
(KnownChainId.isEVMChain(info.toChain) &&
KnownTokenId.isEVMToken(info.toToken)
? await getTerminatingStacksTokenContractAddress(sdkContext, {
stacksChain: transitStacksChain,
evmChain: swapInfo.evmChain,
evmToken: swapInfo.toEVMToken,
}
) :
(checkNever(swapInfo), undefined)
) ?? bridgedToStacksTokenAddress
evmChain: info.toChain,
evmToken: info.toToken,
})
: undefined) ?? bridgedToStacksTokenAddress
let data: undefined | Uint8Array
if (swapInfo == null) {
@@ -283,8 +276,8 @@ async function createBridgeOrderFromMetaImpl(
from: info.fromAddressBuffer,
to: info.toAddressBuffer,
"chain-id": targetChainId,
token: `${swappedToStacksTokenAddress.deployerAddress}.${swappedToStacksTokenAddress.contractName}`,
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
token: `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractBaseCallInfo.executeOptions,
@@ -302,7 +295,7 @@ async function createBridgeOrderFromMetaImpl(
"min-amount-out": numberToStacksContractNumber(
swapInfo.minimumAmountsToReceive,
),
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractSwapCallInfo.executeOptions,
@@ -345,9 +338,9 @@ async function createBridgeOrderFromMetaImpl(
"min-amount-out": numberToStacksContractNumber(
swapInfo.minimumAmountsToReceive,
),
"token-out": `${bridgedToStacksTokenAddress.deployerAddress}.${bridgedToStacksTokenAddress.contractName}`,
"swap-token-in": `${swapFromTokenStacksAddress.deployerAddress}.${swapFromTokenStacksAddress.contractName}`,
"swap-token-out": `${swapToTokenStacksAddress.deployerAddress}.${swapToTokenStacksAddress.contractName}`,
"token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
},
},
contractAggCallInfo.executeOptions,
@@ -365,8 +358,8 @@ async function createBridgeOrderFromMetaImpl(
return {
tokenOutTrait: {
deployerAddress: bridgedToStacksTokenAddress.deployerAddress,
contractName: bridgedToStacksTokenAddress.contractName,
deployerAddress: tokenOutStacksAddress.deployerAddress,
contractName: tokenOutStacksAddress.contractName,
},
data: data!,
}