revert promptToCreateSolanaAccount

Author: adonesky1

Diff for: app/scripts/lib/rpc-method-middleware/handlers/wallet-createSession/handler.test.ts

@@ -462,37 +462,34 @@ describe('wallet_createSession', () => {
 
     await handler(baseRequest);
 
-    expect(requestPermissionsForOrigin).toHaveBeenCalledWith(
-      {
-        [Caip25EndowmentPermissionName]: {
-          caveats: [
-            {
-              type: Caip25CaveatType,
-              value: {
-                requiredScopes: {
-                  'eip155:1337': {
-                    accounts: ['eip155:1337:0x1', 'eip155:1337:0x3'],
-                  },
+    expect(requestPermissionsForOrigin).toHaveBeenCalledWith({
+      [Caip25EndowmentPermissionName]: {
+        caveats: [
+          {
+            type: Caip25CaveatType,
+            value: {
+              requiredScopes: {
+                'eip155:1337': {
+                  accounts: ['eip155:1337:0x1', 'eip155:1337:0x3'],
                 },
-                optionalScopes: {
-                  'eip155:100': {
-                    accounts: ['eip155:100:0x1', 'eip155:100:0x3'],
-                  },
-                  [MultichainNetwork.Solana]: {
-                    accounts: [
-                      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:EEivRh9T4GTLEJprEaKQyjSQzW13JRb5D7jSpvPQ8296',
-                    ],
-                  },
+              },
+              optionalScopes: {
+                'eip155:100': {
+                  accounts: ['eip155:100:0x1', 'eip155:100:0x3'],
+                },
+                [MultichainNetwork.Solana]: {
+                  accounts: [
+                    'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:EEivRh9T4GTLEJprEaKQyjSQzW13JRb5D7jSpvPQ8296',
+                  ],
                 },
-                isMultichainOrigin: true,
-                sessionProperties: {},
               },
+              isMultichainOrigin: true,
+              sessionProperties: {},
             },
-          ],
-        },
+          },
+        ],
       },
-      { metadata: { promptToCreateSolanaAccount: false } },
-    );
+    });
   });
 
   it('throws an error when requesting account permission approval fails', async () => {
@@ -600,32 +597,29 @@ describe('wallet_createSession', () => {
         unsupportableScopes: {},
       });
     await handler(baseRequest);
-    expect(requestPermissionsForOrigin).toHaveBeenCalledWith(
-      {
-        [Caip25EndowmentPermissionName]: {
-          caveats: [
-            {
-              type: Caip25CaveatType,
-              value: {
-                requiredScopes: {
-                  'eip155:1337': {
-                    accounts: ['eip155:1337:0x1', 'eip155:1337:0x3'],
-                  },
+    expect(requestPermissionsForOrigin).toHaveBeenCalledWith({
+      [Caip25EndowmentPermissionName]: {
+        caveats: [
+          {
+            type: Caip25CaveatType,
+            value: {
+              requiredScopes: {
+                'eip155:1337': {
+                  accounts: ['eip155:1337:0x1', 'eip155:1337:0x3'],
                 },
-                optionalScopes: {
-                  'eip155:100': {
-                    accounts: ['eip155:100:0x1', 'eip155:100:0x3'],
-                  },
+              },
+              optionalScopes: {
+                'eip155:100': {
+                  accounts: ['eip155:100:0x1', 'eip155:100:0x3'],
                 },
-                isMultichainOrigin: true,
-                sessionProperties: {},
               },
+              isMultichainOrigin: true,
+              sessionProperties: {},
             },
-          ],
-        },
+          },
+        ],
       },
-      { metadata: { promptToCreateSolanaAccount: false } },
-    );
+    });
   });
 
   it('preserves known session properties', async () => {
@@ -686,159 +680,6 @@ describe('wallet_createSession', () => {
     });
   });
 
-  describe('promptToCreateSolanaAccount', () => {
-    const baseRequestWithSolanaScope = {
-      jsonrpc: '2.0' as const,
-      id: 0,
-      method: 'wallet_createSession',
-      origin: 'http://test.com',
-      params: {
-        optionalScopes: {
-          [MultichainNetwork.Solana]: {
-            methods: [],
-            notifications: [],
-            accounts: [],
-          },
-        },
-        sessionProperties: {
-          [KnownSessionProperties.SolanaAccountChangedNotifications]: true,
-        },
-      },
-    };
-    it('prompts to create a solana account if a solana scope is requested and no solana accounts are currently available', async () => {
-      const {
-        handler,
-        requestPermissionsForOrigin,
-        getNonEvmAccountAddresses,
-      } = createMockedHandler();
-      getNonEvmAccountAddresses.mockResolvedValue([]);
-      MockMultichain.validateAndNormalizeScopes.mockReturnValue({
-        normalizedRequiredScopes: {
-          [MultichainNetwork.Solana]: {
-            methods: [],
-            notifications: [],
-            accounts: [],
-          },
-        },
-        normalizedOptionalScopes: {},
-      });
-
-      MockMultichain.bucketScopes
-        .mockReturnValueOnce({
-          supportedScopes: {},
-          supportableScopes: {},
-          unsupportableScopes: {},
-        })
-        .mockReturnValueOnce({
-          supportedScopes: {
-            'eip155:1337': {
-              methods: [],
-              notifications: [],
-              accounts: [],
-            },
-          },
-          supportableScopes: {},
-          unsupportableScopes: {},
-        });
-
-      await handler(baseRequestWithSolanaScope);
-
-      expect(requestPermissionsForOrigin).toHaveBeenCalledWith(
-        {
-          [Caip25EndowmentPermissionName]: {
-            caveats: [
-              {
-                type: Caip25CaveatType,
-                value: {
-                  requiredScopes: {},
-                  optionalScopes: {
-                    'eip155:1337': {
-                      accounts: [],
-                    },
-                  },
-                  isMultichainOrigin: true,
-                  sessionProperties: {
-                    [KnownSessionProperties.SolanaAccountChangedNotifications]:
-                      true,
-                  },
-                },
-              },
-            ],
-          },
-        },
-        { metadata: { promptToCreateSolanaAccount: true } },
-      );
-    });
-
-    it('does not prompt to create a solana account if a solana scope is requested and solana accounts are currently available', async () => {
-      const {
-        handler,
-        requestPermissionsForOrigin,
-        getNonEvmAccountAddresses,
-      } = createMockedHandler();
-      getNonEvmAccountAddresses.mockResolvedValue([
-        'solana:101:0x1',
-        'solana:101:0x2',
-      ]);
-      MockMultichain.validateAndNormalizeScopes.mockReturnValue({
-        normalizedRequiredScopes: {},
-        normalizedOptionalScopes: {
-          [MultichainNetwork.Solana]: {
-            methods: [],
-            notifications: [],
-            accounts: [],
-          },
-        },
-      });
-
-      MockMultichain.bucketScopes
-        .mockReturnValueOnce({
-          supportedScopes: {},
-          supportableScopes: {},
-          unsupportableScopes: {},
-        })
-        .mockReturnValueOnce({
-          supportedScopes: {
-            [MultichainNetwork.Solana]: {
-              methods: [],
-              notifications: [],
-              accounts: [],
-            },
-          },
-          supportableScopes: {},
-          unsupportableScopes: {},
-        });
-
-      await handler(baseRequestWithSolanaScope);
-
-      expect(requestPermissionsForOrigin).toHaveBeenCalledWith(
-        {
-          [Caip25EndowmentPermissionName]: {
-            caveats: [
-              {
-                type: Caip25CaveatType,
-                value: {
-                  requiredScopes: {},
-                  optionalScopes: {
-                    [MultichainNetwork.Solana]: {
-                      accounts: [],
-                    },
-                  },
-                  isMultichainOrigin: true,
-                  sessionProperties: {
-                    [KnownSessionProperties.SolanaAccountChangedNotifications]:
-                      true,
-                  },
-                },
-              },
-            ],
-          },
-        },
-        { metadata: { promptToCreateSolanaAccount: false } },
-      );
-    });
-  });
-
   describe('address case sensitivity', () => {
     it('treats EVM addresses as case insensitive but other addresses as case sensitive', async () => {
       const {
@@ -925,35 +766,32 @@ describe('wallet_createSession', () => {
         },
       });
 
-      expect(requestPermissionsForOrigin).toHaveBeenCalledWith(
-        {
-          [Caip25EndowmentPermissionName]: {
-            caveats: [
-              {
-                type: Caip25CaveatType,
-                value: {
-                  requiredScopes: {
-                    'eip155:1': {
-                      accounts: ['eip155:1:0xABC123'], // Requested EVM address included
-                    },
+      expect(requestPermissionsForOrigin).toHaveBeenCalledWith({
+        [Caip25EndowmentPermissionName]: {
+          caveats: [
+            {
+              type: Caip25CaveatType,
+              value: {
+                requiredScopes: {
+                  'eip155:1': {
+                    accounts: ['eip155:1:0xABC123'], // Requested EVM address included
+                  },
+                },
+                optionalScopes: {
+                  [MultichainNetwork.Solana]: {
+                    accounts: [], // Solana address excluded due to case mismatch
                   },
-                  optionalScopes: {
-                    [MultichainNetwork.Solana]: {
-                      accounts: [], // Solana address excluded due to case mismatch
-                    },
-                    [MultichainNetwork.Bitcoin]: {
-                      accounts: [], // Bitcoin address excluded due to case mismatch
-                    },
+                  [MultichainNetwork.Bitcoin]: {
+                    accounts: [], // Bitcoin address excluded due to case mismatch
                   },
-                  isMultichainOrigin: true,
-                  sessionProperties: {},
                 },
+                isMultichainOrigin: true,
+                sessionProperties: {},
               },
-            ],
-          },
+            },
+          ],
         },
-        { metadata: { promptToCreateSolanaAccount: false } },
-      );
+      });
     });
   });
 });