From b9acd72b88750fbc17b9b5baf9354f18b34b6ca9 Mon Sep 17 00:00:00 2001 From: SigismundSchlomo Date: Fri, 31 May 2024 12:18:16 +0300 Subject: [PATCH] update imports --- src/approveAndCall.ts | 4 +- src/entities/mixedRoute/route.test.ts | 6 +- src/entities/mixedRoute/route.ts | 6 +- src/entities/mixedRoute/trade.test.ts | 6 +- src/entities/mixedRoute/trade.ts | 8 +-- src/entities/route.test.ts | 6 +- src/entities/route.ts | 6 +- src/entities/trade.test.ts | 6 +- src/entities/trade.ts | 6 +- src/multicallExtended.ts | 4 +- src/paymentsExtended.test.ts | 2 +- src/paymentsExtended.ts | 4 +- src/swapRouter.test.ts | 6 +- src/swapRouter.ts | 6 +- src/utils/encodeMixedRouteToPath.test.ts | 6 +- src/utils/encodeMixedRouteToPath.ts | 6 +- src/utils/index.ts | 6 +- yarn.lock | 74 ++++++++++++------------ 18 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/approveAndCall.ts b/src/approveAndCall.ts index 6b001ba..9055879 100644 --- a/src/approveAndCall.ts +++ b/src/approveAndCall.ts @@ -1,14 +1,14 @@ import { Interface } from '@ethersproject/abi' import invariant from 'tiny-invariant' import { abi } from '@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IApproveAndCall.sol/IApproveAndCall.json' -import { Currency, Percent, Token } from '@sigismund/sdk-core' +import { Currency, Percent, Token } from '@airdao/sdk-core' import { MintSpecificOptions, IncreaseSpecificOptions, NonfungiblePositionManager, Position, toHex, -} from '@sigismund/v3-sdk' +} from '@airdao/v3-sdk' import JSBI from 'jsbi' // condensed version of v3-sdk AddLiquidityOptions containing only necessary swap + add attributes diff --git a/src/entities/mixedRoute/route.test.ts b/src/entities/mixedRoute/route.test.ts index d6465f4..e9a3a1e 100644 --- a/src/entities/mixedRoute/route.test.ts +++ b/src/entities/mixedRoute/route.test.ts @@ -1,8 +1,8 @@ -import { Ether, Token, WETH9, CurrencyAmount, Currency } from '@sigismund/sdk-core' -import { Route as V3RouteSDK, Pool, FeeAmount, TickMath, encodeSqrtRatioX96 } from '@sigismund/v3-sdk' +import { Ether, Token, WETH9, CurrencyAmount, Currency } from '@airdao/sdk-core' +import { Route as V3RouteSDK, Pool, FeeAmount, TickMath, encodeSqrtRatioX96 } from '@airdao/v3-sdk' import { MixedRoute, RouteV3 } from '../route' import { Protocol } from '../protocol' -import { Route as V2RouteSDK, Pair } from '@sigismund/v2-sdk' +import { Route as V2RouteSDK, Pair } from '@airdao/v2-sdk' import { MixedRouteSDK } from './route' import { partitionMixedRouteByProtocol } from '../../utils' diff --git a/src/entities/mixedRoute/route.ts b/src/entities/mixedRoute/route.ts index 4e4f49e..709fb44 100644 --- a/src/entities/mixedRoute/route.ts +++ b/src/entities/mixedRoute/route.ts @@ -1,8 +1,8 @@ import invariant from 'tiny-invariant' -import { Currency, Price, Token } from '@sigismund/sdk-core' -import { Pool } from '@sigismund/v3-sdk' -import { Pair } from '@sigismund/v2-sdk' +import { Currency, Price, Token } from '@airdao/sdk-core' +import { Pool } from '@airdao/v3-sdk' +import { Pair } from '@airdao/v2-sdk' type TPool = Pair | Pool diff --git a/src/entities/mixedRoute/trade.test.ts b/src/entities/mixedRoute/trade.test.ts index b0a0f05..66d2d98 100644 --- a/src/entities/mixedRoute/trade.test.ts +++ b/src/entities/mixedRoute/trade.test.ts @@ -1,6 +1,6 @@ -import { Percent, Price, sqrt, Token, CurrencyAmount, TradeType, WETH9, Ether, Currency } from '@sigismund/sdk-core' -import { Pair } from '@sigismund/v2-sdk' -import { encodeSqrtRatioX96, FeeAmount, nearestUsableTick, Pool, TickMath, TICK_SPACINGS } from '@sigismund/v3-sdk' +import { Percent, Price, sqrt, Token, CurrencyAmount, TradeType, WETH9, Ether, Currency } from '@airdao/sdk-core' +import { Pair } from '@airdao/v2-sdk' +import { encodeSqrtRatioX96, FeeAmount, nearestUsableTick, Pool, TickMath, TICK_SPACINGS } from '@airdao/v3-sdk' import JSBI from 'jsbi' import { MixedRouteSDK } from './route' import { MixedRouteTrade } from './trade' diff --git a/src/entities/mixedRoute/trade.ts b/src/entities/mixedRoute/trade.ts index e80c885..d358637 100644 --- a/src/entities/mixedRoute/trade.ts +++ b/src/entities/mixedRoute/trade.ts @@ -1,6 +1,6 @@ -import { Currency, Fraction, Percent, Price, sortedInsert, CurrencyAmount, TradeType, Token } from '@sigismund/sdk-core' -import { Pair } from '@sigismund/v2-sdk' -import { BestTradeOptions, Pool } from '@sigismund/v3-sdk' +import { Currency, Fraction, Percent, Price, sortedInsert, CurrencyAmount, TradeType, Token } from '@airdao/sdk-core' +import { Pair } from '@airdao/v2-sdk' +import { BestTradeOptions, Pool } from '@airdao/v3-sdk' import invariant from 'tiny-invariant' import { ONE, ZERO } from '../../constants' import { MixedRouteSDK } from './route' @@ -52,7 +52,7 @@ export function tradeComparator { diff --git a/src/entities/route.ts b/src/entities/route.ts index b2b33ac..f04b541 100644 --- a/src/entities/route.ts +++ b/src/entities/route.ts @@ -1,9 +1,9 @@ // entities/route.ts -import { Route as V2RouteSDK, Pair } from '@sigismund/v2-sdk' -import { Route as V3RouteSDK, Pool } from '@sigismund/v3-sdk' +import { Route as V2RouteSDK, Pair } from '@airdao/v2-sdk' +import { Route as V3RouteSDK, Pool } from '@airdao/v3-sdk' import { Protocol } from './protocol' -import { Currency, Price, Token } from '@sigismund/sdk-core' +import { Currency, Price, Token } from '@airdao/sdk-core' import { MixedRouteSDK } from './mixedRoute/route' export interface IRoute { diff --git a/src/entities/trade.test.ts b/src/entities/trade.test.ts index e9d77a3..772b034 100644 --- a/src/entities/trade.test.ts +++ b/src/entities/trade.test.ts @@ -1,4 +1,4 @@ -import { sqrt, Token, CurrencyAmount, TradeType, WETH9, Ether, Percent, Price } from '@sigismund/sdk-core' +import { sqrt, Token, CurrencyAmount, TradeType, WETH9, Ether, Percent, Price } from '@airdao/sdk-core' import JSBI from 'jsbi' import { MixedRoute, RouteV2, RouteV3 } from './route' import { Trade } from './trade' @@ -10,8 +10,8 @@ import { TickMath, nearestUsableTick, encodeSqrtRatioX96, -} from '@sigismund/v3-sdk' -import { Pair, Route as V2RouteSDK } from '@sigismund/v2-sdk' +} from '@airdao/v3-sdk' +import { Pair, Route as V2RouteSDK } from '@airdao/v2-sdk' import { MixedRouteSDK } from './mixedRoute/route' describe('Trade', () => { diff --git a/src/entities/trade.ts b/src/entities/trade.ts index 86dcad9..f4c53c5 100644 --- a/src/entities/trade.ts +++ b/src/entities/trade.ts @@ -1,6 +1,6 @@ -import { Currency, CurrencyAmount, Fraction, Percent, Price, TradeType } from '@sigismund/sdk-core' -import { Pair, Route as V2RouteSDK, Trade as V2TradeSDK } from '@sigismund/v2-sdk' -import { Pool, Route as V3RouteSDK, Trade as V3TradeSDK } from '@sigismund/v3-sdk' +import { Currency, CurrencyAmount, Fraction, Percent, Price, TradeType } from '@airdao/sdk-core' +import { Pair, Route as V2RouteSDK, Trade as V2TradeSDK } from '@airdao/v2-sdk' +import { Pool, Route as V3RouteSDK, Trade as V3TradeSDK } from '@airdao/v3-sdk' import invariant from 'tiny-invariant' import { ONE, ZERO } from '../constants' import { MixedRouteSDK } from './mixedRoute/route' diff --git a/src/multicallExtended.ts b/src/multicallExtended.ts index 453d41a..2dd4ca3 100644 --- a/src/multicallExtended.ts +++ b/src/multicallExtended.ts @@ -1,7 +1,7 @@ import { Interface } from '@ethersproject/abi' -import { BigintIsh } from '@sigismund/sdk-core' +import { BigintIsh } from '@airdao/sdk-core' import { abi } from '@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IMulticallExtended.sol/IMulticallExtended.json' -import { Multicall, toHex } from '@sigismund/v3-sdk' +import { Multicall, toHex } from '@airdao/v3-sdk' // deadline or previousBlockhash export type Validation = BigintIsh | string diff --git a/src/paymentsExtended.test.ts b/src/paymentsExtended.test.ts index 1fd1f06..62eeb09 100644 --- a/src/paymentsExtended.test.ts +++ b/src/paymentsExtended.test.ts @@ -1,4 +1,4 @@ -import { Percent, Token } from '@sigismund/sdk-core' +import { Percent, Token } from '@airdao/sdk-core' import JSBI from 'jsbi' import { PaymentsExtended } from './paymentsExtended' diff --git a/src/paymentsExtended.ts b/src/paymentsExtended.ts index 890c282..8e44239 100644 --- a/src/paymentsExtended.ts +++ b/src/paymentsExtended.ts @@ -1,7 +1,7 @@ import { Interface } from '@ethersproject/abi' -import { Percent, Token, validateAndParseAddress } from '@sigismund/sdk-core' +import { Percent, Token, validateAndParseAddress } from '@airdao/sdk-core' import { abi } from '@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IPeripheryPaymentsWithFeeExtended.sol/IPeripheryPaymentsWithFeeExtended.json' -import { FeeOptions, Payments, toHex } from '@sigismund/v3-sdk' +import { FeeOptions, Payments, toHex } from '@airdao/v3-sdk' import JSBI from 'jsbi' function encodeFeeBips(fee: Percent): string { diff --git a/src/swapRouter.test.ts b/src/swapRouter.test.ts index c4c09c0..848951b 100644 --- a/src/swapRouter.test.ts +++ b/src/swapRouter.test.ts @@ -1,5 +1,5 @@ -import { BigintIsh, CurrencyAmount, Ether, Percent, Token, TradeType, WETH9 } from '@sigismund/sdk-core' -import { Pair, Route as V2Route, Trade as V2Trade } from '@sigismund/v2-sdk' +import { BigintIsh, CurrencyAmount, Ether, Percent, Token, TradeType, WETH9 } from '@airdao/sdk-core' +import { Pair, Route as V2Route, Trade as V2Trade } from '@airdao/v2-sdk' import { encodeSqrtRatioX96, FeeAmount, @@ -10,7 +10,7 @@ import { TickMath, TICK_SPACINGS, Trade as V3Trade, -} from '@sigismund/v3-sdk' +} from '@airdao/v3-sdk' import JSBI from 'jsbi' import { SwapRouter, Trade } from '.' import { ApprovalTypes } from './approveAndCall' diff --git a/src/swapRouter.ts b/src/swapRouter.ts index c364fa1..86296df 100644 --- a/src/swapRouter.ts +++ b/src/swapRouter.ts @@ -1,7 +1,7 @@ import { Interface } from '@ethersproject/abi' -import { Currency, CurrencyAmount, Percent, TradeType, validateAndParseAddress, WETH9 } from '@sigismund/sdk-core' +import { Currency, CurrencyAmount, Percent, TradeType, validateAndParseAddress, WETH9 } from '@airdao/sdk-core' import { abi } from '@uniswap/swap-router-contracts/artifacts/contracts/interfaces/ISwapRouter02.sol/ISwapRouter02.json' -import { Trade as V2Trade } from '@sigismund/v2-sdk' +import { Trade as V2Trade } from '@airdao/v2-sdk' import { encodeRouteToPath, FeeOptions, @@ -13,7 +13,7 @@ import { SelfPermit, toHex, Trade as V3Trade, -} from '@sigismund/v3-sdk' +} from '@airdao/v3-sdk' import invariant from 'tiny-invariant' import JSBI from 'jsbi' import { ADDRESS_THIS, MSG_SENDER } from './constants' diff --git a/src/utils/encodeMixedRouteToPath.test.ts b/src/utils/encodeMixedRouteToPath.test.ts index c26b9bb..776b7ff 100644 --- a/src/utils/encodeMixedRouteToPath.test.ts +++ b/src/utils/encodeMixedRouteToPath.test.ts @@ -1,6 +1,6 @@ -import { CurrencyAmount, Ether, Token, WETH9 } from '@sigismund/sdk-core' -import { Pair } from '@sigismund/v2-sdk' -import { encodeSqrtRatioX96, FeeAmount, Pool } from '@sigismund/v3-sdk' +import { CurrencyAmount, Ether, Token, WETH9 } from '@airdao/sdk-core' +import { Pair } from '@airdao/v2-sdk' +import { encodeSqrtRatioX96, FeeAmount, Pool } from '@airdao/v3-sdk' import { MixedRouteSDK } from '../entities/mixedRoute/route' import { encodeMixedRouteToPath } from './encodeMixedRouteToPath' diff --git a/src/utils/encodeMixedRouteToPath.ts b/src/utils/encodeMixedRouteToPath.ts index 91cb8d2..b1a1f75 100644 --- a/src/utils/encodeMixedRouteToPath.ts +++ b/src/utils/encodeMixedRouteToPath.ts @@ -1,7 +1,7 @@ import { pack } from '@ethersproject/solidity' -import { Currency, Token } from '@sigismund/sdk-core' -import { Pool } from '@sigismund/v3-sdk' -import { Pair } from '@sigismund/v2-sdk' +import { Currency, Token } from '@airdao/sdk-core' +import { Pool } from '@airdao/v3-sdk' +import { Pair } from '@airdao/v2-sdk' import { MixedRouteSDK } from '../entities/mixedRoute/route' import { V2_FEE_PATH_PLACEHOLDER } from '../constants' diff --git a/src/utils/index.ts b/src/utils/index.ts index 27b441f..9af98bb 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,6 +1,6 @@ -import { Currency, Token } from '@sigismund/sdk-core' -import { Pair } from '@sigismund/v2-sdk' -import { Pool } from '@sigismund/v3-sdk' +import { Currency, Token } from '@airdao/sdk-core' +import { Pair } from '@airdao/v2-sdk' +import { Pool } from '@airdao/v3-sdk' import { MixedRouteSDK } from '../entities/mixedRoute/route' /** diff --git a/yarn.lock b/yarn.lock index 88ddaa2..1fc32a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,43 @@ # yarn lockfile v1 +"@airdao/sdk-core@4.0.7-airdao.0": + version "4.0.7-airdao.0" + resolved "https://registry.yarnpkg.com/@airdao/sdk-core/-/sdk-core-4.0.7-airdao.0.tgz#f1e7a7b6d27386eb7b1f6710bbeba45f71ba6585" + integrity sha512-HylW92Q7jbd7L3q7mvOhZi4XnPFt6kslGHkIA2mRnQ7g5lG68/ESuQWTeXWv0wXBsqNvSMskzbguR++i6nOGXg== + dependencies: + "@ethersproject/address" "^5.0.2" + big.js "^5.2.2" + decimal.js-light "^2.5.0" + jsbi "^3.1.4" + tiny-invariant "^1.1.0" + toformat "^2.0.0" + +"@airdao/v2-sdk@3.2.3-airdao.0": + version "3.2.3-airdao.0" + resolved "https://registry.yarnpkg.com/@airdao/v2-sdk/-/v2-sdk-3.2.3-airdao.0.tgz#c3f3540f6e6a661c562fab3261f93783d955963e" + integrity sha512-cY3XMNxxQnd4RTARFTyi8jokccGfJWGVDA36PBcnpqdv880EhOlH0qxEHKzGF+HCf/1zAMfrMhMpSvOQaqV3UQ== + dependencies: + "@airdao/sdk-core" "4.0.7-airdao.0" + "@ethersproject/address" "^5.0.0" + "@ethersproject/solidity" "^5.0.0" + tiny-invariant "^1.1.0" + tiny-warning "^1.0.3" + +"@airdao/v3-sdk@3.10.0-airdao.0": + version "3.10.0-airdao.0" + resolved "https://registry.yarnpkg.com/@airdao/v3-sdk/-/v3-sdk-3.10.0-airdao.0.tgz#a67d74466eab8d7966a6ec0750bebb4e1b57fb18" + integrity sha512-/+jo5WmhhFwIfCsR422yi/SICb9iQx5ubtz2I4hNXSojhUr5ob1AO4onTOLEdrZzEYxJKasMtNbt2KCOwM7nuA== + dependencies: + "@airdao/sdk-core" "4.0.7-airdao.0" + "@ethersproject/abi" "^5.0.12" + "@ethersproject/solidity" "^5.0.9" + "@uniswap/swap-router-contracts" "^1.2.1" + "@uniswap/v3-periphery" "^1.1.1" + "@uniswap/v3-staker" "1.0.0" + tiny-invariant "^1.1.0" + tiny-warning "^1.0.3" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@babel/code-frame@^7.5.5": version "7.15.8" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz" @@ -1374,43 +1411,6 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@sigismund/sdk-core@4.0.7-airdao.1": - version "4.0.7-airdao.1" - resolved "https://registry.npmjs.org/@sigismund/sdk-core/-/sdk-core-4.0.7-airdao.1.tgz" - integrity sha512-IatplwhfMHB2BhgkksDoRGdqx+H+UKb1wlef6OJK74dKETrjKljnmJMY3r+Pae34w6yKqX1SIZrqtqTX9Gru/Q== - dependencies: - "@ethersproject/address" "^5.0.2" - big.js "^5.2.2" - decimal.js-light "^2.5.0" - jsbi "^3.1.4" - tiny-invariant "^1.1.0" - toformat "^2.0.0" - -"@sigismund/v2-sdk@3.2.3-airdao.5": - version "3.2.3-airdao.5" - resolved "https://registry.yarnpkg.com/@sigismund/v2-sdk/-/v2-sdk-3.2.3-airdao.5.tgz#7863560628a1fb3c24b2179ac16681d810c62f29" - integrity sha512-0genSS0kiKKZldBlEWx2t4VsDtFjALaS/IYDCDcwnUuWpVfcc9A86kdfjf2tkLkXWrNJqH2rL4xmWyaqgfav7Q== - dependencies: - "@ethersproject/address" "^5.0.0" - "@ethersproject/solidity" "^5.0.0" - "@sigismund/sdk-core" "4.0.7-airdao.1" - tiny-invariant "^1.1.0" - tiny-warning "^1.0.3" - -"@sigismund/v3-sdk@3.10.0-airdao.3": - version "3.10.0-airdao.3" - resolved "https://registry.npmjs.org/@sigismund/v3-sdk/-/v3-sdk-3.10.0-airdao.3.tgz" - integrity sha512-2clqQ+qoxkeCD/0LB3zL8PyRFS4kFtVEotKL1Ebc2ftQ1N1BE9kqJTQlmSQguY67aVtFoz5CXcmwV4SSGOVsyA== - dependencies: - "@ethersproject/abi" "^5.0.12" - "@ethersproject/solidity" "^5.0.9" - "@sigismund/sdk-core" "4.0.7-airdao.1" - "@uniswap/swap-router-contracts" "^1.2.1" - "@uniswap/v3-periphery" "^1.1.1" - "@uniswap/v3-staker" "1.0.0" - tiny-invariant "^1.1.0" - tiny-warning "^1.0.3" - "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"