@metamask/profile-sync-controller 1.0.2 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. package/CHANGELOG.md +40 -1
  2. package/dist/controllers/user-storage/UserStorageController.cjs +55 -22
  3. package/dist/controllers/user-storage/UserStorageController.cjs.map +1 -1
  4. package/dist/controllers/user-storage/UserStorageController.d.cts +32 -15
  5. package/dist/controllers/user-storage/UserStorageController.d.cts.map +1 -1
  6. package/dist/controllers/user-storage/UserStorageController.d.mts +32 -15
  7. package/dist/controllers/user-storage/UserStorageController.d.mts.map +1 -1
  8. package/dist/controllers/user-storage/UserStorageController.mjs +56 -23
  9. package/dist/controllers/user-storage/UserStorageController.mjs.map +1 -1
  10. package/dist/controllers/user-storage/__fixtures__/mockMessenger.cjs +171 -0
  11. package/dist/controllers/user-storage/__fixtures__/mockMessenger.cjs.map +1 -0
  12. package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.cts +102 -0
  13. package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.cts.map +1 -0
  14. package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.mts +102 -0
  15. package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.mts.map +1 -0
  16. package/dist/controllers/user-storage/__fixtures__/mockMessenger.mjs +166 -0
  17. package/dist/controllers/user-storage/__fixtures__/mockMessenger.mjs.map +1 -0
  18. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.cjs +20 -2
  19. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.cjs.map +1 -1
  20. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.d.cts +8 -1
  21. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.d.cts.map +1 -1
  22. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.d.mts +8 -1
  23. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.d.mts.map +1 -1
  24. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.mjs +17 -1
  25. package/dist/controllers/user-storage/network-syncing/__fixtures__/mockNetwork.mjs.map +1 -1
  26. package/dist/controllers/user-storage/network-syncing/add-network-utils.cjs +35 -0
  27. package/dist/controllers/user-storage/network-syncing/add-network-utils.cjs.map +1 -0
  28. package/dist/controllers/user-storage/network-syncing/add-network-utils.d.cts +21 -0
  29. package/dist/controllers/user-storage/network-syncing/add-network-utils.d.cts.map +1 -0
  30. package/dist/controllers/user-storage/network-syncing/add-network-utils.d.mts +21 -0
  31. package/dist/controllers/user-storage/network-syncing/add-network-utils.d.mts.map +1 -0
  32. package/dist/controllers/user-storage/network-syncing/add-network-utils.mjs +30 -0
  33. package/dist/controllers/user-storage/network-syncing/add-network-utils.mjs.map +1 -0
  34. package/dist/controllers/user-storage/network-syncing/controller-integration.cjs +157 -29
  35. package/dist/controllers/user-storage/network-syncing/controller-integration.cjs.map +1 -1
  36. package/dist/controllers/user-storage/network-syncing/controller-integration.d.cts +45 -3
  37. package/dist/controllers/user-storage/network-syncing/controller-integration.d.cts.map +1 -1
  38. package/dist/controllers/user-storage/network-syncing/controller-integration.d.mts +45 -3
  39. package/dist/controllers/user-storage/network-syncing/controller-integration.d.mts.map +1 -1
  40. package/dist/controllers/user-storage/network-syncing/controller-integration.mjs +154 -28
  41. package/dist/controllers/user-storage/network-syncing/controller-integration.mjs.map +1 -1
  42. package/dist/controllers/user-storage/network-syncing/services.cjs +9 -4
  43. package/dist/controllers/user-storage/network-syncing/services.cjs.map +1 -1
  44. package/dist/controllers/user-storage/network-syncing/services.d.cts.map +1 -1
  45. package/dist/controllers/user-storage/network-syncing/services.d.mts.map +1 -1
  46. package/dist/controllers/user-storage/network-syncing/services.mjs +10 -5
  47. package/dist/controllers/user-storage/network-syncing/services.mjs.map +1 -1
  48. package/dist/controllers/user-storage/network-syncing/sync-all.cjs +10 -28
  49. package/dist/controllers/user-storage/network-syncing/sync-all.cjs.map +1 -1
  50. package/dist/controllers/user-storage/network-syncing/sync-all.d.cts +5 -8
  51. package/dist/controllers/user-storage/network-syncing/sync-all.d.cts.map +1 -1
  52. package/dist/controllers/user-storage/network-syncing/sync-all.d.mts +5 -8
  53. package/dist/controllers/user-storage/network-syncing/sync-all.d.mts.map +1 -1
  54. package/dist/controllers/user-storage/network-syncing/sync-all.mjs +9 -26
  55. package/dist/controllers/user-storage/network-syncing/sync-all.mjs.map +1 -1
  56. package/dist/controllers/user-storage/network-syncing/sync-mutations.cjs +1 -1
  57. package/dist/controllers/user-storage/network-syncing/sync-mutations.cjs.map +1 -1
  58. package/dist/controllers/user-storage/network-syncing/sync-mutations.d.cts +1 -1
  59. package/dist/controllers/user-storage/network-syncing/sync-mutations.d.cts.map +1 -1
  60. package/dist/controllers/user-storage/network-syncing/sync-mutations.d.mts +1 -1
  61. package/dist/controllers/user-storage/network-syncing/sync-mutations.d.mts.map +1 -1
  62. package/dist/controllers/user-storage/network-syncing/sync-mutations.mjs +1 -1
  63. package/dist/controllers/user-storage/network-syncing/sync-mutations.mjs.map +1 -1
  64. package/dist/controllers/user-storage/network-syncing/types.cjs.map +1 -1
  65. package/dist/controllers/user-storage/network-syncing/types.d.cts +1 -4
  66. package/dist/controllers/user-storage/network-syncing/types.d.cts.map +1 -1
  67. package/dist/controllers/user-storage/network-syncing/types.d.mts +1 -4
  68. package/dist/controllers/user-storage/network-syncing/types.d.mts.map +1 -1
  69. package/dist/controllers/user-storage/network-syncing/types.mjs.map +1 -1
  70. package/dist/controllers/user-storage/network-syncing/update-network-utils.cjs +126 -0
  71. package/dist/controllers/user-storage/network-syncing/update-network-utils.cjs.map +1 -0
  72. package/dist/controllers/user-storage/network-syncing/update-network-utils.d.cts +56 -0
  73. package/dist/controllers/user-storage/network-syncing/update-network-utils.d.cts.map +1 -0
  74. package/dist/controllers/user-storage/network-syncing/update-network-utils.d.mts +56 -0
  75. package/dist/controllers/user-storage/network-syncing/update-network-utils.d.mts.map +1 -0
  76. package/dist/controllers/user-storage/network-syncing/update-network-utils.mjs +119 -0
  77. package/dist/controllers/user-storage/network-syncing/update-network-utils.mjs.map +1 -0
  78. package/dist/controllers/user-storage/services.cjs +2 -0
  79. package/dist/controllers/user-storage/services.cjs.map +1 -1
  80. package/dist/controllers/user-storage/services.d.cts.map +1 -1
  81. package/dist/controllers/user-storage/services.d.mts.map +1 -1
  82. package/dist/controllers/user-storage/services.mjs +2 -0
  83. package/dist/controllers/user-storage/services.mjs.map +1 -1
  84. package/dist/sdk/authentication-jwt-bearer/flow-siwe.mjs +1 -2
  85. package/dist/sdk/authentication-jwt-bearer/flow-siwe.mjs.map +1 -1
  86. package/package.json +17 -12
@@ -1 +1 @@
1
- {"version":3,"file":"sync-all.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-all.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,0BAA0B,EAEhC,oBAAgB;AAEjB,KAAK,yBAAyB,GAAG;IAC/B,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,cAAc,EAAE,0BAA0B,EAAE,CAAC;CAC9C,CAAC;AAsBF,eAAO,MAAM,iBAAiB,kBACb,oBAAoB,EAAE,kBACrB,0BAA0B,EAAE;;;;;;CAe7C,CAAC;AAEF,KAAK,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAChE,eAAO,MAAM,yBAAyB,iBACtB,oBAAoB,iBACnB,0BAA0B,KACxC,YA4BF,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAC7B,WAAW,wBAAwB,CAAC;;;CAsCzC,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAC7B,WAAW,wBAAwB,CAAC;;;;CA6CzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAAW;IACzC,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAC7C,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;IAC9C,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;CAC/C,2BAsBA,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAAW,yBAAyB;;;aAoCpE,CAAC"}
1
+ {"version":3,"file":"sync-all.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-all.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qCAAqC;AAGzE,OAAO,EAEL,KAAK,0BAA0B,EAEhC,oBAAgB;AAEjB,KAAK,yBAAyB,GAAG;IAC/B,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,cAAc,EAAE,0BAA0B,EAAE,CAAC;CAC9C,CAAC;AAsBF,eAAO,MAAM,iBAAiB,kBACb,oBAAoB,EAAE,kBACrB,0BAA0B,EAAE;;;;;;CAe7C,CAAC;AAEF,KAAK,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAChE,eAAO,MAAM,yBAAyB,iBACtB,oBAAoB,iBACnB,0BAA0B,KACxC,YA8BF,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAC7B,WAAW,wBAAwB,CAAC;;;CAsCzC,CAAC;AAEF,eAAO,MAAM,sBAAsB,OAC7B,WAAW,wBAAwB,CAAC;;;;CAgDzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAAW,yBAAyB;;;;;aAgCpE,CAAC"}
@@ -45,6 +45,8 @@ export const checkWhichNetworkIsLatest = (localNetwork, remoteNetwork) => {
45
45
  ? 'Local Wins'
46
46
  : 'Remote Wins';
47
47
  }
