Merge pull request #3 from wharfkit/fix-balances

Upgraded dependencies and refactor

Author: aaroncox

.eslintrc

@@ -23,8 +23,15 @@
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
-        "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-empty-function": "warn",
         "no-inner-declarations": "off"
-    }
+    },
+    "overrides": [
+        {
+            "files": ["src/contracts/**/*"],
+            "rules": {
+                "@typescript-eslint/no-unused-vars": "off"
+            }
+        }
+    ]
 }

package.json

@@ -20,8 +20,8 @@
         "prepare": "make"
     },
     "dependencies": {
-        "@wharfkit/antelope": "^1.0.0",
-        "@wharfkit/contract": "^1.0.0",
+        "@wharfkit/antelope": "^1.0.4",
+        "@wharfkit/contract": "^1.1.4",
         "bn.js": "^4.11.9",
         "tslib": "^2.1.0"
     },

src/contracts/system.token.ts

@@ -1,28 +1,39 @@
-import {APIClient, Asset, AssetType, Name, NameType} from '@wharfkit/antelope'
-import * as SystemTokenContract from './contracts/system.token'
+import {Action, APIClient, Asset, AssetType, Name, NameType} from '@wharfkit/antelope'
 import {Contract, ContractKit} from '@wharfkit/contract'
 
+import * as SystemTokenContract from './contracts/system.token'
+
 interface TokenOptions {
     client: APIClient
-    tokenSymbol?: Asset.SymbolType
     contract?: Contract
 }
 
 export class Token {
-    readonly contract: Contract
-    readonly kit: ContractKit
+    client: APIClient
+    contractKit: ContractKit
+    contract: Contract
 
-    constructor({contract, client}: TokenOptions) {
-        this.kit = new ContractKit({
-            client,
-        })
+    constructor({client, contract}: TokenOptions) {
+        this.client = client
         this.contract = contract || new SystemTokenContract.Contract({client})
+        this.contractKit = new ContractKit({
+            client: client,
+        })
     }
 
-    async transfer(from: NameType, to: NameType, amount: AssetType, memo = '') {
+    async getContract(contractName?: NameType) {
+        if (contractName) {
+            return this.contractKit.load(contractName)
+        }
+        return this.contract
+    }
+
+    async transfer(from: NameType, to: NameType, amount: AssetType, memo = ''): Promise<Action> {
         const quantity = Asset.from(amount)
 
-        return this.contract.action('transfer', {
+        const contract = await this.getContract()
+
+        return contract.action('transfer', {
             from: Name.from(from),
             to: Name.from(to),
             quantity,
@@ -35,7 +46,7 @@ export class Token {
         symbolCode?: Asset.SymbolCodeType,
         contractName?: NameType
     ): Promise<Asset> {
-        const contract = contractName ? await this.kit.load(contractName) : this.contract
+        const contract = await this.getContract(contractName)
         const table = contract.table('accounts', accountName)
 
         let tableQuery

src/index.ts

@@ -10,10 +10,10 @@
     "status": 200,
     "json": {
         "rows": [
-            "20670a030000000004454f5300000000"
+            "8639a3030000000004454f5300000000"
         ],
         "more": false,
         "next_key": ""
     },
-    "text": "{\"rows\":[\"20670a030000000004454f5300000000\"],\"more\":false,\"next_key\":\"\"}"
+    "text": "{\"rows\":[\"8639a3030000000004454f5300000000\"],\"more\":false,\"next_key\":\"\"}"
 }

test/data/4422fa1bdbdd5e3cee74c23fc75e0e78aaab31d3.json

@@ -10,10 +10,10 @@
     "status": 200,
     "json": {
         "rows": [
-            "20670a030000000004454f5300000000"
+            "8639a3030000000004454f5300000000"
         ],
         "more": false,
         "next_key": ""
     },
-    "text": "{\"rows\":[\"20670a030000000004454f5300000000\"],\"more\":false,\"next_key\":\"\"}"
+    "text": "{\"rows\":[\"8639a3030000000004454f5300000000\"],\"more\":false,\"next_key\":\"\"}"
 }

test/data/5e885b4772861d842984526c3b03e8027cedc18a.json

@@ -62,10 +62,9 @@ suite('Token', function () {
 
             assert.equal(String(action.account), 'eosio.token')
             assert.equal(String(action.name), 'transfer')
-
             const decoded = Serializer.decode({
                 data: action.data,
-                type: SystemTokenContract.Types.Transfer,
+                type: SystemTokenContract.Types.transfer,
             })
             assert.equal(String(decoded.from), 'teamgreymass')
             assert.equal(String(decoded.to), 'teamgreymass')

test/tests/index.ts

@@ -416,7 +416,7 @@
   dependencies:
     tslib "^2.1.0"
 
-"@wharfkit/contract@^1.0.0":
+"@wharfkit/contract@^1.0.0", "@wharfkit/contract@^1.1.4":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@wharfkit/contract/-/contract-1.1.5.tgz#2ca10090330cbb458049890076089237b644eb0e"
   integrity sha512-I4w2QFvD/zb4uj5z0U4uQJLRCiZEbrT+AJ9/5goGm6SU42fsRud/k55qSBzW8Ij00OAv2h1+e8rR7xzUruXC9g==