Update sdk to develop version

jest.config.js

@@ -10,14 +10,15 @@ module.exports = {
   setupFiles: ['jest-canvas-mock'],
   moduleFileExtensions: [
     'js',
+    'mjs',
     'jsx',
     'json',
     'vue',
   ],
   transform: {
     '^.+\\.vue$': 'vue-jest',
     '.+\\.(css|styl|less|sass|scss|png|jpg|svg|ttf|woff|woff2)$': 'jest-transform-stub',
-    '^.+\\.jsx?$': 'babel-jest',
+    '^.+\\.m?jsx?$': 'babel-jest',
   },
   transformIgnorePatterns: [
     `node_modules/(?!(${packagesToTranspile.join('|')})/)`,

package.json

@@ -19,12 +19,12 @@
     "i18n:report": "vue-i18n-extract report --vueFiles './src/**/*.?(js|vue)' --languageFiles './src/locales/**/*.json'"
   },
   "dependencies": {
-    "@aeternity/aepp-sdk": "^8.1.0",
+    "@aeternity/aepp-sdk": "github:aeternity/aepp-sdk-js#develop",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
     "@aeternity/ledger-app-api": "0.2.1",
     "@download/blockies": "^1.0.3",
-    "@ledgerhq/hw-transport-u2f": "^4.78.0",
+    "@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated",
     "@zxing/library": "^0.19.1",
     "bignumber.js": "^9.0.2",
     "bluebird": "^3.7.2",

src/components/mobile/details-fields.js

@@ -1,4 +1,4 @@
-import { Crypto } from '@aeternity/aepp-sdk';
+import { TxBuilderHelper } from '@aeternity/aepp-sdk';
 import { i18n } from '../../store/plugins/ui/languages';
 import DetailsRawData from './DetailsRawData.vue';
 import DetailsAddress from './DetailsAddress.vue';
@@ -26,7 +26,7 @@ export const genDetailsAmountCurrency = genDetailsWrapper(DetailsAmountCurrency,
 export const Payload = {
   functional: true,
   render: (createElement, { props: { value } }) => {
-    const data = Crypto.decodeBase64Check(Crypto.assertedType(value, 'ba')).toString();
+    const data = TxBuilderHelper.decode(value, 'ba').toString();
     return data
       ? createElement(DetailsRawData, {
         attrs: { name: i18n.t('modal.confirm-transaction-sign.payload'), data },
@@ -47,7 +47,7 @@ export const NameEncoded = {
   render: (createElement, { props: { value } }) => createElement(DetailsField, {
     attrs: {
       name: i18n.t('name.details.name'),
-      value: Crypto.decodeBase58Check(Crypto.assertedType(value, 'nm')).toString(),
+      value: TxBuilderHelper.decode(value, 'nm').toString(),
     },
   }),
 };

src/pages/mobile/RedeemBalance.vue

@@ -37,7 +37,9 @@
 <script>
 import { pick } from 'lodash-es';
 import BigNumber from 'bignumber.js';
-import { Ae, Transaction, Crypto } from '@aeternity/aepp-sdk';
+import {
+  Ae, Transaction, Crypto, TxBuilderHelper,
+} from '@aeternity/aepp-sdk';
 import { handleUnknownError } from '../../lib/utils';
 import AeSpinner from '../../components/AeSpinner.vue';
 import Page from '../../components/Page.vue';
@@ -100,7 +102,7 @@ export default {
         return;
       }
 
-      const address = Crypto.aeEncodeKey(Crypto.generateKeyPairFromSecret(privateKey).publicKey);
+      const address = TxBuilderHelper(Crypto.generateKeyPairFromSecret(privateKey).publicKey, 'ak');
       this.balance = BigNumber(await this.$store.state.sdk.getBalance(address))
         .shiftedBy(-MAGNITUDE);
       if (this.balance < MIN_SPEND_TX_FEE) {

src/store/modules/accounts/airGap.js

@@ -1,6 +1,6 @@
 /* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */
 
-import { Crypto } from '@aeternity/aepp-sdk';
+import { TxBuilderHelper } from '@aeternity/aepp-sdk';
 import { getDesktopRemoteSignAction } from './utils';
 import {
   getPublicKeyByResponseUrl, getSignedTransactionByResponseUrl, generateSignRequestUrl,
@@ -33,7 +33,7 @@ export default {
   actions: process.env.IS_MOBILE_DEVICE ? {
     createByResponseUrl({ commit }, { responseUrl, transport = TRANSPORT_DEEP_LINK }) {
       const publicKey = getPublicKeyByResponseUrl(responseUrl);
-      const address = Crypto.aeEncodeKey(publicKey);
+      const address = TxBuilderHelper.encode(publicKey, 'ak');
       commit('accounts/add', {
         address,
         active: true,

src/store/modules/accounts/hdWallet.js

@@ -3,7 +3,9 @@
 import { pick } from 'lodash-es';
 import Vue from 'vue';
 import { generateMnemonic, mnemonicToSeed } from '@aeternity/bip39';
-import { Crypto, TxBuilder, SCHEMA } from '@aeternity/aepp-sdk';
+import {
+  Crypto, TxBuilder, TxBuilderHelper, SCHEMA,
+} from '@aeternity/aepp-sdk';
 import BigNumber from 'bignumber.js';
 import { MAGNITUDE } from '../../../lib/constants';
 import {
@@ -289,10 +291,7 @@ export default {
     },
 
     async signTransaction({ dispatch, rootState: { sdk } }, txBase64) {
-      const encodedTx = await dispatch(
-        'confirmTxSigning',
-        Crypto.decodeBase64Check(Crypto.assertedType(txBase64, 'tx')),
-      );
+      const encodedTx = await dispatch('confirmTxSigning', TxBuilderHelper.decode(txBase64, 'tx'));
       const signature = await dispatch(
         'signWithoutConfirmation',
         Buffer.concat([Buffer.from(sdk.getNetworkId()), encodedTx]),

src/store/modules/accounts/ledger.js

@@ -2,7 +2,7 @@
 
 import TransportU2F from '@ledgerhq/hw-transport-u2f';
 import Ae from '@aeternity/ledger-app-api';
-import { Crypto, TxBuilder, SCHEMA } from '@aeternity/aepp-sdk';
+import { TxBuilder, SCHEMA } from '@aeternity/aepp-sdk';
 import { i18n } from '../../plugins/ui/languages';
 
 const signOnMobile = async ({ dispatch }) => {
@@ -90,13 +90,12 @@ export default {
       await dispatch('ensureCurrentAccountAvailable');
 
       const txObject = TxBuilder.unpackTx(txBase64).tx;
-      const stringTx = TxBuilder.buildTx(
+      const binaryTx = TxBuilder.buildTx(
         txObject,
         SCHEMA.OBJECT_ID_TX_TYPE[txObject.tag],
         { vsn: txObject.VSN },
-      ).tx;
+      ).rlpEncoded;
 
-      const binaryTx = Crypto.decodeBase64Check(Crypto.assertedType(stringTx, 'tx'));
       const signature = Buffer.from(await dispatch('request', {
         name: 'signTransaction',
         args: [
@@ -105,7 +104,8 @@ export default {
           sdk.getNetworkId(),
         ],
       }), 'hex');
-      return Crypto.encodeTx(Crypto.prepareTx(signature, binaryTx));
+      return TxBuilder
+        .buildTx({ encodedTx: binaryTx, signatures: [signature] }, SCHEMA.TX_TYPE.signed).tx;
     },
   },
 };

src/store/plugins/initSdk/index.js

@@ -5,7 +5,7 @@ import { fetchJson } from '../../utils';
 export default (store) => {
   const createSdk = async (network) => {
     const [{
-      Ae, ChainNode, Transaction, Contract, Aens, genSwaggerClient, Node, SCHEMA,
+      Ae, ChainNode, Transaction, Contract, Aens, genSwaggerClient, Node,
     }, {
       default: WalletRPC,
     }] = (await Promise.all([
@@ -83,7 +83,6 @@ export default (store) => {
     const acceptCb = (_, { accept }) => accept();
     const [sdk, middleware] = await Promise.all([
       Ae.compose(ChainNode, Transaction, Contract, Aens, WalletRPC, { methods })({
-        address: SCHEMA.DRY_RUN_ACCOUNT.pub,
         nodes: [{
           name: network.name,
           instance: await Node({

src/store/plugins/ui/observables.js

@@ -86,7 +86,10 @@ export default (store) => {
       multicast(new BehaviorSubject(def)),
       refCountDelay(1000),
     );
-  const topBlockHeight$ = createSdkObservable(async (sdk) => (await sdk.topBlock()).height, 0);
+  const topBlockHeight$ = createSdkObservable(
+    async (sdk) => (await sdk.api.getTopHeader()).height,
+    0,
+  );
   const middlewareStatus$ = createSdkObservable(
     (sdk) => sdk.middleware.getMdwStatus().catch((error) => {
       handleUnknownError(error);

src/store/utils.js

@@ -1,5 +1,5 @@
 import { derivePathFromKey, getKeyPair } from '@aeternity/hd-wallet/src/hd-key';
-import { Crypto } from '@aeternity/aepp-sdk';
+import { TxBuilderHelper } from '@aeternity/aepp-sdk';
 
 export const genRandomBuffer = (size) => {
   const key = new ArrayBuffer(size);
@@ -38,6 +38,6 @@ export const getHdWalletAccount = (wallet, accountIdx) => {
   return {
     ...keyPair,
     idx: accountIdx,
-    address: Crypto.aeEncodeKey(keyPair.publicKey),
+    address: TxBuilderHelper.encode(keyPair.publicKey, 'ak'),
   };
 };