@aeternity/aepp-sdk 11.0.1 → 12.0.0

package/es/channel/handlers.mjs

@@ -1,3 +1,5 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
+
 /*
  * ISC License (ISC)
  * Copyright (c) 2018 aeternity developers
@@ -19,30 +21,29 @@ import { options, changeStatus, changeState, call, send, emit, channelId, discon
 import { unpackTx, buildTx } from "../tx/builder/index.mjs";
 import { encode } from "../tx/builder/helpers.mjs";
 import { IllegalArgumentError, InsufficientBalanceError, ChannelConnectionError, UnexpectedChannelMessageError } from "../utils/errors.mjs";
-
-async function appendSignature(tx, signFn) {
+import { TX_TYPE } from "../tx/builder/schema.mjs";
+export async function appendSignature(tx, signFn) {
   const {
     signatures,
     encodedTx
-  } = unpackTx(tx).tx;
+  } = unpackTx(tx, TX_TYPE.signed).tx;
   const result = await signFn(encode(encodedTx.rlpEncoded, 'tx'));
 
   if (typeof result === 'string') {
     const {
-      tx: signedTx,
-      txType
-    } = unpackTx(result);
+      tx: signedTx
+    } = unpackTx(result, TX_TYPE.signed);
     return buildTx({
       signatures: signatures.concat(signedTx.signatures),
       encodedTx: signedTx.encodedTx.rlpEncoded
-    }, txType).tx;
+    }, TX_TYPE.signed).tx;
   }
 
   return result;
 }
 
-function handleUnexpectedMessage(channel, message, state) {
-  if (state && state.reject) {
+function handleUnexpectedMessage(_channel, message, state) {
+  if ((state === null || state === void 0 ? void 0 : state.reject) != null) {
     state.reject(Object.assign(new UnexpectedChannelMessageError(`Unexpected message received:\n\n${JSON.stringify(message)}`), {
       wsMessage: message
     }));
@@ -53,13 +54,17 @@ function handleUnexpectedMessage(channel, message, state) {
   };
 }
 
-export function awaitingConnection(channel, message, state) {
+export function awaitingConnection(channel, message) {
   if (message.method === 'channels.info') {
-    if (['channel_accept', 'funding_created'].includes(message.params.data.event)) {
+    var _context;
+
+    const channelInfoStatus = message.params.data.event;
+
+    if (_includesInstanceProperty(_context = ['channel_accept', 'funding_created']).call(_context, channelInfoStatus)) {
       changeStatus(channel, {
         channel_accept: 'accepted',
         funding_created: 'halfSigned'
-      }[message.params.data.event]);
+      }[channelInfoStatus]);
       return {
         handler: awaitingChannelCreateTx
       };
@@ -84,7 +89,9 @@ export function awaitingConnection(channel, message, state) {
   }
 
   if (message.method === 'channels.error') {
-    emit(channel, 'error', new ChannelConnectionError(message.payload.message));
+    var _message$payload;
+
+    emit(channel, 'error', new ChannelConnectionError(message === null || message === void 0 ? void 0 : (_message$payload = message.payload) === null || _message$payload === void 0 ? void 0 : _message$payload.message));
     return {
       handler: channelClosed
     };
@@ -103,72 +110,81 @@ export async function awaitingReconnection(channel, message, state) {
 
   return handleUnexpectedMessage(channel, message, state);
 }
-export async function awaitingChannelCreateTx(channel, message, state) {
-  const tag = {
-    initiator: 'initiator_sign',
-    responder: 'responder_sign'
-  }[options.get(channel).role];
-
-  if (message.method === `channels.sign.${tag}`) {
-    if (message.params.data.tx) {
-      const signedTx = await options.get(channel).sign(tag, message.params.data.tx);
+export async function awaitingChannelCreateTx(channel, message) {
+  const channelOptions = options.get(channel);
+
+  if (channelOptions != null) {
+    const tag = {
+      initiator: 'initiator_sign',
+      responder: 'responder_sign'
+    }[channelOptions.role];
+
+    if (message.method === `channels.sign.${tag}`) {
+      if (message.params.data.tx != null) {
+        const signedTx = await channelOptions.sign(tag, message.params.data.tx);
+        send(channel, {
+          jsonrpc: '2.0',
+          method: `channels.${tag}`,
+          params: {
+            tx: signedTx
+          }
+        });
+        return {
+          handler: awaitingOnChainTx
+        };
+      }
+
+      const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await channelOptions.sign(tag, tx));
       send(channel, {
         jsonrpc: '2.0',
         method: `channels.${tag}`,
         params: {
-          tx: signedTx
+          signed_tx: signedTx
         }
       });
       return {
         handler: awaitingOnChainTx
       };
     }
-
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => options.get(channel).sign(tag, tx));
-    send(channel, {
-      jsonrpc: '2.0',
-      method: `channels.${tag}`,
-      params: {
-        signed_tx: signedTx
-      }
-    });
-    return {
-      handler: awaitingOnChainTx
-    };
   }
 }
-export function awaitingOnChainTx(channel, message, state) {
-  if (message.method === 'channels.on_chain_tx') {
-    if (message.params.data.info === 'funding_signed' && options.get(channel).role === 'initiator') {
-      return {
-        handler: awaitingBlockInclusion
-      };
+export function awaitingOnChainTx(channel, message) {
+  const channelOptions = options.get(channel);
+
+  if (channelOptions != null) {
+    if (message.method === 'channels.on_chain_tx') {
+      if (message.params.data.info === 'funding_signed' && channelOptions.role === 'initiator') {
+        return {
+          handler: awaitingBlockInclusion
+        };
+      }
+
+      if (message.params.data.info === 'funding_created' && channelOptions.role === 'responder') {
+        return {
+          handler: awaitingBlockInclusion
+        };
+      }
     }
 
-    if (message.params.data.info === 'funding_created' && options.get(channel).role === 'responder') {
+    if (message.method === 'channels.info' && message.params.data.event === 'funding_signed' && channelOptions.role === 'initiator') {
+      channelId.set(channel, message.params.channel_id);
+      changeStatus(channel, 'signed');
       return {
-        handler: awaitingBlockInclusion
+        handler: awaitingOnChainTx
       };
     }
   }
-
-  if (message.method === 'channels.info' && message.params.data.event === 'funding_signed' && options.get(channel).role === 'initiator') {
-    channelId.set(channel, message.params.channel_id);
-    changeStatus(channel, 'signed');
-    return {
-      handler: awaitingOnChainTx
-    };
-  }
 }
-export function awaitingBlockInclusion(channel, message, state) {
+export function awaitingBlockInclusion(channel, message) {
   if (message.method === 'channels.info') {
-    const handler = {
+    const handlers = {
       funding_created: awaitingBlockInclusion,
       own_funding_locked: awaitingBlockInclusion,
       funding_locked: awaitingOpenConfirmation
-    }[message.params.data.event];
+    };
+    const handler = handlers[message.params.data.event];
 
-    if (handler) {
+    if (handler != null) {
       return {
         handler
       };
@@ -185,7 +201,7 @@ export function awaitingBlockInclusion(channel, message, state) {
     };
   }
 }
-export function awaitingOpenConfirmation(channel, message, state) {
+export function awaitingOpenConfirmation(channel, message) {
   if (message.method === 'channels.info' && message.params.data.event === 'open') {
     channelId.set(channel, message.params.channel_id);
     return {
@@ -193,7 +209,7 @@ export function awaitingOpenConfirmation(channel, message, state) {
     };
   }
 }
-export function awaitingInitialState(channel, message, state) {
+export function awaitingInitialState(channel, message) {
   if (message.method === 'channels.update') {
     changeState(channel, message.params.data.state);
     return {
@@ -288,7 +304,7 @@ export async function channelOpen(channel, message, state) {
       };
 
     case 'channels.sign.shutdown_sign_ack':
-      return awaitingTxSignRequest(channel, message, state);
+      return await awaitingTxSignRequest(channel, message, state);
   }
 }
 
@@ -302,7 +318,7 @@ export async function awaitingOffChainTx(channel, message, state) {
       sign
     } = state;
 
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await sign(message.params.data.tx, {
         updates: message.params.data.updates
       });
@@ -319,7 +335,7 @@ export async function awaitingOffChainTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => sign(tx, {
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await sign(tx, {
       updates: message.params.data.updates
     }));
 
@@ -359,14 +375,18 @@ export async function awaitingOffChainTx(channel, message, state) {
     };
   }
 
-  if (message.error) {
+  if (message.error != null) {
+    var _message$error;
+
     const {
-      data = []
-    } = message.error;
+      data
+    } = (_message$error = message.error) !== null && _message$error !== void 0 ? _message$error : {
+      data: []
+    };
 
-    if (data.find(i => i.code === 1001)) {
+    if (data.find(i => i.code === 1001) != null) {
       state.reject(new InsufficientBalanceError('Insufficient balance'));
-    } else if (data.find(i => i.code === 1002)) {
+    } else if (data.find(i => i.code === 1002) != null) {
       state.reject(new IllegalArgumentError('Amount cannot be negative'));
     } else {
       state.reject(new ChannelConnectionError(message.error.message));
@@ -435,7 +455,7 @@ export function awaitingOffChainUpdate(channel, message, state) {
     }
   }
 
-  if (message.error) {
+  if (message.error != null) {
     state.reject(new ChannelConnectionError(message.error.message));
     return {
       handler: channelOpen
@@ -445,15 +465,18 @@ export function awaitingOffChainUpdate(channel, message, state) {
   return handleUnexpectedMessage(channel, message, state);
 }
 export async function awaitingTxSignRequest(channel, message, state) {
-  const [, tag] = message.method.match(/^channels\.sign\.([^.]+)$/) || [];
+  var _message$method$match;
 
-  if (tag) {
-    if (message.params.data.tx) {
-      const signedTx = await options.get(channel).sign(tag, message.params.data.tx, {
+  const [, tag] = (_message$method$match = message.method.match(/^channels\.sign\.([^.]+)$/)) !== null && _message$method$match !== void 0 ? _message$method$match : [];
+  const channelOptions = options.get(channel);
+
+  if (tag != null && channelOptions != null) {
+    if (message.params.data.tx != null) {
+      const signedTx = await channelOptions.sign(tag, message.params.data.tx, {
         updates: message.params.data.updates
       });
 
-      if (signedTx) {
+      if (signedTx != null) {
         send(channel, {
           jsonrpc: '2.0',
           method: `channels.${tag}`,
@@ -466,7 +489,7 @@ export async function awaitingTxSignRequest(channel, message, state) {
         };
       }
     } else {
-      const signedTx = await appendSignature(message.params.data.signed_tx, tx => options.get(channel).sign(tag, tx, {
+      const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await channelOptions.sign(tag, tx, {
         updates: message.params.data.updates
       }));
 
@@ -517,7 +540,7 @@ export async function awaitingTxSignRequest(channel, message, state) {
   return handleUnexpectedMessage(channel, message, state);
 }
 export function awaitingUpdateConflict(channel, message, state) {
-  if (message.error) {
+  if (message.error != null) {
     return {
       handler: awaitingUpdateConflict,
       state
@@ -534,7 +557,7 @@ export function awaitingUpdateConflict(channel, message, state) {
 }
 export async function awaitingShutdownTx(channel, message, state) {
   if (message.method === 'channels.sign.shutdown_sign') {
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await state.sign(message.params.data.tx);
       send(channel, {
         jsonrpc: '2.0',
@@ -549,7 +572,7 @@ export async function awaitingShutdownTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => state.sign(tx));
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await state.sign(tx));
     send(channel, {
       jsonrpc: '2.0',
       method: 'channels.shutdown_sign',
@@ -603,7 +626,7 @@ export async function awaitingWithdrawTx(channel, message, state) {
       sign
     } = state;
 
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await sign(message.params.data.tx, {
         updates: message.params.data.updates
       });
@@ -620,7 +643,7 @@ export async function awaitingWithdrawTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => sign(tx, {
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await sign(tx, {
       updates: message.params.data.updates
     }));
 
@@ -657,7 +680,7 @@ export async function awaitingWithdrawTx(channel, message, state) {
 }
 export function awaitingWithdrawCompletion(channel, message, state) {
   if (message.method === 'channels.on_chain_tx') {
-    if (state.onOnChainTx) {
+    if (state.onOnChainTx != null) {
       state.onOnChainTx(message.params.data.tx);
     }
 
@@ -668,13 +691,16 @@ export function awaitingWithdrawCompletion(channel, message, state) {
   }
 
   if (message.method === 'channels.info') {
-    if (['own_withdraw_locked', 'withdraw_locked'].includes(message.params.data.event)) {
-      const callback = {
+    var _context2;
+
+    if (_includesInstanceProperty(_context2 = ['own_withdraw_locked', 'withdraw_locked']).call(_context2, message.params.data.event)) {
+      const callbacks = {
         own_withdraw_locked: state.onOwnWithdrawLocked,
         withdraw_locked: state.onWithdrawLocked
-      }[message.params.data.event];
+      };
+      const callback = callbacks[message.params.data.event];
 
-      if (callback) {
+      if (callback != null) {
         callback();
       }
 
@@ -726,7 +752,7 @@ export async function awaitingDepositTx(channel, message, state) {
       sign
     } = state;
 
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await sign(message.params.data.tx, {
         updates: message.params.data.updates
       });
@@ -743,7 +769,7 @@ export async function awaitingDepositTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => sign(tx, {
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await sign(tx, {
       updates: message.params.data.updates
     }));
 
@@ -780,7 +806,7 @@ export async function awaitingDepositTx(channel, message, state) {
 }
 export function awaitingDepositCompletion(channel, message, state) {
   if (message.method === 'channels.on_chain_tx') {
-    if (state.onOnChainTx) {
+    if (state.onOnChainTx != null) {
       state.onOnChainTx(message.params.data.tx);
     }
 
@@ -791,13 +817,16 @@ export function awaitingDepositCompletion(channel, message, state) {
   }
 
   if (message.method === 'channels.info') {
-    if (['own_deposit_locked', 'deposit_locked'].includes(message.params.data.event)) {
-      const callback = {
+    var _context3;
+
+    if (_includesInstanceProperty(_context3 = ['own_deposit_locked', 'deposit_locked']).call(_context3, message.params.data.event)) {
+      const callbacks = {
         own_deposit_locked: state.onOwnDepositLocked,
         deposit_locked: state.onDepositLocked
-      }[message.params.data.event];
+      };
+      const callback = callbacks[message.params.data.event];
 
-      if (callback) {
+      if (callback != null) {
         callback();
       }
 
@@ -845,7 +874,7 @@ export function awaitingDepositCompletion(channel, message, state) {
 }
 export async function awaitingNewContractTx(channel, message, state) {
   if (message.method === 'channels.sign.update') {
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await state.sign(message.params.data.tx);
       send(channel, {
         jsonrpc: '2.0',
@@ -860,7 +889,7 @@ export async function awaitingNewContractTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => state.sign(tx));
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await state.sign(tx));
 
     if (typeof signedTx === 'string') {
       send(channel, {
@@ -894,23 +923,29 @@ export async function awaitingNewContractTx(channel, message, state) {
   return handleUnexpectedMessage(channel, message, state);
 }
 export function awaitingNewContractCompletion(channel, message, state) {
+  const channelOptions = options.get(channel);
+
   if (message.method === 'channels.update') {
     const {
       round
-    } = unpackTx(message.params.data.state).tx.encodedTx.tx;
-    const owner = options.get(channel)[{
-      initiator: 'initiatorId',
-      responder: 'responderId'
-    }[options.get(channel).role]];
-    changeState(channel, message.params.data.state);
-    state.resolve({
-      accepted: true,
-      address: encodeContractAddress(owner, round),
-      signedTx: message.params.data.state
-    });
-    return {
-      handler: channelOpen
-    };
+    } = unpackTx(message.params.data.state, TX_TYPE.signed).tx.encodedTx.tx;
+
+    if ((channelOptions === null || channelOptions === void 0 ? void 0 : channelOptions.role) != null) {
+      const role = channelOptions.role === 'initiator' ? 'initiatorId' : channelOptions.role === 'responder' ? 'responderId' : null;
+
+      if (role != null) {
+        const owner = channelOptions === null || channelOptions === void 0 ? void 0 : channelOptions[role];
+        changeState(channel, message.params.data.state);
+        state.resolve({
+          accepted: true,
+          address: encodeContractAddress(owner, round),
+          signedTx: message.params.data.state
+        });
+        return {
+          handler: channelOpen
+        };
+      }
+    }
   }
 
   if (message.method === 'channels.conflict') {
@@ -939,7 +974,7 @@ export function awaitingNewContractCompletion(channel, message, state) {
 }
 export async function awaitingCallContractUpdateTx(channel, message, state) {
   if (message.method === 'channels.sign.update') {
-    if (message.params.data.tx) {
+    if (message.params.data.tx != null) {
       const signedTx = await state.sign(message.params.data.tx, {
         updates: message.params.data.updates
       });
@@ -956,7 +991,7 @@ export async function awaitingCallContractUpdateTx(channel, message, state) {
       };
     }
 
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => state.sign(tx, {
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await state.sign(tx, {
       updates: message.params.data.updates
     }));
 
@@ -993,7 +1028,7 @@ export async function awaitingCallContractUpdateTx(channel, message, state) {
 }
 export async function awaitingCallContractForceProgressUpdate(channel, message, state) {
   if (message.method === 'channels.sign.force_progress_tx') {
-    const signedTx = await appendSignature(message.params.data.signed_tx, tx => state.sign(tx, {
+    const signedTx = await appendSignature(message.params.data.signed_tx, async tx => await state.sign(tx, {
       updates: message.params.data.updates
     }));
     send(channel, {
@@ -1013,7 +1048,7 @@ export async function awaitingCallContractForceProgressUpdate(channel, message,
 }
 export function awaitingForceProgressCompletion(channel, message, state) {
   if (message.method === 'channels.on_chain_tx') {
-    if (state.onOnChainTx) {
+    if (state.onOnChainTx != null) {
       state.onOnChainTx(message.params.data);
     }
 
@@ -1065,7 +1100,7 @@ export function awaitingCallContractCompletion(channel, message, state) {
 
   return handleUnexpectedMessage(channel, message, state);
 }
-export function awaitingCallsPruned(channels, message, state) {
+export function awaitingCallsPruned(_channels, message, state) {
   if (message.method === 'channels.calls_pruned.reply') {
     state.resolve();
     return {
@@ -1078,8 +1113,8 @@ export function awaitingCallsPruned(channels, message, state) {
     handler: channelClosed
   };
 }
-export function channelClosed(channel, message, state) {
-  if (!state) return {
+export function channelClosed(_channel, message, state) {
+  if (state == null) return {
     handler: channelClosed
   };
   if (message.params.data.event === 'closing') return {