Feat/lw 12074 enable new input resolver in lace

apps/browser-extension-wallet/package.json

@@ -48,8 +48,8 @@
     "@cardano-sdk/tx-construction": "0.24.4",
     "@cardano-sdk/util": "0.15.5",
     "@cardano-sdk/util-rxjs": "0.9.2",
-    "@cardano-sdk/wallet": "0.49.1",
-    "@cardano-sdk/web-extension": "0.37.4",
+    "@cardano-sdk/wallet": "0.49.2",
+    "@cardano-sdk/web-extension": "0.37.5",
     "@emurgo/cip14-js": "~3.0.1",
     "@input-output-hk/lace-ui-toolkit": "1.21.0",
     "@lace/cardano": "0.1.0",

apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/DappTransactionContainer.tsx

@@ -28,7 +28,6 @@ import { Skeleton } from 'antd';
 import { useCurrencyStore } from '@providers';
 import { logger, walletRepository } from '@lib/wallet-api-ui';
 import { useComputeTxCollateral } from '@hooks/useComputeTxCollateral';
-import { utxoAndBackendChainHistoryResolver } from '@src/utils/utxo-chain-history-resolver';
 import { eraSlotDateTime } from '@src/utils/era-slot-datetime';
 import { AddressBookSchema, useDbStateValue } from '@lib/storage';
 import { getAllWalletsAddresses } from '@src/utils/get-all-wallets-addresses';
@@ -80,17 +79,7 @@ export const DappTransactionContainer = withAddressBookContext(
       TransactionSummaryInspection | undefined
     >();
 
-    const { chainHistoryProvider } = getProviders();
-
-    const txInputResolver = useMemo(
-      () =>
-        utxoAndBackendChainHistoryResolver({
-          utxo: inMemoryWallet.utxo,
-          transactions: inMemoryWallet.transactions,
-          chainHistoryProvider
-        }),
-      [inMemoryWallet, chainHistoryProvider]
-    );
+    const { inputResolver } = getProviders();
 
     const tx = useMemo(() => req?.transaction.toCore(), [req?.transaction]);
 
@@ -105,7 +94,7 @@ export const DappTransactionContainer = withAddressBookContext(
       return () => subscription?.unsubscribe();
     }, [inMemoryWallet?.governance?.isRegisteredAsDRep$, userAckNonRegisteredState, tx]);
 
-    const txCollateral = useComputeTxCollateral(walletState, tx);
+    const txCollateral = useComputeTxCollateral(inputResolver, walletState, tx);
 
     const userAddresses = useMemo(() => walletInfo.addresses.map((v) => v.address), [walletInfo.addresses]);
     const userRewardAccounts = useObservable(inMemoryWallet.delegation.rewardAccounts$);
