Skip to content

Release: develop -> main #3080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TaprootFreak merged 4 commits into from
Jan 31, 2026
Merged

Release: develop -> main #3080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82fb200
[DEV-4536] notification mail for older unassignedTx (#2970)
Yannick1712 Jan 30, 2026
81138e0
[DEV-4545] dfxApproval kyc bug (#3074)
Yannick1712 Jan 30, 2026
27cf474
feat(liquidity): add LayerZero bridge adapter for Ethereum->Citrea br…
TaprootFreak Jan 30, 2026
a8d1118
Allow kycFileId column in debug endpoint (#3082)
TaprootFreak Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions src/integration/blockchain/shared/evm/abi/layerzero-oft-adapter.abi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
[
{
"inputs": [
{
"components": [
{ "internalType": "uint32", "name": "dstEid", "type": "uint32" },
{ "internalType": "bytes32", "name": "to", "type": "bytes32" },
{ "internalType": "uint256", "name": "amountLD", "type": "uint256" },
{ "internalType": "uint256", "name": "minAmountLD", "type": "uint256" },
{ "internalType": "bytes", "name": "extraOptions", "type": "bytes" },
{ "internalType": "bytes", "name": "composeMsg", "type": "bytes" },
{ "internalType": "bytes", "name": "oftCmd", "type": "bytes" }
],
"internalType": "struct SendParam",
"name": "_sendParam",
"type": "tuple"
},
{ "internalType": "bool", "name": "_payInLzToken", "type": "bool" }
],
"name": "quoteSend",
"outputs": [
{
"components": [
{ "internalType": "uint256", "name": "nativeFee", "type": "uint256" },
{ "internalType": "uint256", "name": "lzTokenFee", "type": "uint256" }
],
"internalType": "struct MessagingFee",
"name": "msgFee",
"type": "tuple"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"components": [
{ "internalType": "uint32", "name": "dstEid", "type": "uint32" },
{ "internalType": "bytes32", "name": "to", "type": "bytes32" },
{ "internalType": "uint256", "name": "amountLD", "type": "uint256" },
{ "internalType": "uint256", "name": "minAmountLD", "type": "uint256" },
{ "internalType": "bytes", "name": "extraOptions", "type": "bytes" },
{ "internalType": "bytes", "name": "composeMsg", "type": "bytes" },
{ "internalType": "bytes", "name": "oftCmd", "type": "bytes" }
],
"internalType": "struct SendParam",
"name": "_sendParam",
"type": "tuple"
},
{
"components": [
{ "internalType": "uint256", "name": "nativeFee", "type": "uint256" },
{ "internalType": "uint256", "name": "lzTokenFee", "type": "uint256" }
],
"internalType": "struct MessagingFee",
"name": "_fee",
"type": "tuple"
},
{ "internalType": "address", "name": "_refundAddress", "type": "address" }
],
"name": "send",
"outputs": [
{
"components": [
{ "internalType": "bytes32", "name": "guid", "type": "bytes32" },
{ "internalType": "uint64", "name": "nonce", "type": "uint64" },
{
"components": [
{ "internalType": "uint256", "name": "nativeFee", "type": "uint256" },
{ "internalType": "uint256", "name": "lzTokenFee", "type": "uint256" }
],
"internalType": "struct MessagingFee",
"name": "fee",
"type": "tuple"
}
],
"internalType": "struct MessagingReceipt",
"name": "msgReceipt",
"type": "tuple"
},
{
"components": [
{ "internalType": "uint256", "name": "amountSentLD", "type": "uint256" },
{ "internalType": "uint256", "name": "amountReceivedLD", "type": "uint256" }
],
"internalType": "struct OFTReceipt",
"name": "oftReceipt",
"type": "tuple"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [],
"name": "token",
"outputs": [{ "internalType": "address", "name": "", "type": "address" }],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "approvalRequired",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "view",
"type": "function"
}
]
13 changes: 12 additions & 1 deletion src/integration/blockchain/shared/evm/evm-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ export abstract class EvmClient extends BlockchainClient {
return EvmUtil.getGasPriceLimitFromHex(txHex, currentGasPrice);
}

async approveContract(asset: Asset, contractAddress: string): Promise<string> {
async approveContract(asset: Asset, contractAddress: string, wait = false): Promise<string> {
const contract = this.getERC20ContractForDex(asset.chainId);

const transaction = await contract.populateTransaction.approve(contractAddress, ethers.constants.MaxInt256);
Expand All @@ -464,9 +464,20 @@ export abstract class EvmClient extends BlockchainClient {

this.setNonce(this.walletAddress, nonce + 1);

if (wait) await tx.wait();

return tx.hash;
}

async checkAndApproveContract(asset: Asset, contractAddress: string, amount: EthersNumber): Promise<string | null> {
const contract = this.getERC20ContractForDex(asset.chainId);
const allowance = await contract.allowance(this.walletAddress, contractAddress);

if (allowance.gte(amount)) return null;

return this.approveContract(asset, contractAddress, true);
}

// --- PUBLIC API - SWAPS --- //

async getUniswapLiquidity(nftContract: string, positionId: number): Promise<[number, number]> {
Expand Down
Loading
Loading