Commit 711acfa3 authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch 'jsalyers-upgrade-hive-js-and-get-account-history' into 'develop'

[JES] Update wallet to use newest version of hive-js, call new version of...

See merge request !65
parents 495eebc1 b4279f0a
......@@ -41,7 +41,7 @@
"testURL": "http://localhost/"
},
"dependencies": {
"@hiveio/hive-js": "0.8.5",
"@hiveio/hive-js": "0.8.6",
"@steem/crypto-session": "git+https://github.com/steemit/crypto-session.git#83a90b319ce5bc6a70362d52a15a815de7e729bb",
"assert": "1.4.1",
"autoprefixer-loader": "3.2.0",
......
import { api } from 'app/utils/custom_api/lib';
import { api } from '@hiveio/hive-js';
import {
ChainTypes,
makeBitMaskFilter,
} from '@hiveio/hive-js/lib/auth/serializer';
import stateCleaner from 'app/redux/stateCleaner';
const op = ChainTypes.operations;
let wallet_operations_bitmask = makeBitMaskFilter([
op.transfer,
op.transfer_to_vesting,
op.withdraw_vesting,
op.interest,
op.liquidity_reward,
op.transfer_to_savings,
op.transfer_from_savings,
op.escrow_transfer,
op.cancel_transfer_from_savings,
op.escrow_approve,
op.escrow_dispute,
op.escrow_release,
op.fill_convert_request,
op.fill_order,
op.claim_reward_balance,
]);
async function getStateForTrending() {
let result = {};
result.content = {};
......@@ -66,7 +89,7 @@ export async function getStateAsync(url) {
account_name,
-1,
500,
582907592732
...wallet_operations_bitmask
);
let account = await api.getAccountsAsync([account_name]);
account = account[0];
......
......@@ -132,10 +132,10 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
"@hiveio/hive-js@0.8.5":
version "0.8.5"
resolved "https://registry.yarnpkg.com/@hiveio/hive-js/-/hive-js-0.8.5.tgz#271fa801e5489c8519ac0c3011ad059cdd928b13"
integrity sha512-rBBZ5njd2XAXkOgCFu5kVFQIZ5QTvNLuEdbCXgVV2LU8yv+AbbdpCpKp8+V1ygMpzq5ZyqLnn2sbSzSKXu6AgA==
"@hiveio/hive-js@0.8.6":
version "0.8.6"
resolved "https://registry.yarnpkg.com/@hiveio/hive-js/-/hive-js-0.8.6.tgz#27e6b5ebb0b1dd708a6c165e4e3b49993e80740f"
integrity sha512-nHEcOYubKlmZzJV1c6wLwlbL4mEgkoV0G3xSmS4J48e1tzfxlZV60Hk6e9ngCeGC9j5pA71namWTJIt8N0wzCQ==
dependencies:
"@steemit/rpc-auth" "^1.1.1"
bigi "^1.4.2"
......@@ -151,6 +151,7 @@
debug "^2.6.8"
detect-node "^2.0.3"
ecurve "^1.0.5"
jsbi "^3.1.4"
lodash "^4.16.4"
retry "^0.12.0"
secure-random "^1.1.2"
......@@ -5973,6 +5974,11 @@ js-yaml@^3.13.1, js-yaml@^3.7.0, js-yaml@^3.9.0:
argparse "^1.0.7"
esprima "^4.0.0"
jsbi@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0"
integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg==
jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment