Merge branch 'develop' into test/token-gated-communities

Author: romanzac

services/connector/api.go

@@ -34,10 +34,12 @@ func NewAPI(s *Service) *API {
 	r.Register("eth_signTypedData_v4", commands.NewSignCommand(s.db, c))
 
 	// Accounts query and dapp permissions
-	// NOTE: Some dApps expect same behavior for both eth_accounts and eth_requestAccounts
-	accountsCommand := commands.NewRequestAccountsCommand(s.db, c)
+	// NOTE: eth_accounts returns accounts only if already permitted, without user prompt
+	// eth_requestAccounts always prompts the user for permission (EIP-1102)
+	accountsCommand := commands.NewAccountsCommand(s.db)
+	requestAccountsCommand := commands.NewRequestAccountsCommand(s.db, c)
 	r.Register("eth_accounts", accountsCommand)
-	r.Register("eth_requestAccounts", accountsCommand)
+	r.Register("eth_requestAccounts", requestAccountsCommand)
 
 	// Active chain per dapp management
 	defaultChainIDGetter := chainutils.NewNetworkManagerAdapter(s.nm)

services/connector/commands/accounts.go

@@ -35,7 +35,8 @@ func (c *AccountsCommand) Execute(ctx context.Context, request RPCRequest) (inte
 	}
 
 	if dApp == nil {
-		return "", ErrDAppIsNotPermittedByUser
+		// Per EIP-1102, eth_accounts should return empty array if not permitted
+		return []string{}, nil
 	}
 
 	return FormatAccountAddressToResponse(dApp.SharedAccount), nil

services/connector/commands/accounts_test.go

@@ -29,8 +29,8 @@ func TestFailToGetAccountForUnpermittedDApp(t *testing.T) {
 	assert.NoError(t, err)
 
 	result, err := state.cmd.Execute(state.ctx, request)
-	assert.Equal(t, ErrDAppIsNotPermittedByUser, err)
-	assert.Empty(t, result)
+	assert.NoError(t, err)
+	assert.Equal(t, []string{}, result)
 }
 
 func TestGetAccountForPermittedDApp(t *testing.T) {

tests-functional/tests/test_status_connector.py

@@ -54,8 +54,13 @@ def test_chain_id_resolved_before_connection(self, backend, connector):
         assert message.get("result") == hex(backend.network_id)
 
     def test_connect_and_accounts(self, backend, connector, wallet_account):
-        # Request accounts through connector
+        # eth_accounts returns empty array when not connected (per EIP-1102)
         connector.eth_accounts()
+        message = connector.receive()
+        assert message.get("result") == []
+
+        # Use eth_requestAccounts to trigger connection request
+        connector.eth_request_accounts()
         # And accept connection request
         accept_connector(backend, connector, wallet_account)
 
@@ -66,6 +71,13 @@ def test_connect_and_accounts(self, backend, connector, wallet_account):
         assert len(accounts) == 1
         assert accounts[0] == wallet_account
 
+        # Now eth_accounts should return the connected account
+        connector.eth_accounts()
+        message = connector.receive()
+        accounts = message.get("result")
+        assert len(accounts) == 1
+        assert accounts[0] == wallet_account
+
     def test_connect_and_request_accounts(self, backend, connector, wallet_account):
         # Request accounts through connector using eth_requestAccounts
         connector.eth_request_accounts()
@@ -86,7 +98,7 @@ def test_block_number(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -105,7 +117,7 @@ def test_get_balance(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -124,7 +136,7 @@ def test_get_transaction_count(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -144,7 +156,7 @@ def test_eth_call(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -164,7 +176,7 @@ def test_estimate_gas_resolved(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -184,7 +196,7 @@ def test_get_transaction_receipt(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -206,7 +218,7 @@ def test_send_transaction_flow(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -232,7 +244,7 @@ def test_switch_ethereum_chain(self, backend, connector, wallet_account):
             connector.receive()
 
         # Establish connection
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -249,7 +261,7 @@ def test_switch_ethereum_chain(self, backend, connector, wallet_account):
     def test_revoke_permissions_on_disconnect(self, backend, connector, wallet_account):
         # Request accounts through connector
         # And accept connection request
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         message = connector.receive()
         assert message.get("result") is not None
@@ -266,7 +278,7 @@ def test_revoke_permissions_on_disconnect(self, backend, connector, wallet_accou
 
     def test_unavailable_statusgo_method(self, backend, connector, wallet_account):
         # First, register the dApp by calling some proper command
-        connector.eth_accounts()
+        connector.eth_request_accounts()
         accept_connector(backend, connector, wallet_account)
         connector.receive()  # Read out the message