diff --git a/packages/asset-service/package.json b/packages/asset-service/package.json index ab3e6fbf9..25855b6cb 100644 --- a/packages/asset-service/package.json +++ b/packages/asset-service/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@ethersproject/providers": "^5.5.2", "@shapeshiftoss/caip": "^2.0.0", - "@shapeshiftoss/types": "^2.1.0", + "@shapeshiftoss/types": "^3.0.0", "@types/lodash": "^4.14.172", "@yfi/sdk": "^1.0.30", "dotenv": "^14.3.0", diff --git a/packages/chain-adapters/package.json b/packages/chain-adapters/package.json index cb355b0ce..9d46e1eae 100644 --- a/packages/chain-adapters/package.json +++ b/packages/chain-adapters/package.json @@ -48,7 +48,7 @@ "@shapeshiftoss/caip": "^2.1.2", "@shapeshiftoss/hdwallet-core": "^1.20.0", "@shapeshiftoss/hdwallet-native": "^1.20.0", - "@shapeshiftoss/types": "^2.1.0", + "@shapeshiftoss/types": "^3.0.0", "@shapeshiftoss/unchained-client": "^6.6.0", "@types/bs58check": "^2.1.0", "@types/multicoin-address-validator": "^0.5.0" diff --git a/packages/chain-adapters/src/cosmossdk/CosmosSdkBaseAdapter.ts b/packages/chain-adapters/src/cosmossdk/CosmosSdkBaseAdapter.ts index 3d90a3497..248e7b9f9 100644 --- a/packages/chain-adapters/src/cosmossdk/CosmosSdkBaseAdapter.ts +++ b/packages/chain-adapters/src/cosmossdk/CosmosSdkBaseAdapter.ts @@ -30,7 +30,8 @@ const transformValidator = ( address: validator.address, moniker: validator.moniker, commission: validator.commission.rate, - apr: validator.apr + apr: validator.apr, + tokens: validator.tokens }) export abstract class CosmosSdkBaseAdapter implements IChainAdapter { diff --git a/packages/investor-foxy/package.json b/packages/investor-foxy/package.json index 7f9da89f9..eaeefc616 100644 --- a/packages/investor-foxy/package.json +++ b/packages/investor-foxy/package.json @@ -45,6 +45,6 @@ "@shapeshiftoss/caip": "^2.1.2", "@shapeshiftoss/chain-adapters": "^2.13.0", "@shapeshiftoss/hdwallet-core": "^1.20.0", - "@shapeshiftoss/types": "^2.1.0" + "@shapeshiftoss/types": "^3.0.0" } } diff --git a/packages/investor-foxy/src/api/api.ts b/packages/investor-foxy/src/api/api.ts index ec654b4ff..f457281e9 100644 --- a/packages/investor-foxy/src/api/api.ts +++ b/packages/investor-foxy/src/api/api.ts @@ -55,7 +55,7 @@ import { export * from './foxy-types' export type ConstructorArgs = { - adapter: ChainAdapter + adapter: ChainAdapter providerUrl: string foxyAddresses: FoxyAddressesType network?: @@ -82,7 +82,7 @@ export const transformData = ({ tvl, apy, expired, ...contractData }: FoxyOpport const TOKE_IPFS_URL = 'https://ipfs.tokemaklabs.xyz/ipfs' export class FoxyApi { - public adapter: ChainAdapter + public adapter: ChainAdapter public provider: HttpProvider private providerUrl: string public jsonRpcProvider: JsonRpcProvider diff --git a/packages/investor-foxy/src/foxycli.ts b/packages/investor-foxy/src/foxycli.ts index 8be3ff234..421338e61 100644 --- a/packages/investor-foxy/src/foxycli.ts +++ b/packages/investor-foxy/src/foxycli.ts @@ -1,5 +1,5 @@ import { caip2 } from '@shapeshiftoss/caip' -import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters' +import { ChainAdapter, ChainAdapterManager } from '@shapeshiftoss/chain-adapters' import { NativeAdapterArgs, NativeHDWallet } from '@shapeshiftoss/hdwallet-native' import { ChainTypes, NetworkTypes, WithdrawType } from '@shapeshiftoss/types' import dotenv from 'dotenv' @@ -44,9 +44,9 @@ const main = async (): Promise => { const liquidityReserveContractAddress = foxyAddresses[0].liquidityReserve const api = new FoxyApi({ - adapter: await adapterManager.byChainId( + adapter: (await adapterManager.byChainId( caip2.toCAIP2({ chain: ChainTypes.Ethereum, network: NetworkTypes.MAINNET }) - ), + )) as ChainAdapter, providerUrl: process.env.ARCHIVE_NODE || 'http://127.0.0.1:8545/', foxyAddresses: foxyAddresses }) diff --git a/packages/investor-yearn/package.json b/packages/investor-yearn/package.json index 3be8b4dbf..b0a009d30 100644 --- a/packages/investor-yearn/package.json +++ b/packages/investor-yearn/package.json @@ -40,8 +40,8 @@ "@shapeshiftoss/types": "^2.1.0" }, "devDependencies": { - "@shapeshiftoss/chain-adapters": "^2.0.0", + "@shapeshiftoss/chain-adapters": "^2.13.0", "@shapeshiftoss/hdwallet-core": "^1.20.0", - "@shapeshiftoss/types": "^2.1.0" + "@shapeshiftoss/types": "^3.0.0" } } diff --git a/packages/market-service/src/market-service-manager.ts b/packages/market-service/src/market-service-manager.ts index 2f699102c..82257b37e 100644 --- a/packages/market-service/src/market-service-manager.ts +++ b/packages/market-service/src/market-service-manager.ts @@ -6,7 +6,7 @@ import { PriceHistoryArgs, PriceHistoryType } from '@shapeshiftoss/types' -import { FindAllMarketArgs } from '@shapeshiftoss/types/src' +import { FindAllMarketArgs } from '@shapeshiftoss/types' import { MarketProviders } from './market-providers' diff --git a/packages/swapper/package.json b/packages/swapper/package.json index 3b9ae4ab0..354a2d67c 100644 --- a/packages/swapper/package.json +++ b/packages/swapper/package.json @@ -41,7 +41,7 @@ "@shapeshiftoss/caip": "^2.0.0", "@shapeshiftoss/chain-adapters": "^2.0.0", "@shapeshiftoss/hdwallet-core": "^1.20.0", - "@shapeshiftoss/types": "^2.1.0", + "@shapeshiftoss/types": "^3.0.0", "@types/readline-sync": "^1.4.4", "readline-sync": "^1.4.10", "web3-utils": "^1.5.2"