Upgrade IOV-Core to 0.13

jest.config.js

@@ -117,8 +117,8 @@ module.exports = {
   // The paths to modules that run some code to configure or set up the testing environment before each test
   // setupFiles: [],
 
-  // The path to a module that runs some code to configure or set up the testing framework before each test
-  setupTestFrameworkScriptFile: "<rootDir>/config/jest/jest.setup.js",
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test.
+  setupFilesAfterEnv: ["<rootDir>/config/jest/jest.setup.js"],
 
   // A list of paths to snapshot serializer modules Jest should use for snapshot testing
   // snapshotSerializers: [],

package.json

@@ -24,26 +24,26 @@
     "surge": "surge"
   },
   "dependencies": {
-    "@iov/bns": "^0.12.2",
-    "@iov/core": "^0.12.2",
-    "@iov/crypto": "^0.12.2",
-    "@iov/ethereum": "^0.12.2",
-    "@iov/faucets": "^0.12.2",
-    "@iov/keycontrol": "^0.12.2",
-    "@iov/lisk": "^0.12.2",
-    "@iov/stream": "^0.12.0",
+    "@iov/bns": "^0.13.0",
+    "@iov/core": "^0.13.0",
+    "@iov/crypto": "^0.13.0",
+    "@iov/ethereum": "^0.13.0",
+    "@iov/faucets": "^0.13.0",
+    "@iov/keycontrol": "^0.13.0",
+    "@iov/lisk": "^0.13.0",
+    "@iov/stream": "^0.13.0",
     "@material-ui/core": "^3.5.1",
     "@material-ui/icons": "^3.0.1",
     "@sentry/browser": "4.5.2",
     "classnames": "^2.2.6",
     "config": "^2.0.1",
     "connected-react-router": "^6.0.0",
-    "encoding-down": "^5.0.4",
+    "encoding-down": "^6.0.1",
     "file-saver": "^2.0.1",
     "final-form": "^4.11.0",
     "history": "^4.7.2",
-    "level-js": "^3.0.0",
-    "levelup": "^3.1.1",
+    "level-js": "^4.0.0",
+    "levelup": "^4.0.0",
     "lodash": "^4.17.11",
     "memdown": "^3.0.0",
     "postcss-flexbugs-fixes": "^4.1.0",
@@ -99,7 +99,7 @@
     "babel-loader": "^8.0.4",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "mini-css-extract-plugin": "^0.4.3",
     "node-sass": "^4.10.0",
     "prettier": "^1.14.3",
@@ -112,7 +112,7 @@
     "source-map-support": "^0.5.9",
     "surge": "^0.20.1",
     "ts-import-plugin": "^1.5.5",
-    "ts-jest": "^23.10.5",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^4.4.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",

src/components/Header/test/selector.spec.ts

@@ -1,4 +1,4 @@
-import { Amount } from "@iov/bcp-types";
+import { Amount } from "@iov/bcp";
 import { TokenTicker } from "@iov/core";
 import { randomString } from "~/logic/testhelpers";
 import { aNewStore } from "~/store";

src/components/subComponents/typography/balanceInfo.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 // import styled from "styled-components";
 
-// import { BcpCoin } from "@iov/bcp-types";
+// import { BcpCoin } from "@iov/bcp";
 
 // import { coinToString } from "../../../logic";
 

src/logic/account.spec.ts

@@ -1,4 +1,4 @@
-import { Account, Amount, BlockInfoSucceeded, TokenTicker } from "@iov/bcp-types";
+import { Account, Amount, BlockInfoSucceeded, TokenTicker } from "@iov/bcp";
 import { BnsConnection } from "@iov/bns";
 import { MultiChainSigner } from "@iov/core";
 

src/logic/account.ts

@@ -5,13 +5,14 @@ import {
   BcpConnection,
   ChainId,
   ConfirmedTransaction,
+  Fee,
   isConfirmedTransaction,
   PostTxResponse,
   PublicIdentity,
   SendTransaction,
   TokenTicker,
   TxCodec,
-} from "@iov/bcp-types";
+} from "@iov/bcp";
 import { BnsConnection, RegisterUsernameTx } from "@iov/bns";
 import { ChainAddressPair } from "@iov/bns/types/types";
 import { MultiChainSigner, UserProfile } from "@iov/core";
