@cityofzion/bs-neo-legacy 0.8.0 → 0.9.1

package/dist/constants.d.ts

@@ -3,11 +3,9 @@ export declare const TOKENS: Record<NetworkType, Token[]>;
 export declare const LEGACY_NETWORK_BY_NETWORK_TYPE: Record<Exclude<NetworkType, 'custom'>, string>;
 export declare const NATIVE_ASSETS: {
     symbol: string;
-    type: string;
     name: string;
     hash: string;
     decimals: number;
-    blockchain: string;
 }[];
 export declare const DEFAULT_URL_BY_NETWORK_TYPE: Record<Exclude<NetworkType, 'custom'>, string>;
 export declare const DERIVATION_PATH = "m/44'/888'/0'/0/?";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo-legacy",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Coz",
@@ -9,19 +9,24 @@
     "@cityofzion/dora-ts": "0.0.11",
     "@cityofzion/neon-js": "4.8.3",
     "axios": "1.5.1",
-    "@cityofzion/blockchain-service": "0.8.0",
+    "@cityofzion/blockchain-service": "0.9.0",
     "@cityofzion/bs-asteroid-sdk": "0.7.3"
   },
   "devDependencies": {
-    "ts-node": "10.9.1",
-    "typescript": "4.9.5",
+    "@types/jest": "29.5.3",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "dotenv": "16.3.1",
+    "eslint": "^8.48.0",
     "jest": "29.6.2",
     "ts-jest": "29.1.1",
-    "@types/jest": "29.5.3",
-    "dotenv": "16.3.1"
+    "ts-node": "10.9.1",
+    "typescript": "4.9.5"
   },
   "scripts": {
     "build": "tsc  --project tsconfig.build.json",
-    "test": "jest --config jest.config.ts"
+    "test": "jest --config jest.config.ts",
+    "lint": "eslint .",
+    "format": "eslint --fix"
   }
 }

package/src/BSNeoLegacy.ts

@@ -27,8 +27,7 @@ import { keychain } from '@cityofzion/bs-asteroid-sdk'
 import { DoraESNeoLegacy } from './DoraESNeoLegacy'
 
 export class BSNeoLegacy<BSCustomName extends string = string>
-  implements BlockchainService, BSClaimable, BSWithExplorerService
-{
+  implements BlockchainService, BSClaimable, BSWithExplorerService {
   readonly blockchainName: BSCustomName
   readonly feeToken: Token
   readonly claimToken: Token
@@ -103,19 +102,23 @@ export class BSNeoLegacy<BSCustomName extends string = string>
     try {
       const { NativeModules } = require('react-native')
       BsReactNativeDecrypt = NativeModules.BsReactNativeDecrypt
+
+      if (!BsReactNativeDecrypt) {
+        throw new Error('@CityOfZion/bs-react-native-decrypt is not installed')
+      }
     } catch {
       const key = await wallet.decrypt(encryptedKey, password)
       return this.generateAccountFromKey(key)
     }
 
-    if (!BsReactNativeDecrypt) {
-      throw new Error('@CityOfZion/bs-react-native-decrypt is not installed')
-    }
-
     const privateKey = await BsReactNativeDecrypt.decryptNeoLegacy(encryptedKey, password)
     return this.generateAccountFromKey(privateKey)
   }
 
+  encrypt(key: string, password: string): Promise<string> {
+    return wallet.encrypt(key, password)
+  }
+
   async transfer({ intent: transferIntent, senderAccount, tipIntent, ...params }: TransferParam): Promise<string> {
     const apiProvider = new api.neoCli.instance(this.network.url)
     const account = new wallet.Account(senderAccount.key)

package/src/DoraBDSNeoLegacy.ts

@@ -8,7 +8,6 @@ import {
   BDSClaimable,
   TransactionTransferAsset,
   Token,
-  NetworkType,
   Network,
 } from '@cityofzion/blockchain-service'
 import { api } from '@cityofzion/dora-ts'
@@ -124,7 +123,7 @@ export class DoraBDSNeoLegacy implements BlockchainDataService, BDSClaimable {
     if (!data || 'error' in data) throw new Error(`Token ${tokenHash} not found`)
 
     const token = {
-      decimals: data.decimals,
+      decimals: Number(data.decimals),
       symbol: data.symbol,
       hash: data.scripthash,
       name: data.name,
@@ -139,16 +138,20 @@ export class DoraBDSNeoLegacy implements BlockchainDataService, BDSClaimable {
     const data = await api.NeoLegacyREST.balance(address, this.network.type)
 
     const promises = data.map<Promise<BalanceResponse>>(async balance => {
+      const hash = balance.asset.replace('0x', '')
+
       let token: Token = {
-        hash: balance.asset,
+        hash,
         name: balance.asset_name,
         symbol: balance.symbol,
         decimals: 8,
       }
 
       try {
-        token = await this.getTokenInfo(balance.asset)
-      } catch {}
+        token = await this.getTokenInfo(hash)
+      } catch {
+        // Empty block
+      }
 
       return {
         amount: Number(balance.balance).toFixed(token.decimals),

package/src/__tests__/BDSNeoLegacy.spec.ts

@@ -3,7 +3,7 @@ import { DoraBDSNeoLegacy } from '../DoraBDSNeoLegacy'
 import { DEFAULT_URL_BY_NETWORK_TYPE, TOKENS } from '../constants'
 
 const gasToken = TOKENS.testnet.find(t => t.symbol === 'GAS')!
-let doraBDSNeoLegacy = new DoraBDSNeoLegacy(
+const doraBDSNeoLegacy = new DoraBDSNeoLegacy(
   { type: 'testnet', url: DEFAULT_URL_BY_NETWORK_TYPE.testnet },
   gasToken,
   gasToken
@@ -67,7 +67,9 @@ describe('BDSNeoLegacy', () => {
             })
           )
         })
-      } catch {}
+      } catch {
+        // Empty block
+      }
     }
   )
 
@@ -106,6 +108,7 @@ describe('BDSNeoLegacy', () => {
           decimals: expect.any(Number),
         },
       })
+      expect(balance.token.hash.startsWith("0x")).toBeFalsy()
     })
   })
 

