Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/cleanup experiments #1674

Merged
merged 5 commits into from
Jan 28, 2025
Merged

Refactor/cleanup experiments #1674

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4d33b2
refactor: remove Blockfrost provider experiments
rhyslbw Jan 28, 2025
00ae726
refactor: remove other Blockfrost experiments
rhyslbw Jan 28, 2025
38efa68
refactor: cleanup extension storage experiment
rhyslbw Jan 28, 2025
b8592c1
refactor: drop DRepProvider active override
rhyslbw Jan 28, 2025
3961a37
feat: pause polling while not using Lace LW-12174 (#1673)
mkazlauskas Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions apps/browser-extension-wallet/src/lib/scripts/background/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,7 @@ export const getProviders = async (chainName: Wallet.ChainName): Promise<Wallet.
logger,
experiments: {
useDrepProviderOverrideActiveStatus: isExperimentEnabled(ExperimentName.USE_DREP_PROVIDER_OVERRIDE),
useWebSocket: isExperimentEnabled(ExperimentName.WEBSOCKET_API),
useBlockfrostAssetProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_ASSET_PROVIDER),
useBlockfrostChainHistoryProvider: true,
useBlockfrostNetworkInfoProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_NETWORK_INFO_PROVIDER),
useBlockfrostRewardsProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_REWARDS_PROVIDER),
useBlockfrostTxSubmitProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_TX_SUBMIT_PROVIDER),
useBlockfrostUtxoProvider: isExperimentEnabled(ExperimentName.BLOCKFROST_UTXO_PROVIDER),
useBlockfrostAddressDiscovery: true,
useBlockfrostInputResolver: true
useWebSocket: isExperimentEnabled(ExperimentName.WEBSOCKET_API)
}
});
};
Expand Down
18 changes: 6 additions & 12 deletions apps/browser-extension-wallet/src/lib/scripts/background/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,13 @@ type StoredWallet = AnyWallet<Wallet.WalletMetadata, Wallet.WalletMetadata>;
const createWalletRepositoryStore = (): Observable<storage.CollectionStore<StoredWallet>> =>
from(
(async () => {
// wallet repository is always using feature flag of 'mainnet', because it has to be the same for all networks
const featureFlags = await getFeatureFlags(Wallet.Cardano.ChainIds.Mainnet.networkMagic);
if (isExperimentEnabled(featureFlags, ExperimentName.EXTENSION_STORAGE)) {
const extensionStore = new ExtensionBlobCollectionStore<StoredWallet>('walletRepository', logger);
const wallets = await firstValueFrom(extensionStore.getAll().pipe(defaultIfEmpty(null)));
if (!wallets) {
const pouchdbStore = createPouchdbWalletRepositoryStore();
await migrateCollectionStore(pouchdbStore, extensionStore, logger);
}
return extensionStore;
const extensionStore = new ExtensionBlobCollectionStore<StoredWallet>('walletRepository', logger);
const wallets = await firstValueFrom(extensionStore.getAll().pipe(defaultIfEmpty(null)));
if (!wallets) {
const pouchdbStore = createPouchdbWalletRepositoryStore();
await migrateCollectionStore(pouchdbStore, extensionStore, logger);
}

return createPouchdbWalletRepositoryStore();
return extensionStore;
})()
);

Expand Down
45 changes: 0 additions & 45 deletions apps/browser-extension-wallet/src/providers/ExperimentsProvider/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@ export const getDefaultFeatureFlags = (): FallbackConfiguration => ({
[ExperimentName.USE_SWITCH_TO_NAMI_MODE]: false,
[ExperimentName.SHARED_WALLETS]: false,
[ExperimentName.WEBSOCKET_API]: false,
[ExperimentName.BLOCKFROST_ASSET_PROVIDER]: false,
[ExperimentName.BLOCKFROST_CHAIN_HISTORY_PROVIDER]: false,
[ExperimentName.BLOCKFROST_NETWORK_INFO_PROVIDER]: false,
[ExperimentName.BLOCKFROST_REWARDS_PROVIDER]: false,
[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
});
Expand All @@ -40,42 +31,6 @@ export const experiments: ExperimentsConfig = {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_ASSET_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_CHAIN_HISTORY_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_NETWORK_INFO_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_REWARDS_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_TX_SUBMIT_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_UTXO_PROVIDER]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_ADDRESS_DISCOVERY]: {
value: false,
default: false
},
[ExperimentName.BLOCKFROST_INPUT_RESOLVER]: {
value: false,
default: false
},
[ExperimentName.EXTENSION_STORAGE]: {
value: false,
default: false
},
[ExperimentName.USE_DREP_PROVIDER_OVERRIDE]: {
value: false,
default: false
Expand Down
9 changes: 0 additions & 9 deletions apps/browser-extension-wallet/src/providers/ExperimentsProvider/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ export enum ExperimentName {
USE_SWITCH_TO_NAMI_MODE = 'use-switch-to-nami-mode',
SHARED_WALLETS = 'shared-wallets',
WEBSOCKET_API = 'websocket-api',
BLOCKFROST_ASSET_PROVIDER = 'blockfrost-asset-provider',
BLOCKFROST_CHAIN_HISTORY_PROVIDER = 'blockfrost-chain-history-provider',
BLOCKFROST_NETWORK_INFO_PROVIDER = 'blockfrost-network-info-provider',
BLOCKFROST_REWARDS_PROVIDER = 'blockfrost-rewards-provider',
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'
}
Expand Down
53 changes: 11 additions & 42 deletions packages/cardano/src/wallet/lib/providers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,8 @@ import type { DRepInfo } from '@cardano-sdk/core';
import {
CardanoWsClient,
CreateHttpProviderConfig,
assetInfoHttpProvider,
chainHistoryHttpProvider,
networkInfoHttpProvider,
rewardsHttpProvider,
stakePoolHttpProvider,
utxoHttpProvider,
TxSubmitApiProvider,
txSubmitHttpProvider,
BlockfrostClientConfig,
RateLimiter,
BlockfrostClient,
Expand All @@ -42,11 +36,11 @@ import {
} from '@cardano-sdk/cardano-services-client';
import { RemoteApiProperties, RemoteApiPropertyType } from '@cardano-sdk/web-extension';
import { BlockfrostAddressDiscovery } from '@wallet/lib/blockfrost-address-discovery';
import { DEFAULT_LOOK_AHEAD_SEARCH, HDSequentialDiscovery } from '@cardano-sdk/wallet';
import { WalletProvidersDependencies } from './cardano-wallet';
import { BlockfrostInputResolver } from './blockfrost-input-resolver';

const createTxSubmitProvider = (
blockfrostClient: BlockfrostClient,
httpProviderConfig: CreateHttpProviderConfig<Provider>,
customSubmitTxUrl?: string
): TxSubmitProvider => {
Expand All @@ -61,7 +55,7 @@ const createTxSubmitProvider = (
);
}

return txSubmitHttpProvider(httpProviderConfig);
return new BlockfrostTxSubmitProvider(blockfrostClient, httpProviderConfig.logger);
};

export type AllProviders = {
Expand Down Expand Up @@ -114,18 +108,7 @@ export const createProviders = ({
axiosAdapter,
env: { baseCardanoServicesUrl: baseUrl, customSubmitTxUrl, blockfrostConfig },
logger,
experiments: {
useBlockfrostAssetProvider,
useBlockfrostChainHistoryProvider,
useBlockfrostNetworkInfoProvider,
useBlockfrostRewardsProvider,
useBlockfrostTxSubmitProvider,
useBlockfrostUtxoProvider,
useDrepProviderOverrideActiveStatus,
useBlockfrostAddressDiscovery,
useBlockfrostInputResolver,
useWebSocket
}
experiments: { useDrepProviderOverrideActiveStatus, useWebSocket }
}: ProvidersConfig): WalletProvidersDependencies => {
if (!logger) logger = console;

Expand All @@ -134,27 +117,15 @@ export const createProviders = ({
const blockfrostClient = new BlockfrostClient(blockfrostConfig, {
rateLimiter: blockfrostConfig.rateLimiter
});
const assetProvider = useBlockfrostAssetProvider
? new BlockfrostAssetProvider(blockfrostClient, logger)
: assetInfoHttpProvider(httpProviderConfig);
const networkInfoProvider = useBlockfrostNetworkInfoProvider
? new BlockfrostNetworkInfoProvider(blockfrostClient, logger)
: networkInfoHttpProvider(httpProviderConfig);
const chainHistoryProvider = useBlockfrostChainHistoryProvider
? new BlockfrostChainHistoryProvider(blockfrostClient, networkInfoProvider, logger)
: chainHistoryHttpProvider(httpProviderConfig);
const rewardsProvider = useBlockfrostRewardsProvider
? new BlockfrostRewardsProvider(blockfrostClient, logger)
: rewardsHttpProvider(httpProviderConfig);
const assetProvider = new BlockfrostAssetProvider(blockfrostClient, logger);
const networkInfoProvider = new BlockfrostNetworkInfoProvider(blockfrostClient, logger);
const chainHistoryProvider = new BlockfrostChainHistoryProvider(blockfrostClient, networkInfoProvider, logger);
const rewardsProvider = new BlockfrostRewardsProvider(blockfrostClient, logger);
const stakePoolProvider = stakePoolHttpProvider(httpProviderConfig);
const txSubmitProvider = useBlockfrostTxSubmitProvider
? new BlockfrostTxSubmitProvider(blockfrostClient, logger)
: createTxSubmitProvider(httpProviderConfig, customSubmitTxUrl);
const txSubmitProvider = createTxSubmitProvider(blockfrostClient, httpProviderConfig, customSubmitTxUrl);
const dRepProvider = new BlockfrostDRepProvider(blockfrostClient, logger);

const addressDiscovery = useBlockfrostAddressDiscovery
? new BlockfrostAddressDiscovery(blockfrostClient, logger)
: new HDSequentialDiscovery(chainHistoryProvider, DEFAULT_LOOK_AHEAD_SEARCH);
const addressDiscovery = new BlockfrostAddressDiscovery(blockfrostClient, logger);

const rewardAccountInfoProvider = new BlockfrostRewardAccountInfoProvider({
client: blockfrostClient,
Expand All @@ -163,7 +134,7 @@ export const createProviders = ({
stakePoolProvider
});

const inputResolver = useBlockfrostInputResolver ? new BlockfrostInputResolver(blockfrostClient, logger) : undefined;
const inputResolver = new BlockfrostInputResolver(blockfrostClient, logger);

// Temporary proxy for drepProvider to overwrite the 'active' property to always be true
const drepProviderOverrideActiveStatus = new Proxy(dRepProvider, {
Expand Down Expand Up @@ -221,9 +192,7 @@ export const createProviders = ({
};
}

const utxoProvider = useBlockfrostUtxoProvider
? new BlockfrostUtxoProvider(blockfrostClient, logger)
: utxoHttpProvider(httpProviderConfig);
const utxoProvider = new BlockfrostUtxoProvider(blockfrostClient, logger);

return {
assetProvider,
Expand Down
Loading