Skip to content

Commit

Permalink
update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
SigismundSchlomo committed May 31, 2024
1 parent 52bb6df commit b9acd72
Show file tree
Hide file tree
Showing 18 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions src/approveAndCall.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/entities/mixedRoute/route.test.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
6 changes: 3 additions & 3 deletions src/entities/mixedRoute/route.ts
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/entities/mixedRoute/trade.test.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
8 changes: 4 additions & 4 deletions src/entities/mixedRoute/trade.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -52,7 +52,7 @@ export function tradeComparator<TInput extends Currency, TOutput extends Currenc
*
* Does not account for slippage, i.e., changes in price environment that can occur between
* the time the trade is submitted and when it is executed.
* @notice This class is functionally the same as the `Trade` class in the `@sigismund/v3-sdk` package, aside from typing and some input validation.
* @notice This class is functionally the same as the `Trade` class in the `@airdao/v3-sdk` package, aside from typing and some input validation.
* @template TInput The input token, either Ether or an ERC-20
* @template TOutput The output token, either Ether or an ERC-20
* @template TTradeType The trade type, either exact input or exact output
Expand Down
6 changes: 3 additions & 3 deletions src/entities/route.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Ether, Token, WETH9, CurrencyAmount } from '@sigismund/sdk-core'
import { Route as V3RouteSDK, Pool, FeeAmount, TickMath, encodeSqrtRatioX96 } from '@sigismund/v3-sdk'
import { Ether, Token, WETH9, CurrencyAmount } from '@airdao/sdk-core'
import { Route as V3RouteSDK, Pool, FeeAmount, TickMath, encodeSqrtRatioX96 } from '@airdao/v3-sdk'
import { 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 { RouteV2 } from './route'

describe('RouteV3', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/entities/route.ts
Original file line number Diff line number Diff line change
@@ -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<TInput extends Currency, TOutput extends Currency, TPool extends Pool | Pair> {
Expand Down
6 changes: 3 additions & 3 deletions src/entities/trade.test.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/entities/trade.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions src/multicallExtended.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/paymentsExtended.test.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
4 changes: 2 additions & 2 deletions src/paymentsExtended.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/swapRouter.test.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions src/swapRouter.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions src/utils/encodeMixedRouteToPath.test.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
6 changes: 3 additions & 3 deletions src/utils/encodeMixedRouteToPath.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
6 changes: 3 additions & 3 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -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'

/**
Expand Down
74 changes: 37 additions & 37 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit b9acd72

Please sign in to comment.