Skip to content

navi: fix reward collection for NAVI-VSUI and NAVI-LOOP-USDT-USDC #95

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
jangid merged 2 commits into from
Aug 4, 2026
Merged

navi: fix reward collection for NAVI-VSUI and NAVI-LOOP-USDT-USDC #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a920a4
navi: fix reward collection for NAVI-VSUI and NAVI-LOOP-USDT-USDC
Zorag44 Aug 3, 2026
e2670b2
Merge branch 'main' into bugfix/navi
rg-alpha Aug 4, 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
11 changes: 5 additions & 6 deletions src/strategies/lending.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,8 @@ export class LendingStrategy extends BaseStrategy<
} else if (this.poolLabel.asset.name === 'vSUI') {
if (reward.rewardCoinType === navxCoin.coinType) {
tx.moveCall({
target: `${this.poolLabel.packageId}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps_bluefin`,
// Routed through Cetus: the Bluefin NAVX-SUI pool is too thin to swap through.
target: `${this.poolLabel.packageId}::alphafi_navi_investor::collect_v3_rewards_with_two_swaps`,
typeArguments: [this.poolLabel.asset.type, suiCoin.coinType, navxCoin.coinType],
arguments: [
tx.object(this.poolLabel.investorId),
Expand All @@ -755,17 +756,15 @@ export class LendingStrategy extends BaseStrategy<
),
tx.object(NAVI_CONFIG.INCENTIVE_V3_ID),
tx.object(NAVI_CONFIG.REWARDS_POOL.NAVX),
tx.object(
await this.context.getPoolIdBySymbolsAndProtocol('NAVX', 'SUI', 'bluefin'),
),
tx.object(await this.context.getPoolIdBySymbolsAndProtocol('NAVX', 'SUI', 'cetus')),
tx.object(
await this.context.getPoolIdBySymbolsAndProtocol(
this.poolLabel.asset.name,
'SUI',
'bluefin',
'cetus',
),
),
tx.object(GLOBAL_CONFIGS.BLUEFIN),
tx.object(GLOBAL_CONFIGS.CETUS),
],
});
} else if (reward.rewardCoinType === vsuiCoin.coinType) {
Expand Down
69 changes: 68 additions & 1 deletion src/strategies/looping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,11 @@ export class LoopingStrategy extends BaseStrategy<
if (!claimableRewards) {
return;
}
const [navxCoin, vsuiCoin, stsuiCoin] = await this.context.getCoinsBySymbols([
const [navxCoin, vsuiCoin, stsuiCoin, suiCoin] = await this.context.getCoinsBySymbols([
'NAVX',
'vSUI',
'stSUI',
'SUI',
]);

for (const reward of claimableRewards) {
Expand Down Expand Up @@ -491,6 +492,58 @@ export class LoopingStrategy extends BaseStrategy<
],
});
}
} else if (this.poolLabel.supplyAsset.name === 'USDT') {
// Rewards route reward -> SUI -> USDC -> USDT; `update_pool_v3` asserts the
// investor has no unclaimed incentive-v3 rewards, so skipping this aborts 15151.
if (reward.rewardCoinType === vsuiCoin.coinType) {
tx.moveCall({
target: `${this.poolLabel.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
typeArguments: [
this.poolLabel.supplyAsset.type,
this.poolLabel.borrowAsset.type,
suiCoin.coinType,
vsuiCoin.coinType,
],
arguments: [
tx.object(this.poolLabel.investorId),
tx.object(VERSIONS.ALPHA_VERSIONS[5]),
tx.object(CLOCK_PACKAGE_ID),
tx.object(NAVI_CONFIG.NAVI_STORAGE_ID),
tx.object(NAVI_CONFIG.INCENTIVE_V3_ID),
tx.object(NAVI_CONFIG.REWARDS_POOL.vSUI),
tx.object(await this.context.getPoolIdBySymbolsAndProtocol('vSUI', 'SUI', 'cetus')),
tx.object(await this.context.getPoolIdBySymbolsAndProtocol('USDC', 'SUI', 'cetus')),
tx.object(
await this.context.getPoolIdBySymbolsAndProtocol('USDC', 'USDT', 'cetus'),
),
tx.object(GLOBAL_CONFIGS.CETUS),
],
});
} else if (reward.rewardCoinType === navxCoin.coinType) {
tx.moveCall({
target: `${this.poolLabel.packageId}::alphafi_navi_usdt_usdc_investor::collect_v3_rewards_with_three_swaps`,
typeArguments: [
this.poolLabel.supplyAsset.type,
this.poolLabel.borrowAsset.type,
suiCoin.coinType,
navxCoin.coinType,
],
arguments: [
tx.object(this.poolLabel.investorId),
tx.object(VERSIONS.ALPHA_VERSIONS[5]),
tx.object(CLOCK_PACKAGE_ID),
tx.object(NAVI_CONFIG.NAVI_STORAGE_ID),
tx.object(NAVI_CONFIG.INCENTIVE_V3_ID),
tx.object(NAVI_CONFIG.REWARDS_POOL.NAVX),
tx.object(await this.context.getPoolIdBySymbolsAndProtocol('NAVX', 'SUI', 'cetus')),
tx.object(await this.context.getPoolIdBySymbolsAndProtocol('USDC', 'SUI', 'cetus')),
tx.object(
await this.context.getPoolIdBySymbolsAndProtocol('USDC', 'USDT', 'cetus'),
),
tx.object(GLOBAL_CONFIGS.CETUS),
],
});
}
}
rewardCoinSet.add(reward.rewardCoinType);
}
Expand Down Expand Up @@ -598,6 +651,20 @@ export class LoopingStrategy extends BaseStrategy<
rewardCoinSet,
claimableRewards[normalizeStructTag(this.poolLabel.borrowAsset.type)],
);
} else if (this.poolLabel.supplyAsset.name === 'USDT') {
const claimableRewards = await this.getAvailableRewards(
NAVI_CONFIG.ACCOUNT_ADDRESSES.USDT_USDC_LOOP,
);
await this.collectAndSwapRewardsTxb(
tx,
rewardCoinSet,
claimableRewards[normalizeStructTag(this.poolLabel.supplyAsset.type)],
);
await this.collectAndSwapRewardsTxb(
tx,
rewardCoinSet,
claimableRewards[normalizeStructTag(this.poolLabel.borrowAsset.type)],
);
}
}

Expand Down
Loading