Skip to content
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

Jump to bottom

feat: support swap on jupiter #1153

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: support swap on jupiter #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/adapters/defi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,21 @@ class Defi extends Fetcher {
})
}

async swap(userDiscordId: string, chainName: string, routeSummary: any) {
async swap(
userDiscordId: string,
chainName: string,
routeSummary: any,
aggregator: string,
swapData: any
) {
return await this.jsonFetch(`${API_BASE_URL}/swap`, {
method: "POST",
body: {
userDiscordId,
chainName,
routeSummary,
aggregator,
swapData,
},
bodyCamelToSnake: false,
})
Expand Down
49 changes: 25 additions & 24 deletions src/commands/swap/index/processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ export async function handleSwap(i: ButtonInteraction) {
const { status, ok, log, error, curl } = await defi.swap(
i.user.id,
chainName,
swapCacheData.routeSummary
swapCacheData.routeSummary,
swapCacheData.aggregator,
swapCacheData.swapData
)
if (!ok) {
if (status === 400) {
Expand Down Expand Up @@ -281,6 +283,7 @@ export async function render(
i: CommandInteraction | ButtonInteraction,
data: {
routeSummary: RouteSummary
aggregator: string
tokenIn: { decimals: number }
tokenOut: { decimals: number }
},
Expand Down Expand Up @@ -310,28 +313,24 @@ export async function render(
})

const tradeRoutes = Object.values(routes).map((route, i) => {
return `${i === 0 ? "" : "\n"}${getEmoji("REPLY_3")}${
route.percent
} ${fromEmo} ${from}\n${route.hops
.map((hop, j) => {
const lastOfLast =
i === Object.values(routes).length - 1 && j === route.hops.length - 1

return `${
lastOfLast ? getEmoji("REPLY") : getEmoji("REPLY_2")
} ${getEmojiToken(hop.tokenOutSymbol as TokenEmojiKey, false)} ${
hop.tokenOutSymbol
}\n${hop.pools
.map((p, o) => {
return `${lastOfLast ? getEmoji("BLANK") : getEmoji("REPLY_3")}${
o === hop.pools.length - 1
? getEmoji("REPLY")
: getEmoji("REPLY_2")
}[(${p.name}: ${p.percent})](${HOMEPAGE_URL})`
})
.join("\n")}`
})
.join("\n")}`
return `${i === 0 ? "" : "\n"}${getEmoji("REPLY_3")}${route.percent
} ${fromEmo} ${from}\n${route.hops
.map((hop, j) => {
const lastOfLast =
i === Object.values(routes).length - 1 && j === route.hops.length - 1

return `${lastOfLast ? getEmoji("REPLY") : getEmoji("REPLY_2")
} ${getEmojiToken(hop.tokenOutSymbol as TokenEmojiKey, false)} ${hop.tokenOutSymbol
}\n${hop.pools
.map((p, o) => {
return `${lastOfLast ? getEmoji("BLANK") : getEmoji("REPLY_3")}${o === hop.pools.length - 1
? getEmoji("REPLY")
: getEmoji("REPLY_2")
}[(${p.name}: ${p.percent})](${HOMEPAGE_URL})`
})
.join("\n")}`
})
.join("\n")}`
})

// check to see if we can combine routes without exceeding discord 1024 char limit
Expand Down Expand Up @@ -406,7 +405,9 @@ export async function render(
.setStyle("PRIMARY"),
new MessageButton()
.setURL(
`https://kyberswap.com/swap/${chainName}/${from.toLowerCase()}-to-${to.toLowerCase()}`
data.aggregator === "jupiter"
? `https://jup.ag/swap/${from.toUpperCase()}-${to.toUpperCase()}`
: `https://kyberswap.com/swap/${chainName}/${from.toLowerCase()}-to-${to.toLowerCase()}`
)
.setLabel("View in web")
.setStyle("LINK")
Expand Down