Replace graphenejs-lib by bitsharesjs

bloom_filter/bloom_filter_wallet.js

@@ -21,7 +21,7 @@ var fs = require('fs')
 
 require('coffee-script/register') // npm install coffee-script
 
-var graphenejs = require("graphenejs-lib");
+var graphenejs = require("bitsharesjs");
 var h = graphenejs.hash;
 var key_utils = graphenejs.key;
 const chainPrefix = "BTS";

bloom_filter/package.json

@@ -12,6 +12,6 @@
   "license": "ISC",
   "devDependencies": {
     "coffee-script": "^1.12.2",
-    "graphenejs-lib": "^0.4.10"
+    "bitsharesjs": "^0.4.10"
   }
 }

release-notes.txt

@@ -32,8 +32,8 @@ Release 2.0.160629
 
 New features
 --------
-- Api code moved to new [graphenejs-ws](https://github.com/svk31/graphenejs-ws) library
-- Crypto and blockchain state code moved to [graphenejs-lib](https://github.com/svk31/graphenejs-lib) library
+- Api code moved to new [bitsharesjs-ws](https://github.com/svk31/bitsharesjs-ws) library
+- Crypto and blockchain state code moved to [bitsharesjs](https://github.com/svk31/bitsharesjs) library
 - Add OPEN.MKR deposit/withdrawal
 - Limit chat messages to 140 characters
 - Refactor MyMarkets selection to tabbed layout

web/app/App.jsx

@@ -1,5 +1,5 @@
-import {ChainStore} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {ChainStore} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import React from "react";
 import IntlStore from "stores/IntlStore";
 import AccountStore from "stores/AccountStore";

web/app/Routes-dev.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 import { Router, Route, IndexRoute, browserHistory } from "react-router/es";
 import App from "./App";

web/app/Routes.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 import { Route, IndexRoute } from "react-router/es";
 import App from "./App";

web/app/actions/AssetActions.js

@@ -1,10 +1,10 @@
 var alt = require("alt-instance");
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import utils from "common/utils";
 import WalletApi from "api/WalletApi";
 import ApplicationApi from "api/ApplicationApi";
 import WalletDb from "stores/WalletDb";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import big from "bignumber.js";
 
 let wallet_api = new WalletApi();

web/app/actions/BackupActions.js

@@ -1,7 +1,7 @@
 import alt from "alt-instance";
 import iDB from "idb-instance";
 import {compress, decompress} from "lzma";
-import {PrivateKey, PublicKey, Aes, key} from "graphenejs-lib/es";
+import {PrivateKey, PublicKey, Aes, key} from "bitsharesjs/es";
 import WalletActions from "actions/WalletActions";
 
 class BackupActions {

web/app/actions/BlockchainActions.js

@@ -1,5 +1,5 @@
 var alt = require("alt-instance");
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 let latestBlocks = {};
 

web/app/actions/MarketsActions.js

@@ -1,8 +1,8 @@
 var alt = require("alt-instance");
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb";
-import {ChainStore} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {ChainStore} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import marketUtils from "common/market_utils";
 import accountUtils from "common/account_utils";
 import Immutable from "immutable";

web/app/actions/TransactionConfirmActions.js

@@ -1,5 +1,5 @@
 import alt from "alt-instance";
-import {ChainConfig} from "graphenejs-ws";
+import {ChainConfig} from "bitsharesjs-ws";
 
 class TransactionConfirmActions {
 

web/app/actions/WalletActions.js

@@ -2,8 +2,8 @@ import WalletDb from "stores/WalletDb";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import CachedPropertyActions from "actions/CachedPropertyActions";
 import ApplicationApi from "api/ApplicationApi";
-import {TransactionBuilder, FetchChain} from "graphenejs-lib/es";
-import {Apis} from "graphenejs-ws";
+import {TransactionBuilder, FetchChain} from "bitsharesjs/es";
+import {Apis} from "bitsharesjs-ws";
 import alt from "alt-instance";
 import SettingsStore from "stores/SettingsStore";
 

web/app/api/ApplicationApi.js

@@ -1,6 +1,6 @@
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import WalletDb from "stores/WalletDb";
-import {Aes, ChainValidation, TransactionBuilder, TransactionHelper, FetchChain} from "graphenejs-lib/es";
+import {Aes, ChainValidation, TransactionBuilder, TransactionHelper, FetchChain} from "bitsharesjs/es";
 
 class ApplicationApi {
 

web/app/api/DebugApi.js

@@ -1,4 +1,4 @@
-import { SerializerValidation, types} from "graphenejs-lib/es";
+import { SerializerValidation, types} from "bitsharesjs/es";
 var config = require("chain/serializer_config");
 
 class DebugApi {

web/app/api/WalletApi.js

@@ -1,4 +1,4 @@
-import {SerializerValidation, TransactionBuilder, TransactionHelper} from "graphenejs-lib/es";
+import {SerializerValidation, TransactionBuilder, TransactionHelper} from "bitsharesjs/es";
 import ApplicationApi from "./ApplicationApi";
 
 class WalletApi {

web/app/api/accountApi.js

@@ -1,4 +1,4 @@
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class Api {
 

web/app/components/Account/AccountAssetCreate.jsx

@@ -4,7 +4,7 @@ import classnames from "classnames";
 import AssetActions from "actions/AssetActions";
 import HelpContent from "../Utility/HelpContent";
 import utils from "common/utils";
-import {ChainStore, ChainValidation} from "graphenejs-lib/es";
+import {ChainStore, ChainValidation} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import counterpart from "counterpart";
 import ChainTypes from "../Utility/ChainTypes";

web/app/components/Account/AccountAssetUpdate.jsx

@@ -4,7 +4,7 @@ import classnames from "classnames";
 import AssetActions from "actions/AssetActions";
 import HelpContent from "../Utility/HelpContent";
 import utils from "common/utils";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import FormattedFee from "../Utility/FormattedFee";
 import counterpart from "counterpart";
@@ -597,6 +597,7 @@ class AccountAssetUpdate extends React.Component {
                                         </div>
                                         <div>
                                             <h5><Translate content="exchange.price" />: <FormattedPrice
+                                                invert
                                                 style={{fontWeight: "bold"}}
                                                 quote_amount={cr_quote_amount}
                                                 quote_asset={core_exchange_rate.quote.asset_id}

web/app/components/Account/AccountMembership.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import {Link} from "react-router/es";
 import Translate from "react-translate-component";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import Statistics from "./Statistics";

web/app/components/Account/AccountOrders.jsx

@@ -4,7 +4,7 @@ import {OrderRow, TableHeader} from "../Exchange/MyOpenOrders";
 import market_utils from "common/market_utils";
 import counterpart from "counterpart";
 import MarketsActions from "actions/MarketsActions";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import MarketLink from "../Utility/MarketLink";
 
 class AccountOrders extends React.Component {

web/app/components/Account/AccountOverview.jsx

@@ -9,7 +9,7 @@ import AssetName from "../Utility/AssetName";
 import CollateralPosition from "../Blockchain/CollateralPosition";
 import { RecentTransactions } from "./RecentTransactions";
 import Proposals from "components/Account/Proposals";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import SettingsActions from "actions/SettingsActions";
 import assetUtils from "common/asset_utils";
 import counterpart from "counterpart";

web/app/components/Account/AccountPermissions.jsx

@@ -6,7 +6,7 @@ import utils from "common/utils";
 import accountUtils from "common/account_utils";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
-import {PublicKey} from "graphenejs-lib/es";;
+import {PublicKey} from "bitsharesjs/es";;
 import AccountPermissionsList from "./AccountPermissionsList";
 import PubKeyInput from "../Forms/PubKeyInput";
 import {Tabs, Tab} from "../Utility/Tabs";

web/app/components/Account/AccountSelector.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import utils from "common/utils";
 import AccountImage from "../Account/AccountImage";
 import Translate from "react-translate-component";
-import {ChainStore, PublicKey, ChainValidation} from "graphenejs-lib/es";
+import {ChainStore, PublicKey, ChainValidation} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import classnames from "classnames";

web/app/components/Account/AccountVesting.jsx

@@ -1,10 +1,10 @@
 import React from "react";
 import Translate from "react-translate-component";
 import FormattedAsset from "../Utility/FormattedAsset";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "common/utils";
 import WalletActions from "actions/WalletActions";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 
 class VestingBalance extends React.Component {
 

web/app/components/Account/AccountVoting.jsx

@@ -5,7 +5,7 @@ import counterpart from "counterpart";
 import accountUtils from "common/account_utils";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
-import {ChainStore, FetchChainObjects} from "graphenejs-lib/es";
+import {ChainStore, FetchChainObjects} from "bitsharesjs/es";
 import WorkerApproval from "./WorkerApproval";
 import AccountVotingProxy from "./AccountVotingProxy";
 import AccountsList from "./AccountsList";

web/app/components/Account/AccountVotingProxy.jsx

@@ -5,7 +5,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import Translate from "react-translate-component";
 import AccountImage from "../Account/AccountImage";
 import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AccountVotingProxy extends React.Component {
 

web/app/components/Account/AccountsList.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import AccountSelector from "./AccountSelector";
 import Translate from "react-translate-component";
 import AccountImage from "./AccountImage";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import FormattedAsset from "../Utility/FormattedAsset";
 import BindToChainState from "../Utility/BindToChainState";

web/app/components/Account/CreateAccount.jsx

@@ -14,7 +14,7 @@ import TransactionConfirmStore from "stores/TransactionConfirmStore";
 import LoadingIndicator from "../LoadingIndicator";
 import WalletActions from "actions/WalletActions";
 import Translate from "react-translate-component";
-import {ChainStore, FetchChain} from "graphenejs-lib/es";
+import {ChainStore, FetchChain} from "bitsharesjs/es";
 import {BackupCreate} from "../Wallet/Backup";
 import ReactTooltip from "react-tooltip";
 import utils from "common/utils";

web/app/components/Account/NestedApprovalState.jsx

@@ -6,7 +6,7 @@ import Icon from "../Icon/Icon";
 import LinkToAccountById from "../Blockchain/LinkToAccountById";
 import pu from "common/permission_utils";
 import {cloneDeep} from "lodash";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AccountPermissionTree extends React.Component {
 

web/app/components/Account/Proposals.jsx

@@ -7,7 +7,7 @@ import ChainTypes from "components/Utility/ChainTypes";
 import utils from "common/utils";
 import ProposalApproveModal from "../Modal/ProposalApproveModal";
 import NestedApprovalState from "../Account/NestedApprovalState";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import counterpart from "counterpart";
 
 class Proposals extends Component {

web/app/components/Account/RecentTransactions.jsx

@@ -5,7 +5,7 @@ import Operation from "../Blockchain/Operation";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import utils from "common/utils";
-import {ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import TransitionWrapper from "../Utility/TransitionWrapper";
 import ps from "perfect-scrollbar";
 import counterpart from "counterpart";

web/app/components/Blockchain/Asset.jsx

@@ -12,7 +12,7 @@ import HelpContent from "../Utility/HelpContent";
 import Icon from "../Icon/Icon";
 import assetUtils from "common/asset_utils";
 import utils from "common/utils";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 class AssetFlag extends React.Component {
     render()

web/app/components/Blockchain/Fees.jsx

@@ -8,7 +8,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedAsset from "../Utility/FormattedAsset";
 import {EquivalentValueComponent} from "../Utility/EquivalentValueComponent";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 const {operations} = grapheneChainTypes;
 let ops = Object.keys(operations);
 

web/app/components/Blockchain/Operation.jsx

@@ -12,7 +12,7 @@ import LinkToAssetById from "../Blockchain/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import ChainTypes from "../Utility/ChainTypes";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import account_constants from "chain/account_constants";
 import MemoText from "./MemoText";
 import ProposedOperation from "./ProposedOperation";

web/app/components/Blockchain/ProposedOperation.jsx

@@ -10,7 +10,7 @@ import LinkToAccountById from "../Blockchain/LinkToAccountById";
 import LinkToAssetById from "../Blockchain/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedPrice from "../Utility/FormattedPrice";
-import {ChainStore, ChainTypes as grapheneChainTypes} from "graphenejs-lib/es";
+import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
 import account_constants from "chain/account_constants";
 import MemoText from "./MemoText";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";

web/app/components/Blockchain/Transaction.jsx

@@ -16,7 +16,7 @@ import Icon from "../Icon/Icon";
 import PrivateKeyStore from "stores/PrivateKeyStore";
 import WalletUnlockActions from "actions/WalletUnlockActions";
 import ProposedOperation from "./ProposedOperation";
-import {ChainTypes} from "graphenejs-lib/es";
+import {ChainTypes} from "bitsharesjs/es";
 let {operations} = ChainTypes;
 import ReactTooltip from "react-tooltip";
 

web/app/components/Blockchain/TransactionConfirm.jsx

@@ -11,7 +11,7 @@ import LoadingIndicator from "../LoadingIndicator";
 import WalletDb from "stores/WalletDb";
 import AccountStore from "stores/AccountStore";
 import AccountSelect from "components/Forms/AccountSelect";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import utils from "common/utils";
 
 class TransactionConfirm extends React.Component {

web/app/components/Chat/Chat.jsx

@@ -3,7 +3,7 @@ import { connect } from "alt-react";
 import AccountStore from "stores/AccountStore";
 import Translate from "react-translate-component";
 import Icon from "../Icon/Icon";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import {debounce} from "lodash";
 import SettingsActions from "actions/SettingsActions";
 import SettingsStore from "stores/SettingsStore";
@@ -13,7 +13,7 @@ import counterpart from "counterpart";
 import LoadingIndicator from "../LoadingIndicator";
 import AccountActions from "actions/AccountActions";
 import TransactionConfirmStore from "stores/TransactionConfirmStore";
-import {FetchChainObjects} from "graphenejs-lib/es";;
+import {FetchChainObjects} from "bitsharesjs/es";;
 
 const PROD = true;
 const hostConfig = PROD ? { // Prod config

web/app/components/Console/Console.jsx

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {Apis} from "graphenejs-ws";
+import {Apis} from "bitsharesjs-ws";
 import ApplicationApi from "api/ApplicationApi";
 import WalletApi from "api/WalletApi";
 import DebugApi from "api/DebugApi";

web/app/components/Dashboard/AccountCard.jsx

@@ -4,7 +4,7 @@ import AccountImage from "../Account/AccountImage";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import AccountStore from "stores/AccountStore";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 
 /**
  *  @brief displays the summary of a given account in a condenced view (for the dashboard)

web/app/components/Dashboard/DashboardList.jsx

@@ -8,7 +8,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import SettingsActions from "actions/SettingsActions";
 import Icon from "../Icon/Icon";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import TotalBalanceValue from "../Utility/TotalBalanceValue";
 import AccountStore from "stores/AccountStore";
 import counterpart from "counterpart";

web/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import Translate from "react-translate-component";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "components/Utility/ChainTypes";
 import BindToChainState from "components/Utility/BindToChainState";
 import WithdrawModalBlocktrades from "./WithdrawModalBlocktrades";

web/app/components/DepositWithdraw/transwiser/TranswiserWithdrawModal.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import Trigger from "react-foundation-apps/src/trigger";
 import Translate from "react-translate-component";
 import ChainTypes from "components/Utility/ChainTypes";
-import {ChainStore} from "graphenejs-lib/es";
+import {ChainStore} from "bitsharesjs/es";
 import BindToChainState from "components/Utility/BindToChainState";
 import utils from "common/utils";
 import BalanceComponent from "components/Utility/BalanceComponent";