48
+ // Unreachable statement
49
+ /* istanbul ignore next */
48
50
  return 'Do Nothing';
49
51
  };
50
52
  export const getMissingNetworkLists = (ds) => {
@@ -84,6 +86,9 @@ export const getUpdatedNetworkLists = (ds) => {
84
86
  const localNetwork = localMap.get(chain);
85
87
  const remoteNetwork = remoteMap.get(chain);
86
88
  if (!localNetwork || !remoteNetwork) {
89
+ // This should be unreachable as we know the Maps created will have the values
90
+ // This is to satisfy types
91
+ /* istanbul ignore next */
87
92
  return;
88
93
  }
89
94
  const whichIsLatest = checkWhichNetworkIsLatest(localNetwork, remoteNetwork);
@@ -109,25 +114,6 @@ export const getUpdatedNetworkLists = (ds) => {
109
114
  localNetworksToRemove,
110
115
  };
111
116
  };
112
- export const getNewLocalNetworks = (props) => {
113
- let newList = [...props.originalList];
114
- newList.push(...props.missingLocalNetworks);
115
- const updateMap = createMap(props.localNetworksToUpdate);
116
- const remoteMap = createMap(props.localNetworksToRemove);
117
- newList = newList
118
- .map((n) => {
119
- if (remoteMap.has(n.chainId)) {
120
- return undefined;
121
- }
122
- const updatedNetwork = updateMap.get(n.chainId);
123
- if (updatedNetwork) {
124
- return updatedNetwork;
125
- }
126
- return n;
127
- })
128
- .filter((n) => n !== undefined);
129
- return newList;
130
- };
131
117
  export const findNetworksToUpdate = (props) => {
132
118
  try {
133
119
  const { localNetworks, remoteNetworks } = props;
@@ -142,21 +128,18 @@ export const findNetworksToUpdate = (props) => {
142
128
  ...missingNetworks.missingRemoteNetworks,
143
129
  ...updatedNetworks.remoteNetworksToUpdate,
144
130
  ];
145
- // List of new local networks
146
- const newLocalNetworks = getNewLocalNetworks({
147
- originalList: localNetworks,
131
+ return {
132
+ remoteNetworksToUpdate,
148
133
  missingLocalNetworks: missingNetworks.missingLocalNetworks,
149
134
  localNetworksToRemove: updatedNetworks.localNetworksToRemove,
150
135
  localNetworksToUpdate: updatedNetworks.localNetworksToUpdate,
151
- });
152
- return {
153
- remoteNetworksToUpdate,
154
- newLocalNetworks,
155
136
  };
156
137
  }
157
138
  catch {
158
139
  // Unable to perform sync, silently fail
159
140
  }
141
+ // Unreachable statement
142
+ /* istanbul ignore next */
160
143
  return undefined;
161
144
  };
162
145
  //# sourceMappingURL=sync-all.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"sync-all.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-all.ts"],"names":[],"mappings":"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","sourcesContent":["import { setDifference, setIntersection } from '../utils';\nimport {\n toRemoteNetworkConfiguration,\n type NetworkConfiguration,\n type RemoteNetworkConfiguration,\n toNetworkConfiguration,\n} from './types';\n\ntype FindNetworksToUpdateProps = {\n localNetworks: NetworkConfiguration[];\n remoteNetworks: RemoteNetworkConfiguration[];\n};\n\nconst createMap = <\n Network extends NetworkConfiguration | RemoteNetworkConfiguration,\n>(\n networks: Network[],\n): Map<string, Network> => {\n return new Map(networks.map((n) => [n.chainId, n]));\n};\n\nconst createKeySet = <\n Network extends NetworkConfiguration | RemoteNetworkConfiguration,\n>(\n networks: Network[],\n predicate?: (n: Network) => boolean,\n): Set<string> => {\n const filteredNetworks = predicate\n ? networks.filter((n) => predicate(n))\n : networks;\n return new Set(filteredNetworks.map((n) => n.chainId));\n};\n\nexport const getDataStructures = (\n localNetworks: NetworkConfiguration[],\n remoteNetworks: RemoteNetworkConfiguration[],\n) => {\n const localMap = createMap(localNetworks);\n const remoteMap = createMap(remoteNetworks);\n const localKeySet = createKeySet(localNetworks);\n const remoteKeySet = createKeySet(remoteNetworks);\n const existingRemoteKeySet = createKeySet(remoteNetworks, (n) => !n.d);\n\n return {\n localMap,\n remoteMap,\n localKeySet,\n remoteKeySet,\n existingRemoteKeySet,\n };\n};\n\ntype MatrixResult = 'Do Nothing' | 'Local Wins' | 'Remote Wins';\nexport const checkWhichNetworkIsLatest = (\n localNetwork: NetworkConfiguration,\n remoteNetwork: RemoteNetworkConfiguration,\n): MatrixResult => {\n // Neither network has updatedAt field (indicating no changes were made)\n if (!localNetwork.lastUpdatedAt && !remoteNetwork.lastUpdatedAt) {\n return 'Do Nothing';\n }\n\n // Local only has updatedAt field\n if (localNetwork.lastUpdatedAt && !remoteNetwork.lastUpdatedAt) {\n return 'Local Wins';\n }\n\n // Remote only has updatedAt field\n if (!localNetwork.lastUpdatedAt && remoteNetwork.lastUpdatedAt) {\n return 'Remote Wins';\n }\n\n // Both have updatedAt field, perform comparison\n if (localNetwork.lastUpdatedAt && remoteNetwork.lastUpdatedAt) {\n if (localNetwork.lastUpdatedAt === remoteNetwork.lastUpdatedAt) {\n return 'Do Nothing';\n }\n\n return localNetwork.lastUpdatedAt > remoteNetwork.lastUpdatedAt\n ? 'Local Wins'\n : 'Remote Wins';\n }\n\n return 'Do Nothing';\n};\n\nexport const getMissingNetworkLists = (\n ds: ReturnType<typeof getDataStructures>,\n) => {\n const {\n localKeySet,\n localMap,\n remoteKeySet,\n remoteMap,\n existingRemoteKeySet,\n } = ds;\n\n const missingLocalNetworks: NetworkConfiguration[] = [];\n const missingRemoteNetworks: RemoteNetworkConfiguration[] = [];\n\n // Networks that are in local, but not in remote\n const missingRemoteNetworkKeys = setDifference(localKeySet, remoteKeySet);\n missingRemoteNetworkKeys.forEach((chain) => {\n const n = localMap.get(chain);\n if (n) {\n missingRemoteNetworks.push(toRemoteNetworkConfiguration(n));\n }\n });\n\n // Networks that are in remote (not deleted), but not in local\n const missingLocalNetworkKeys = setDifference(\n existingRemoteKeySet,\n localKeySet,\n );\n missingLocalNetworkKeys.forEach((chain) => {\n const n = remoteMap.get(chain);\n if (n) {\n missingLocalNetworks.push(toNetworkConfiguration(n));\n }\n });\n\n return {\n missingLocalNetworks,\n missingRemoteNetworks,\n };\n};\n\nexport const getUpdatedNetworkLists = (\n ds: ReturnType<typeof getDataStructures>,\n) => {\n const { localKeySet, localMap, remoteKeySet, remoteMap } = ds;\n\n const remoteNetworksToUpdate: RemoteNetworkConfiguration[] = [];\n const localNetworksToUpdate: NetworkConfiguration[] = [];\n const localNetworksToRemove: NetworkConfiguration[] = [];\n\n // Get networks in both, these need to be compared against\n // each other to see which network to update.\n const networksInBoth = setIntersection(localKeySet, remoteKeySet);\n networksInBoth.forEach((chain) => {\n const localNetwork = localMap.get(chain);\n const remoteNetwork = remoteMap.get(chain);\n if (!localNetwork || !remoteNetwork) {\n return;\n }\n\n const whichIsLatest = checkWhichNetworkIsLatest(\n localNetwork,\n remoteNetwork,\n );\n\n // Local Wins -> Need to update remote\n if (whichIsLatest === 'Local Wins') {\n remoteNetworksToUpdate.push(toRemoteNetworkConfiguration(localNetwork));\n }\n\n // Remote Wins...\n if (whichIsLatest === 'Remote Wins') {\n if (remoteNetwork.d) {\n // ...and is deleted -> Need to remove from local list\n localNetworksToRemove.push(toNetworkConfiguration(remoteNetwork));\n } else {\n // ...and isn't deleted -> Need to update local list\n localNetworksToUpdate.push(toNetworkConfiguration(remoteNetwork));\n }\n }\n });\n\n return {\n remoteNetworksToUpdate,\n localNetworksToUpdate,\n localNetworksToRemove,\n };\n};\n\nexport const getNewLocalNetworks = (props: {\n originalList: NetworkConfiguration[];\n missingLocalNetworks: NetworkConfiguration[];\n localNetworksToUpdate: NetworkConfiguration[];\n localNetworksToRemove: NetworkConfiguration[];\n}) => {\n let newList = [...props.originalList];\n newList.push(...props.missingLocalNetworks);\n const updateMap = createMap(props.localNetworksToUpdate);\n const remoteMap = createMap(props.localNetworksToRemove);\n\n newList = newList\n .map((n) => {\n if (remoteMap.has(n.chainId)) {\n return undefined;\n }\n\n const updatedNetwork = updateMap.get(n.chainId);\n if (updatedNetwork) {\n return updatedNetwork;\n }\n\n return n;\n })\n .filter((n): n is NetworkConfiguration => n !== undefined);\n\n return newList;\n};\n\nexport const findNetworksToUpdate = (props: FindNetworksToUpdateProps) => {\n try {\n const { localNetworks, remoteNetworks } = props;\n\n // Get Maps & Key Sets\n const ds = getDataStructures(localNetworks, remoteNetworks);\n\n // Calc Missing Networks\n const missingNetworks = getMissingNetworkLists(ds);\n\n // Calc Updated Networks\n const updatedNetworks = getUpdatedNetworkLists(ds);\n\n // List of networks we need to update\n const remoteNetworksToUpdate = [\n ...missingNetworks.missingRemoteNetworks,\n ...updatedNetworks.remoteNetworksToUpdate,\n ];\n\n // List of new local networks\n const newLocalNetworks = getNewLocalNetworks({\n originalList: localNetworks,\n missingLocalNetworks: missingNetworks.missingLocalNetworks,\n localNetworksToRemove: updatedNetworks.localNetworksToRemove,\n localNetworksToUpdate: updatedNetworks.localNetworksToUpdate,\n });\n\n return {\n remoteNetworksToUpdate,\n newLocalNetworks,\n };\n } catch {\n // Unable to perform sync, silently fail\n }\n\n return undefined;\n};\n"]}
1
+ {"version":3,"file":"sync-all.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-all.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkConfiguration } from '@metamask/network-controller';\n\nimport { setDifference, setIntersection } from '../utils';\nimport {\n toRemoteNetworkConfiguration,\n type RemoteNetworkConfiguration,\n toNetworkConfiguration,\n} from './types';\n\ntype FindNetworksToUpdateProps = {\n localNetworks: NetworkConfiguration[];\n remoteNetworks: RemoteNetworkConfiguration[];\n};\n\nconst createMap = <\n Network extends NetworkConfiguration | RemoteNetworkConfiguration,\n>(\n networks: Network[],\n): Map<string, Network> => {\n return new Map(networks.map((n) => [n.chainId, n]));\n};\n\nconst createKeySet = <\n Network extends NetworkConfiguration | RemoteNetworkConfiguration,\n>(\n networks: Network[],\n predicate?: (n: Network) => boolean,\n): Set<string> => {\n const filteredNetworks = predicate\n ? networks.filter((n) => predicate(n))\n : networks;\n return new Set(filteredNetworks.map((n) => n.chainId));\n};\n\nexport const getDataStructures = (\n localNetworks: NetworkConfiguration[],\n remoteNetworks: RemoteNetworkConfiguration[],\n) => {\n const localMap = createMap(localNetworks);\n const remoteMap = createMap(remoteNetworks);\n const localKeySet = createKeySet(localNetworks);\n const remoteKeySet = createKeySet(remoteNetworks);\n const existingRemoteKeySet = createKeySet(remoteNetworks, (n) => !n.d);\n\n return {\n localMap,\n remoteMap,\n localKeySet,\n remoteKeySet,\n existingRemoteKeySet,\n };\n};\n\ntype MatrixResult = 'Do Nothing' | 'Local Wins' | 'Remote Wins';\nexport const checkWhichNetworkIsLatest = (\n localNetwork: NetworkConfiguration,\n remoteNetwork: RemoteNetworkConfiguration,\n): MatrixResult => {\n // Neither network has updatedAt field (indicating no changes were made)\n if (!localNetwork.lastUpdatedAt && !remoteNetwork.lastUpdatedAt) {\n return 'Do Nothing';\n }\n\n // Local only has updatedAt field\n if (localNetwork.lastUpdatedAt && !remoteNetwork.lastUpdatedAt) {\n return 'Local Wins';\n }\n\n // Remote only has updatedAt field\n if (!localNetwork.lastUpdatedAt && remoteNetwork.lastUpdatedAt) {\n return 'Remote Wins';\n }\n\n // Both have updatedAt field, perform comparison\n if (localNetwork.lastUpdatedAt && remoteNetwork.lastUpdatedAt) {\n if (localNetwork.lastUpdatedAt === remoteNetwork.lastUpdatedAt) {\n return 'Do Nothing';\n }\n\n return localNetwork.lastUpdatedAt > remoteNetwork.lastUpdatedAt\n ? 'Local Wins'\n : 'Remote Wins';\n }\n\n // Unreachable statement\n /* istanbul ignore next */\n return 'Do Nothing';\n};\n\nexport const getMissingNetworkLists = (\n ds: ReturnType<typeof getDataStructures>,\n) => {\n const {\n localKeySet,\n localMap,\n remoteKeySet,\n remoteMap,\n existingRemoteKeySet,\n } = ds;\n\n const missingLocalNetworks: NetworkConfiguration[] = [];\n const missingRemoteNetworks: RemoteNetworkConfiguration[] = [];\n\n // Networks that are in local, but not in remote\n const missingRemoteNetworkKeys = setDifference(localKeySet, remoteKeySet);\n missingRemoteNetworkKeys.forEach((chain) => {\n const n = localMap.get(chain);\n if (n) {\n missingRemoteNetworks.push(toRemoteNetworkConfiguration(n));\n }\n });\n\n // Networks that are in remote (not deleted), but not in local\n const missingLocalNetworkKeys = setDifference(\n existingRemoteKeySet,\n localKeySet,\n );\n missingLocalNetworkKeys.forEach((chain) => {\n const n = remoteMap.get(chain);\n if (n) {\n missingLocalNetworks.push(toNetworkConfiguration(n));\n }\n });\n\n return {\n missingLocalNetworks,\n missingRemoteNetworks,\n };\n};\n\nexport const getUpdatedNetworkLists = (\n ds: ReturnType<typeof getDataStructures>,\n) => {\n const { localKeySet, localMap, remoteKeySet, remoteMap } = ds;\n\n const remoteNetworksToUpdate: RemoteNetworkConfiguration[] = [];\n const localNetworksToUpdate: NetworkConfiguration[] = [];\n const localNetworksToRemove: NetworkConfiguration[] = [];\n\n // Get networks in both, these need to be compared against\n // each other to see which network to update.\n const networksInBoth = setIntersection(localKeySet, remoteKeySet);\n networksInBoth.forEach((chain) => {\n const localNetwork = localMap.get(chain);\n const remoteNetwork = remoteMap.get(chain);\n if (!localNetwork || !remoteNetwork) {\n // This should be unreachable as we know the Maps created will have the values\n // This is to satisfy types\n /* istanbul ignore next */\n return;\n }\n\n const whichIsLatest = checkWhichNetworkIsLatest(\n localNetwork,\n remoteNetwork,\n );\n\n // Local Wins -> Need to update remote\n if (whichIsLatest === 'Local Wins') {\n remoteNetworksToUpdate.push(toRemoteNetworkConfiguration(localNetwork));\n }\n\n // Remote Wins...\n if (whichIsLatest === 'Remote Wins') {\n if (remoteNetwork.d) {\n // ...and is deleted -> Need to remove from local list\n localNetworksToRemove.push(toNetworkConfiguration(remoteNetwork));\n } else {\n // ...and isn't deleted -> Need to update local list\n localNetworksToUpdate.push(toNetworkConfiguration(remoteNetwork));\n }\n }\n });\n\n return {\n remoteNetworksToUpdate,\n localNetworksToUpdate,\n localNetworksToRemove,\n };\n};\n\nexport const findNetworksToUpdate = (props: FindNetworksToUpdateProps) => {\n try {\n const { localNetworks, remoteNetworks } = props;\n\n // Get Maps & Key Sets\n const ds = getDataStructures(localNetworks, remoteNetworks);\n\n // Calc Missing Networks\n const missingNetworks = getMissingNetworkLists(ds);\n\n // Calc Updated Networks\n const updatedNetworks = getUpdatedNetworkLists(ds);\n\n // List of networks we need to update\n const remoteNetworksToUpdate = [\n ...missingNetworks.missingRemoteNetworks,\n ...updatedNetworks.remoteNetworksToUpdate,\n ];\n\n return {\n remoteNetworksToUpdate,\n missingLocalNetworks: missingNetworks.missingLocalNetworks,\n localNetworksToRemove: updatedNetworks.localNetworksToRemove,\n localNetworksToUpdate: updatedNetworks.localNetworksToUpdate,\n };\n } catch {\n // Unable to perform sync, silently fail\n }\n\n // Unreachable statement\n /* istanbul ignore next */\n return undefined;\n};\n"]}
@@ -13,7 +13,7 @@ const deleteNetwork = async (network, opts) => {
13
13
  v: '1',
14
14
  ...network,
15
15
  d: true,
16
- lastUpdatedAt: network.lastUpdatedAt ?? Date.now(), // Ensures that a deleted entry has a date field
16
+ lastUpdatedAt: Date.now(), // Ensures that a deleted entry has a date field
17
17
  }, opts);
