Merge pull request #823 from aeternity/fix/channel-5.2.0-compatibility

hotfix(Channel): 5.2.0 compatibility

Author: shekhar-shubhendu

.env

@@ -1,2 +1,2 @@
-TAG=v5.1.0-rc.1
-COMPILER_TAG=v4.0.0
+TAG=v5.2.0
+COMPILER_TAG=v4.1.0

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [6.1.3](https://github.com/aeternity/aepp-sdk-js/compare/6.1.2...6.1.3) (2019-12-11)
+
+
+### Bug Fixes
+
+* **Channel:** 5.2.0 compatibility ([4be8eb8](https://github.com/aeternity/aepp-sdk-js/commit/4be8eb8))
+
+
+
 ## [6.1.2](https://github.com/aeternity/aepp-sdk-js/compare/6.1.1...6.1.2) (2019-11-12)
 
 

docs/api/channel/index.md

@@ -17,6 +17,7 @@ import Channel from '@aeternity/aepp-sdk/es/channel/index'
         * [~state()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..state) ⇒ `Promise.<Object>`
         * [~round()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..round) ⇒ `Number`
         * [~id()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..id) ⇒ `String`
+        * [~fsmId()](#module_@aeternity/aepp-sdk/es/channel/index--Channel..fsmId) ⇒ `String`
         * [~update(from, to, amount, sign, metadata)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..update) ⇒ `Promise.<Object>`
         * [~poi(addresses)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..poi) ⇒ `Promise.<String>`
         * [~balances(accounts)](#module_@aeternity/aepp-sdk/es/channel/index--Channel..balances) ⇒ `Promise.<Object>`
@@ -151,6 +152,12 @@ it will return `null`.
 #### Channel~id() ⇒ `String`
 Get channel id
 
+**Kind**: inner method of [`Channel`](#exp_module_@aeternity/aepp-sdk/es/channel/index--Channel)  
+<a id="module_@aeternity/aepp-sdk/es/channel/index--Channel..fsmId"></a>
+
+#### Channel~fsmId() ⇒ `String`
+Get channel's fsm id
+
 **Kind**: inner method of [`Channel`](#exp_module_@aeternity/aepp-sdk/es/channel/index--Channel)  
 <a id="module_@aeternity/aepp-sdk/es/channel/index--Channel..update"></a>
 

docs/examples/node/aecontract.md

@@ -107,7 +107,7 @@ implementation directly in the SDK.
   
 
 ```js
-  Ae({ url: program.host, debug: program.debug, compilerUrl: program.compilerUrl,  process }).then(ae => {
+  Ae({ url: program.host, debug: program.debug, process }).then(ae => {
     return ae.contractCompile(code)
 
 ```

es/channel/handlers.js

@@ -20,10 +20,12 @@ import {
   options,
   changeStatus,
   changeState,
+  call,
   send,
   emit,
   channelId,
-  disconnect
+  disconnect,
+  fsmId
 } from './internal'
 import { unpackTx, buildTx } from '../tx/builder'
 
@@ -66,6 +68,10 @@ export function awaitingConnection (channel, message, state) {
     if (message.params.data.event === 'channel_reestablished') {
       return { handler: awaitingOpenConfirmation }
     }
+    if (message.params.data.event === 'fsm_up') {
+      fsmId.set(channel, message.params.data.fsm_id)
+      return { handler: awaitingConnection }
+    }
     return { handler: awaitingConnection }
   }
   if (message.method === 'channels.error') {
@@ -74,6 +80,17 @@ export function awaitingConnection (channel, message, state) {
   }
 }
 
+export async function awaitingReconnection (channel, message, state) {
+  if (message.method === 'channels.info') {
+    if (message.params.data.event === 'fsm_up') {
+      fsmId.set(channel, message.params.data.fsm_id)
+      changeState(channel, (await call(channel, 'channels.get.offchain_state', {})).signed_tx)
+      return { handler: channelOpen }
+    }
+  }
+  return handleUnexpectedMessage(channel, message, state)
+}
+
 export async function awaitingChannelCreateTx (channel, message, state) {
   const tag = {
     initiator: 'initiator_sign',
@@ -171,6 +188,9 @@ export async function channelOpen (channel, message, state) {
           //       are blocked until channel is reestablished.
           emit(channel, message.params.data.event)
           return { handler: channelOpen }
+        case 'fsm_up':
+          fsmId.set(channel, message.params.data.fsm_id)
+          return { handler: channelOpen }
         case 'close_mutual':
           return { handler: channelOpen }
         case 'closing':

es/channel/index.js

@@ -36,7 +36,8 @@ import {
   send,
   channelId,
   call,
-  disconnect as channelDisconnect
+  disconnect as channelDisconnect,
+  fsmId as channelFsmId
 } from './internal'
 import * as R from 'ramda'
 
@@ -136,6 +137,15 @@ function id () {
   return channelId.get(this)
 }
 
+/**
+ * Get channel's fsm id
+ *
+ * @return {String}
+ */
+function fsmId () {
+  return channelFsmId.get(this)
+}
+
 /**
  * Trigger a transfer update
  *
@@ -783,6 +793,7 @@ const Channel = AsyncInit.compose({
     state,
     round,
     id,
+    fsmId,
     update,
     poi,
     balances,

es/channel/internal.js

@@ -20,7 +20,7 @@ import { EventEmitter } from 'events'
 import * as R from 'ramda'
 import JSONBig from '../utils/json-big'
 import { pascalToSnake } from '../utils/string'
-import { awaitingConnection, channelClosed, channelOpen } from './handlers'
+import { awaitingConnection, awaitingReconnection, channelOpen } from './handlers'
 
 // Send ping message every 10 seconds
 const PING_TIMEOUT_MS = 10000
@@ -42,6 +42,7 @@ const channelId = new WeakMap()
 const rpcCallbacks = new WeakMap()
 const pingTimeoutId = new WeakMap()
 const pongTimeoutId = new WeakMap()
+const fsmId = new WeakMap()
 
 function channelURL (url, params) {
   const paramString = R.join('&', R.values(R.mapObjIndexed((value, key) =>
@@ -221,7 +222,11 @@ async function initialize (channel, channelOptions) {
   const wsUrl = channelURL(url, { ...params, protocol: 'json-rpc' })
 
   options.set(channel, channelOptions)
-  fsm.set(channel, { handler: params.reconnectTx ? channelClosed : awaitingConnection })
+  if (params.existingFsmId) {
+    fsm.set(channel, { handler: awaitingReconnection })
+  } else {
+    fsm.set(channel, { handler: awaitingConnection })
+  }
   eventEmitters.set(channel, new EventEmitter())
   sequence.set(channel, 0)
   rpcCallbacks.set(channel, new Map())
@@ -260,5 +265,6 @@ export {
   enqueueAction,
   channelId,
   call,
-  disconnect
+  disconnect,
+  fsmId
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "browser": "dist/aepp-sdk.browser.js",
@@ -42,7 +42,7 @@
     "libsodium-wrappers-sumo": "0.7.6",
     "ramda": "^0.26.1",
     "rlp": "2.2.4",
-    "serialize-javascript": "^2.0.0",
+    "serialize-javascript": "^2.1.2",
     "sha.js": "^2.4.11",
     "tweetnacl": "^1.0.0",
     "tweetnacl-auth": "^1.0.1",