@com-chain/jsc3l 2.0.1-rc.0 → 2.0.1-rc.10

package/build/type.d.ts

@@ -1,6 +1,6 @@
 export declare const httpMethods: readonly ["GET", "POST", "PUT", "DELETE", "PATCH", "HEAD"];
-export declare type httpMethod = typeof httpMethods[number];
-export declare type coreHttpOpts = {
+export type httpMethod = typeof httpMethods[number];
+export type coreHttpOpts = {
     protocol: string;
     host: string;
     path: string;
@@ -10,13 +10,13 @@ export declare type coreHttpOpts = {
     data?: any;
     timeout?: number;
 };
-export declare type HttpRequest = (opts: coreHttpOpts) => Object;
+export type HttpRequest = (opts: coreHttpOpts) => Object;
 export interface IPersistentStore {
     get(key: string, defaultValue?: string): string;
     set(key: string, value: string): void;
     del(key: string): void;
 }
-export declare type UrlParts = {
+export type UrlParts = {
     protocol: string;
     host: string;
     port: number;

package/build/wallet.d.ts

@@ -1,4 +1,5 @@
 import AjaxReq from './rest/ajaxReq';
+import { SignedQR } from './qr';
 import Wallet from './ethereum/myetherwallet';
 export default abstract class MessagingWalletAbstract extends Wallet {
     abstract ajaxReq: AjaxReq;
@@ -10,7 +11,7 @@ export default abstract class MessagingWalletAbstract extends Wallet {
     };
     static createWallet(this: {
         new (): MessagingWalletAbstract;
-    }): Promise<"REPLACED_WITH_REMOTE" | "CREATED_NEW">;
+    }): Promise<MessagingWalletAbstract>;
     private publishMessageKey;
     publishReqMessages(addTo: any, message: any): Promise<any>;
     ensureWalletMessageKey(): Promise<"REPLACED_WITH_REMOTE" | "CREATED_NEW">;
@@ -21,15 +22,12 @@ export default abstract class MessagingWalletAbstract extends Wallet {
     encryptWallet(password: any): {
         [k: string]: any;
     };
-    enrollAddress(codeId: any, token: any): any;
+    enrollAddress(id: any, token: any): any;
     requestUnlock(): any;
     static getWalletFromPrivKeyFile(jsonStr: any, password: any): Wallet;
-    makeSignedQRWithPubKey(objContent: any, pubKey: any): {
-        signature: any;
-        qrContent: string;
-    };
-    makeSignedQR(obj: any): {
-        signature: any;
-        qrContent: string;
+    makeSignedQRContent(obj: any, pubKey: string | null): SignedQR;
+    makeSignedQRFragments(obj: any, fragmentCount: number, pubKey: string | null): {
+        full: string;
     };
+    checkSignedQRFromString(qrString: string): true | "InvalidFormat" | "InvalidSignature" | "NotForYou" | "Expired";
 }

package/build/wallet.js

@@ -1,4 +1,4 @@
-import ethUtil from 'ethereumjs-util';
+import { checkSignedQR, makeSignedQRContent, makeSignedQRFragments } from './qr';
 import { shortenAddress, cipherMsg, decipherMsg } from './ethereum/cipher';
 import Wallet from './ethereum/myetherwallet';
 export default class MessagingWalletAbstract extends Wallet {
@@ -8,7 +8,8 @@ export default class MessagingWalletAbstract extends Wallet {
     }
     static async createWallet() {
         const wallet = new this();
-        return wallet.ensureWalletMessageKey();
+        await wallet.ensureWalletMessageKey();
+        return wallet;
     }
     publishMessageKey() {
         const dataStr = JSON.stringify({
@@ -34,7 +35,7 @@ export default class MessagingWalletAbstract extends Wallet {
     async ensureWalletMessageKey() {
         const remoteKey = await this.ajaxReq.getMessageKey(this.getAddressString(), true);
         const walletMessageKey = this === null || this === void 0 ? void 0 : this.message_key;
-        if (remoteKey.public_message_key !== undefined) {
+        if (typeof remoteKey.public_message_key !== 'undefined') {
             this.message_key = {
                 pub: remoteKey.public_message_key,
                 priv: remoteKey.private_message_key,
@@ -78,7 +79,7 @@ export default class MessagingWalletAbstract extends Wallet {
         const newKey = Wallet.generate(false);
         const mPub = newKey.getPublicKeyString();
         const mPriv = newKey.getPrivateKeyString();
-        return { pub: mPub, priv: cipherMsg(this.getPublicKey(), mPriv) };
+        return { pub: mPub, priv: cipherMsg(this.getPublicKeyString(), mPriv) };
     }
     messageKeysFromCrypted(cipheredKey) {
         // XXXvlab: here we are converting to hex and de-converting in decipherMsg...
@@ -98,8 +99,14 @@ export default class MessagingWalletAbstract extends Wallet {
             message_key: this.message_key
         });
     }
-    enrollAddress(codeId, token) {
-        return this.ajaxReq.enrollAddress(codeId, this.getAddressString(), this.currencyName, token);
+    enrollAddress(id, token) {
+        return this.ajaxReq.enrollPost({
+            id,
+            token,
+            currency: this.currencyName,
+            // XXXvlab: Yes, typo is intentional here (in PHP API):
+            adresse: this.getAddressString(),
+        });
     }
     requestUnlock() {
         return this.ajaxReq.requestUnlock(this.getAddressString(), this.unlockUrl);
@@ -123,40 +130,25 @@ export default class MessagingWalletAbstract extends Wallet {
         }
     }
     //
-    // QR Codes requires EthUtils
+    // QR Code helpers
     //
-    makeSignedQRWithPubKey(objContent, pubKey) {
-        objContent.message_key = cipherMsg(pubKey, this.messageKeysFromWallet());
-        objContent.address = this.getAddressString();
-        return this.makeSignedQR(objContent);
-    }
-    makeSignedQR(obj) {
-        // Values expected:
-        const { server, destinary, begin, end, viewbalance, viewoldtran, pub_key } = obj;
-        const formatDate = (date) => `${begin.getFullYear()}/${begin.getMonth()}/${begin.getDate()}`;
-        const objContent = Object.assign(obj, {
-            address: this.getAddressString(),
-            begin: formatDate(begin),
-            end: formatDate(end)
-        });
-        const hash = ethUtil.sha3(JSON.stringify(objContent));
-        const signature = ethUtil.ecsign(hash, this.privKey);
-        return {
-            signature,
-            qrContent: JSON.stringify({
-                data: objContent,
-                signature: {
-                    v: signature.v,
-                    r: '0x' + signature.r.toString('hex'),
-                    s: '0x' + signature.s.toString('hex')
-                }
-            })
-        };
+    makeSignedQRContent(obj, pubKey) {
+        return makeSignedQRContent(Object.assign(Object.assign({ server: this.currencyName, address: this.getAddressString() }, obj), pubKey && {
+            message_key: cipherMsg(pubKey, this.messageKeysFromWallet())
+        }), this.privKey);
+    }
+    makeSignedQRFragments(obj, fragmentCount, pubKey) {
+        return makeSignedQRFragments(this.makeSignedQRContent(obj, pubKey), fragmentCount);
+    }
+    checkSignedQRFromString(qrString) {
+        let qrContent;
+        try {
+            qrContent = JSON.parse(qrString);
+        }
+        catch (e) {
+            return 'InvalidFormat';
+        }
+        return checkSignedQR(qrContent, this.getAddressString());
     }
 }
-// // TODO: What to do with this validateEnrollment
-// public static validateEnrollment (codeId, signature) {
-//     return this.ajaxReq.validateEnrollmentLetter(
-//       codeId, this.currencyName, signature)
-//   }
 //# sourceMappingURL=wallet.js.map

package/build/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,iBAAiB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC1E,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAG7C,MAAM,CAAC,OAAO,OAAgB,uBAAwB,SAAQ,MAAM;IAApE;;QAME,gBAAW,GAAuC,IAAI,CAAA;IAmLxD,CAAC;IAjLQ,MAAM,CAAC,KAAK,CAAC,YAAY;QAC9B,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAA;QACzB,OAAO,MAAM,CAAC,sBAAsB,EAAE,CAAA;IACxC,CAAC;IAEO,iBAAiB;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE;YAChC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG;YACxC,mBAAmB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;SAC3C,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAE,KAAK,EAAE,OAAO;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE,CAC3B,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAA;QAEnE,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAA;QACxC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;QAEpC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;YACzD,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;SACtD,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAChD,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,CAAA;QAChC,MAAM,gBAAgB,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAA;QAC1C,IAAI,SAAS,CAAC,kBAAkB,KAAK,SAAS,EAAE;YAC9C,IAAI,CAAC,WAAW,GAAG;gBACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB;gBACjC,IAAI,EAAE,SAAS,CAAC,mBAAmB;aACpC,CAAA;YACD,IAAI,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,GAAG,MAAK,SAAS,CAAC,kBAAkB,EAAE;gBAC1D,OAAO,sBAAsB,CAAA;aAC9B;YACD,OAAM;SACP;QAED,IAAI,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,GAAG,CAAA,IAAI,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,CAAA,EAAE;YACrD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;YACvC,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACxB,OAAO,aAAa,CAAA;SACrB;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAE,QAAQ,EAAE,YAAY,EAAE,eAAe;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACrC,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAA;QAClD,MAAM,KAAK,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAA;QACjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAA;QAEpB,IAAI,OAAO,GAAG,EAAE,CAAA;QAChB,IAAI,eAAe,IAAI,IAAI,CAAC,QAAQ,EAAE;YACpC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAA;SACxB;aAAM,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,EAAE;YAC1C,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;SACtB;aAAM;YACL,OAAO,EAAE,CAAA;SACV;QAED,IAAI;YACF,OAAO,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;SAC1C;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,CAAA;SACV;IACH,CAAC;IAEO,aAAa;QACnB,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAA;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAA;QAC1C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,KAAK,CAAC,EAAE,CAAA;IACnE,CAAC;IAEM,sBAAsB,CAAE,WAAW;QACxC,6EAA6E;QAC7E,OAAO,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,WAAW,CAAC,CAAC,CAAA;IAC7E,CAAC;IAEM,qBAAqB;QAC1B,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAC3D,CAAC;IAGD,EAAE;IACF,qBAAqB;IACrB,EAAE;IAEK,aAAa,CAAE,QAAQ;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACzB,GAAG,EAAE,QAAQ;YACb,CAAC,EAAE,IAAI;YACP,WAAW,EAAE,IAAI,CAAC,YAAY;YAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAA;IACJ,CAAC;IAEM,aAAa,CAAE,MAAM,EAAE,KAAK;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAC/B,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAC/B,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IAC7B,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAC/B,IAAI,CAAC,gBAAgB,EAAE,EACvB,IAAI,CAAC,SAAS,CAAC,CAAA;IACnB,CAAC;IAEM,MAAM,CAAC,wBAAwB,CAAE,OAAO,EAAE,QAAQ;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACnC,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;aAClE,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI;YAC7B,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;SAC5C;aAAM,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE;YAC/B,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;SACjD;aAAM,IAAI,OAAO,CAAC,SAAS,KAAK,eAAe,EAAE;YAChD,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;SACzC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;SACvE;IACH,CAAC;IAGD,EAAE;IACF,6BAA6B;IAC7B,EAAE;IAEK,sBAAsB,CAAE,UAAU,EAAE,MAAM;QAC/C,UAAU,CAAC,WAAW,GAAG,SAAS,CAChC,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,CACrC,CAAA;QACD,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IAEM,YAAY,CAAE,GAAG;QAEtB,mBAAmB;QACnB,MAAM,EACJ,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAC7B,WAAW,EAAE,WAAW,EAAE,OAAO,EAClC,GAAG,GAAG,CAAA;QACP,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,EAAE,CAC1B,GAAG,KAAK,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAA;QACjE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;YACpC,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE;YAChC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC;YACxB,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC;SACrB,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;QACrD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACpD,OAAO;YACL,SAAS;YACT,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;gBACxB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE;oBACT,CAAC,EAAE,SAAS,CAAC,CAAC;oBACd,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;oBACrC,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;iBACtC;aACF,CAAC;SACH,CAAA;IACH,CAAC;CAEF;AAED,mDAAmD;AACnD,yDAAyD;AACzD,oDAAoD;AACpD,8CAA8C;AAC9C,MAAM"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@com-chain/jsc3l",
-  "version": "2.0.1-rc.0",
+  "version": "2.0.1-rc.10",
   "description": "JavaScript Com-Chain Communication Library",
   "main": "build/index.js",
   "scripts": {
@@ -24,10 +24,12 @@
   },
   "homepage": "https://github.com/com-chain/JSC3L#readme",
   "devDependencies": {
+    "@0k.io/prettier": "^0.0.1",
     "@types/node": "^16.10.3",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "eslint": "^7.29.0",
+    "eslint-config-standard": "^16.0.3",
     "typescript": "^4.4.3"
   },
   "dependencies": {

package/src/bcRead.ts

@@ -4,15 +4,68 @@ import AjaxReq from './rest/ajaxReq'
 import { getNakedAddress, padLeft, getDataObj } from './ethereum/ethFuncs'
 
 
-function getNumber (data, ratio) {
-  const shortData = '0x' + data.slice(-12)
-  let a = parseInt(shortData, 16)
 
-  if (a > (34359738368 * 4096)) {
-    a -= 68719476736 * 4096
+function decodeData (abiType: string, data: string): any {
+  if (data.startsWith('0x')) {
+    data = data.slice(2)
+  }
+  if (data.length === 0) {
+    return null
+  }
+  let dataBuffer: Buffer
+  try {
+    dataBuffer = Buffer.from(data, 'hex')
+  } catch (e) {
+    throw new Error(
+      'Invalid data provided: not an hex string')
+  }
+  if (dataBuffer.length % 32 !== 0) {
+    throw new Error(
+      'Invalid data provided: data length is not a multiple of 32')
+  }
+  const uintData = dataBuffer.readUIntBE(0, 32)
+  switch (abiType) {
+    case 'string':
+      const dataLocation = uintData
+      if (dataLocation % 32 !== 0) {
+        throw new Error(
+          'Invalid data provided while decoding string: ' +
+            'first 32byte word is not a valid address')
+      }
+      if (dataLocation + 64 > dataBuffer.length) {
+        throw new Error(
+          'Invalid data provided while decoding string: ' +
+            'not enough data to decode length and first word at given location')
+      }
+      const dataLength = dataBuffer.readUIntBE(dataLocation, 32)
+      const expectedLength = Math.ceil((dataLocation + 32 + dataLength) / 32) * 32
+      console.log("expected:", expectedLength)
+      if (dataBuffer.length !== expectedLength) {
+        throw new Error(
+          'Invalid data provided while decoding string: ' +
+            'not enough data to decode advertised string')
+      }
+      const dataValue = dataBuffer.slice(dataLocation + 32, dataLocation + 32 + dataLength)
+      return dataValue.toString()
+    case 'uint':
+    case 'uint256':
+      return uintData
+    case 'number/100':
+      return (decodeData('number', data) / 100.0).toString()
+    case 'number':
+      const shortData = '0x' + data.slice(-12)
+      let a = parseInt(shortData, 16)
+
+      if (a > (34359738368 * 4096)) {
+        a -= 68719476736 * 4096
+      }
+
+      return a
+    case 'bool':
+      return uintData === 1
+    default:
+      throw new Error(`Unsupported ABI type: ${abiType}`)
   }
-
-  return a / ratio
 }
 
 
@@ -22,13 +75,22 @@ export default abstract class BcReadAbstract {
   abstract contracts: string[]
 
   // Get Global status of the contract
-  async getContractStatus () { return this.getGlobInfo('0x8b3c7c69') }
+  getContractStatus () { return this.read(this.contracts[0], '0x8b3c7c69') }
   // Get Global infos: Tax destinary Account
-  async getTaxAccount () { return this.getGlobInfo('0x4f2eabe0') }
+  getTaxAccount () { return this.read(this.contracts[0], '0x4f2eabe0') }
 
   // Get Historical infos infos: Global balance
   async getHistoricalGlobalBalance (walletAddress, blockNb) {
-    return this.getAmountAt('0x70a08231', walletAddress, blockNb)
+    const data = await this.read(
+      this.contracts[0], '0x70a08231', [
+        getNakedAddress(walletAddress)
+      ], blockNb)
+    return decodeData('number/100', data)
+  }
+
+  async getVersion () {
+    const data = await this.read(this.contracts[0], '0x54fd4d50')
+    return decodeData('string', data as string)
   }
 
 
@@ -36,46 +98,45 @@ export default abstract class BcReadAbstract {
   // Generic read function
 
   async getAmount (address, walletAddress) {
-    const userInfo = getDataObj(
-      this.contracts[0], address, [getNakedAddress(walletAddress)])
-    const data = await this.ajaxReq.getEthCall(userInfo)
-    return getNumber(data, 100.0).toString()
+    const data = await this.read(
+      this.contracts[0], address, [
+        getNakedAddress(walletAddress)
+      ])
+    return decodeData('number/100', data)
   }
 
   async getAccInfo (address, walletAddress) {
-    return this.getInfo(this.contracts[0], address, walletAddress)
-  }
-
-  getGlobInfo (address) {
-    const userInfo = getDataObj(this.contracts[0], address, [])
-    return this.ajaxReq.getEthCall(userInfo)
-  }
-
-  async getAmountAt (address, walletAddress, blockNb) {
-    const userInfo = getDataObj(
-      this.contracts[0], address, [getNakedAddress(walletAddress)])
-    const blockHex = '0x' + new BigNumber(blockNb).toString(16)
-    const data = await this.ajaxReq.getEthCallAt(userInfo, blockHex)
-    return getNumber(data, 100.0).toString()
+    const data = await this.read(
+      this.contracts[0], address, [
+        getNakedAddress(walletAddress)
+      ])
+    return decodeData('number', data)
   }
 
-  async getInfo (contract, address, walletAddress) {
-    const userInfo = getDataObj(
-      contract, address, [getNakedAddress(walletAddress)])
-    const data = await this.ajaxReq.getEthCall(userInfo)
-    return getNumber(data, 1.0)
+  async read (contract: string, address: string, args?: any[],
+              blockNb: string = 'pending'): Promise<string> {
+    args = args || []
+    const ethCall = getDataObj(contract, address, args)
+    if (blockNb !== 'pending') {
+      blockNb = '0x' + new BigNumber(blockNb).toString(16)
+    }
+    try {
+      return (await this.ajaxReq.getEthCallAt(ethCall, blockNb)) as string
+    } catch (e) {
+      throw new Error(
+        `Failed read contract: ${contract}, fn: ${address}`
+      )
+    }
   }
 
   async getAmountForElement (
     contract, functionAddress, callerAddress, elementAddress) {
-    const userInfo = getDataObj(
-      contract, functionAddress,
-      [
+    const data = await this.read(
+      contract, functionAddress, [
         getNakedAddress(callerAddress),
         getNakedAddress(elementAddress)
       ])
-    const data = await this.ajaxReq.getEthCall(userInfo)
-    return getNumber(data, 100.0).toString()
+    return decodeData('number/100', data)
   }
 
   async getElementInList (
@@ -84,19 +145,16 @@ export default abstract class BcReadAbstract {
 
     if (index < indMin) return list
 
-    const userInfo = getDataObj(
-      contract, mapFunctionAddress,
-      [
+    const data = await this.read(
+      contract, mapFunctionAddress, [
         getNakedAddress(callerAddress),
         padLeft(new BigNumber(index).toString(16), 64)
       ])
-    const data: {[k: string]: any} = await this.ajaxReq.getEthCall(userInfo)
-
     const amount = await this.getAmountForElement(
       contract, amountFunctionAddress, callerAddress, data)
 
-    const cleanedAdd = '0x' + data.substring(data.length - 40)
-    const element = { address: cleanedAdd, amount: amount }
+    const address = '0x' + data.substring(data.length - 40)
+    const element = { address, amount }
     list.unshift(element)
     return this.getElementInList(
       contract, mapFunctionAddress,
@@ -165,10 +223,11 @@ for (const key in ListFunction) {
       // avoid unwanted infinite loops
       indMax = indMax || 0
       indMin = indMin || 0
-      const count = await this.getInfo(
-        this.contracts[1],
-        `0x${configList.count}`,
-        walletAddress)
+      const data = await this.read(
+        this.contracts[1], `0x${configList.count}`, [
+          getNakedAddress(walletAddress)
+        ])
+      const count = decodeData('number', data)
       const list = []
       const index = Math.min(count - 1, indMax)
       return this.getElementInList(

package/src/bcTransaction.ts

@@ -13,20 +13,26 @@ function typeConv (label: string): (x:any) => (string | number) {
   if (label.endsWith('Address')) {
     return (a) => padLeft(getNakedAddress(a), 64)
   }
+  if (label === 'int') {
+    return (nb) => encodeNumber(parseInt(nb, 19))
+  }
   if (label.startsWith('limit') || label === 'amount') {
     return (nb) => encodeNumber(roundCent(nb))
   }
-  if (label.endsWith('Status') || label.endsWith('Type')) {
+  if (label.endsWith('Status') || label.endsWith('Type') || label.endsWith('Int')) {
     return (nb) => encodeNumber(nb)
   }
+  if (label.endsWith('Hex')) {
+    return (s) => s.padEnd(128, '0')
+  }
   if (label === 'status') {
-    return (nb) => (parseInt(nb, 10) === 0 ? 0 : 1)
+    return (nb) => encodeNumber(parseInt(nb, 10) === 0 ? 0 : 1)
   }
   throw new Error(`Unexpected label '${label}' in FnDefs.`)
 }
 
 
-export default abstract class BcTransactionAbstract {
+export abstract class BcTransactionAbstract {
 
   abstract ajaxReq: AjaxReq
   abstract contracts: string[]
@@ -77,81 +83,56 @@ export default abstract class BcTransactionAbstract {
 }
 
 
-[
-  // First Contract
-  {
-    setAccountParam: '848b2592:accAddress accStatus accType limitPlus limitMinus',
-    pledgeAccount: '6c343eef:accAddress amount *',
-    setAllowance: 'd4e12f2e:spenderAddress amount',
-    setDelegation: '75741c79:spenderAddress limit',
-    setTaxAmount: 'f6f1897d:amount',
-    setTaxLegAmount: 'fafaf4c0:amount',
-    setTaxAccount: 'd0385b5e:accAddress',
-    setOwnerAccount: 'f2fde38b:accAddress',
-    setContractStatus: '0x88b8084f:status',
-  },
-  // Second Contract
-  {
-    transferNant: 'a5f7c148:toAddress amount *',
-    transferCM: '60ca9c4c:toAddress amount *',
-    transferOnBehalfNant: '1b6b1ee5:fromAddress toAddress amount D',
-    transferOnBehalfCM: '74c421fe:fromAddress toAddress amount D',
-    askTransferFrom: '58258353:fromAddress amount',
-    askTransferCMFrom: '2ef9ade2:fromAddress amount',
-    payRequestNant: '132019f4:toAddress amount *',
-    payRequestCM: '1415707c:toAddress amount *',
-    rejectRequest: 'af98f757:toAddress',
-    dismissAcceptedInfo: 'ccf93c7a:accAddress',
-    dismissRejectedInfo: '88759215:accAddress',
-  }
-].forEach((contractFnDefs, contractNb) => {
-
-  for (const fnName in contractFnDefs) {
-
-    const [fnHash, argStringList] = contractFnDefs[fnName].split(':')
-    const argList = argStringList.split(' ')
-    let hasAdditionalPostData = false
-    let hasDelegate = false
-    if (argList.slice(-1)[0] === '*') {
-      hasAdditionalPostData = true
-      argList.pop()
-    } else if (argList.slice(-1)[0] === 'D') {
-      hasAdditionalPostData = true
-      hasDelegate = true
-      argList.pop()
-    }
+export function transactionFactory(transactionDefs: any[], bcTransactionClass: any) {
+
+  transactionDefs.forEach((contractFnDefs, contractNb) => {
 
-    // Build argument array function
-    const argFnList = argList.map((arg) => typeConv(arg))
-    const concatArgs = (args) =>
-      args.map((arg, idx) => argFnList[idx](arg)).join('')
-
-    BcTransactionAbstract.prototype[fnName] = async function (wallet, ...args) {
-      const addr = wallet.getAddressString()
-      const data = await this.ajaxReq.getTransactionData(addr)
-      // TODO: must test this
-      if (data.error) {
-        console.log(`Failed getTransactionData(${addr})`)
-        throw new Error(data.msg)
+    for (const fnName in contractFnDefs) {
+
+      const [fnHash, argStringList] = contractFnDefs[fnName].split(':')
+      const argList = argStringList.split(' ')
+      let hasAdditionalPostData = false
+      let hasDelegate = false
+      if (argList.slice(-1)[0] === '*') {
+        hasAdditionalPostData = true
+        argList.pop()
+      } else if (argList.slice(-1)[0] === 'D') {
+        hasAdditionalPostData = true
+        hasDelegate = true
+        argList.pop()
       }
-      const additionalPostData = hasAdditionalPostData ? args.pop() : {}
-      if (hasDelegate) {
-        additionalPostData.delegate = wallet.getAddressString()
+
+      // Build argument array function
+      const argFnList = argList.map((arg) => typeConv(arg))
+      const concatArgs = (args) =>
+        args.map((arg, idx) => argFnList[idx](arg)).join('')
+
+      bcTransactionClass.prototype[fnName] = async function (wallet, ...args) {
+        const addr = wallet.getAddressString()
+        const data = await this.ajaxReq.getTransactionData(addr)
+        // TODO: must test this
+        if (data.error) {
+          console.log(`Failed getTransactionData(${addr})`)
+          throw new Error(data.msg)
+        }
+        const additionalPostData = hasAdditionalPostData ? args.pop() : {}
+        if (hasDelegate) {
+          additionalPostData.delegate = wallet.getAddressString()
+        }
+        const rawSignedTx = generateTx({
+          gasLimit: 500000,
+          data: fnHash + concatArgs(args),
+          to: this.contracts[contractNb],
+          unit: 'ether',
+          value: 0,
+          nonce: 1,
+          gasPrice: null,
+          donate: false,
+          from: addr,
+          key: wallet.getPrivateKeyString()
+        }, data)
+        return this.ajaxReq.sendTx(rawSignedTx, additionalPostData)
       }
-      const rawTx = generateTx({
-        gasLimit: 500000,
-        data: fnHash + concatArgs(args),
-        to: this.contracts[contractNb],
-        unit: 'ether',
-        value: 0,
-        nonce: 1,
-        gasPrice: null,
-        donate: false,
-        from: addr,
-        key: wallet.getPrivateKeyString()
-      }, data)
-      if (rawTx.isError) return rawTx
-      return this.ajaxReq.sendTx(rawTx.signedTx, additionalPostData)
     }
-  }
-})
+  })
+}

package/src/config/transactions.ts

@@ -0,0 +1,30 @@
+
+
+export default [
+  // First Contract
+  {
+    setAccountParam: '848b2592:accAddress accStatus accType limitPlus limitMinus',
+    pledgeAccount: '6c343eef:accAddress amount *',
+    setAllowance: 'd4e12f2e:spenderAddress amount',
+    setDelegation: '75741c79:spenderAddress limit',
+    setTaxAmount: 'f6f1897d:int',
+    setTaxLegAmount: 'fafaf4c0:int',
+    setTaxAccount: 'd0385b5e:accAddress',
+    setOwnerAccount: 'f2fde38b:accAddress',
+    setContractStatus: '88b8084f:status',
+  },
+  // Second Contract
+  {
+    transferNant: 'a5f7c148:toAddress amount *',
+    transferCM: '60ca9c4c:toAddress amount *',
+    transferOnBehalfNant: '1b6b1ee5:fromAddress toAddress amount D',
+    transferOnBehalfCM: '74c421fe:fromAddress toAddress amount D',
+    askTransferFrom: '58258353:fromAddress amount',
+    askTransferCMFrom: '2ef9ade2:fromAddress amount',
+    payRequestNant: '132019f4:toAddress amount *',
+    payRequestCM: '1415707c:toAddress amount *',
+    rejectRequest: 'af98f757:toAddress',
+    dismissAcceptedInfo: 'ccf93c7a:accAddress',
+    dismissRejectedInfo: '88759215:accAddress',
+  },
+]

package/src/connection.ts

@@ -43,8 +43,15 @@ abstract class ConnectionAbstract {
   ///
   // [Lower level] Get the list of ComChain end-points from given repo
   ///
-  getCCEndPointList (repo: string) {
-    return this.http.get(repo + config.nodesRepo, { _: new Date().getTime() })
+  async getCCEndPointList (repo: string) {
+    try {
+      return await this.http.get(
+        repo + config.nodesRepo,
+        { _: new Date().getTime() })
+    } catch (e) {
+      console.error(`Failed to get endpoint list on ${repo}`, e)
+      return false
+    }
   }
 
   ///
@@ -232,11 +239,12 @@ export default abstract class ConnectionMgrAbstract extends ConnectionAbstract {
   public getLocalConfJSON () {
     if (this.conf) return this.conf
     const cfgJson = this.persistentStore.get('ServerConf')
-    if (!cfgJson) return null
-    const cfg = JSON.parse(cfgJson)
-    // Completing with other informations
-    cfg.repo = this.repo
-    cfg.custoRepo = this.repo + config.custoRepo
+    const cfg = cfgJson ? JSON.parse(cfgJson) : {}
+    // Completing with other informations if available
+    if (this.repo) {
+      cfg.repo = this.repo
+      cfg.custoRepo = this.repo + config.custoRepo
+    }
     return cfg
   }