18
18
  };
19
19
  exports.deleteNetwork = deleteNetwork;
@@ -1 +1 @@
1
- {"version":3,"file":"sync-mutations.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":";;;AACA,6CAA4E;AAGrE,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,OAAO,MAAM,IAAA,8BAAmB,EAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AAEW,QAAA,UAAU,GAAG,qBAAa,CAAC;AAEjC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,gFAAgF;IAChF,OAAO,MAAM,IAAA,8BAAmB,EAC9B;QACE,CAAC,EAAE,GAAG;QACN,GAAG,OAAO;QACV,CAAC,EAAE,IAAI;QACP,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,gDAAgD;KACrG,EACD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEK,MAAM,mBAAmB,GAAG,KAAK,EACtC,QAA0D,EAC1D,IAA4B,EAC5B,EAAE;IACF,MAAM,cAAc,GAAiC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC,EAAE,GAAG;QACN,GAAG,CAAC;KACL,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,IAAA,oCAAyB,EAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC;AATW,QAAA,mBAAmB,uBAS9B","sourcesContent":["import type { UserStorageBaseOptions } from '../services';\nimport { batchUpsertRemoteNetworks, upsertRemoteNetwork } from './services';\nimport type { NetworkConfiguration, RemoteNetworkConfiguration } from './types';\n\nexport const updateNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n return await upsertRemoteNetwork({ v: '1', ...network, d: false }, opts);\n};\n\nexport const addNetwork = updateNetwork;\n\nexport const deleteNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n // we are soft deleting, as we need to consider devices that have not yet synced\n return await upsertRemoteNetwork(\n {\n v: '1',\n ...network,\n d: true,\n lastUpdatedAt: network.lastUpdatedAt ?? Date.now(), // Ensures that a deleted entry has a date field\n },\n opts,\n );\n};\n\nexport const batchUpdateNetworks = async (\n networks: (NetworkConfiguration & { deleted?: boolean })[],\n opts: UserStorageBaseOptions,\n) => {\n const remoteNetworks: RemoteNetworkConfiguration[] = networks.map((n) => ({\n v: '1',\n ...n,\n }));\n return await batchUpsertRemoteNetworks(remoteNetworks, opts);\n};\n"]}
1
+ {"version":3,"file":"sync-mutations.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":";;;AAGA,6CAA4E;AAGrE,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,OAAO,MAAM,IAAA,8BAAmB,EAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AAEW,QAAA,UAAU,GAAG,qBAAa,CAAC;AAEjC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,gFAAgF;IAChF,OAAO,MAAM,IAAA,8BAAmB,EAC9B;QACE,CAAC,EAAE,GAAG;QACN,GAAG,OAAO;QACV,CAAC,EAAE,IAAI;QACP,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,gDAAgD;KAC5E,EACD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEK,MAAM,mBAAmB,GAAG,KAAK,EACtC,QAA0D,EAC1D,IAA4B,EAC5B,EAAE;IACF,MAAM,cAAc,GAAiC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC,EAAE,GAAG;QACN,GAAG,CAAC;KACL,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,IAAA,oCAAyB,EAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC;AATW,QAAA,mBAAmB,uBAS9B","sourcesContent":["import type { NetworkConfiguration } from '@metamask/network-controller';\n\nimport type { UserStorageBaseOptions } from '../services';\nimport { batchUpsertRemoteNetworks, upsertRemoteNetwork } from './services';\nimport type { RemoteNetworkConfiguration } from './types';\n\nexport const updateNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n return await upsertRemoteNetwork({ v: '1', ...network, d: false }, opts);\n};\n\nexport const addNetwork = updateNetwork;\n\nexport const deleteNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n // we are soft deleting, as we need to consider devices that have not yet synced\n return await upsertRemoteNetwork(\n {\n v: '1',\n ...network,\n d: true,\n lastUpdatedAt: Date.now(), // Ensures that a deleted entry has a date field\n },\n opts,\n );\n};\n\nexport const batchUpdateNetworks = async (\n networks: (NetworkConfiguration & { deleted?: boolean })[],\n opts: UserStorageBaseOptions,\n) => {\n const remoteNetworks: RemoteNetworkConfiguration[] = networks.map((n) => ({\n v: '1',\n ...n,\n }));\n return await batchUpsertRemoteNetworks(remoteNetworks, opts);\n};\n"]}
@@ -1,5 +1,5 @@
1
+ import type { NetworkConfiguration } from "@metamask/network-controller";
1
2
  import type { UserStorageBaseOptions } from "../services.cjs";
