feat(AEX_2): Allow to connect without node (#991)

* feat(AEX_2): Remove check for available network in Wallet `connect` handler * feat(AEX_2): Fix RPC example apps.
aeternity · May 20, 2020 · 87b9ef9 · 87b9ef9
1 parent 4efd341
commit 87b9ef9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/es/node.js b/es/node.js
@@ -48,8 +48,9 @@ async function remoteSwag (url, axiosConfig) {
  * @rtype () => networkId: String
  * @return {String} NetworkId
  */
-export function getNetworkId ({ networkId } = {}) {
-  if (!networkId && !this.networkId && (!this.selectedNode || !this.selectedNode.networkId)) throw new Error('networkId is not provided')
+export function getNetworkId ({ networkId, force = false } = {}) {
+  if (!force && !networkId && !this.networkId && (!this.selectedNode || !this.selectedNode.networkId)) throw new Error('networkId is not provided')
+  if (force && !networkId && !this.networkId && (!this.selectedNode || !this.selectedNode.networkId)) return null
   return networkId || this.networkId || this.selectedNode.networkId
 }
 

diff --git a/es/utils/aepp-wallet-communication/rpc/aepp-rpc.js b/es/utils/aepp-wallet-communication/rpc/aepp-rpc.js
@@ -122,7 +122,7 @@ export const AeppRpc = Ae.compose({
       if (this.rpcClient && this.rpcClient.isConnected()) throw new Error('You are already connected to wallet ' + this.rpcClient)
       this.rpcClient = RpcClient({
         connection,
-        networkId: this.getNetworkId(),
+        networkId: this.getNetworkId({ force: true }),
         ...connection.connectionInfo,
         id: uuid(),
         handlers: [handleMessage(this), this.onDisconnect]
@@ -215,7 +215,7 @@ export const AeppRpc = Ae.compose({
         METHODS.aepp.connect, {
           name: this.name,
           version: VERSION,
-          networkId: this.getNetworkId()
+          networkId: this.getNetworkId({ force: true })
         }
       )
     },

diff --git a/es/utils/aepp-wallet-communication/rpc/wallet-rpc.js b/es/utils/aepp-wallet-communication/rpc/wallet-rpc.js
@@ -33,7 +33,7 @@ const REQUESTS = {
   async [METHODS.aepp.connect] (callInstance, instance, client, { name, networkId, version, icons }) {
     // Check if protocol and network is compatible with wallet
     if (version !== VERSION) return { error: ERRORS.unsupportedProtocol() }
-    if (networkId !== instance.getNetworkId()) return { error: ERRORS.unsupportedNetwork() }
+    // if (networkId !== instance.getNetworkId()) return { error: ERRORS.unsupportedNetwork() }
 
     // Store new AEPP and wait for connection approve
     rpcClients.updateClientInfo(client.id, {
@@ -208,7 +208,7 @@ const handleMessage = (instance, id) => async (msg, origin) => {
  * @return {Object}
  */
 export const WalletRpc = Ae.compose(Accounts, Selector, {
-  init ({ name, onConnection, onSubscription, onSign, onDisconnect, onAskAccounts, onMessageSign }) {
+  init ({ name, onConnection, onSubscription, onSign, onDisconnect, onAskAccounts, onMessageSign, forceValidation = false }) {
     const eventsHandlers = ['onConnection', 'onSubscription', 'onSign', 'onDisconnect', 'onMessageSign']
     // CallBacks for events
     this.onConnection = onConnection
@@ -219,7 +219,7 @@ export const WalletRpc = Ae.compose(Accounts, Selector, {
     this.onMessageSign = onMessageSign
 
     eventsHandlers.forEach(event => {
-      if (typeof this[event] !== 'function') throw new Error(`Call-back for ${event} must be an function!`)
+      if (!forceValidation && typeof this[event] !== 'function') throw new Error(`Call-back for ${event} must be an function!`)
     })
     //
     this.name = name

diff --git a/examples/browser/vuejs/connect-two-ae/identity/src/components/Home.vue b/examples/browser/vuejs/connect-two-ae/identity/src/components/Home.vue
@@ -130,7 +130,14 @@
           }[params.onAccount]
           accept(null, { onAccount }) // provide this account for signing
         },
-        onMessageSign: genConfirmCallback(() => 'sign message'),
+        onMessageSign (aepp, { accept, deny, params }, origin) {
+          // Get account outside of SDK if needed
+          const onAccount = {
+            [keypair.publicKey]: MemoryAccount({ keypair }),
+            [keypair2.publicKey]: MemoryAccount({ keypair: keypair2 }),
+          }[params.onAccount]
+          accept({ onAccount }) // provide this account for signing
+        },
         onAskAccounts: genConfirmCallback(() => 'get accounts'),
         onDisconnect (message, client) {
           this.shareWalletInfo(connection.sendMessage.bind(connection))