Merge pull request #28 from nash-io/ts/add-movement-external

add support for personal->external add movement

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.3.21](https://github.com/nash-io/nash-protocol/compare/v3.3.11...v3.3.21) (2020-12-16)
+
 ### [3.3.11](https://github.com/nash-io/nash-protocol/compare/v3.4.7...v3.3.11) (2020-08-11)
 
 ### [3.3.7](https://github.com/nash-io/nash-protocol/compare/v3.3.5...v3.3.7) (2020-07-16)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-exchange/nash-protocol",
-  "version": "3.3.12",
+  "version": "3.3.21",
   "description": "TypeScript implementation of Nash crypto routines",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",

src/payload/payload.ts

@@ -14,6 +14,9 @@ export interface SignedState extends SyncState {
 
 export const MovementTypeDeposit = 'DEPOSIT'
 export const MovementTypeWithdrawal = 'WITHDRAWAL'
+// This is used for personal -> external
+export const MovementTypeTransfer = 'TRANSFER'
+
 export const BuyOrSellBuy = 'BUY'
 export const BuyOrSellSell = 'SELL'
 

src/payload/signingPayloadID.ts

@@ -1,4 +1,4 @@
-import { MovementTypeWithdrawal, MovementTypeDeposit } from './payload'
+import { MovementTypeWithdrawal, MovementTypeDeposit, MovementTypeTransfer } from './payload'
 
 /**
  * IDs mapping Nash Matching Engine operations with handling strategies.
@@ -101,15 +101,20 @@ export function isStateSigning(kind: SigningPayloadID): boolean {
   return kind === SigningPayloadID.signStatesPayload
 }
 
-export function needBlockchainSignature(kind: SigningPayloadID): boolean {
-  return (
+export function needBlockchainSignature(kind: SigningPayloadID, payload): boolean {
+  if (
     [
       SigningPayloadID.placeLimitOrderPayload,
       SigningPayloadID.placeMarketOrderPayload,
       SigningPayloadID.placeStopLimitOrderPayload,
-      SigningPayloadID.placeStopMarketOrderPayload,
-      SigningPayloadID.addMovementPayload
+      SigningPayloadID.placeStopMarketOrderPayload
     ].indexOf(kind) > -1
+  ) {
+    return true
+  }
+
+  return (
+    kind === SigningPayloadID.addMovementPayload && [MovementTypeDeposit, MovementTypeWithdrawal].includes(payload.type)
   )
 }
 
@@ -139,6 +144,9 @@ export function kindToOrderPrefix(kind: SigningPayloadID, payload?: any): string
   if (kind === SigningPayloadID.addMovementPayload && payload.type === MovementTypeWithdrawal) {
     return '03'
   }
+  if (kind === SigningPayloadID.addMovementPayload && payload.type === MovementTypeTransfer) {
+    return ''
+  }
 
   throw new Error(`invalid kind given ${kindToName(kind)}`)
 }

src/signPayload/signPayload.ts

@@ -134,7 +134,7 @@ export default function signPayload(
     pers: null
   })
 
-  if (needBlockchainSignature(kind)) {
+  if (needBlockchainSignature(kind, payload)) {
     if (config === undefined) {
       throw new Error('blockchain signatures needs a Config object')
     }
@@ -208,7 +208,7 @@ export async function preSignPayload(
     pers: null
   })
 
-  if (needBlockchainSignature(kind)) {
+  if (needBlockchainSignature(kind, payload)) {
     if (config == null) {
       throw new Error('blockchain signatures needs a Config object')
     }