@@ -119,31 +120,33 @@ export async function sendTransaction(
   amount: Amount,
   memo?: string,
 ): Promise<PostTxResponse> {
-  const { walletId, identity: signer } = getWalletAndIdentity(profile, chainId);
-  const gasPrice = {
-    quantity: "20000000000",
-    fractionalDigits: 18,
-    tokenTicker: "ETH" as TokenTicker,
-  };
-  const gasLimit = {
-    quantity: "2100000",
-    fractionalDigits: 18,
-    tokenTicker: "ETH" as TokenTicker,
-  };
+  const { identity: creator } = getWalletAndIdentity(profile, chainId);
+
+  let fee: Fee | undefined;
+  if (chainId.startsWith("ethereum-")) {
+    fee = {
+      gasPrice: {
+        quantity: "20000000000",
+        fractionalDigits: 18,
+        tokenTicker: "ETH" as TokenTicker,
+      },
+      gasLimit: {
+        quantity: "2100000",
+        fractionalDigits: 18,
+        tokenTicker: "ETH" as TokenTicker,
+      },
+    };
+  }
+
   const unsigned: SendTransaction = {
     kind: "bcp/send",
-    creator: {
-      chainId: chainId,
-      pubkey: signer.pubkey,
-    },
+    creator: creator,
     recipient: recipient,
     memo: memo || undefined, // use undefined not "" for compatibility with golang codec
     amount,
-    // TODO: don't set gasPrice/gasLimit for non-Ethereum blockchains
-    gasPrice: gasPrice,
-    gasLimit: gasLimit,
+    fee: fee,
   };
-  return writer.signAndPost(unsigned, walletId);
+  return writer.signAndPost(unsigned);
 }
 
 // registers a new username nft on the bns with the given list of chain-address pairs
@@ -154,15 +157,12 @@ export async function setName(
   username: string,
   addresses: ReadonlyArray<ChainAddressPair>,
 ): Promise<PostTxResponse> {
-  const { walletId, identity: signer } = getWalletAndIdentity(profile, bnsId);
+  const { identity: creator } = getWalletAndIdentity(profile, bnsId);
   const unsigned: RegisterUsernameTx = {
     kind: "bns/register_username",
-    creator: {
-      chainId: bnsId,
-      pubkey: signer.pubkey,
-    },
+    creator: creator,
     username,
     addresses,
   };
-  return writer.signAndPost(unsigned, walletId);
+  return writer.signAndPost(unsigned);
 }

src/logic/balances.spec.ts

@@ -1,4 +1,4 @@
-import { TokenTicker } from "@iov/bcp-types";
+import { TokenTicker } from "@iov/bcp";
 
 import {
   amountToString,

src/logic/balances.ts

@@ -1,4 +1,4 @@
-import { Amount, TokenTicker } from "@iov/bcp-types";
+import { Amount, TokenTicker } from "@iov/bcp";
 import { Omit } from "recompose";
 
 export type Figures = Omit<Amount, "tokenTicker">;

src/logic/connection.spec.ts

@@ -1,4 +1,4 @@
-import { BcpTicker } from "@iov/bcp-types";
+import { BcpTicker } from "@iov/bcp";
 import { MultiChainSigner } from "@iov/core";
 
 import { addBlockchain } from "./connection";

src/logic/connection.ts

@@ -1,4 +1,4 @@
-import { BcpConnection, ChainConnector, PublicIdentity, TxCodec } from "@iov/bcp-types";
+import { BcpConnection, ChainConnector, PublicIdentity, TxCodec } from "@iov/bcp";
 import { bnsCodec, bnsConnector } from "@iov/bns";
 import { ChainId, MultiChainSigner, UserProfile } from "@iov/core";
 import { ethereumCodec, ethereumConnector } from "@iov/ethereum";

src/logic/faucet.ts

@@ -1,4 +1,4 @@
-import { Address } from "@iov/bcp-types";
+import { Address } from "@iov/bcp";
 import { TokenTicker } from "@iov/core";
 import { IovFaucet } from "@iov/faucets";
 

src/logic/name.ts

@@ -1,4 +1,4 @@
-import { Address, ChainId, TxReadCodec } from "@iov/bcp-types";
+import { Address, ChainId, TxReadCodec } from "@iov/bcp";
 import { BnsConnection, BnsUsernameNft } from "@iov/bns";
 
 import { getAddressByName } from "./account";

src/logic/profile.spec.ts

@@ -1,4 +1,4 @@
-import { ChainId, PublicIdentity } from "@iov/bcp-types";
+import { ChainId, PublicIdentity } from "@iov/bcp";
 import { UserProfile } from "@iov/keycontrol";
 
 import { createMemDb } from "./db";

src/logic/profile.ts

@@ -1,4 +1,4 @@
-import { ChainId, PublicIdentity } from "@iov/bcp-types";
+import { ChainId, PublicIdentity } from "@iov/bcp";
 import { Bip39, Random, Slip10RawIndex } from "@iov/crypto";
 import { Ed25519HdWallet, HdPaths, Secp256k1HdWallet, UserProfile, WalletId } from "@iov/keycontrol";
 
@@ -53,7 +53,7 @@ function selectWalletAndPath(
     case "lsk":
       return { walletId: edWallet, path: HdPaths.bip44Like(134, 0) };
     case "eth":
-      return { walletId: secWallet, path: HdPaths.metamaskHdKeyTree(0) };
+      return { walletId: secWallet, path: HdPaths.ethereum(0) };
     default:
       throw new Error(`unsupported codec: ${codecType}`);
   }

src/logic/transaction.ts

@@ -11,7 +11,7 @@ import {
   SendTransaction,
   TxCodec,
   UnsignedTransaction,
-} from "@iov/bcp-types";
+} from "@iov/bcp";
 import { BnsConnection, RegisterBlockchainTx } from "@iov/bns";
 import { MultiChainSigner, UserProfile } from "@iov/core";
 import { ReadonlyDate } from "readonly-date";