package/src/__tests__/BSNeoLegacy.spec.ts

@@ -1,5 +1,4 @@
 import { BSNeoLegacy } from '../BSNeoLegacy'
-import { wallet } from '@cityofzion/neon-js'
 import { generateMnemonic } from '@cityofzion/bs-asteroid-sdk'
 
 let bsNeoLegacy: BSNeoLegacy
@@ -53,11 +52,19 @@ describe('BSNeoLegacy', () => {
     const mnemonic = generateMnemonic()
     const account = bsNeoLegacy.generateAccountFromMnemonic(mnemonic, 0)
     const password = 'TestPassword'
-    const encryptedKey = await wallet.encrypt(account.key, password)
+    const encryptedKey = await bsNeoLegacy.encrypt(account.key, password)
     const decryptedAccount = await bsNeoLegacy.decrypt(encryptedKey, password)
     expect(account).toEqual(expect.objectContaining(decryptedAccount))
   }, 10000)
 
+  it('Should be able to encrypt a key', async () => {
+    const mnemonic = generateMnemonic()
+    const account = bsNeoLegacy.generateAccountFromMnemonic(mnemonic, 0)
+    const password = 'TestPassword'
+    const encryptedKey = await bsNeoLegacy.encrypt(account.key, password)
+    expect(encryptedKey).toEqual(expect.any(String))
+  })
+
   it.skip('Should be able to transfer a native asset', async () => {
     const account = bsNeoLegacy.generateAccountFromKey(process.env.TESTNET_PRIVATE_KEY as string)
     const balance = await bsNeoLegacy.blockchainDataService.getBalance(account.address)

package/src/assets/tokens/common.json

@@ -1,18 +1,14 @@
 [
   {
     "symbol": "GAS",
-    "type": "UtilityToken",
     "name": "GAS",
     "hash": "602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7",
-    "decimals": 8,
-    "blockchain": "neoLegacy"
+    "decimals": 8
   },
   {
     "symbol": "NEO",
-    "type": "GoverningToken",
     "name": "NEO",
     "hash": "c56f33fc6ecfcd0c225c4ab356fee59390af8560be0e930faebe74a6daff7c9b",
-    "decimals": 0,
-    "blockchain": "neoLegacy"
+    "decimals": 0
   }
 ]