2
- import type { NetworkConfiguration } from "./types.cjs";
3
3
  export declare const updateNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
4
4
  export declare const addNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
5
5
  export declare const deleteNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"sync-mutations.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAoB;AAE1D,OAAO,KAAK,EAAE,oBAAoB,EAA8B,oBAAgB;AAEhF,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAG7B,CAAC;AAEF,eAAO,MAAM,UAAU,YANZ,oBAAoB,QACvB,sBAAsB,kBAKS,CAAC;AAExC,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAY7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,QACpD,sBAAsB,kBAO7B,CAAC"}
1
+ {"version":3,"file":"sync-mutations.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qCAAqC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAoB;AAI1D,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAG7B,CAAC;AAEF,eAAO,MAAM,UAAU,YANZ,oBAAoB,QACvB,sBAAsB,kBAKS,CAAC;AAExC,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAY7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,QACpD,sBAAsB,kBAO7B,CAAC"}
@@ -1,5 +1,5 @@
1
+ import type { NetworkConfiguration } from "@metamask/network-controller";
1
2
  import type { UserStorageBaseOptions } from "../services.mjs";
2
- import type { NetworkConfiguration } from "./types.mjs";
3
3
  export declare const updateNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
4
4
  export declare const addNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
5
5
  export declare const deleteNetwork: (network: NetworkConfiguration, opts: UserStorageBaseOptions) => Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"sync-mutations.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAoB;AAE1D,OAAO,KAAK,EAAE,oBAAoB,EAA8B,oBAAgB;AAEhF,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAG7B,CAAC;AAEF,eAAO,MAAM,UAAU,YANZ,oBAAoB,QACvB,sBAAsB,kBAKS,CAAC;AAExC,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAY7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,QACpD,sBAAsB,kBAO7B,CAAC"}
1
+ {"version":3,"file":"sync-mutations.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qCAAqC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,wBAAoB;AAI1D,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAG7B,CAAC;AAEF,eAAO,MAAM,UAAU,YANZ,oBAAoB,QACvB,sBAAsB,kBAKS,CAAC;AAExC,eAAO,MAAM,aAAa,YACf,oBAAoB,QACvB,sBAAsB,kBAY7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,QACpD,sBAAsB,kBAO7B,CAAC"}
@@ -9,7 +9,7 @@ export const deleteNetwork = async (network, opts) => {
9
9
  v: '1',
10
10
  ...network,
11
11
  d: true,
12
- lastUpdatedAt: network.lastUpdatedAt ?? Date.now(), // Ensures that a deleted entry has a date field
12
+ lastUpdatedAt: Date.now(), // Ensures that a deleted entry has a date field
13
13
  }, opts);
