chore: add safeMerge shared util

eslint-suppressions.json

@@ -344,14 +344,6 @@
       "count": 2
     }
   },
-  "packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts": {
-    "@typescript-eslint/await-thenable": {
-      "count": 1
-    },
-    "no-unused-private-class-members": {
-      "count": 2
-    }
-  },
   "packages/solana-wallet-snap/src/core/services/assets/TokenHelper.test.ts": {
     "@typescript-eslint/no-explicit-any": {
       "count": 1
@@ -368,6 +360,14 @@
       "count": 1
     }
   },
+  "packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts": {
+    "@typescript-eslint/await-thenable": {
+      "count": 1
+    },
+    "no-unused-private-class-members": {
+      "count": 2
+    }
+  },
   "packages/solana-wallet-snap/src/core/services/config/ConfigProvider.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1

packages/snap-networks-utils/CHANGELOG.md

@@ -7,10 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
+### Added
 
-- **BREAKING** Replace the logger utilities with a configurable `Logger` class that requires a log level and supports level filtering, per-instance prefixes, and method decorators.
+- Add a `safeMerge` utility for shallowly merging objects.
+
+### Changed
 
+- **BREAKING** Replace the logger utilities with a configurable `Logger` class that requires a log level and supports level filtering, per-instance prefixes, and method decorators. ([#136](https://github.com/MetaMask/internal-snaps/pull/136))
 - Bump `@metamask/utils` from `^11.9.0` to `^11.11.9` ([#161](https://github.com/MetaMask/internal-snaps/pull/161))
 
 ## [1.0.0]

packages/snap-networks-utils/src/index.ts

@@ -8,3 +8,4 @@ export {
   RemoteFeatureFlagsProvider,
   type RemoteFeatureFlagsProviderMessenger,
 } from './providers/remote-feature-flags/RemoteFeatureFlagsProvider';
+export { safeMerge } from './safeMerge';

packages/solana-wallet-snap/src/core/services/state/State.test.ts

@@ -86,6 +86,12 @@ describe('State', () => {
       expect(stateValue).toStrictEqual(DEFAULT_STATE);
     });
 
+    it('preserves defaults when persisted state values are undefined', async () => {
+      snap.request.mockResolvedValue({ users: undefined });
+
+      expect(await state.get()).toStrictEqual(DEFAULT_STATE);
+    });
+
     describe('when getting serialized non-JSON values', () => {
       it('deserializes undefined values', async () => {
         const mockUnderlyingState = {

packages/solana-wallet-snap/src/core/services/state/State.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import type { Transaction } from '@metamask/keyring-api';
+import { safeMerge } from '@metamask/snap-networks-utils';
 import type { Address, Signature } from '@solana/kit';
 import type { MutexInterface } from 'async-mutex';
 import { Mutex } from 'async-mutex';
@@ -16,7 +17,6 @@ import type { SpotPrices } from '../../clients/price-api/types';
 import { deserialize } from '../../serialization/deserialize';
 import { serialize } from '../../serialization/serialize';
 import type { Serializable } from '../../serialization/types';
-import { safeMerge } from '../../utils/safeMerge';
 import type { IStateManager } from './IStateManager';
 
 export type AccountId = string;

packages/tron-wallet-snap/src/services/state/State.test.ts

@@ -113,6 +113,12 @@ describe('State', () => {
       expect(stateValue).toStrictEqual(DEFAULT_STATE);
     });
 
+    it('preserves defaults when persisted state values are undefined', async () => {
+      snap.request.mockResolvedValue({ users: undefined });
+
+      expect(await state.get()).toStrictEqual(DEFAULT_STATE);
+    });
+
     describe('when getting serialized non-JSON values', () => {
       it('deserializes undefined values', async () => {
         const mockUnderlyingState = {

packages/tron-wallet-snap/src/services/state/State.ts

@@ -1,12 +1,12 @@
 import type { Transaction } from '@metamask/keyring-api';
+import { safeMerge } from '@metamask/snap-networks-utils';
 import type { MutexInterface } from 'async-mutex';
 import { Mutex } from 'async-mutex';
 import { unset } from 'lodash';
 
 import type { SpotPrices } from '../../clients/price-api/types';
 import type { AssetEntity } from '../../entities/assets';
 import type { TronKeyringAccount } from '../../entities/keyring-account';
-import { safeMerge } from '../../utils/safeMerge';
 import { deserialize } from '../../utils/serialization/deserialize';
 import { serialize } from '../../utils/serialization/serialize';
 import type { Serializable } from '../../utils/serialization/types';