Skip to content

Develop #172

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
Hugo0 merged 2 commits into from
Mar 1, 2025
Merged

Develop #172

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
dc18059
feat: use squid v2 everywhere
jjramirezn Feb 28, 2025
9df087c
Merge pull request #171 from peanutprotocol/feat/use-squid-v2
Hugo0 Mar 1, 2025
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
1 change: 1 addition & 0 deletions src/consts/misc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export const SQUID_ADDRESS = {
mainnet: '0xce16F69375520ab01377ce7B88f5BA8C48F8D666',
testnet: '0xC3468a191Fe51815b26535ED1F82C1f79e6Ec37D',
}
export const SQUID_API_URL = 'https://apiplus.squidrouter.com/v2'

export const PEANUT_SALT = '0x70adbbeba9d4f0c82e28dd574f15466f75df0543b65f24460fc445813b5d94e0'
export const ANYONE_WITHDRAWAL_MODE = '0x0000000000000000000000000000000000000000000000000000000000000000'
Expand Down
10 changes: 3 additions & 7 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import {
} from './util.ts'

import * as interfaces from './consts/interfaces.consts.ts'
import { SQUID_ADDRESS } from './consts/misc.ts'
import { SQUID_ADDRESS, SQUID_API_URL } from './consts/misc.ts'
import {
EIP3009Tokens,
GaslessReclaimTypes,
Expand Down Expand Up @@ -2128,9 +2128,7 @@ async function claimLinkXChainGasless({

async function getSquidChains({ isTestnet }: { isTestnet: boolean }): Promise<interfaces.ISquidChain[]> {
// TODO rate limits? Caching?
const url = isTestnet
? 'https://testnet.apiplus.squidrouter.com/v2/chains'
: 'https://apiplus.squidrouter.com/v2/chains'
const url = isTestnet ? 'https://testnet.apiplus.squidrouter.com/v2/chains' : `${SQUID_API_URL}/chains`
try {
const response = await fetch(url, {
headers: {
Expand Down Expand Up @@ -2162,9 +2160,7 @@ async function getSquidChains({ isTestnet }: { isTestnet: boolean }): Promise<in
async function getSquidTokens({ isTestnet }: { isTestnet: boolean }): Promise<interfaces.ISquidToken[]> {
// TODO rate limits? Caching?
// const url = isTestnet ? 'https://testnet.api.squidrouter.com/v1/tokens' : 'https://api.squidrouter.com/v1/tokens'
const url = isTestnet
? 'https://testnet.apiplus.squidrouter.com/v2/tokens'
: 'https://apiplus.squidrouter.com/v2/tokens'
const url = isTestnet ? 'https://testnet.apiplus.squidrouter.com/v2/tokens' : `${SQUID_API_URL}/tokens`

try {
const response = await fetch(url, {
Expand Down
11 changes: 6 additions & 5 deletions src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as interfaces from './consts/interfaces.consts.ts'
import { ANYONE_WITHDRAWAL_MODE, PEANUT_SALT, RECIPIENT_WITHDRAWAL_MODE } from './consts/misc.ts'
import { TransactionRequest } from '@ethersproject/abstract-provider'
import { getSquidRoute } from '.'
import { SQUID_API_URL } from './consts/misc.ts'

export function assert(condition: any, message: string) {
if (!condition) {
Expand Down Expand Up @@ -599,7 +600,7 @@ export function getSquidRouterUrl(isMainnet: boolean, usePeanutApi: boolean): st
} else {
// using squid api
if (isMainnet) {
squidRouteUrl = 'https://apiplus.squidrouter.com/v2/route'
squidRouteUrl = `${SQUID_API_URL}/route`
} else {
squidRouteUrl = 'https://testnet.apiplus.squidrouter.com/v2/route'
}
Expand Down Expand Up @@ -693,11 +694,11 @@ export async function getTokenPrice({
tokenAddress: string
chainId: string | number
}): Promise<number> {
const response = await fetch(
'https://api.0xsquid.com/v1/token-price?' + new URLSearchParams({ tokenAddress, chainId: chainId.toString() })
)
const response = await fetch(`${SQUID_API_URL}/token-price?tokenAddress=${tokenAddress}&chainId=${chainId}`, {
headers: { 'x-integrator-id': '11CBA45B-5EE9-4331-B146-48CCD7ED4C7C' },
})
const data = await response.json()
return data.price
return data.token.usdPrice
}

interface TokenData {
Expand Down
Loading