feat(State Channels): Make state channels compatible with aeternity v… (

#415) * feat(State Channels): Make state channels compatible with aeternity v3.0.0 * Fix lint error
aeternity · May 17, 2019 · 668e7f1 · 668e7f1
1 parent 46027cd
commit 668e7f1
Show file tree

Hide file tree

Showing 4 changed files with 436 additions and 115 deletions.
diff --git a/es/channel/handlers.js b/es/channel/handlers.js
@@ -151,7 +151,7 @@ channelOpen.enter = (channel) => {
 export async function awaitingOffChainTx (channel, message, state) {
   if (message.method === 'channels.sign.update') {
     const { sign } = state
-    const signedTx = await sign(message.params.data.tx)
+    const signedTx = await sign(message.params.data.tx, { updates: message.params.data.updates })
     send(channel, { jsonrpc: '2.0', method: 'channels.update', params: { tx: signedTx } })
     return { handler: awaitingOffChainUpdate, state }
   }
@@ -194,7 +194,11 @@ export async function awaitingTxSignRequest (channel, message, state) {
   // eslint-disable-next-line no-useless-escape
   const [, tag] = message.method.match(/^channels\.sign\.([^\.]+)$/) || []
   if (tag) {
-    const signedTx = await options.get(channel).sign(tag, message.params.data.tx)
+    const signedTx = await options.get(channel).sign(
+      tag,
+      message.params.data.tx,
+      { updates: message.params.data.updates }
+    )
     if (signedTx) {
       send(channel, { jsonrpc: '2.0', method: `channels.${tag}`, params: { tx: signedTx } })
       return { handler: channelOpen }
@@ -256,7 +260,10 @@ export function awaitingLeave (channel, message, state) {
 
 export async function awaitingWithdrawTx (channel, message, state) {
   if (message.method === 'channels.sign.withdraw_tx') {
-    const signedTx = await Promise.resolve(state.sign(message.params.data.tx))
+    const signedTx = await Promise.resolve(state.sign(
+      message.params.data.tx,
+      { updates: message.params.data.updates }
+    ))
     send(channel, { jsonrpc: '2.0', method: 'channels.withdraw_tx', params: { tx: signedTx } })
     return { handler: awaitingWithdrawCompletion, state }
   }
@@ -296,7 +303,10 @@ export function awaitingWithdrawCompletion (channel, message, state) {
 
 export async function awaitingDepositTx (channel, message, state) {
   if (message.method === 'channels.sign.deposit_tx') {
-    const signedTx = await Promise.resolve(state.sign(message.params.data.tx))
+    const signedTx = await Promise.resolve(state.sign(
+      message.params.data.tx,
+      { updates: message.params.data.updates }
+    ))
     send(channel, { jsonrpc: '2.0', method: 'channels.deposit_tx', params: { tx: signedTx } })
     return { handler: awaitingDepositCompletion, state }
   }

diff --git a/es/tx/builder/index.js b/es/tx/builder/index.js
@@ -302,7 +302,10 @@ export function buildTx (params, type, { excludeKeys = [], prefix = 'tx' } = {})
   if (!TX_SERIALIZATION_SCHEMA[type]) {
     throw new Error('Transaction serialization not implemented for ' + type)
   }
-  const [schema, tag] = TX_SERIALIZATION_SCHEMA[type]
+  if (!TX_SERIALIZATION_SCHEMA[type][VSN]) {
+    throw new Error('Transaction serialization not implemented for ' + type + ' version ' + VSN)
+  }
+  const [schema, tag] = TX_SERIALIZATION_SCHEMA[type][VSN]
   const binary = buildRawTx({ ...params, VSN, tag }, schema, { excludeKeys }).filter(e => e !== undefined)
 
   const rlpEncoded = rlp.encode(binary)
@@ -327,7 +330,11 @@ export function unpackTx (encodedTx, fromRlpBinary = false) {
   if (!TX_DESERIALIZATION_SCHEMA[objId]) {
     return { message: 'Transaction deserialization not implemented for tag ' + objId }
   }
-  const [schema] = TX_DESERIALIZATION_SCHEMA[objId]
+  const vsn = readInt(binary[1])
+  if (!TX_DESERIALIZATION_SCHEMA[objId][vsn]) {
+    return { message: 'Transaction deserialization not implemented for tag ' + objId + ' version ' + vsn }
+  }
+  const [schema] = TX_DESERIALIZATION_SCHEMA[objId][vsn]
 
   return { txType: OBJECT_ID_TX_TYPE[objId], tx: unpackRawTx(binary, schema), rlpEncoded, binary }
 }