Parity with Network 0.3.0

Author: BHouwens

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@a-block/a-blockjs",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "description": "API wrapper to access the ABlock network",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

src/mgmt/script.mgmt.ts

@@ -118,6 +118,7 @@ export function constructTxInsAddress(txIns: ICreateTxIn[]): IResult<string> {
                     script_sig.Pay2PkH.address_version,
                 );
                 if (script.isErr()) return err(script.error);
+                
                 return previousOutPoint !== null
                     ? `${getFormattedOutPointString(previousOutPoint)}-${getFormattedScriptString(
                         script.value,
@@ -174,7 +175,7 @@ export function p2pkh(
     );
     const addr = constructAddress(getHexStringBytes(publicKeyData), addressVersion);
     if (addr.isErr()) return err(addr.error);
-    stackEntries.push(new StackEntry('PubKeyHash', addr.value));
+    stackEntries.push(new StackEntry('Bytes', addr.value));
     stackEntries.push(new StackEntry('Op', 'OP_EQUALVERIFY'));
     stackEntries.push(new StackEntry('Op', 'OP_CHECKSIG'));
     return ok({

src/mgmt/tx.mgmt.ts

@@ -71,10 +71,11 @@ export function getInputsForTx(
             : initIAssetItem({
                 Item: {
                     amount: 0,
-                    drs_tx_hash: paymentAsset.Item.drs_tx_hash,
-                    metadata: paymentAsset.Item.metadata,
+                    drs_tx_hash: paymentAsset.Item.drs_tx_hash || '',
+                    metadata: paymentAsset.Item.metadata || null,
                 },
             });
+        
         // A list of all addresses used to gather inputs
         const usedAddresses: string[] = [];
         // A list of all addresses which no longer contain usable assets after this transaction is created

src/services/ablock.service.ts

@@ -41,6 +41,7 @@ import {
     initIAssetItem,
     initIAssetToken,
     throwIfErr,
+    formatAssetStructures,
     transformCreateTxResponseFromNetwork,
 } from '../utils';
 import { mgmtClient } from './mgmt.service';
@@ -1323,7 +1324,8 @@ export class ABlockWallet {
             );
 
             // We assume that the filtered data should contain a single key-value pair since DRUID values are unique
-            const txInfo = throwIfErr(formatSingleCustomKeyValuePair(rbDataForDruid)).value.value;
+            const rawTxInfo = throwIfErr(formatSingleCustomKeyValuePair(rbDataForDruid)).value.value;
+            const txInfo = throwIfErr(formatAssetStructures(rawTxInfo));
 
             // Get the key-pair assigned to this receiver address
             const receiverKeypair = keyPairMap.get(txInfo.receiverExpectation.to);
@@ -1332,6 +1334,8 @@ export class ABlockWallet {
             // Set the status of the pending request
             txInfo.status = status;
 
+            console.log('receiverExpectation', txInfo);
+
             // Handle case for 'accepted'; create and send transaction to mempool node
             if (status === 'accepted') {
                 const sendIbTxHalf = throwIfErr(

src/utils/general.utils.ts

@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { BAL_LIMIT } from '../mgmt/constants';
 
-import { IClientResponse, ICustomKeyPair, IErrorInternal, IResult } from '../interfaces';
+import { IClientResponse, ICustomKeyPair, IErrorInternal, IPendingIbTxDetails, IResult } from '../interfaces';
 
 /**
  * Cast `status` received from ABlock network to lowercase string variant
@@ -266,3 +266,36 @@ export const formatSingleCustomKeyValuePair = <K extends string | number | symbo
     };
     return ok(returnValue);
 };
+
+/**
+ * Adds sensible defaults to asset structures for receiving and sending in 2 way transactions. Ensures
+ * error handling for missing fields.
+ *
+ * @param {IPendingIbTxDetails} txStructure
+ * @return {*}  {IResult<IPendingIbTxDetails>}
+ */
+export const formatAssetStructures = (txStructure: IPendingIbTxDetails): IResult<IPendingIbTxDetails> => {
+    const defaults = {
+        amount: 0,
+        drs_tx_hash: null,
+        metadata: null
+    };
+
+    if ('Item' in txStructure.senderExpectation.asset) {
+        let senderExpectation = txStructure.senderExpectation.asset.Item;
+        Object.assign(senderExpectation, ...Object.entries(defaults).filter(([key]) => !(key in senderExpectation)).map(([key, value]) => ({ [key]: value })));
+
+        senderExpectation.metadata = null;
+        txStructure.senderExpectation.asset.Item = senderExpectation;
+    }
+    
+    if ('Item' in txStructure.receiverExpectation.asset) {
+        let receiverExpectation = txStructure.receiverExpectation.asset.Item;
+        Object.assign(receiverExpectation, ...Object.entries(defaults).filter(([key]) => !(key in receiverExpectation)).map(([key, value]) => ({ [key]: value })));
+
+        receiverExpectation.metadata = null;
+        txStructure.receiverExpectation.asset.Item = receiverExpectation;
+    }
+
+    return ok(txStructure);
+}