Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
102 changes: 1 addition & 101 deletions eslint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -1352,15 +1352,7 @@
"count": 20
}
},
"packages/tron-wallet-snap/src/caching/InMemoryCache.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/caching/StateCache.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
},
"no-restricted-syntax": {
"count": 1
}
Expand All @@ -1375,20 +1367,7 @@
"count": 2
}
},
"packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/clients/price-api/types.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/clients/security-alerts-api/utils.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
},
"no-restricted-syntax": {
"count": 5
}
Expand All @@ -1401,11 +1380,6 @@
"count": 1
}
},
"packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/clients/trongrid/TrongridApiClient.test.ts": {
"require-atomic-updates": {
"count": 1
Expand All @@ -1424,16 +1398,6 @@
"count": 42
}
},
"packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/handlers/cronjob/cronjob.test.tsx": {
"@typescript-eslint/explicit-function-return-type": {
"count": 2
Expand All @@ -1452,34 +1416,19 @@
"count": 1
}
},
"packages/tron-wallet-snap/src/services/accounts/AccountsService.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/assets/AssetsRepository.test.ts": {
"@typescript-eslint/explicit-function-return-type": {
"count": 2
}
},
"packages/tron-wallet-snap/src/services/assets/AssetsService.test.ts": {
"@typescript-eslint/explicit-function-return-type": {
"count": 3
"count": 2
},
"@typescript-eslint/no-explicit-any": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/config/ConfigProvider.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts": {
"no-restricted-syntax": {
"count": 1
Expand All @@ -1493,11 +1442,6 @@
"count": 15
}
},
"packages/tron-wallet-snap/src/services/send/SendService.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/send/TransactionExpirationRefresherService.test.ts": {
"@typescript-eslint/explicit-function-return-type": {
"count": 5
Expand All @@ -1508,11 +1452,6 @@
"count": 7
}
},
"packages/tron-wallet-snap/src/services/staking/StakingService.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/state/State.test.ts": {
"@typescript-eslint/explicit-function-return-type": {
"count": 1
Expand All @@ -1521,11 +1460,6 @@
"count": 1
}
},
"packages/tron-wallet-snap/src/services/transaction-expiration-refresher/TransactionExpirationRefresherService.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts": {
"no-restricted-syntax": {
"count": 5
Expand All @@ -1542,14 +1476,6 @@
},
"@typescript-eslint/no-explicit-any": {
"count": 7
},
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/services/wallet/WalletService.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/ui/confirmation/components/TransactionAlert/TransactionAlert.test.tsx": {
Expand All @@ -1568,9 +1494,6 @@
"packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignMessage/render.test.tsx": {
"@typescript-eslint/no-explicit-any": {
"count": 3
},
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/ConfirmSignTransaction.test.tsx": {
Expand All @@ -1581,14 +1504,6 @@
"packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/render.test.tsx": {
"@typescript-eslint/no-explicit-any": {
"count": 14
},
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmSignTransaction/render.tsx": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/ui/confirmation/views/ConfirmTransactionRequest/ConfirmTransactionRequest.test.tsx": {
Expand All @@ -1604,26 +1519,11 @@
"count": 2
}
},
"packages/tron-wallet-snap/src/utils/deriveTronFromCoinTypeNode.test.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/utils/deriveTronFromCoinTypeNode.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/utils/getExplorerUrl.test.ts": {
"n/no-process-env": {
"count": 3
}
},
"packages/tron-wallet-snap/src/validation/keyring-structs.test.ts": {
"import-x/no-extraneous-dependencies": {
"count": 1
}
},
"packages/tron-wallet-snap/src/validation/transaction.test.ts": {
"@typescript-eslint/no-explicit-any": {
"count": 1
Expand Down
3 changes: 3 additions & 0 deletions packages/tron-wallet-snap/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

### Added

- Add Core messenger plumbing (`coreMessenger`, `RemoteFeatureFlagsProvider`, `AssetsProvider`) for upcoming AssetsController migration ([#95](https://github.com/MetaMask/internal-snaps/pull/95))
- Add `CoreAssetsAdapter` and initialize it in `AssetsService` for upcoming AssetsController routing ([#127](https://github.com/MetaMask/internal-snaps/pull/127))

### Fixed

Expand Down
1 change: 1 addition & 0 deletions packages/tron-wallet-snap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"@metamask/snaps-jest": "^10.2.0",
"@metamask/snaps-sdk": "^11.2.0",
"@metamask/superstruct": "^3.4.1",
"@metamask/utils": "^11.9.0",
"@types/lodash": "^4.17.15",
"async-mutex": "^0.5.0",
"bignumber.js": "^9.3.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/tron-wallet-snap/snap.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/MetaMask/internal-snaps.git"
},
"source": {
"shasum": "e7sZ7XY8fvO4GLcznlb5N/Fh95+ANPKS/GzYoHHz2pc=",
"shasum": "1GetcX2q26WkRq3aUu5hrAElNLvZXEfzEK2rAZv6ddI=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
Expand Down Expand Up @@ -66,10 +66,10 @@
},
"endowment:messenger": {
"actions": [
"RemoteFeatureFlagController:getState",
"AssetsController:getAccountAssetByID",
"AssetsController:getAccountAssetsByIDs",
"AssetsController:getAccountAssetsByScope"
"AssetsController:getAccountAssetsByScope",
"RemoteFeatureFlagController:getState"
]
}
},
Expand Down
17 changes: 14 additions & 3 deletions packages/tron-wallet-snap/src/context.ts

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct implementation of the Adapters means they should be initialized outside and passed into the AssetsService

Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import { RpcHandler } from './handlers/rpc/rpc';
import { UserInputHandler } from './handlers/user-input/userInput';
import { AccountsRepository } from './services/accounts/AccountsRepository';
import { AccountsService } from './services/accounts/AccountsService';
import { CoreAssetsAdapter } from './services/assets/adapters/CoreAssetsAdapter';
import { SnapAssetsAdapter } from './services/assets/adapters/SnapAssetsAdapter';
import { AssetsRepository } from './services/assets/AssetsRepository';
import { AssetsService } from './services/assets/AssetsService';
import { ConfigProvider } from './services/config';
Expand Down Expand Up @@ -113,8 +115,7 @@ const securityAlertsApiClient = new SecurityAlertsApiClient(
logger,
);

// Business Services
const assetsService = new AssetsService({
const snapAssetsAdapter = new SnapAssetsAdapter({
logger,
state,
assetsRepository,
Expand All @@ -123,10 +124,20 @@ const assetsService = new AssetsService({
priceApiClient,
tokenApiClient,
snapClient,
remoteFeatureFlagsProvider,
configProvider,
});
const coreAssetsAdapter = new CoreAssetsAdapter({
logger,
assetsProvider,
});

// Business Services
const assetsService = new AssetsService({
snapAdapter: snapAssetsAdapter,
coreAdapter: coreAssetsAdapter,
remoteFeatureFlagsProvider,
});

const transactionsService = new TransactionsService({
logger,
transactionsRepository,
Expand Down
Loading
Loading