14
14
  };
15
15
  export const batchUpdateNetworks = async (networks, opts) => {
@@ -1 +1 @@
1
- {"version":3,"file":"sync-mutations.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,uBAAmB;AAG5E,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,OAAO,MAAM,mBAAmB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,gFAAgF;IAChF,OAAO,MAAM,mBAAmB,CAC9B;QACE,CAAC,EAAE,GAAG;QACN,GAAG,OAAO;QACV,CAAC,EAAE,IAAI;QACP,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,gDAAgD;KACrG,EACD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,QAA0D,EAC1D,IAA4B,EAC5B,EAAE;IACF,MAAM,cAAc,GAAiC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC,EAAE,GAAG;QACN,GAAG,CAAC;KACL,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,yBAAyB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC","sourcesContent":["import type { UserStorageBaseOptions } from '../services';\nimport { batchUpsertRemoteNetworks, upsertRemoteNetwork } from './services';\nimport type { NetworkConfiguration, RemoteNetworkConfiguration } from './types';\n\nexport const updateNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n return await upsertRemoteNetwork({ v: '1', ...network, d: false }, opts);\n};\n\nexport const addNetwork = updateNetwork;\n\nexport const deleteNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n // we are soft deleting, as we need to consider devices that have not yet synced\n return await upsertRemoteNetwork(\n {\n v: '1',\n ...network,\n d: true,\n lastUpdatedAt: network.lastUpdatedAt ?? Date.now(), // Ensures that a deleted entry has a date field\n },\n opts,\n );\n};\n\nexport const batchUpdateNetworks = async (\n networks: (NetworkConfiguration & { deleted?: boolean })[],\n opts: UserStorageBaseOptions,\n) => {\n const remoteNetworks: RemoteNetworkConfiguration[] = networks.map((n) => ({\n v: '1',\n ...n,\n }));\n return await batchUpsertRemoteNetworks(remoteNetworks, opts);\n};\n"]}
1
+ {"version":3,"file":"sync-mutations.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/sync-mutations.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,uBAAmB;AAG5E,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,OAAO,MAAM,mBAAmB,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,OAA6B,EAC7B,IAA4B,EAC5B,EAAE;IACF,gFAAgF;IAChF,OAAO,MAAM,mBAAmB,CAC9B;QACE,CAAC,EAAE,GAAG;QACN,GAAG,OAAO;QACV,CAAC,EAAE,IAAI;QACP,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,gDAAgD;KAC5E,EACD,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,QAA0D,EAC1D,IAA4B,EAC5B,EAAE;IACF,MAAM,cAAc,GAAiC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC,EAAE,GAAG;QACN,GAAG,CAAC;KACL,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,yBAAyB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC","sourcesContent":["import type { NetworkConfiguration } from '@metamask/network-controller';\n\nimport type { UserStorageBaseOptions } from '../services';\nimport { batchUpsertRemoteNetworks, upsertRemoteNetwork } from './services';\nimport type { RemoteNetworkConfiguration } from './types';\n\nexport const updateNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n return await upsertRemoteNetwork({ v: '1', ...network, d: false }, opts);\n};\n\nexport const addNetwork = updateNetwork;\n\nexport const deleteNetwork = async (\n network: NetworkConfiguration,\n opts: UserStorageBaseOptions,\n) => {\n // we are soft deleting, as we need to consider devices that have not yet synced\n return await upsertRemoteNetwork(\n {\n v: '1',\n ...network,\n d: true,\n lastUpdatedAt: Date.now(), // Ensures that a deleted entry has a date field\n },\n opts,\n );\n};\n\nexport const batchUpdateNetworks = async (\n networks: (NetworkConfiguration & { deleted?: boolean })[],\n opts: UserStorageBaseOptions,\n) => {\n const remoteNetworks: RemoteNetworkConfiguration[] = networks.map((n) => ({\n v: '1',\n ...n,\n }));\n return await batchUpsertRemoteNetworks(remoteNetworks, opts);\n};\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":";;;AAmBO,MAAM,4BAA4B,GAAG,CAC1C,OAA6B,EACD,EAAE;IAC9B,OAAO;QACL,GAAG,OAAO;QACV,CAAC,EAAE,GAAG;KACP,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,MAAM,sBAAsB,GAAG,CACpC,OAAmC,EACb,EAAE;IACxB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IACrD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC","sourcesContent":["import type { NetworkConfiguration as _NetworkConfiguration } from '@metamask/network-controller';\n\n// TODO - replace shim once we update NetworkController type\nexport type NetworkConfiguration = _NetworkConfiguration & {\n lastUpdatedAt?: number;\n};\n\nexport type RemoteNetworkConfiguration = NetworkConfiguration & {\n /**\n * `version` property. Enables future versioning of the `NetworkConfiguration` shape\n */\n v: '1';\n /**\n * isDeleted property, used for soft deletion & for correct syncing\n * (delete vs upload network)\n */\n d?: boolean;\n};\n\nexport const toRemoteNetworkConfiguration = (\n network: NetworkConfiguration,\n): RemoteNetworkConfiguration => {\n return {\n ...network,\n v: '1',\n };\n};\n\nexport const toNetworkConfiguration = (\n network: RemoteNetworkConfiguration,\n): NetworkConfiguration => {\n const { v: _v, d: _d, ...originalNetwork } = network;\n return originalNetwork;\n};\n"]}
1
+ {"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":";;;AAcO,MAAM,4BAA4B,GAAG,CAC1C,OAA6B,EACD,EAAE;IAC9B,OAAO;QACL,GAAG,OAAO;QACV,CAAC,EAAE,GAAG;KACP,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,MAAM,sBAAsB,GAAG,CACpC,OAAmC,EACb,EAAE;IACxB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IACrD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC","sourcesContent":["import type { NetworkConfiguration } from '@metamask/network-controller';\n\nexport type RemoteNetworkConfiguration = NetworkConfiguration & {\n /**\n * `version` property. Enables future versioning of the `NetworkConfiguration` shape\n */\n v: '1';\n /**\n * isDeleted property, used for soft deletion & for correct syncing\n * (delete vs upload network)\n */\n d?: boolean;\n};\n\nexport const toRemoteNetworkConfiguration = (\n network: NetworkConfiguration,\n): RemoteNetworkConfiguration => {\n return {\n ...network,\n v: '1',\n };\n};\n\nexport const toNetworkConfiguration = (\n network: RemoteNetworkConfiguration,\n): NetworkConfiguration => {\n const { v: _v, d: _d, ...originalNetwork } = network;\n return originalNetwork;\n};\n"]}
@@ -1,7 +1,4 @@
1
- import type { NetworkConfiguration as _NetworkConfiguration } from "@metamask/network-controller";
2
- export type NetworkConfiguration = _NetworkConfiguration & {
3
- lastUpdatedAt?: number;
4
- };
1
+ import type { NetworkConfiguration } from "@metamask/network-controller";
5
2
  export type RemoteNetworkConfiguration = NetworkConfiguration & {
6
3
  /**
7
4
  * `version` property. Enables future versioning of the `NetworkConfiguration` shape
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,IAAI,qBAAqB,EAAE,qCAAqC;AAGlG,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GAAG;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,oBAAoB,GAAG;IAC9D;;OAEG;IACH,CAAC,EAAE,GAAG,CAAC;IACP;;;OAGG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,4BAA4B,YAC9B,oBAAoB,KAC5B,0BAKF,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,0BAA0B,KAClC,oBAGF,CAAC"}
1
+ {"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qCAAqC;AAEzE,MAAM,MAAM,0BAA0B,GAAG,oBAAoB,GAAG;IAC9D;;OAEG;IACH,CAAC,EAAE,GAAG,CAAC;IACP;;;OAGG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,4BAA4B,YAC9B,oBAAoB,KAC5B,0BAKF,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,0BAA0B,KAClC,oBAGF,CAAC"}
@@ -1,7 +1,4 @@
1
- import type { NetworkConfiguration as _NetworkConfiguration } from "@metamask/network-controller";
2
- export type NetworkConfiguration = _NetworkConfiguration & {
3
- lastUpdatedAt?: number;
4
- };
1
+ import type { NetworkConfiguration } from "@metamask/network-controller";
5
2
  export type RemoteNetworkConfiguration = NetworkConfiguration & {
6
3
  /**
7
4
  * `version` property. Enables future versioning of the `NetworkConfiguration` shape
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,IAAI,qBAAqB,EAAE,qCAAqC;AAGlG,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GAAG;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,oBAAoB,GAAG;IAC9D;;OAEG;IACH,CAAC,EAAE,GAAG,CAAC;IACP;;;OAGG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,4BAA4B,YAC9B,oBAAoB,KAC5B,0BAKF,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,0BAA0B,KAClC,oBAGF,CAAC"}
1
+ {"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qCAAqC;AAEzE,MAAM,MAAM,0BAA0B,GAAG,oBAAoB,GAAG;IAC9D;;OAEG;IACH,CAAC,EAAE,GAAG,CAAC;IACP;;;OAGG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,eAAO,MAAM,4BAA4B,YAC9B,oBAAoB,KAC5B,0BAKF,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,0BAA0B,KAClC,oBAGF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,OAA6B,EACD,EAAE;IAC9B,OAAO;QACL,GAAG,OAAO;QACV,CAAC,EAAE,GAAG;KACP,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAAmC,EACb,EAAE;IACxB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IACrD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC","sourcesContent":["import type { NetworkConfiguration as _NetworkConfiguration } from '@metamask/network-controller';\n\n// TODO - replace shim once we update NetworkController type\nexport type NetworkConfiguration = _NetworkConfiguration & {\n lastUpdatedAt?: number;\n};\n\nexport type RemoteNetworkConfiguration = NetworkConfiguration & {\n /**\n * `version` property. Enables future versioning of the `NetworkConfiguration` shape\n */\n v: '1';\n /**\n * isDeleted property, used for soft deletion & for correct syncing\n * (delete vs upload network)\n */\n d?: boolean;\n};\n\nexport const toRemoteNetworkConfiguration = (\n network: NetworkConfiguration,\n): RemoteNetworkConfiguration => {\n return {\n ...network,\n v: '1',\n };\n};\n\nexport const toNetworkConfiguration = (\n network: RemoteNetworkConfiguration,\n): NetworkConfiguration => {\n const { v: _v, d: _d, ...originalNetwork } = network;\n return originalNetwork;\n};\n"]}
1
+ {"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/types.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,OAA6B,EACD,EAAE;IAC9B,OAAO;QACL,GAAG,OAAO;QACV,CAAC,EAAE,GAAG;KACP,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,OAAmC,EACb,EAAE;IACxB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,CAAC;IACrD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC","sourcesContent":["import type { NetworkConfiguration } from '@metamask/network-controller';\n\nexport type RemoteNetworkConfiguration = NetworkConfiguration & {\n /**\n * `version` property. Enables future versioning of the `NetworkConfiguration` shape\n */\n v: '1';\n /**\n * isDeleted property, used for soft deletion & for correct syncing\n * (delete vs upload network)\n */\n d?: boolean;\n};\n\nexport const toRemoteNetworkConfiguration = (\n network: NetworkConfiguration,\n): RemoteNetworkConfiguration => {\n return {\n ...network,\n v: '1',\n };\n};\n\nexport const toNetworkConfiguration = (\n network: RemoteNetworkConfiguration,\n): NetworkConfiguration => {\n const { v: _v, d: _d, ...originalNetwork } = network;\n return originalNetwork;\n};\n"]}
@@ -0,0 +1,126 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createUpdateNetworkProps = exports.getNewRPCIndex = exports.appendMissingInfuraNetworks = exports.getMappedNetworkConfiguration = void 0;
4
+ const network_controller_1 = require("@metamask/network-controller");
5
+ const utils_1 = require("../utils.cjs");
6
+ /**
7
+ * Will map the network configuration we want to update into something valid that `updateNetwork` accepts
8
+ * Exported for testability
9
+ *
10
+ * @param props - properties
11
+ * @param props.originalNetworkConfiguration - original network configuration we will override
12
+ * @param props.newNetworkConfiguration - new network configuration
13
+ * @returns NetworkConfiguration to dispatch to `NetworkController:updateNetwork`
14
+ */
15
+ const getMappedNetworkConfiguration = (props) => {
16
+ const { originalNetworkConfiguration, newNetworkConfiguration } = props;
17
+ // Map of URL <> clientId (url is unique)
18
+ const originalRPCUrlMap = new Map(originalNetworkConfiguration.rpcEndpoints.map((r) => [r.url, r.networkClientId]));
19
+ const updateNetworkConfig = newNetworkConfiguration;
20
+ updateNetworkConfig.rpcEndpoints = updateNetworkConfig.rpcEndpoints.map((r) => {
21
+ const originalRPCClientId = originalRPCUrlMap.get(r.url);
22
+ // This is an existing RPC, so use the clients networkClientId
23
+ if (originalRPCClientId) {
24
+ r.networkClientId = originalRPCClientId;
25
+ return r;
26
+ }
27
+ // This is a new RPC, so remove the remote networkClientId
28
+ r.networkClientId = undefined;
29
+ return r;
30
+ });
31
+ return updateNetworkConfig;
32
+ };
33
+ exports.getMappedNetworkConfiguration = getMappedNetworkConfiguration;
34
+ /**
35
+ * Will insert any missing infura RPCs, as we cannot remove infura RPC
36
+ * Exported for testability
37
+ * @param props - properties
38
+ * @param props.originalNetworkConfiguration - original network configuration
39
+ * @param props.updateNetworkConfiguration - the updated network configuration to use when dispatching `NetworkController:updateNetwork`
40
+ * @returns mutates and returns the updateNetworkConfiguration
41
+ */
42
+ const appendMissingInfuraNetworks = (props) => {
43
+ const { originalNetworkConfiguration, updateNetworkConfiguration } = props;
44
+ // Ensure we have not removed any infura networks (and add them back if they were removed)
45
+ const origInfuraRPCMap = new Map(originalNetworkConfiguration.rpcEndpoints
46
+ .filter((r) => r.type === network_controller_1.RpcEndpointType.Infura)
47
+ .map((r) => [r.networkClientId, r]));
48
+ const newInfuraRPCMap = new Map(updateNetworkConfiguration.rpcEndpoints
49
+ .filter((r) => r.type === network_controller_1.RpcEndpointType.Infura && r.networkClientId)
50
+ .map((r) => [r.networkClientId, r]));
51
+ const missingOrigInfuraRPCs = (0, utils_1.setDifference)(new Set(origInfuraRPCMap.keys()), new Set(newInfuraRPCMap.keys()));
52
+ if (missingOrigInfuraRPCs.size > 0) {
53
+ const missingRPCs = [];
54
+ missingOrigInfuraRPCs.forEach((clientId) => {
55
+ missingRPCs.push(origInfuraRPCMap.get(clientId));
56
+ });
57
+ updateNetworkConfiguration.rpcEndpoints.unshift(...missingRPCs);
58
+ }
59
+ return updateNetworkConfiguration;
60
+ };
61
+ exports.appendMissingInfuraNetworks = appendMissingInfuraNetworks;
62
+ /**
63
+ * The `NetworkController:updateNetwork` method will require us to pass in a `replacementSelectedRpcEndpointIndex` if the selected RPC is removed or modified
64
+ * @param props - properties
65
+ * @param props.originalNetworkConfiguration - the original network configuration
66
+ * @param props.updateNetworkConfiguration - the new network configuration we will use to update
67
+ * @param props.selectedNetworkClientId - the NetworkController's selected network id.
68
+ * @returns the new RPC index if it needs modification
69
+ */
70
+ const getNewRPCIndex = (props) => {
71
+ const { originalNetworkConfiguration, updateNetworkConfiguration, selectedNetworkClientId, } = props;
72
+ const isRPCInNewList = updateNetworkConfiguration.rpcEndpoints.some((r) => r.networkClientId === selectedNetworkClientId);
73
+ const isRPCInOldList = originalNetworkConfiguration.rpcEndpoints.some((r) => r.networkClientId === selectedNetworkClientId);
74
+ const getAnyRPCIndex = () => Math.max(updateNetworkConfiguration.rpcEndpoints.findIndex((r) => Boolean(r.networkClientId)), 0);
75
+ // We have removed the selected RPC, so we must point to a new RPC index
76
+ if (isRPCInOldList && !isRPCInNewList) {
77
+ // Try finding an existing index, or default to first RPC.
78
+ const newIndex = getAnyRPCIndex();
79
+ return newIndex;
80
+ }
81
+ // We have updated the selected RPC, so we must point to the same RPC index (or a new one)
82
+ if (isRPCInOldList && isRPCInNewList) {
83
+ const existingIndex = updateNetworkConfiguration.rpcEndpoints.findIndex((r) => r.networkClientId === selectedNetworkClientId);
84
+ /* istanbul ignore next - the `getAnyRPCIndex` should not be reachable since this is an existing network */
85
+ return existingIndex !== -1 ? existingIndex : getAnyRPCIndex();
86
+ }
87
+ return undefined;
88
+ };
89
+ exports.getNewRPCIndex = getNewRPCIndex;
90
+ /**
91
+ * create the correct `NetworkController:updateNetwork` parameters
92
+ * @param props - properties
93
+ * @param props.originalNetworkConfiguration - original config
94
+ * @param props.newNetworkConfiguration - new config (from remote)
95
+ * @param props.selectedNetworkClientId - the current selected network client id
96
+ * @returns parameters to be used for `NetworkController:updateNetwork` call
97
+ */
98
+ const createUpdateNetworkProps = (props) => {
99
+ const { originalNetworkConfiguration, newNetworkConfiguration, selectedNetworkClientId, } = props;
100
+ // The `NetworkController:updateNetwork` has a strict set of rules to follow
101
+ // New RPCs that we are adding must not have a networkClientId
102
+ // Existing RPCs must point to the correct networkClientId (so we must convert and use this client clientIds set)
103
+ // Removing RPCs are omitted from the list
104
+ // We cannot remove infura RPCs - so ensure that they stay populated
105
+ // If we are removing a selected RPC - then we need to provide `replacementSelectedRpcEndpointIndex` to an index in the new list
106
+ // If we are updating a selected RPC - then we need to provide `replacementSelectedRpcEndpointIndex` to the index in the new list
107
+ const mappedNetworkConfiguration = (0, exports.getMappedNetworkConfiguration)({
108
+ originalNetworkConfiguration,
109
+ newNetworkConfiguration,
110
+ });
111
+ (0, exports.appendMissingInfuraNetworks)({
112
+ originalNetworkConfiguration,
113
+ updateNetworkConfiguration: mappedNetworkConfiguration,
114
+ });
115
+ const updatedRPCIndex = (0, exports.getNewRPCIndex)({
116
+ originalNetworkConfiguration,
117
+ updateNetworkConfiguration: mappedNetworkConfiguration,
118
+ selectedNetworkClientId,
119
+ });
120
+ return {
121
+ updateNetworkFields: mappedNetworkConfiguration,
122
+ newSelectedRpcEndpointIndex: updatedRPCIndex,
123
+ };
124
+ };
125
+ exports.createUpdateNetworkProps = createUpdateNetworkProps;
126
+ //# sourceMappingURL=update-network-utils.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-network-utils.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/update-network-utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n RpcEndpointType,\n type UpdateNetworkFields,\n type NetworkConfiguration,\n} from '@metamask/network-controller';\n\nimport { setDifference } from '../utils';\n\n/**\n * Will map the network configuration we want to update into something valid that `updateNetwork` accepts\n * Exported for testability\n *\n * @param props - properties\n * @param props.originalNetworkConfiguration - original network configuration we will override\n * @param props.newNetworkConfiguration - new network configuration\n * @returns NetworkConfiguration to dispatch to `NetworkController:updateNetwork`\n */\nexport const getMappedNetworkConfiguration = (props: {\n originalNetworkConfiguration: NetworkConfiguration;\n newNetworkConfiguration: NetworkConfiguration;\n}): UpdateNetworkFields => {\n const { originalNetworkConfiguration, newNetworkConfiguration } = props;\n\n // Map of URL <> clientId (url is unique)\n const originalRPCUrlMap = new Map(\n originalNetworkConfiguration.rpcEndpoints.map(\n (r) => [r.url, r.networkClientId] as const,\n ),\n );\n\n const updateNetworkConfig = newNetworkConfiguration as UpdateNetworkFields;\n\n updateNetworkConfig.rpcEndpoints = updateNetworkConfig.rpcEndpoints.map(\n (r) => {\n const originalRPCClientId = originalRPCUrlMap.get(r.url);\n\n // This is an existing RPC, so use the clients networkClientId\n if (originalRPCClientId) {\n r.networkClientId = originalRPCClientId;\n return r;\n }\n\n // This is a new RPC, so remove the remote networkClientId\n r.networkClientId = undefined;\n return r;\n },\n );\n\n return updateNetworkConfig;\n};\n\n/**\n * Will insert any missing infura RPCs, as we cannot remove infura RPC\n * Exported for testability\n * @param props - properties\n * @param props.originalNetworkConfiguration - original network configuration\n * @param props.updateNetworkConfiguration - the updated network configuration to use when dispatching `NetworkController:updateNetwork`\n * @returns mutates and returns the updateNetworkConfiguration\n */\nexport const appendMissingInfuraNetworks = (props: {\n originalNetworkConfiguration: NetworkConfiguration;\n updateNetworkConfiguration: UpdateNetworkFields;\n}) => {\n const { originalNetworkConfiguration, updateNetworkConfiguration } = props;\n\n // Ensure we have not removed any infura networks (and add them back if they were removed)\n const origInfuraRPCMap = new Map(\n originalNetworkConfiguration.rpcEndpoints\n .filter((r) => r.type === RpcEndpointType.Infura)\n .map((r) => [r.networkClientId, r] as const),\n );\n const newInfuraRPCMap = new Map(\n updateNetworkConfiguration.rpcEndpoints\n .filter((r) => r.type === RpcEndpointType.Infura && r.networkClientId)\n .map((r) => [r.networkClientId as string, r]),\n );\n const missingOrigInfuraRPCs = setDifference(\n new Set(origInfuraRPCMap.keys()),\n new Set(newInfuraRPCMap.keys()),\n );\n\n if (missingOrigInfuraRPCs.size > 0) {\n const missingRPCs: UpdateNetworkFields['rpcEndpoints'] = [];\n missingOrigInfuraRPCs.forEach((clientId) => {\n missingRPCs.push(\n origInfuraRPCMap.get(\n clientId,\n ) as UpdateNetworkFields['rpcEndpoints'][number],\n );\n });\n\n updateNetworkConfiguration.rpcEndpoints.unshift(...missingRPCs);\n }\n\n return updateNetworkConfiguration;\n};\n\n/**\n * The `NetworkController:updateNetwork` method will require us to pass in a `replacementSelectedRpcEndpointIndex` if the selected RPC is removed or modified\n * @param props - properties\n * @param props.originalNetworkConfiguration - the original network configuration\n * @param props.updateNetworkConfiguration - the new network configuration we will use to update\n * @param props.selectedNetworkClientId - the NetworkController's selected network id.\n * @returns the new RPC index if it needs modification\n */\nexport const getNewRPCIndex = (props: {\n originalNetworkConfiguration: NetworkConfiguration;\n updateNetworkConfiguration: UpdateNetworkFields;\n selectedNetworkClientId: string;\n}) => {\n const {\n originalNetworkConfiguration,\n updateNetworkConfiguration,\n selectedNetworkClientId,\n } = props;\n\n const isRPCInNewList = updateNetworkConfiguration.rpcEndpoints.some(\n (r) => r.networkClientId === selectedNetworkClientId,\n );\n const isRPCInOldList = originalNetworkConfiguration.rpcEndpoints.some(\n (r) => r.networkClientId === selectedNetworkClientId,\n );\n\n const getAnyRPCIndex = () =>\n Math.max(\n updateNetworkConfiguration.rpcEndpoints.findIndex((r) =>\n Boolean(r.networkClientId),\n ),\n 0,\n );\n\n // We have removed the selected RPC, so we must point to a new RPC index\n if (isRPCInOldList && !isRPCInNewList) {\n // Try finding an existing index, or default to first RPC.\n const newIndex = getAnyRPCIndex();\n return newIndex;\n }\n\n // We have updated the selected RPC, so we must point to the same RPC index (or a new one)\n if (isRPCInOldList && isRPCInNewList) {\n const existingIndex = updateNetworkConfiguration.rpcEndpoints.findIndex(\n (r) => r.networkClientId === selectedNetworkClientId,\n );\n /* istanbul ignore next - the `getAnyRPCIndex` should not be reachable since this is an existing network */\n return existingIndex !== -1 ? existingIndex : getAnyRPCIndex();\n }\n\n return undefined;\n};\n\n/**\n * create the correct `NetworkController:updateNetwork` parameters\n * @param props - properties\n * @param props.originalNetworkConfiguration - original config\n * @param props.newNetworkConfiguration - new config (from remote)\n * @param props.selectedNetworkClientId - the current selected network client id\n * @returns parameters to be used for `NetworkController:updateNetwork` call\n */\nexport const createUpdateNetworkProps = (props: {\n originalNetworkConfiguration: NetworkConfiguration;\n newNetworkConfiguration: NetworkConfiguration;\n selectedNetworkClientId: string;\n}) => {\n const {\n originalNetworkConfiguration,\n newNetworkConfiguration,\n selectedNetworkClientId,\n } = props;\n\n // The `NetworkController:updateNetwork` has a strict set of rules to follow\n // New RPCs that we are adding must not have a networkClientId\n // Existing RPCs must point to the correct networkClientId (so we must convert and use this client clientIds set)\n // Removing RPCs are omitted from the list\n // We cannot remove infura RPCs - so ensure that they stay populated\n // If we are removing a selected RPC - then we need to provide `replacementSelectedRpcEndpointIndex` to an index in the new list\n // If we are updating a selected RPC - then we need to provide `replacementSelectedRpcEndpointIndex` to the index in the new list\n\n const mappedNetworkConfiguration = getMappedNetworkConfiguration({\n originalNetworkConfiguration,\n newNetworkConfiguration,\n });\n\n appendMissingInfuraNetworks({\n originalNetworkConfiguration,\n updateNetworkConfiguration: mappedNetworkConfiguration,\n });\n\n const updatedRPCIndex = getNewRPCIndex({\n originalNetworkConfiguration,\n updateNetworkConfiguration: mappedNetworkConfiguration,\n selectedNetworkClientId,\n });\n\n return {\n updateNetworkFields: mappedNetworkConfiguration,\n newSelectedRpcEndpointIndex: updatedRPCIndex,\n };\n};\n"]}
@@ -0,0 +1,56 @@
1
+ import { type UpdateNetworkFields, type NetworkConfiguration } from "@metamask/network-controller";
2
+ /**
3
+ * Will map the network configuration we want to update into something valid that `updateNetwork` accepts
4
+ * Exported for testability
5
+ *
6
+ * @param props - properties
7
+ * @param props.originalNetworkConfiguration - original network configuration we will override
8
+ * @param props.newNetworkConfiguration - new network configuration
9
+ * @returns NetworkConfiguration to dispatch to `NetworkController:updateNetwork`
10
+ */
11
+ export declare const getMappedNetworkConfiguration: (props: {
12
+ originalNetworkConfiguration: NetworkConfiguration;
13
+ newNetworkConfiguration: NetworkConfiguration;
14
+ }) => UpdateNetworkFields;
15
+ /**
16
+ * Will insert any missing infura RPCs, as we cannot remove infura RPC
17
+ * Exported for testability
18
+ * @param props - properties
19
+ * @param props.originalNetworkConfiguration - original network configuration
20
+ * @param props.updateNetworkConfiguration - the updated network configuration to use when dispatching `NetworkController:updateNetwork`
21
+ * @returns mutates and returns the updateNetworkConfiguration
22
+ */
23
+ export declare const appendMissingInfuraNetworks: (props: {
24
+ originalNetworkConfiguration: NetworkConfiguration;
25
+ updateNetworkConfiguration: UpdateNetworkFields;
26
+ }) => UpdateNetworkFields;
27
+ /**
28
+ * The `NetworkController:updateNetwork` method will require us to pass in a `replacementSelectedRpcEndpointIndex` if the selected RPC is removed or modified
29
+ * @param props - properties
30
+ * @param props.originalNetworkConfiguration - the original network configuration
31
+ * @param props.updateNetworkConfiguration - the new network configuration we will use to update
32
+ * @param props.selectedNetworkClientId - the NetworkController's selected network id.
33
+ * @returns the new RPC index if it needs modification
34
+ */
35
+ export declare const getNewRPCIndex: (props: {
36
+ originalNetworkConfiguration: NetworkConfiguration;
37
+ updateNetworkConfiguration: UpdateNetworkFields;
38
+ selectedNetworkClientId: string;
39
+ }) => number | undefined;
40
+ /**
41
+ * create the correct `NetworkController:updateNetwork` parameters
42
+ * @param props - properties
43
+ * @param props.originalNetworkConfiguration - original config
44
+ * @param props.newNetworkConfiguration - new config (from remote)
45
+ * @param props.selectedNetworkClientId - the current selected network client id
46
+ * @returns parameters to be used for `NetworkController:updateNetwork` call
47
+ */
48
+ export declare const createUpdateNetworkProps: (props: {
49
+ originalNetworkConfiguration: NetworkConfiguration;
50
+ newNetworkConfiguration: NetworkConfiguration;
51
+ selectedNetworkClientId: string;
52
+ }) => {
53
+ updateNetworkFields: UpdateNetworkFields;
54
+ newSelectedRpcEndpointIndex: number | undefined;
55
+ };
56
+ //# sourceMappingURL=update-network-utils.d.cts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-network-utils.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/update-network-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAC1B,qCAAqC;AAItC;;;;;;;;GAQG;AACH,eAAO,MAAM,6BAA6B,UAAW;IACnD,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,uBAAuB,EAAE,oBAAoB,CAAC;CAC/C,KAAG,mBA6BH,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,UAAW;IACjD,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,0BAA0B,EAAE,mBAAmB,CAAC;CACjD,wBAiCA,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,UAAW;IACpC,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,0BAA0B,EAAE,mBAAmB,CAAC;IAChD,uBAAuB,EAAE,MAAM,CAAC;CACjC,uBAuCA,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,UAAW;IAC9C,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,uBAAuB,EAAE,oBAAoB,CAAC;IAC9C,uBAAuB,EAAE,MAAM,CAAC;CACjC;;;CAmCA,CAAC"}
@@ -0,0 +1,56 @@
1
+ import { type UpdateNetworkFields, type NetworkConfiguration } from "@metamask/network-controller";
2
+ /**
3
+ * Will map the network configuration we want to update into something valid that `updateNetwork` accepts
4
+ * Exported for testability
5
+ *
6
+ * @param props - properties
7
+ * @param props.originalNetworkConfiguration - original network configuration we will override
8
+ * @param props.newNetworkConfiguration - new network configuration
9
+ * @returns NetworkConfiguration to dispatch to `NetworkController:updateNetwork`
10
+ */
11
+ export declare const getMappedNetworkConfiguration: (props: {
12
+ originalNetworkConfiguration: NetworkConfiguration;
13
+ newNetworkConfiguration: NetworkConfiguration;
14
+ }) => UpdateNetworkFields;
15
+ /**
16
+ * Will insert any missing infura RPCs, as we cannot remove infura RPC
17
+ * Exported for testability
18
+ * @param props - properties
19
+ * @param props.originalNetworkConfiguration - original network configuration
20
+ * @param props.updateNetworkConfiguration - the updated network configuration to use when dispatching `NetworkController:updateNetwork`
21
+ * @returns mutates and returns the updateNetworkConfiguration
22
+ */
23
+ export declare const appendMissingInfuraNetworks: (props: {
24
+ originalNetworkConfiguration: NetworkConfiguration;
25
+ updateNetworkConfiguration: UpdateNetworkFields;
26
+ }) => UpdateNetworkFields;
27
+ /**
28
+ * The `NetworkController:updateNetwork` method will require us to pass in a `replacementSelectedRpcEndpointIndex` if the selected RPC is removed or modified
29
+ * @param props - properties
30
+ * @param props.originalNetworkConfiguration - the original network configuration
31
+ * @param props.updateNetworkConfiguration - the new network configuration we will use to update
32
+ * @param props.selectedNetworkClientId - the NetworkController's selected network id.
33
+ * @returns the new RPC index if it needs modification
34
+ */
35
+ export declare const getNewRPCIndex: (props: {
36
+ originalNetworkConfiguration: NetworkConfiguration;
37
+ updateNetworkConfiguration: UpdateNetworkFields;
38
+ selectedNetworkClientId: string;
39
+ }) => number | undefined;
40
+ /**
41
+ * create the correct `NetworkController:updateNetwork` parameters
42
+ * @param props - properties
43
+ * @param props.originalNetworkConfiguration - original config
44
+ * @param props.newNetworkConfiguration - new config (from remote)
45
+ * @param props.selectedNetworkClientId - the current selected network client id
46
+ * @returns parameters to be used for `NetworkController:updateNetwork` call
47
+ */
48
+ export declare const createUpdateNetworkProps: (props: {
49
+ originalNetworkConfiguration: NetworkConfiguration;
50
+ newNetworkConfiguration: NetworkConfiguration;
51
+ selectedNetworkClientId: string;
52
+ }) => {
53
+ updateNetworkFields: UpdateNetworkFields;
54
+ newSelectedRpcEndpointIndex: number | undefined;
55
+ };
56
+ //# sourceMappingURL=update-network-utils.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-network-utils.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/network-syncing/update-network-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAC1B,qCAAqC;AAItC;;;;;;;;GAQG;AACH,eAAO,MAAM,6BAA6B,UAAW;IACnD,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,uBAAuB,EAAE,oBAAoB,CAAC;CAC/C,KAAG,mBA6BH,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,UAAW;IACjD,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,0BAA0B,EAAE,mBAAmB,CAAC;CACjD,wBAiCA,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,UAAW;IACpC,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,0BAA0B,EAAE,mBAAmB,CAAC;IAChD,uBAAuB,EAAE,MAAM,CAAC;CACjC,uBAuCA,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,UAAW;IAC9C,4BAA4B,EAAE,oBAAoB,CAAC;IACnD,uBAAuB,EAAE,oBAAoB,CAAC;IAC9C,uBAAuB,EAAE,MAAM,CAAC;CACjC;;;CAmCA,CAAC"}