@@ -84,16 +84,11 @@ export async function checkBnsBlockchainNft(
 ): Promise<void> {
   const result = await connection.getBlockchains({ chainId });
   if (result.length === 0) {
-    const registryChainId = await connection.chainId();
-
-    const { walletId, identity: signer } = getWalletAndIdentity(profile, connection.chainId());
+    const { identity: creator } = getWalletAndIdentity(profile, connection.chainId());
 
     const blockchainRegistration: RegisterBlockchainTx = {
       kind: "bns/register_blockchain",
-      creator: {
-        chainId: registryChainId,
-        pubkey: signer.pubkey,
-      },
+      creator: creator,
       chain: {
         chainId: chainId,
         production: false,
@@ -104,7 +99,7 @@ export async function checkBnsBlockchainNft(
       codecName,
       codecConfig: `{ }`,
     };
-    await waitForCommit(writer.signAndPost(blockchainRegistration, walletId));
+    await waitForCommit(writer.signAndPost(blockchainRegistration));
   }
 }
 

src/reducers/blockchain/actions.ts

@@ -1,4 +1,4 @@
-import { Account, BcpConnection, BcpTicker, PublicIdentity, TxCodec } from "@iov/bcp-types";
+import { Account, BcpConnection, BcpTicker, PublicIdentity, TxCodec } from "@iov/bcp";
 import { ChainId, MultiChainSigner } from "@iov/core";
 import { UserProfile } from "@iov/keycontrol";
 

src/reducers/blockchain/state.ts

@@ -1,4 +1,4 @@
-import { Account, Address, BcpConnection, BcpTicker, TokenTicker, TxCodec } from "@iov/bcp-types";
+import { Account, Address, BcpConnection, BcpTicker, TokenTicker, TxCodec } from "@iov/bcp";
 import { BnsUsernameNft } from "@iov/bns";
 import { ChainId, MultiChainSigner } from "@iov/core";
 import { ChainTicker } from "~/selectors";

src/routes/balance/components/index.stories.tsx

@@ -1,4 +1,4 @@
-import { BcpCoin, TokenTicker } from "@iov/bcp-types";
+import { BcpCoin, TokenTicker } from "@iov/bcp";
 import { storiesOf } from "@storybook/react";
 import * as React from "react";
 import PageMenu from "~/components/pages/PageMenu";

src/routes/balance/components/index.tsx

@@ -1,4 +1,4 @@
-import { BcpCoin } from "@iov/bcp-types";
+import { BcpCoin } from "@iov/bcp";
 import { createStyles, withStyles, WithStyles } from "@material-ui/core";
 import * as React from "react";
 import Block from "~/components/layout/Block";

src/routes/balance/container/selector.ts

@@ -1,4 +1,4 @@
-import { BcpCoin } from "@iov/bcp-types";
+import { BcpCoin } from "@iov/bcp";
 import { createSelector, createStructuredSelector, Selector } from "reselect";
 import { RootState } from "~/reducers";
 import { accountNameSelector, ChainAccount, getAllAccounts } from "~/selectors";

src/routes/receivePayment/receiveNonIov/container/index.stories.tsx

@@ -1,4 +1,4 @@
-import { Address, BcpTicker } from "@iov/bcp-types";
+import { Address, BcpTicker } from "@iov/bcp";
 import { ChainId } from "@iov/core";
 import { storiesOf } from "@storybook/react";
 import * as React from "react";

src/routes/sendPayment/components/FillPayment/index.tsx

@@ -1,4 +1,4 @@
-import { BcpCoin } from "@iov/bcp-types";
+import { BcpCoin } from "@iov/bcp";
 import { createStyles, withStyles, WithStyles } from "@material-ui/core";
 import { FormState } from "final-form";
 import * as React from "react";

src/routes/sendPayment/container/index.stories.tsx

@@ -1,4 +1,4 @@
-import { BcpCoin, TokenTicker } from "@iov/bcp-types";
+import { BcpCoin, TokenTicker } from "@iov/bcp";
 import { ChainId } from "@iov/core";
 import { storiesOf } from "@storybook/react";
 import * as React from "react";

src/routes/sendPayment/container/index.tsx

@@ -1,4 +1,4 @@
-import { Amount, BcpCoin } from "@iov/bcp-types";
+import { Amount, BcpCoin } from "@iov/bcp";
 import * as React from "react";
 import { connect } from "react-redux";
 import { RouteComponentProps } from "react-router";

src/routes/sendPayment/container/selector.ts

@@ -1,6 +1,6 @@
 import { createSelector, createStructuredSelector, Selector } from "reselect";
 
-import { BcpCoin } from "@iov/bcp-types";
+import { BcpCoin } from "@iov/bcp";
 import { BnsConnection } from "@iov/bns";
 import { MultiChainSigner } from "@iov/core";
 

src/routes/sendPayment/store/actions/sendTransaction.ts

@@ -1,4 +1,4 @@
-import { Amount } from "@iov/bcp-types";
+import { Amount } from "@iov/bcp";
 import { ChainId } from "@iov/core";
 import { sendTransactionSequence } from "~/sequences";
 

src/routes/sendPayment/test/sendPayment.dom.spec.ts

@@ -1,4 +1,4 @@
-import { BcpCoin } from "@iov/bcp-types";
+import { BcpCoin } from "@iov/bcp";
 import TestUtils from "react-dom/test-utils";
 import { Store } from "redux";
 import { mayTestBns, randomString } from "~/logic/testhelpers";

src/scripts/genRandomAccount.ts

@@ -1,4 +1,4 @@
-import { ChainId } from "@iov/bcp-types";
+import { ChainId } from "@iov/bcp";
 import { bnsCodec } from "@iov/bns";
 import { Bip39, Random, Slip10RawIndex } from "@iov/crypto";
 import { Bech32, Encoding } from "@iov/encoding";

src/selectors/index.ts

@@ -1,6 +1,6 @@
 import { createSelector } from "reselect";
 
-import { Account, BcpTicker } from "@iov/bcp-types";
+import { Account, BcpTicker } from "@iov/bcp";
 import { BnsConnection } from "@iov/bns";
 import { Address, ChainId } from "@iov/core";
 

src/sequences/boot.ts

@@ -7,7 +7,7 @@ import {
   isConfirmedTransaction,
   PublicIdentity,
   TxCodec,
-} from "@iov/bcp-types";
+} from "@iov/bcp";
 import { bnsCodec, BnsConnection } from "@iov/bns";
 import { MultiChainSigner } from "@iov/core";
 

src/sequences/transactions.ts

@@ -1,4 +1,4 @@
-import { Amount, ChainId } from "@iov/bcp-types";
+import { Amount, ChainId } from "@iov/bcp";
 
 import {
   addressToCodec,

src/store/notifications/state.ts

@@ -1,6 +1,6 @@
 import { ReadonlyDate } from "readonly-date";
 
-import { Amount } from "@iov/bcp-types";
+import { Amount } from "@iov/bcp";
 
 export interface Tx {
   readonly id: string;