Merge pull request #1869 from zeitgeistpm/remove-sdk-v1

Remove sdk v1

components/account/AccountButton.tsx

@@ -1,6 +1,6 @@
 import { Menu, Popover, Transition } from "@headlessui/react";
 import { getWallets } from "@talismn/connect-wallets";
-import { isRpcSdk, ZTG } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk, ZTG } from "@zeitgeistpm/sdk";
 import Avatar from "components/ui/Avatar";
 import Modal from "components/ui/Modal";
 import Decimal from "decimal.js";

components/account/AccountModalContent.tsx

@@ -3,7 +3,7 @@ import { LogOut } from "react-feather";
 import AccountSelect, { AccountOption } from "./AccountSelect";
 import { useWallet } from "lib/state/wallet";
 import { useZtgBalance } from "lib/hooks/queries/useZtgBalance";
-import { ZTG } from "@zeitgeistpm/sdk-next";
+import { ZTG } from "@zeitgeistpm/sdk";
 import { useChainConstants } from "lib/hooks/queries/useChainConstants";
 
 const AccountModalContent: FC = () => {

components/assets/AssetActionButtons/AssetTradingButtons.tsx

@@ -1,5 +1,5 @@
 import { Dialog } from "@headlessui/react";
-import { ScalarAssetId, CategoricalAssetId } from "@zeitgeistpm/sdk-next";
+import { ScalarAssetId, CategoricalAssetId } from "@zeitgeistpm/sdk";
 import TradeForm from "components/trade-form";
 import Modal from "components/ui/Modal";
 import SecondaryButton from "components/ui/SecondaryButton";

components/assets/AssetActionButtons/DisputeButton.tsx

@@ -5,7 +5,7 @@ import {
   isRpcSdk,
   Market,
   MarketOutcomeAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import CategoricalDisputeBox from "components/outcomes/CategoricalDisputeBox";
 import ScalarDisputeBox from "components/outcomes/ScalarDisputeBox";
 import Modal from "components/ui/Modal";

components/assets/AssetActionButtons/PoolShareButtons.tsx

@@ -12,7 +12,7 @@ import {
   getIndexOf,
   isRpcSdk,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import { useChainConstants } from "lib/hooks/queries/useChainConstants";
 import { useBalance } from "lib/hooks/queries/useBalance";
 import { useWallet } from "lib/state/wallet";

components/assets/AssetActionButtons/RedeemButton.tsx

@@ -8,7 +8,7 @@ import {
   Market,
   MarketId,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import SecondaryButton from "components/ui/SecondaryButton";
 import Decimal from "decimal.js";
 import { ZTG } from "lib/constants";

components/assets/AssetActionButtons/ReportButton.tsx

@@ -7,7 +7,7 @@ import {
   isRpcSdk,
   Market,
   ScalarAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import ScalarReportBox from "components/outcomes/ScalarReportBox";
 import Modal from "components/ui/Modal";
 import SecondaryButton from "components/ui/SecondaryButton";

components/assets/AssetActionButtons/index.tsx

@@ -1,4 +1,4 @@
-import { CategoricalAssetId, ScalarAssetId } from "@zeitgeistpm/sdk-next";
+import { CategoricalAssetId, ScalarAssetId } from "@zeitgeistpm/sdk";
 import { useMarket } from "lib/hooks/queries/useMarket";
 import { useMarketStage } from "lib/hooks/queries/useMarketStage";
 import { useWallet } from "lib/state/wallet";

components/create/editor/Publishing.tsx

@@ -1,7 +1,12 @@
 import { Dialog } from "@headlessui/react";
 import { useQuery } from "@tanstack/react-query";
 import { PollingTimeout, poll } from "@zeitgeistpm/avatara-util";
-import { IOZtgAssetId, ZTG, isFullSdk } from "@zeitgeistpm/sdk-next";
+import {
+  IOForeignAssetId,
+  IOZtgAssetId,
+  ZTG,
+  isFullSdk,
+} from "@zeitgeistpm/sdk";
 import { StorageError } from "@zeitgeistpm/web3.storage";
 import Modal from "components/ui/Modal";
 import TransactionButton from "components/ui/TransactionButton";
@@ -166,7 +171,9 @@ export const Publishing = ({ editor }: PublishingProps) => {
 
         const result = await sdk.model.markets.create(
           params,
-          feeDetails?.assetId,
+          IOForeignAssetId.is(feeDetails?.assetId)
+            ? feeDetails?.assetId
+            : undefined,
         );
         const marketId = result.saturate().unwrap().market.marketId;
 

components/front-page/LatestTrades.tsx

@@ -2,7 +2,7 @@ import Table, { TableColumn, TableData } from "components/ui/Table";
 import Link from "next/link";
 import { formatNumberLocalized } from "lib/util";
 import { useLatestTrades } from "lib/hooks/queries/useLatestTrades";
-import { ZTG } from "@zeitgeistpm/sdk-next";
+import { ZTG } from "@zeitgeistpm/sdk";
 import moment from "moment";
 import Avatar from "components/ui/Avatar";
 

components/liquidity/ExitPoolForm.tsx

@@ -6,7 +6,7 @@ import {
   isRpcSdk,
   parseAssetId,
   ZTG,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import FormTransactionButton from "components/ui/FormTransactionButton";
 import Input from "components/ui/Input";
 import Decimal from "decimal.js";

components/liquidity/JoinPoolForm.tsx

@@ -1,5 +1,5 @@
 import { useQueryClient } from "@tanstack/react-query";
-import { isRpcSdk, ZTG } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk, ZTG } from "@zeitgeistpm/sdk";
 import FormTransactionButton from "components/ui/FormTransactionButton";
 import Input from "components/ui/Input";
 import Decimal from "decimal.js";

components/liquidity/LiquidityModal.tsx

@@ -3,7 +3,7 @@ import {
   getIndexOf,
   IOMarketOutcomeAssetId,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import Decimal from "decimal.js";
 import { useAccountAssetBalances } from "lib/hooks/queries/useAccountAssetBalances";
 import { useAccountPoolAssetBalances } from "lib/hooks/queries/useAccountPoolAssetBalances";

components/liquidity/MarketLiquiditySection.tsx

@@ -1,5 +1,5 @@
 import { FullMarketFragment } from "@zeitgeistpm/indexer";
-import { parseAssetId } from "@zeitgeistpm/sdk-next";
+import { parseAssetId } from "@zeitgeistpm/sdk";
 import LiquidityModal from "components/liquidity/LiquidityModal";
 import PoolTable from "components/liquidity/PoolTable";
 import BuySellFullSetsButton from "components/markets/BuySellFullSetsButton";

components/liquidity/PoolTable.tsx

@@ -1,4 +1,4 @@
-import { IOBaseAssetId, parseAssetId, ZTG } from "@zeitgeistpm/sdk-next";
+import { IOBaseAssetId, parseAssetId, ZTG } from "@zeitgeistpm/sdk";
 import Table, { TableColumn, TableData } from "components/ui/Table";
 import Decimal from "decimal.js";
 import { useAccountPoolAssetBalances } from "lib/hooks/queries/useAccountPoolAssetBalances";

components/markets/BuyFullSetForm.tsx

@@ -1,4 +1,4 @@
-import { isRpcSdk, parseAssetId } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk, parseAssetId } from "@zeitgeistpm/sdk";
 import Input from "components/ui/Input";
 import TransactionButton from "components/ui/TransactionButton";
 import Decimal from "decimal.js";

components/markets/DisputeResult.tsx

@@ -1,5 +1,5 @@
 import { FullMarketFragment } from "@zeitgeistpm/indexer";
-import { ScalarRangeType } from "@zeitgeistpm/sdk-next";
+import { ScalarRangeType } from "@zeitgeistpm/sdk";
 import { TwitterBird } from "components/markets/TradeResult";
 import {
   MarketCategoricalOutcome,

components/markets/MarketAssetDetails.tsx

@@ -3,7 +3,7 @@ import {
   CategoricalAssetId,
   MarketOutcomeAssetId,
   ScalarAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import AssetActionButtons from "components/assets/AssetActionButtons";
 import Table, { TableColumn, TableData } from "components/ui/Table";
 import Decimal from "decimal.js";

components/markets/MarketChart.tsx

@@ -1,4 +1,4 @@
-import { MarketStatus, parseAssetId } from "@zeitgeistpm/sdk-next";
+import { MarketStatus, parseAssetId } from "@zeitgeistpm/sdk";
 import TimeFilters, { filters, TimeFilter } from "components/ui/TimeFilters";
 import TimeSeriesChart, { ChartSeries } from "components/ui/TimeSeriesChart";
 import { useAssetMetadata } from "lib/hooks/queries/useAssetMetadata";

components/markets/MarketContextActionOutcomeSelector.tsx

@@ -1,6 +1,6 @@
 import { Listbox, Transition } from "@headlessui/react";
 import { FullMarketFragment } from "@zeitgeistpm/indexer";
-import { MarketOutcomeAssetId, getIndexOf } from "@zeitgeistpm/sdk-next";
+import { MarketOutcomeAssetId, getIndexOf } from "@zeitgeistpm/sdk";
 import Input from "components/ui/Input";
 import TruncatedText from "components/ui/TruncatedText";
 import Fuse from "fuse.js";

components/markets/MarketHeader.tsx

@@ -5,7 +5,7 @@ import {
   MarketStatus,
   ScalarRangeType,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import Avatar from "components/ui/Avatar";
 import Skeleton from "components/ui/Skeleton";
 import Decimal from "decimal.js";
@@ -19,7 +19,7 @@ import { hasDatePassed } from "lib/util/hasDatePassed";
 import { FC, PropsWithChildren, useState } from "react";
 import { MarketTimer } from "./MarketTimer";
 import { MarketTimerSkeleton } from "./MarketTimer";
-import { MarketDispute, OutcomeReport } from "@zeitgeistpm/sdk/dist/types";
+import { OutcomeReport } from "@zeitgeistpm/indexer";
 import {
   MarketEventHistory,
   useMarketEventHistory,
@@ -40,6 +40,7 @@ import {
 import { useMarketsStats } from "lib/hooks/queries/useMarketsStats";
 import { MarketPromotionCallout } from "./PromotionCallout";
 import { PromotedMarket } from "lib/cms/get-promoted-markets";
+import { MarketDispute } from "lib/types/markets";
 
 export const UserIdentity: FC<
   PropsWithChildren<{ user: string; className?: string }>
@@ -159,7 +160,7 @@ const MarketHistory: FC<
   }).format(marketHistory?.end?.timestamp);
   const getOutcome = (outcome: OutcomeReport) => {
     if (marketType.scalar === null) {
-      return categories[outcome["categorical"]]?.name;
+      return categories[outcome.categorical!]?.name;
     } else {
       return formatScalarOutcome(outcome["scalar"], scalarType);
     }

components/markets/MarketTimer.tsx

@@ -1,4 +1,4 @@
-import { isInfinite, MarketStage } from "@zeitgeistpm/sdk-next";
+import { isInfinite, MarketStage } from "@zeitgeistpm/sdk";
 import { clamp } from "lodash-es";
 import Skeleton from "components/ui/Skeleton";
 import moment from "moment";

components/markets/MarketsList.tsx

@@ -1,4 +1,4 @@
-import { ScalarRangeType } from "@zeitgeistpm/sdk-next";
+import { ScalarRangeType } from "@zeitgeistpm/sdk";
 import React, { useEffect, useState } from "react";
 import Decimal from "decimal.js";
 import { useInView } from "react-intersection-observer";

components/markets/PoolDeployer.tsx

@@ -5,7 +5,7 @@ import {
   isRpcSdk,
   parseAssetId,
   swapFeeFromFloat,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import TransactionButton from "components/ui/TransactionButton";
 import Decimal from "decimal.js";
 import { ZTG } from "lib/constants";

components/markets/PromotionCallout.tsx

@@ -1,5 +1,5 @@
 import { Dialog } from "@headlessui/react";
-import { IndexerContext, Market } from "@zeitgeistpm/sdk-next";
+import { IndexerContext, Market } from "@zeitgeistpm/sdk";
 import Modal from "components/ui/Modal";
 import { PromotedMarket } from "lib/cms/get-promoted-markets";
 import { MarketPageIndexedData } from "lib/gql/markets";

components/markets/ReportResult.tsx

@@ -1,5 +1,5 @@
 import { FullMarketFragment } from "@zeitgeistpm/indexer";
-import { ScalarRangeType } from "@zeitgeistpm/sdk-next";
+import { ScalarRangeType } from "@zeitgeistpm/sdk";
 import { TwitterBird } from "components/markets/TradeResult";
 import {
   MarketCategoricalOutcome,

components/markets/ScalarPriceRange.tsx

@@ -1,4 +1,4 @@
-import type { ScalarRangeType } from "@zeitgeistpm/sdk/dist/types";
+import type { ScalarRangeType } from "@zeitgeistpm/sdk";
 import { formatNumberCompact } from "lib/util/format-compact";
 import { useMemo } from "react";
 import { useResizeDetector } from "react-resize-detector";

components/markets/SellFullSetForm.tsx

@@ -1,4 +1,4 @@
-import { isRpcSdk } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk } from "@zeitgeistpm/sdk";
 import Input from "components/ui/Input";
 import TransactionButton from "components/ui/TransactionButton";
 import Decimal from "decimal.js";

components/markets/SimilarMarketsSection.tsx

@@ -1,5 +1,5 @@
 import type { FullMarketFragment } from "@zeitgeistpm/indexer";
-import { ScalarRangeType } from "@zeitgeistpm/sdk-next";
+import { ScalarRangeType } from "@zeitgeistpm/sdk";
 import MarketCard from "components/markets/market-card";
 import Decimal from "decimal.js";
 import { ZTG } from "lib/constants";

components/markets/market-card/index.tsx

@@ -1,4 +1,4 @@
-import type { ScalarRangeType } from "@zeitgeistpm/sdk/dist/types";
+import type { ScalarRangeType } from "@zeitgeistpm/sdk";
 import Skeleton from "components/ui/Skeleton";
 import { motion } from "framer-motion";
 import Decimal from "decimal.js";
@@ -15,7 +15,7 @@ import {
   IOBaseAssetId,
   IOForeignAssetId,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import { lookupAssetImagePath } from "lib/constants/foreign-asset";
 import Image from "next/image";
 import MarketImage from "components/ui/MarketImage";

components/meta/MarketMeta.tsx

@@ -1,4 +1,4 @@
-import { IndexerContext, Market } from "@zeitgeistpm/sdk-next";
+import { IndexerContext, Market } from "@zeitgeistpm/sdk";
 import { MarketPageIndexedData } from "lib/gql/markets";
 import { OgHead } from "./OgHead";
 

components/outcomes/CategoricalDisputeBox.tsx

@@ -7,7 +7,7 @@ import {
   Market,
   MarketOutcomeAssetId,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import TransactionButton from "components/ui/TransactionButton";
 import { useChainConstants } from "lib/hooks/queries/useChainConstants";
 import {

components/outcomes/CategoricalReportBox.tsx

@@ -7,7 +7,7 @@ import {
   isRpcSdk,
   Market,
   parseAssetId,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import MarketContextActionOutcomeSelector from "components/markets/MarketContextActionOutcomeSelector";
 import TransactionButton from "components/ui/TransactionButton";
 import TruncatedText from "components/ui/TruncatedText";

components/outcomes/ScalarDisputeBox.tsx

@@ -1,4 +1,4 @@
-import { IndexerContext, isRpcSdk, Market } from "@zeitgeistpm/sdk-next";
+import { IndexerContext, isRpcSdk, Market } from "@zeitgeistpm/sdk";
 import TransactionButton from "components/ui/TransactionButton";
 import Decimal from "decimal.js";
 import { ZTG } from "lib/constants";

components/outcomes/ScalarReportBox.tsx

@@ -4,7 +4,7 @@ import {
   ScalarRangeType,
   getScalarBounds,
   isRpcSdk,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import Input from "components/ui/Input";
 import TransactionButton from "components/ui/TransactionButton";
 import { DateTimeInput } from "components/ui/inputs";

components/portfolio/Breakdown.tsx

@@ -1,5 +1,5 @@
 import Skeleton from "components/ui/Skeleton";
-import { ZTG } from "@zeitgeistpm/sdk-next";
+import { ZTG } from "@zeitgeistpm/sdk";
 import Decimal from "decimal.js";
 import { PorfolioBreakdown } from "lib/hooks/queries/usePortfolioPositions";
 import { formatNumberLocalized } from "lib/util";

components/portfolio/CurrenciesTable.tsx

@@ -12,7 +12,7 @@ import Image from "next/image";
 import { lookupAssetImagePath } from "lib/constants/foreign-asset";
 import { ChainName, CHAIN_IMAGES } from "lib/constants/chains";
 import TransferButton from "./TransferButton";
-import { AssetId } from "@zeitgeistpm/sdk-next";
+import { AssetId } from "@zeitgeistpm/sdk";
 import { convertDecimals } from "lib/util/convert-decimals";
 
 const columns: TableColumn[] = [

components/portfolio/DepositButton.tsx

@@ -1,5 +1,5 @@
 import { Dialog } from "@headlessui/react";
-import { ZTG } from "@zeitgeistpm/sdk-next";
+import { ZTG } from "@zeitgeistpm/sdk";
 import FormTransactionButton from "components/ui/FormTransactionButton";
 import Modal from "components/ui/Modal";
 import SecondaryButton from "components/ui/SecondaryButton";

components/portfolio/MarketPositions.tsx

@@ -5,7 +5,7 @@ import {
   IOPoolShareAssetId,
   Market,
   ZTG,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import DisputeButton from "components/assets/AssetActionButtons/DisputeButton";
 import RedeemButton from "components/assets/AssetActionButtons/RedeemButton";
 import ReportButton from "components/assets/AssetActionButtons/ReportButton";

components/portfolio/TransferButton.tsx

@@ -4,12 +4,7 @@ import React, { useMemo, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import type { ApiPromise } from "@polkadot/api";
 import { encodeAddress } from "@polkadot/keyring";
-import {
-  AssetId,
-  IOForeignAssetId,
-  ZTG,
-  isRpcSdk,
-} from "@zeitgeistpm/sdk-next";
+import { AssetId, IOForeignAssetId, ZTG, isRpcSdk } from "@zeitgeistpm/sdk";
 import AddressInput, { AddressOption } from "components/ui/AddressInput";
 import AssetInput from "components/ui/AssetInput";
 import { AssetOption } from "components/ui/AssetSelect";

components/portfolio/WithdrawButton.tsx

@@ -1,6 +1,6 @@
 import { Dialog } from "@headlessui/react";
 import type { ApiPromise } from "@polkadot/api";
-import { isRpcSdk } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk } from "@zeitgeistpm/sdk";
 import FormTransactionButton from "components/ui/FormTransactionButton";
 import Modal from "components/ui/Modal";
 import SecondaryButton from "components/ui/SecondaryButton";

components/settings/AccountSettingsForm.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { useForm } from "react-hook-form";
-import { isRpcSdk } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk } from "@zeitgeistpm/sdk";
 import FormTransactionButton from "components/ui/FormTransactionButton";
 import { identityRootKey } from "lib/hooks/queries/useIdentity";
 import { useExtrinsic } from "lib/hooks/useExtrinsic";

components/settings/OtherSettingsForm.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 import { Controller, useForm } from "react-hook-form";
 import AddressInput, { AddressOption } from "components/ui/AddressInput";
 import FormTransactionButton from "components/ui/FormTransactionButton";
-import { isRpcSdk } from "@zeitgeistpm/sdk-next";
+import { isRpcSdk } from "@zeitgeistpm/sdk";
 import { useSdkv2 } from "lib/hooks/useSdkv2";
 import { useWallet } from "lib/state/wallet";
 import { isValidPolkadotAddress } from "lib/util";

components/trade-form/index.tsx

@@ -9,7 +9,7 @@ import {
   MarketOutcomeAssetId,
   ZTG,
   getMarketIdOf,
-} from "@zeitgeistpm/sdk-next";
+} from "@zeitgeistpm/sdk";
 import MarketContextActionOutcomeSelector from "components/markets/MarketContextActionOutcomeSelector";
 import TradeResult from "components/markets/TradeResult";
 import Input from "components/ui/Input";