From 3f45d7e9638b000c25cee290993ca1ea818b6111 Mon Sep 17 00:00:00 2001 From: Anthony <75007+kwongpan@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:39:44 -0700 Subject: [PATCH 1/5] [squid-api#586] update @axelar-network/axelarjs-sdk to 0.16.1 (#62) --- package.json | 6 +++--- yarn.lock | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index b554262..8a3b008 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xsquid/squid-types", - "version": "0.1.75", + "version": "0.1.76", "description": "JS and TS types relating to 0xsquid related projects.", "main": "dist/index.js", "types": "./dist/index.d.ts", @@ -37,10 +37,10 @@ "author": "0xsquid", "license": "Apache-2.0", "directories": { - "typescript": "^4.9.5" + "typescript": "^5.3.3" }, "dependencies": { - "@axelar-network/axelarjs-sdk": "^0.13.6", + "@axelar-network/axelarjs-sdk": "^0.16.1", "@ethersproject/providers": "^5.7.2", "typescript": "*" }, diff --git a/yarn.lock b/yarn.lock index d7b9f1f..1a53053 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,17 +7,24 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@axelar-network/axelar-cgp-solidity@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@axelar-network/axelar-cgp-solidity/-/axelar-cgp-solidity-4.5.0.tgz#f0456a2a6665302613a4d5243282ce1b18842348" - integrity sha512-4F4rmHei0cmzeUR7/mW4Bap5rc/KlPV2crD9HA7HTRfl15mVcN6/3z8p+pAm9We6bOrQplNW9KBZ3HJFP3C1Gw== +"@axelar-network/axelar-cgp-solidity@^6.3.0": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@axelar-network/axelar-cgp-solidity/-/axelar-cgp-solidity-6.3.1.tgz#da35246f3002911368fd5fa7c7cb637ac4e642ec" + integrity sha512-RJmcOQbj2VhQb8uqBtu0beNj4MKRVjiYj74wXu6QI/a4bJ5EwwZK3+uCbTVNM9Qc7LqJqObhtGQfKUnAXEFCHA== + dependencies: + "@axelar-network/axelar-gmp-sdk-solidity" "5.8.0" + +"@axelar-network/axelar-gmp-sdk-solidity@5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@axelar-network/axelar-gmp-sdk-solidity/-/axelar-gmp-sdk-solidity-5.8.0.tgz#449c6246b9f403af97a030b0a90b4f321c3a8a66" + integrity sha512-ThiCWK7lhwmsipgjKkw8c0z0ubB9toRMV9X0tRVOXHHSknKp5DCFfatbCwjpSC5GZRa+61ciTSqJNtCc7j9YoQ== -"@axelar-network/axelarjs-sdk@^0.13.6": - version "0.13.7" - resolved "https://registry.yarnpkg.com/@axelar-network/axelarjs-sdk/-/axelarjs-sdk-0.13.7.tgz#953b1866ae0c1efdf8e3abd0adbda71bcf3543f3" - integrity sha512-fqb31pXE/NoAmVUWIz+Dd5b+YYA893OD0ghZqlPicXagaozDnZZZVgPv0deythh4DWAqWl9D0dz0exbbkrL83A== +"@axelar-network/axelarjs-sdk@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@axelar-network/axelarjs-sdk/-/axelarjs-sdk-0.16.1.tgz#59eb7e40a18d70c9c50b50fece15eec4553b3fff" + integrity sha512-dhLe7yl3a37NxkZ1rEj7whMIANN/Ra+r8ZA10KvQ4LPRAHUNLGEcFwcbS9QaLRvDkKYFuJS2CCiJ86iYll1C7A== dependencies: - "@axelar-network/axelar-cgp-solidity" "^4.5.0" + "@axelar-network/axelar-cgp-solidity" "^6.3.0" "@axelar-network/axelarjs-types" "^0.33.0" "@cosmjs/json-rpc" "^0.30.1" "@cosmjs/stargate" "0.31.0-alpha.1" From b38a79071fcc4340bf37b7c8433ff67fd308d8e2 Mon Sep 17 00:00:00 2001 From: Cory <146833132+corysquid@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:25:45 -0700 Subject: [PATCH 2/5] feat: Trader Joe v2.1 types (#63) * feat: Trader Joe v2.1 types - Add Trader Joe v2.1 DexName and DexType - Add binStep to ActionBaseData and SwapDetails type --- package.json | 2 +- src/dexes/index.ts | 2 ++ src/path/index.ts | 1 + src/routes/index.ts | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a3b008..c07f652 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xsquid/squid-types", - "version": "0.1.76", + "version": "0.1.77", "description": "JS and TS types relating to 0xsquid related projects.", "main": "dist/index.js", "types": "./dist/index.d.ts", diff --git a/src/dexes/index.ts b/src/dexes/index.ts index e96c0a2..7c9751a 100644 --- a/src/dexes/index.ts +++ b/src/dexes/index.ts @@ -56,6 +56,7 @@ export enum DexName { THENA_SOLIDLY = "Thena Solidly", THENA_V3 = "Thena V3", TRADERJOE_V2 = "Trader Joe V2", + TRADERJOE_V21 = "Trader Joe V2.1", TRIDENT = "Trident", THRUSTER_V3 = "Thruster V3", UBESWAP_V2 = "Ubeswap V2", @@ -86,6 +87,7 @@ export enum DexType { SADDLE = "saddle", SLIPSTREAM = "slipstream", SOLIDLY = "solidly", + TRADERJOE_V21 = "traderjoe-v21", TRIDENT = "trident", WOMBAT = "wombat", UNISWAP_V2 = "uniswap-v2", diff --git a/src/path/index.ts b/src/path/index.ts index ff86cb4..374ae13 100644 --- a/src/path/index.ts +++ b/src/path/index.ts @@ -55,6 +55,7 @@ export interface ActionBaseData { }[]; buckets: Buckets; tickSpacing: number; + binStep: number; // wrappers address: string; diff --git a/src/routes/index.ts b/src/routes/index.ts index 763bdc8..3a25414 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -126,6 +126,7 @@ export interface SwapDetails { poolId: string; poolFee: string; tickSpacing: number; + binStep: number; osmosisPools: { poolId: string; tokenOutDenom: string; From 8843c93b9f43fe2a5fc97ea81af96f582a799744 Mon Sep 17 00:00:00 2001 From: Cory <146833132+corysquid@users.noreply.github.com> Date: Sat, 8 Jun 2024 02:30:34 -0700 Subject: [PATCH 3/5] feat: DEX parity (#65) * [squid-api#586] update @axelar-network/axelarjs-sdk to 0.16.1 (#62) (#64) * chore: add Beamswap Saddle DexName * chore: add Lynex V3 DexName * fix: Pharaoh Solidly DexName * chore: Nile/Ramses Solidly DexName - Add back Ramses Solidly - Add Nile Solidly (Linea) * chore: add Ra, Pharaoh and Nile V3 DexNames --------- Co-authored-by: Anthony <75007+kwongpan@users.noreply.github.com> --- src/dexes/index.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/dexes/index.ts b/src/dexes/index.ts index 7c9751a..ab4b42d 100644 --- a/src/dexes/index.ts +++ b/src/dexes/index.ts @@ -18,6 +18,7 @@ export enum DexName { BASESWAP_V3 = "Baseswap V3", BEAMSWAP_V2 = "Beamswap V2", BEAMSWAP_V3 = "Beamswap V3", + BEAMSWAP_SADDLE = "Beamswap Saddle", CAMELOT_V3 = "Camelot V3", CURVE_V2 = "Curve V2", ELLIPSIS = "Ellipsis", @@ -31,17 +32,23 @@ export enum DexName { KYBERSWAP = "KyberSwap", KYBERSWAP_AGGREGATOR = "kyberswap Aggregator", KINETIX_V3 = "Kinetix V3", + LYNEX_V3 = "Lynex V3", MENTO_V2 = "Mento V2", + NILE_SOLIDLY = "Nile Solidly", + NILE_V3 = "Nile V3", OPENOCEAN = "OpenOcean", OSMOSIS = "Osmosis", PANCAKESWAP_V2 = "Pancakeswap V2", PANCAKESWAP_V3 = "Pancakeswap V3", PANCAKESWAP_STABLE = "Pancakeswap Stable", PANGOLIN_V2 = "Pangolin V2", + PHARAOH_SOLIDLY = "Pharaoh Solidly", + PHARAOH_V3 = "Pharaoh V3", PLATYPUS = "Platypus", QUICKSWAP_V2 = "Quickswap V2", QUICKSWAP_V3 = "Quickswap V3", RAMSES_SOLIDLY = "Ramses Solidly", + RA_V3 = "Ra V3", RAMSES_V3 = "Ramses V3", SPOOKYSWAP_V2 = "Spookyswap V2", STELLASWAP_V2 = "Stellaswap V2", From dc7f90af8d790f43461edbd335fb47110beaf50a Mon Sep 17 00:00:00 2001 From: Cory <146833132+corysquid@users.noreply.github.com> Date: Sat, 8 Jun 2024 02:53:02 -0700 Subject: [PATCH 4/5] [squid-api#586] update @axelar-network/axelarjs-sdk to 0.16.1 (#62) (#64) (#67) Co-authored-by: Anthony <75007+kwongpan@users.noreply.github.com> From e52ca8ca5723850c3c1de9095e78d46fc9538ec3 Mon Sep 17 00:00:00 2001 From: Cory <146833132+corysquid@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:05:40 -0700 Subject: [PATCH 5/5] chore: add Immutable types (#70) * chore: add Immutable types - ChainName and NetworkIdentifier * chore: use IMMUTABLE_ZKEVM type * chore: increase package version --- package.json | 2 +- src/chains/index.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b799569..5a196c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xsquid/squid-types", - "version": "0.1.78", + "version": "0.1.79", "description": "JS and TS types relating to 0xsquid related projects.", "main": "dist/index.js", "types": "./dist/index.d.ts", diff --git a/src/chains/index.ts b/src/chains/index.ts index 9b8fb7a..db2d8f8 100644 --- a/src/chains/index.ts +++ b/src/chains/index.ts @@ -115,6 +115,7 @@ export enum ChainName { FANTOM = "Fantom", FILECOIN = "filecoin", FILECOIN2 = "filecoin-2", //testnet + IMMUTABLE_ZKEVM = "immutable", KAVA = "kava", MANTLE = "mantle", MOONBEAM = "Moonbeam", @@ -167,6 +168,7 @@ export enum NetworkIdentifier { CELO = "celo", FANTOM = "fantom", FILECOIN = "filecoin", + IMMUTABLE_ZKEVM = "immutable", KAVA = "kava", MANTLE = "mantle", MOONBEAM = "moonbeam",