@cityofzion/bs-neo3 0.9.2 → 0.10.0

package/CHANGELOG.json

@@ -1,14 +1,51 @@
 {
   "name": "@cityofzion/bs-neo3",
   "entries": [
+    {
+      "version": "0.10.0",
+      "tag": "@cityofzion/bs-neo3_v0.10.0",
+      "date": "Thu, 04 Apr 2024 19:52:20 GMT",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Add ledger support"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@cityofzion/blockchain-service\" to `0.10.0`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.9.3",
+      "tag": "@cityofzion/bs-neo3_v0.9.3",
+      "date": "Wed, 28 Feb 2024 17:43:01 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Add creator infomations in nft methods return"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@cityofzion/blockchain-service\" to `0.9.1`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.9.2",
       "tag": "@cityofzion/bs-neo3_v0.9.2",
-      "date": "Mon, 29 Jan 2024 16:09:49 GMT",
+      "date": "Tue, 30 Jan 2024 18:26:00 GMT",
       "comments": {
         "patch": [
           {
             "comment": "Fixed bug preventing decryption in dev mode in React Native"
+          },
+          {
+            "comment": "Fixed lint errors that were preventing the build"
           }
         ]
       }

package/CHANGELOG.md

@@ -1,13 +1,28 @@
 # Change Log - @cityofzion/bs-neo3
 
-This log was last generated on Mon, 29 Jan 2024 16:09:49 GMT and should not be manually modified.
+This log was last generated on Thu, 04 Apr 2024 19:52:20 GMT and should not be manually modified.
+
+## 0.10.0
+Thu, 04 Apr 2024 19:52:20 GMT
+
+### Minor changes
+
+- Add ledger support
+
+## 0.9.3
+Wed, 28 Feb 2024 17:43:01 GMT
+
+### Patches
+
+- Add creator infomations in nft methods return
 
 ## 0.9.2
-Mon, 29 Jan 2024 16:09:49 GMT
+Tue, 30 Jan 2024 18:26:00 GMT
 
 ### Patches
 
 - Fixed bug preventing decryption in dev mode in React Native
+- Fixed lint errors that were preventing the build
 
 ## 0.9.1
 Wed, 06 Dec 2023 21:51:30 GMT

package/dist/BSNeo3.d.ts

@@ -1,5 +1,6 @@
-import { BlockchainDataService, BlockchainService, BSClaimable, Account, ExchangeDataService, BDSClaimable, Token, BSWithNameService, Network, PartialBy, TransferParam, BSCalculableFee, NftDataService, BSWithNft, AccountWithDerivationPath, BSWithExplorerService, ExplorerService } from '@cityofzion/blockchain-service';
-export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService {
+import { BlockchainDataService, BlockchainService, BSClaimable, Account, ExchangeDataService, BDSClaimable, Token, BSWithNameService, Network, PartialBy, TransferParam, BSCalculableFee, NftDataService, BSWithNft, AccountWithDerivationPath, BSWithExplorerService, ExplorerService, BSWithLedger } from '@cityofzion/blockchain-service';
+import { LedgerServiceNeo3 } from './LedgerServiceNeo3';
+export declare class BSNeo3<BSCustomName extends string = string> implements BlockchainService, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService, BSWithLedger {
     readonly blockchainName: BSCustomName;
     readonly feeToken: Token;
     readonly claimToken: Token;
@@ -7,6 +8,7 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     readonly derivationPath: string;
     blockchainDataService: BlockchainDataService & BDSClaimable;
     nftDataService: NftDataService;
+    ledgerService: LedgerServiceNeo3;
     exchangeDataService: ExchangeDataService;
     explorerService: ExplorerService;
     tokens: Token[];
@@ -18,6 +20,7 @@ export declare class BSNeo3<BSCustomName extends string = string> implements Blo
     validateKey(key: string): boolean;
     validateNameServiceDomainFormat(domainName: string): boolean;
     generateAccountFromMnemonic(mnemonic: string[] | string, index: number): AccountWithDerivationPath;
+    generateAccountFromPublicKey(publicKey: string): Account;
     generateAccountFromKey(key: string): Account;
     decrypt(encryptedKey: string, password: string): Promise<Account>;
     encrypt(key: string, password: string): Promise<string>;

package/dist/BSNeo3.js

@@ -11,9 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeo3 = void 0;
 const neon_js_1 = require("@cityofzion/neon-js");
-const neon_invoker_1 = require("@cityofzion/neon-invoker");
-const neon_parser_1 = require("@cityofzion/neon-parser");
-const neo3_parser_1 = require("@cityofzion/neo3-parser");
+const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
 const RpcBDSNeo3_1 = require("./RpcBDSNeo3");
 const DoraBDSNeo3_1 = require("./DoraBDSNeo3");
 const constants_1 = require("./constants");
@@ -21,8 +19,10 @@ const FlamingoEDSNeo3_1 = require("./FlamingoEDSNeo3");
 const GhostMarketNDSNeo3_1 = require("./GhostMarketNDSNeo3");
 const bs_asteroid_sdk_1 = require("@cityofzion/bs-asteroid-sdk");
 const DoraESNeo3_1 = require("./DoraESNeo3");
+const LedgerServiceNeo3_1 = require("./LedgerServiceNeo3");
 class BSNeo3 {
     constructor(blockchainName, network) {
+        this.ledgerService = new LedgerServiceNeo3_1.LedgerServiceNeo3();
         this.blockchainName = blockchainName;
         this.tokens = constants_1.TOKENS[network.type];
         this.derivationPath = constants_1.DERIVATION_PATH;
@@ -70,6 +70,16 @@ class BSNeo3 {
         const { address } = new neon_js_1.wallet.Account(key);
         return { address, key, type: 'wif', derivationPath: path };
     }
+    generateAccountFromPublicKey(publicKey) {
+        if (!neon_js_1.wallet.isPublicKey(publicKey))
+            throw new Error('Invalid public key');
+        const account = new neon_js_1.wallet.Account(publicKey);
+        return {
+            address: account.address,
+            key: account.publicKey,
+            type: 'publicKey',
+        };
+    }
     generateAccountFromKey(key) {
         const type = neon_js_1.wallet.isWIF(key) ? 'wif' : neon_js_1.wallet.isPrivateKey(key) ? 'privateKey' : undefined;
         if (!type)
@@ -101,24 +111,25 @@ class BSNeo3 {
     calculateTransferFee(param) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = new neon_js_1.wallet.Account(param.senderAccount.key);
-            const invoker = yield neon_invoker_1.NeonInvoker.init({
+            const invoker = yield neon_dappkit_1.NeonInvoker.init({
                 rpcAddress: this.network.url,
                 account,
             });
             const invocations = this.buildTransferInvocation(param, account);
-            const { networkFee, systemFee } = yield invoker.calculateFee({
+            const { total } = yield invoker.calculateFee({
                 invocations,
                 signers: [],
             });
-            return networkFee.add(systemFee).toDecimal(this.feeToken.decimals);
+            return total.toString();
         });
     }
     transfer(param) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = new neon_js_1.wallet.Account(param.senderAccount.key);
-            const invoker = yield neon_invoker_1.NeonInvoker.init({
+            const invoker = yield neon_dappkit_1.NeonInvoker.init({
                 rpcAddress: this.network.url,
                 account,
+                signingCallback: param.isLedger ? this.ledgerService.getSigningCallback(param.ledgerTransport) : undefined,
             });
             const invocations = this.buildTransferInvocation(param, account);
             const transactionHash = yield invoker.invokeFunction({
@@ -141,8 +152,8 @@ class BSNeo3 {
     resolveNameServiceDomain(domainName) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const parser = neon_parser_1.NeonParser;
-            const invoker = yield neon_invoker_1.NeonInvoker.init({ rpcAddress: this.network.url });
+            const parser = neon_dappkit_1.NeonParser;
+            const invoker = yield neon_dappkit_1.NeonInvoker.init({ rpcAddress: this.network.url });
             const response = yield invoker.testInvoke({
                 invocations: [
                     {
@@ -156,7 +167,7 @@ class BSNeo3 {
                 throw new Error((_a = response.exception) !== null && _a !== void 0 ? _a : 'unrecognized response');
             }
             const parsed = parser.parseRpcResponse(response.stack[0], {
-                type: neo3_parser_1.ABI_TYPES.HASH160.name,
+                type: 'Hash160',
             });
             const address = parser.accountInputToAddress(parsed.replace('0x', ''));
             return address;

package/dist/GhostMarketNDSNeo3.js

@@ -68,6 +68,10 @@ class GhostMarketNDSNeo3 {
             image: this.treatGhostMarketImage(data.metadata.mediaUri),
             isSVG: String(data.metadata.mediaType).includes('svg+xml'),
             name: data.metadata.name,
+            creator: {
+                address: data.creator.address,
+                name: data.creator.offchainName,
+            },
         };
         return nftResponse;
     }

package/dist/LedgerServiceNeo3.d.ts

@@ -0,0 +1,12 @@
+import { LedgerService } from '@cityofzion/blockchain-service';
+import Transport from '@ledgerhq/hw-transport';
+import { api } from '@cityofzion/neon-js';
+export declare class LedgerServiceNeo3 implements LedgerService {
+    getAddress(transport: Transport): Promise<string>;
+    getSigningCallback(transport: Transport): api.SigningFunction;
+    getSignature(transport: Transport, serializedTransaction: string, networkMagic: number, addressIndex?: number): Promise<string>;
+    getPublicKey(transport: Transport, addressIndex?: number): Promise<string>;
+    private toBip44Buffer;
+    private to8BitHex;
+    private derSignatureToHex;
+}

package/dist/LedgerServiceNeo3.js

@@ -0,0 +1,93 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LedgerServiceNeo3 = void 0;
+const neon_js_1 = require("@cityofzion/neon-js");
+const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
+class LedgerServiceNeo3 {
+    getAddress(transport) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const publicKey = yield this.getPublicKey(transport);
+            const { address } = new neon_js_1.wallet.Account(publicKey);
+            return address;
+        });
+    }
+    getSigningCallback(transport) {
+        return (transaction, { witnessIndex, network }) => __awaiter(this, void 0, void 0, function* () {
+            const publicKey = yield this.getPublicKey(transport);
+            const account = new neon_js_1.wallet.Account(publicKey);
+            const witnessScriptHash = neon_js_1.wallet.getScriptHashFromVerificationScript(transaction.witnesses[witnessIndex].verificationScript.toString());
+            if (account.scriptHash !== witnessScriptHash) {
+                throw new Error('Invalid witness script hash');
+            }
+            const signature = yield this.getSignature(transport, transaction.serialize(false), network, witnessIndex);
+            return signature;
+        });
+    }
+    getSignature(transport, serializedTransaction, networkMagic, addressIndex = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bip44Buffer = this.toBip44Buffer(addressIndex);
+            yield transport.send(0x80, 0x02, 0, 0x80, bip44Buffer, [0x9000]);
+            yield transport.send(0x80, 0x02, 1, 0x80, Buffer.from(neon_dappkit_1.NeonParser.numToHex(networkMagic, 4, true), 'hex'), [0x9000]);
+            const chunks = serializedTransaction.match(/.{1,510}/g) || [];
+            for (let i = 0; i < chunks.length - 1; i++) {
+                yield transport.send(0x80, 0x02, 2 + i, 0x80, Buffer.from(chunks[i], 'hex'), [0x9000]);
+            }
+            const response = yield transport.send(0x80, 0x02, 2 + chunks.length, 0x00, Buffer.from(chunks[chunks.length - 1], 'hex'), [0x9000]);
+            if (response.length <= 2) {
+                throw new Error(`No more data but Ledger did not return signature!`);
+            }
+            return this.derSignatureToHex(response.toString('hex'));
+        });
+    }
+    getPublicKey(transport, addressIndex = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bip44Buffer = this.toBip44Buffer(addressIndex);
+            const result = yield transport.send(0x80, 0x04, 0x00, 0x00, bip44Buffer, [0x9000]);
+            const publicKey = result.toString('hex').substring(0, 130);
+            return publicKey;
+        });
+    }
+    toBip44Buffer(addressIndex = 0, changeIndex = 0, accountIndex = 0) {
+        const accountHex = this.to8BitHex(accountIndex + 0x80000000);
+        const changeHex = this.to8BitHex(changeIndex);
+        const addressHex = this.to8BitHex(addressIndex);
+        return Buffer.from('8000002C' + '80000378' + accountHex + changeHex + addressHex, 'hex');
+    }
+    to8BitHex(num) {
+        const hex = num.toString(16);
+        return '0'.repeat(8 - hex.length) + hex;
+    }
+    derSignatureToHex(response) {
+        const ss = new neon_js_1.u.StringStream(response);
+        // The first byte is format. It is usually 0x30 (SEQ) or 0x31 (SET)
+        // The second byte represents the total length of the DER module.
+        ss.read(2);
+        // Now we read each field off
+        // Each field is encoded with a type byte, length byte followed by the data itself
+        ss.read(1); // Read and drop the type
+        const r = ss.readVarBytes();
+        ss.read(1);
+        const s = ss.readVarBytes();
+        // We will need to ensure both integers are 32 bytes long
+        const integers = [r, s].map(i => {
+            if (i.length < 64) {
+                i = '0'.repeat(i.length - 64) + i;
+            }
+            if (i.length > 64) {
+                i = i.substr(-64);
+            }
+            return i;
+        });
+        return integers.join('');
+    }
+}
+exports.LedgerServiceNeo3 = LedgerServiceNeo3;

package/dist/RpcBDSNeo3.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCBDSNeo3 = void 0;
 const neon_core_1 = require("@cityofzion/neon-core");
-const neon_invoker_1 = require("@cityofzion/neon-invoker");
+const neon_dappkit_1 = require("@cityofzion/neon-dappkit");
 const constants_1 = require("./constants");
 class RPCBDSNeo3 {
     constructor(network, feeToken, claimToken) {
@@ -82,7 +82,7 @@ class RPCBDSNeo3 {
             try {
                 const rpcClient = new neon_core_1.rpc.RPCClient(this.network.url);
                 const contractState = yield rpcClient.getContractState(tokenHash);
-                const invoker = yield neon_invoker_1.NeonInvoker.init({
+                const invoker = yield neon_dappkit_1.NeonInvoker.init({
                     rpcAddress: this.network.url,
                 });
                 const response = yield invoker.testInvoke({
@@ -95,6 +95,10 @@ class RPCBDSNeo3 {
                         { scriptHash: tokenHash, operation: 'symbol', args: [] },
                     ],
                 });
+                if (!neon_dappkit_1.TypeChecker.isStackTypeInteger(response.stack[0]))
+                    throw new Error('Invalid decimals');
+                if (!neon_dappkit_1.TypeChecker.isStackTypeByteString(response.stack[1]))
+                    throw new Error('Invalid symbol');
                 const decimals = Number(response.stack[0].value);
                 const symbol = neon_core_1.u.base642utf8(response.stack[1].value);
                 const token = {

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "author": "Coz",
   "license": "MIT",
   "dependencies": {
-    "@cityofzion/neon-js": "5.3.0",
-    "@cityofzion/neon-core": "5.3.0",
-    "@cityofzion/neon-invoker": "1.6.0",
-    "@cityofzion/neo3-invoker": "1.6.0",
-    "@cityofzion/neon-parser": "1.6.2",
-    "@cityofzion/neo3-parser": "1.6.0",
+    "@cityofzion/neon-js": "5.5.1",
+    "@cityofzion/neon-core": "5.5.1",
     "@cityofzion/dora-ts": "0.0.11",
     "axios": "1.5.1",
     "query-string": "7.1.3",
-    "@cityofzion/blockchain-service": "0.9.0",
-    "@cityofzion/bs-asteroid-sdk": "0.7.3"
+    "@ledgerhq/hw-transport": "~6.30.5",
+    "@cityofzion/neon-dappkit": "0.4.1",
+    "@cityofzion/neon-dappkit-types": "~0.3.1",
+    "@ledgerhq/hw-transport-node-hid": "~6.28.5",
+    "@cityofzion/bs-asteroid-sdk": "0.7.3",
+    "@cityofzion/blockchain-service": "0.10.0"
   },
   "devDependencies": {
     "@types/jest": "29.5.3",

package/src/BSNeo3.ts

@@ -16,14 +16,11 @@ import {
   AccountWithDerivationPath,
   BSWithExplorerService,
   ExplorerService,
+  BSWithLedger,
 } from '@cityofzion/blockchain-service'
 import { api, u, wallet } from '@cityofzion/neon-js'
 import Neon from '@cityofzion/neon-core'
-import { NeonInvoker } from '@cityofzion/neon-invoker'
-import { NeonParser } from '@cityofzion/neon-parser'
-import { ABI_TYPES } from '@cityofzion/neo3-parser'
-import { ContractInvocation } from '@cityofzion/neo3-invoker'
-
+import { NeonInvoker, NeonParser } from '@cityofzion/neon-dappkit'
 import { RPCBDSNeo3 } from './RpcBDSNeo3'
 import { DoraBDSNeo3 } from './DoraBDSNeo3'
 import { DEFAULT_URL_BY_NETWORK_TYPE, DERIVATION_PATH, NEO_NS_HASH, TOKENS } from './constants'
@@ -31,9 +28,19 @@ import { FlamingoEDSNeo3 } from './FlamingoEDSNeo3'
 import { GhostMarketNDSNeo3 } from './GhostMarketNDSNeo3'
 import { keychain } from '@cityofzion/bs-asteroid-sdk'
 import { DoraESNeo3 } from './DoraESNeo3'
+import { ContractInvocation } from '@cityofzion/neon-dappkit-types'
+import { LedgerServiceNeo3 } from './LedgerServiceNeo3'
 
 export class BSNeo3<BSCustomName extends string = string>
-  implements BlockchainService, BSClaimable, BSWithNameService, BSCalculableFee, BSWithNft, BSWithExplorerService {
+  implements
+    BlockchainService,
+    BSClaimable,
+    BSWithNameService,
+    BSCalculableFee,
+    BSWithNft,
+    BSWithExplorerService,
+    BSWithLedger
+{
   readonly blockchainName: BSCustomName
   readonly feeToken: Token
   readonly claimToken: Token
@@ -42,6 +49,7 @@ export class BSNeo3<BSCustomName extends string = string>
 
   blockchainDataService!: BlockchainDataService & BDSClaimable
   nftDataService!: NftDataService
+  ledgerService: LedgerServiceNeo3 = new LedgerServiceNeo3()
   exchangeDataService!: ExchangeDataService
   explorerService!: ExplorerService
   tokens: Token[]
@@ -102,6 +110,18 @@ export class BSNeo3<BSCustomName extends string = string>
     return { address, key, type: 'wif', derivationPath: path }
   }
 
+  generateAccountFromPublicKey(publicKey: string): Account {
+    if (!wallet.isPublicKey(publicKey)) throw new Error('Invalid public key')
+
+    const account = new wallet.Account(publicKey)
+
+    return {
+      address: account.address,
+      key: account.publicKey,
+      type: 'publicKey',
+    }
+  }
+
   generateAccountFromKey(key: string): Account {
     const type = wallet.isWIF(key) ? 'wif' : wallet.isPrivateKey(key) ? 'privateKey' : undefined
     if (!type) throw new Error('Invalid key')
@@ -135,6 +155,7 @@ export class BSNeo3<BSCustomName extends string = string>
 
   async calculateTransferFee(param: TransferParam): Promise<string> {
     const account = new wallet.Account(param.senderAccount.key)
+
     const invoker = await NeonInvoker.init({
       rpcAddress: this.network.url,
       account,
@@ -142,19 +163,21 @@ export class BSNeo3<BSCustomName extends string = string>
 
     const invocations = this.buildTransferInvocation(param, account)
 
-    const { networkFee, systemFee } = await invoker.calculateFee({
+    const { total } = await invoker.calculateFee({
       invocations,
       signers: [],
     })
 
-    return networkFee.add(systemFee).toDecimal(this.feeToken.decimals)
+    return total.toString()
   }
 
   async transfer(param: TransferParam): Promise<string> {
     const account = new wallet.Account(param.senderAccount.key)
+
     const invoker = await NeonInvoker.init({
       rpcAddress: this.network.url,
       account,
+      signingCallback: param.isLedger ? this.ledgerService.getSigningCallback(param.ledgerTransport) : undefined,
     })
 
     const invocations = this.buildTransferInvocation(param, account)
@@ -196,7 +219,7 @@ export class BSNeo3<BSCustomName extends string = string>
     }
 
     const parsed = parser.parseRpcResponse(response.stack[0] as any, {
-      type: ABI_TYPES.HASH160.name,
+      type: 'Hash160',
     })
     const address = parser.accountInputToAddress(parsed.replace('0x', ''))
     return address

package/src/GhostMarketNDSNeo3.ts

@@ -19,7 +19,7 @@ type GhostMarketNFT = {
     symbol: string
   }
   creator: {
-    address?: string
+    address: string
     offchainName?: string
   }
   apiUrl?: string
@@ -110,6 +110,10 @@ export class GhostMarketNDSNeo3 implements NftDataService {
       image: this.treatGhostMarketImage(data.metadata.mediaUri),
       isSVG: String(data.metadata.mediaType).includes('svg+xml'),
       name: data.metadata.name,
+      creator: {
+        address: data.creator.address,
+        name: data.creator.offchainName,
+      },
     }
 
     return nftResponse

package/src/LedgerServiceNeo3.ts

@@ -0,0 +1,107 @@
+import { LedgerService } from '@cityofzion/blockchain-service'
+import Transport from '@ledgerhq/hw-transport'
+import { wallet, api, u } from '@cityofzion/neon-js'
+import { NeonParser } from '@cityofzion/neon-dappkit'
+
+export class LedgerServiceNeo3 implements LedgerService {
+  async getAddress(transport: Transport): Promise<string> {
+    const publicKey = await this.getPublicKey(transport)
+    const { address } = new wallet.Account(publicKey)
+
+    return address
+  }
+
+  getSigningCallback(transport: Transport): api.SigningFunction {
+    return async (transaction, { witnessIndex, network }) => {
+      const publicKey = await this.getPublicKey(transport)
+      const account = new wallet.Account(publicKey)
+
+      const witnessScriptHash = wallet.getScriptHashFromVerificationScript(
+        transaction.witnesses[witnessIndex].verificationScript.toString()
+      )
+
+      if (account.scriptHash !== witnessScriptHash) {
+        throw new Error('Invalid witness script hash')
+      }
+
+      const signature = await this.getSignature(transport, transaction.serialize(false), network, witnessIndex)
+
+      return signature
+    }
+  }
+
+  async getSignature(transport: Transport, serializedTransaction: string, networkMagic: number, addressIndex = 0) {
+    const bip44Buffer = this.toBip44Buffer(addressIndex)
+    await transport.send(0x80, 0x02, 0, 0x80, bip44Buffer, [0x9000])
+    await transport.send(0x80, 0x02, 1, 0x80, Buffer.from(NeonParser.numToHex(networkMagic, 4, true), 'hex'), [0x9000])
+
+    const chunks = serializedTransaction.match(/.{1,510}/g) || []
+
+    for (let i = 0; i < chunks.length - 1; i++) {
+      await transport.send(0x80, 0x02, 2 + i, 0x80, Buffer.from(chunks[i], 'hex'), [0x9000])
+    }
+
+    const response = await transport.send(
+      0x80,
+      0x02,
+      2 + chunks.length,
+      0x00,
+      Buffer.from(chunks[chunks.length - 1], 'hex'),
+      [0x9000]
+    )
+
+    if (response.length <= 2) {
+      throw new Error(`No more data but Ledger did not return signature!`)
+    }
+
+    return this.derSignatureToHex(response.toString('hex'))
+  }
+
+  async getPublicKey(transport: Transport, addressIndex = 0): Promise<string> {
+    const bip44Buffer = this.toBip44Buffer(addressIndex)
+
+    const result = await transport.send(0x80, 0x04, 0x00, 0x00, bip44Buffer, [0x9000])
+    const publicKey = result.toString('hex').substring(0, 130)
+
+    return publicKey
+  }
+
+  private toBip44Buffer(addressIndex = 0, changeIndex = 0, accountIndex = 0) {
+    const accountHex = this.to8BitHex(accountIndex + 0x80000000)
+    const changeHex = this.to8BitHex(changeIndex)
+    const addressHex = this.to8BitHex(addressIndex)
+
+    return Buffer.from('8000002C' + '80000378' + accountHex + changeHex + addressHex, 'hex')
+  }
+
+  private to8BitHex(num: number): string {
+    const hex = num.toString(16)
+    return '0'.repeat(8 - hex.length) + hex
+  }
+
+  private derSignatureToHex(response: string): string {
+    const ss = new u.StringStream(response)
+    // The first byte is format. It is usually 0x30 (SEQ) or 0x31 (SET)
+    // The second byte represents the total length of the DER module.
+    ss.read(2)
+    // Now we read each field off
+    // Each field is encoded with a type byte, length byte followed by the data itself
+    ss.read(1) // Read and drop the type
+    const r = ss.readVarBytes()
+    ss.read(1)
+    const s = ss.readVarBytes()
+
+    // We will need to ensure both integers are 32 bytes long
+    const integers = [r, s].map(i => {
+      if (i.length < 64) {
+        i = '0'.repeat(i.length - 64) + i
+      }
+      if (i.length > 64) {
+        i = i.substr(-64)
+      }
+      return i
+    })
+
+    return integers.join('')
+  }
+}

package/src/RpcBDSNeo3.ts

@@ -12,7 +12,7 @@ import {
   TransactionsByAddressResponse,
 } from '@cityofzion/blockchain-service'
 import { rpc, u } from '@cityofzion/neon-core'
-import { NeonInvoker } from '@cityofzion/neon-invoker'
+import { NeonInvoker, TypeChecker } from '@cityofzion/neon-dappkit'
 import { TOKENS } from './constants'
 
 export class RPCBDSNeo3 implements BlockchainDataService, BDSClaimable {
@@ -102,8 +102,10 @@ export class RPCBDSNeo3 implements BlockchainDataService, BDSClaimable {
         ],
       })
 
+      if (!TypeChecker.isStackTypeInteger(response.stack[0])) throw new Error('Invalid decimals')
+      if (!TypeChecker.isStackTypeByteString(response.stack[1])) throw new Error('Invalid symbol')
       const decimals = Number(response.stack[0].value)
-      const symbol = u.base642utf8(response.stack[1].value as string)
+      const symbol = u.base642utf8(response.stack[1].value)
       const token = {
         name: contractState.manifest.name,
         symbol,