@@ -122,7 +111,7 @@ export const DappTransactionContainer = withAddressBookContext(
       const getTxSummary = async () => {
         const inspector = createTxInspector({
           tokenTransfer: tokenTransferInspector({
-            inputResolver: txInputResolver,
+            inputResolver,
             fromAddressAssetProvider: createWalletAssetProvider({
               assetProvider,
               assetInfo$: inMemoryWallet.assetInfo$,
@@ -140,7 +129,7 @@ export const DappTransactionContainer = withAddressBookContext(
           summary: transactionSummaryInspector({
             addresses: userAddresses,
             rewardAccounts: rewardAccountsAddresses,
-            inputResolver: txInputResolver,
+            inputResolver,
             protocolParameters,
             assetProvider: createWalletAssetProvider({
               assetProvider,
@@ -166,7 +155,7 @@ export const DappTransactionContainer = withAddressBookContext(
       walletInfo.addresses,
       userAddresses,
       rewardAccountsAddresses,
-      txInputResolver,
+      inputResolver,
       protocolParameters,
       assetProvider,
       inMemoryWallet.assetInfo$,

apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/__tests__/DappTransactionContainer.test.tsx

@@ -84,6 +84,9 @@ const inMemoryWallet = {
   protocolParameters$,
   governance: {
     isRegisteredAsDRep$: new BehaviorSubject(true)
+  },
+  util: {
+    resolveInput: jest.fn().mockResolvedValue(null)
   }
 };
 const REWARD_ACCOUNT = Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj');
@@ -129,7 +132,10 @@ const mockProviders = {
     transactionsByHashes: jest.fn().mockResolvedValue([]),
     blocksByHashes: jest.fn().mockResolvedValue([])
   },
-  assetProvider
+  assetProvider,
+  inputResolver: {
+    resolveInput: jest.fn().mockResolvedValue(null)
+  }
 };
 
 jest.mock('@stores/slices/blockchain-provider-slice', () => ({

apps/browser-extension-wallet/src/hooks/useComputeTxCollateral.ts

@@ -1,21 +1,19 @@
 import { Wallet } from '@lace/cardano';
-import { createHistoricalOwnInputResolver } from '@src/utils/own-input-resolver';
 import { useState, useEffect } from 'react';
-import { getCollateral } from '@cardano-sdk/core';
+import { Cardano, getCollateral } from '@cardano-sdk/core';
 import { ObservableWalletState } from './useWalletState';
 
-export const useComputeTxCollateral = (wallet?: ObservableWalletState, tx?: Wallet.Cardano.Tx): bigint | undefined => {
+export const useComputeTxCollateral = (
+  inputResolver: Cardano.InputResolver,
+  wallet?: ObservableWalletState,
+  tx?: Wallet.Cardano.Tx
+): bigint | undefined => {
   const [txCollateral, setTxCollateral] = useState<bigint>();
 
   useEffect(() => {
     if (!tx || !wallet) return;
 
     const computeCollateral = async () => {
-      const inputResolver = createHistoricalOwnInputResolver({
-        addresses: wallet.addresses,
-        transactions: wallet.transactions
-      });
-
       const collateral = await getCollateral(
         tx,
         inputResolver,
@@ -26,7 +24,7 @@ export const useComputeTxCollateral = (wallet?: ObservableWalletState, tx?: Wall
     };
 
     computeCollateral();
-  }, [tx, wallet]);
+  }, [tx, wallet, inputResolver]);
 
   return txCollateral;
 };

apps/browser-extension-wallet/src/lib/scripts/background/config.ts

@@ -33,7 +33,7 @@ export const backgroundServiceProperties: RemoteApiProperties<BackgroundService>
 const { BLOCKFROST_CONFIGS, BLOCKFROST_RATE_LIMIT_CONFIG } = config();
 // Important to use the same rateLimiter object for all networks,
 // because Blockfrost rate limit is per IP address, not per project id
-const rateLimiter: RateLimiter = new Bottleneck({
+export const rateLimiter: RateLimiter = new Bottleneck({
   reservoir: BLOCKFROST_RATE_LIMIT_CONFIG.size,
   reservoirIncreaseAmount: BLOCKFROST_RATE_LIMIT_CONFIG.increaseAmount,
   reservoirIncreaseInterval: BLOCKFROST_RATE_LIMIT_CONFIG.increaseInterval,
@@ -68,7 +68,8 @@ export const getProviders = async (chainName: Wallet.ChainName): Promise<Wallet.
       useBlockfrostRewardsProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_REWARDS_PROVIDER),
       useBlockfrostTxSubmitProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_TX_SUBMIT_PROVIDER),
       useBlockfrostUtxoProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_UTXO_PROVIDER),
-      useBlockfrostAddressDiscovery: isExperimentEnabled(ExperimentName.BLOCKFROST_ADDRESS_DISCOVERY)
+      useBlockfrostAddressDiscovery: isExperimentEnabled(ExperimentName.BLOCKFROST_ADDRESS_DISCOVERY),
+      useBlockfrostInputResolver: isExperimentEnabled(ExperimentName.BLOCKFROST_INPUT_RESOLVER)
     }
   });
 };

apps/browser-extension-wallet/src/lib/scripts/background/wallet.ts

@@ -105,12 +105,10 @@ export const walletRepository = new WalletRepository({
 const currentWalletProviders$ = new BehaviorSubject<Wallet.WalletProvidersDependencies | null>(null);
 
 const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata> = {
+  // eslint-disable-next-line complexity, max-statements
   create: async ({ chainId, accountIndex }, wallet, { stores, witnesser }) => {
     const chainName: Wallet.ChainName = networkMagicToChainName(chainId.networkMagic);
-    const providers = await getProviders(chainName);
-
-    // Caches current wallet providers.
-    currentWalletProviders$.next(providers);
+    let providers = await getProviders(chainName);
 
     const baseUrl = getBaseUrlForChain(chainName);
 
@@ -130,11 +128,13 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
       });
     }
 
+    const featureFlags = await getFeatureFlags(chainId.networkMagic);
+
     if (wallet.type === WalletType.Script) {
       const stakingScript = wallet.stakingScript as SharedWalletScriptKind;
       const paymentScript = wallet.paymentScript as SharedWalletScriptKind;
 
-      return createSharedWallet(
+      const sharedWallet = createSharedWallet(
         { name: wallet.metadata.name },
         {
           ...providers,
@@ -152,6 +152,12 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
           witnesser
         }
       );
+
+      // Caches current wallet providers.
+      providers = { ...providers, inputResolver: { resolveInput: sharedWallet.util.resolveInput } };
+      currentWalletProviders$.next(providers);
+
+      return sharedWallet;
     }
 
     const walletAccount = wallet.accounts.find((acc) => acc.accountIndex === accountIndex);
@@ -164,14 +170,13 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
       extendedAccountPublicKey: walletAccount.extendedAccountPublicKey
     });
 
-    const featureFlags = await getFeatureFlags(chainId.networkMagic);
     const useWebSocket = isExperimentEnabled(featureFlags, ExperimentName.WEBSOCKET_API);
     const localPollingIntervalConfig = !Number.isNaN(Number(process.env.WALLET_POLLING_INTERVAL_IN_SEC))
       ? // eslint-disable-next-line no-magic-numbers
         Number(process.env.WALLET_POLLING_INTERVAL_IN_SEC) * 1000
       : DEFAULT_POLLING_CONFIG.pollInterval;
 
-    return createPersonalWallet(
+    const personalWallet = createPersonalWallet(
       {
         name: walletAccount.metadata.name,
         polling: {
@@ -194,6 +199,12 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
         bip32Account
       }
     );
+
+    // Caches current wallet providers.
+    providers = { ...providers, inputResolver: { resolveInput: personalWallet.util.resolveInput } };
+    currentWalletProviders$.next(providers);
+
+    return personalWallet;
   }
 };
 

apps/browser-extension-wallet/src/providers/ExperimentsProvider/config.ts

@@ -13,6 +13,7 @@ export const getDefaultFeatureFlags = (): FallbackConfiguration => ({
   [ExperimentName.BLOCKFROST_TX_SUBMIT_PROVIDER]: false,
   [ExperimentName.BLOCKFROST_UTXO_PROVIDER]: false,
   [ExperimentName.BLOCKFROST_ADDRESS_DISCOVERY]: false,
+  [ExperimentName.BLOCKFROST_INPUT_RESOLVER]: false,
   [ExperimentName.EXTENSION_STORAGE]: false,
   [ExperimentName.USE_DREP_PROVIDER_OVERRIDE]: false,
   [ExperimentName.DAPP_EXPLORER]: false
@@ -67,6 +68,10 @@ export const experiments: ExperimentsConfig = {
     value: false,
     default: false
   },
+  [ExperimentName.BLOCKFROST_INPUT_RESOLVER]: {
+    value: false,
+    default: false
+  },
   [ExperimentName.EXTENSION_STORAGE]: {
     value: false,
     default: false

apps/browser-extension-wallet/src/providers/ExperimentsProvider/types.ts

@@ -18,6 +18,7 @@ export enum ExperimentName {
   BLOCKFROST_TX_SUBMIT_PROVIDER = 'blockfrost-tx-submit-provider',
   BLOCKFROST_UTXO_PROVIDER = 'blockfrost-utxo-provider',
   BLOCKFROST_ADDRESS_DISCOVERY = 'blockfrost-address-discovery',
+  BLOCKFROST_INPUT_RESOLVER = 'blockfrost-input-resolver',
   EXTENSION_STORAGE = 'extension-storage',
   USE_DREP_PROVIDER_OVERRIDE = 'use-drep-provider-override',
   DAPP_EXPLORER = 'dapp-explorer'

apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts

@@ -2,7 +2,7 @@ import { BlockchainProviderSlice, SliceCreator } from '../types';
 import { Wallet } from '@lace/cardano';
 import { consumeRemoteApi } from '@cardano-sdk/web-extension';
 import { runtime } from 'webextension-polyfill';
-import { DRepProvider } from '@cardano-sdk/core';
+import { Cardano, DRepProvider } from '@cardano-sdk/core';
 
 export interface IBlockchainProvider {
   stakePoolProvider: Wallet.StakePoolProvider;
@@ -13,6 +13,7 @@ export interface IBlockchainProvider {
   chainHistoryProvider: Wallet.ChainHistoryProvider;
   rewardsProvider: Wallet.RewardsProvider;
   drepProvider?: DRepProvider;
+  inputResolver: Cardano.InputResolver;
 }
 
 export type BlockchainProviderFactory = () => IBlockchainProvider;
@@ -26,7 +27,8 @@ export const IBlockchainProvider = {
     utxoProvider: providers?.utxoProvider,
     rewardsProvider: providers?.rewardsProvider,
     chainHistoryProvider: providers?.chainHistoryProvider,
-    drepProvider: providers?.drepProvider
+    drepProvider: providers?.drepProvider,
+    inputResolver: providers?.inputResolver
   }),
   fromWalletProviders: (providers: Wallet.WalletProvidersDependencies): IBlockchainProvider => ({
     txSubmitProvider: providers?.txSubmitProvider,
@@ -36,7 +38,8 @@ export const IBlockchainProvider = {
     utxoProvider: providers?.utxoProvider,
     rewardsProvider: providers?.rewardsProvider,
     chainHistoryProvider: providers?.chainHistoryProvider,
-    drepProvider: providers?.drepProvider
+    drepProvider: providers?.drepProvider,
+    inputResolver: providers?.inputResolver
   })
 };
 

apps/browser-extension-wallet/src/utils/mocks/blockchain-providers.ts

@@ -1,6 +1,7 @@
 import { IWalletProvider } from '@lib/wallet-provider';
 import { Wallet } from '@lace/cardano';
 import { IBlockchainProvider } from '@src/stores/slices';
+import { Cardano } from '@cardano-sdk/core';
 
 /**
  * Wallet Provider mock
@@ -53,5 +54,12 @@ export const mockBlockchainProviders = (blockchainProviders?: Partial<IBlockchai
   utxoProvider: mockUtxoProvider(),
   rewardsProvider: mockRewardsProvider(),
   chainHistoryProvider: mockChainHistoryProvider(),
+  inputResolver: {
+    resolveInput: jest.fn().mockResolvedValue({
+      address: 'Addr' as Cardano.PaymentAddress,
+      /* eslint-disable no-magic-numbers */
+      value: { coins: BigInt(999) }
+    })
+  },
   ...blockchainProviders
 });

apps/browser-extension-wallet/src/views/nami-mode/NamiView.tsx

@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { CommonOutsideHandlesProvider, Main as Nami, OutsideHandlesProvider } from '@lace/nami';
 import { useWalletStore } from '@src/stores';
 import { config } from '@src/config';
+import { createHistoricalOwnInputResolver } from '@src/utils/own-input-resolver';
 import {
   useBackgroundServiceAPIContext,
   useCurrencyStore,
@@ -31,7 +32,7 @@ import { useDelegationTransaction, useRewardAccountsData } from '../browser-view
 import { useSecrets } from '@lace/core';
 import { useDelegationStore } from '@src/features/delegation/stores';
 import { useStakePoolDetails } from '@src/features/stake-pool-details/store';
-import { getPoolInfos } from '@src/stores/slices';
+import { getPoolInfos, getProviders } from '@src/stores/slices';
 import { Wallet } from '@lace/cardano';
 import { walletBalanceTransformer } from '@src/api/transformers';
 import { PostHogAction, useObservable } from '@lace/common';
@@ -43,7 +44,6 @@ import { isKeyHashAddress } from '@cardano-sdk/wallet';
 import { BackgroundStorage } from '@lib/scripts/types';
 import { getWalletAccountsQtyString } from '@src/utils/get-wallet-count-string';
 import { useNetworkError } from '@hooks/useNetworkError';
-import { createHistoricalOwnInputResolver } from '@src/utils/own-input-resolver';
 import { walletRoutePaths } from '@routes';
 import { StakingErrorType } from '@views/browser/features/staking/types';
 
@@ -184,6 +184,7 @@ export const NamiView = withDappContext((): React.ReactElement => {
   }, [analytics, deleteWallet, setDeletingWallet, walletRepository]);
 
   const { lockedStakeRewards } = useRewardAccountsData();
+  const { inputResolver } = getProviders();
 
   const redirectToStaking = useRedirection(walletRoutePaths.earn);
 
@@ -219,6 +220,7 @@ export const NamiView = withDappContext((): React.ReactElement => {
         availableChains: AVAILABLE_CHAINS,
         enableCustomNode,
         getCustomSubmitApiForNetwork,
+        createHistoricalOwnInputResolver,
         defaultSubmitApi: DEFAULT_SUBMIT_API,
         isValidURL,
         buildDelegation,
@@ -248,9 +250,9 @@ export const NamiView = withDappContext((): React.ReactElement => {
         chainHistoryProvider,
         protocolParameters: walletState?.protocolParameters,
         assetInfo: walletState?.assetInfo,
-        createHistoricalOwnInputResolver,
         lockedStakeRewards,
         redirectToStaking,
+        inputResolver,
         govToolsUrl: GOV_TOOLS_URLS[environmentName]
       }}
     >

packages/cardano/package.json

@@ -48,8 +48,8 @@
     "@cardano-sdk/key-management": "0.25.1",
     "@cardano-sdk/tx-construction": "0.24.4",
     "@cardano-sdk/util": "0.15.5",
-    "@cardano-sdk/wallet": "0.49.1",
-    "@cardano-sdk/web-extension": "0.37.4",
+    "@cardano-sdk/wallet": "0.49.2",
+    "@cardano-sdk/web-extension": "0.37.5",
     "@lace/common": "0.1.0",
     "@ledgerhq/devices": "^8.4.4",
     "@stablelib/chacha20poly1305": "1.0.1",