From e7781329a4de8e3b01d1bc844e34f306f735ac6e Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Fri, 10 Apr 2020 02:15:35 +1000 Subject: [PATCH 01/25] travis: Update per-branch deployment --- aepp-identity-deploy.enc | Bin 1680 -> 0 bytes scripts/deploy.sh | 46 +++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 aepp-identity-deploy.enc diff --git a/aepp-identity-deploy.enc b/aepp-identity-deploy.enc deleted file mode 100644 index e340ab82dd67fa8df6798c2fc2b0ec8f5cf7e5db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25k?*%RGW=d3l3QQkjA`;8+bS^W!ZG*blR?UudKttmJA z<}VnN5;J%YNDCYmFoN#WE_}>INAo!QTXW?;1Ye`v5FKg7I5JCJf;b4=Al08%G%Ei{ zlID1<)1i`)7a^ird(D8Usxe@8%c8vbar@U}lvDmX68D^_+9Ud8k_P07?d<0ji8@NS z=;-ex6*BSc>#T&hnn9WScD9Ve;!$Ka96C}|*%Ae608#1L$LxNljfb)Uw+09VH$`bG z2JQ}zG-3PqYzb;rqM=5aIhCm+`Bb$cx z?^A=|#>?!dK5?OhEx(!6fY*|Ov+DFLaotzvAU$YVWY*sYCMM5%{k2AE=#z*%W7VxP zxfE>Z$MKa%+~B;5WF}`fokHZ3-xY!_Q0w4cqlx$0lChWknpWH8Ecj- zpb?WfPs7{#j%}nLrXfnOv`oG9bY;YzgTO>lrZPRnPe^CKQig#9AXSf4 z^Ghi=uV!RMLiv8JuJ3lYAhLsvFTEDIp3=}`NtRmG{^jecjHI4*%JDPn1GI;@1pRnz z8YXftA{W+=Vkh#Po-3oV>_zDKd&36bzS6p7gPv*7AemUF0oKuhKN0lLL= zxsUyf$~G08=ik=7jEz*{R%yJz!rnG=(`G?Siw4Ya|069K<60=8b#>&kpup9WQ99qi zM&Ju~b*cM6M^bKGCc_%p2$YTSP#+XGeU0lxPS)%fIp4!31!Z526nn#`+q`)v^XF?< zvAvln(V21rn7?&kCyyS8R-P45b`cbMu__wO0vr@*$ZVaHjiX);GTQm7AA7{+2%2k$ zHr);-oAqvGoM$~bRaCM_9Zs9dL2tUv14GAVVyMoFhOdc2zSep9nY%3a!surZ%zlC8 zbxs*mJOm{>4l|3Ve`K9PO&fm(vTbYaBBnn0_7Q2x-z&eyj5!TNSfR+lVD5UH#c525 zIhGjt{cAwL0dk3u%$?2Dq?l=0epF=5?LzbX5|^i6io5Z5j9)#g-C^QPLB2-^v*03j zEBWwN*UqI(4ysbYQfXUDl~Kj;u=R)FzQJ#`Cga9hUUcB!A>Pxxzv!veWcso^OD)9& zcqp1Rw)dnqV9D{QOprPWENa+~Osr#q{Iu&e8)7nMoeOmdalfUiG`O>X<8dobO@uuo zu&?!CMbwJCNjqc&Bu7g%yW%gPo_X6KcM~l|w^$^{TP95a@&V5J9EOc!^-y-@bCV@2 znRJjFsE&5K+8cc-(>mpi5UJoE2goU|!gG|ZNl5oiNEnQQjaY8`fB`9yWT1}POAr!p a%8HD{&P@%?Jo#=-qp7eaDgp}|x^Z~u0Y!fR diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 02a252781..38d76f9c9 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,40 +1,34 @@ #!/bin/bash set -e -openssl aes-256-cbc -K $encrypted_0d22c88004c9_key -iv $encrypted_0d22c88004c9_iv \ - -in aepp-identity-deploy.enc -out aepp-identity-deploy -d -eval "$(ssh-agent -s)" -chmod 600 aepp-identity-deploy -ssh-add aepp-identity-deploy -mkdir -p ~/.ssh -echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config +APP_NAME=aepp-base -case $TRAVIS_BRANCH in - master) - UPLOAD_PATH=identity.aepps.com - ;; - develop) - UPLOAD_PATH=stage-identity.aepps.com - ;; - *) - DOMAIN=`echo $TRAVIS_BRANCH | tr '[:punct:]' '-'` - echo "Deploying to $DOMAIN.origin.aepps.com" - ssh deploy@139.59.142.164 "mkdir -p /var/www/html/BRANCHES.origin.aepps.com/$DOMAIN/" - UPLOAD_PATH=BRANCHES.origin.aepps.com/$DOMAIN - ;; -esac +echo "${DEPLOY_KNOWN_HOSTS_BASE64}" | base64 --decode >> ~/.ssh/known_hosts +echo "${DEPLOY_USER_KEY_BASE64}" | base64 --decode > /tmp/user-key +eval "$(ssh-agent -s)" +chmod 600 /tmp/user-key +ssh-add /tmp/user-key -UPLOAD_PATH=deploy@139.59.142.164:/var/www/html/$UPLOAD_PATH -RSYNC_OPTIONS="-r --delete-after -v" +DOMAIN=`echo $TRAVIS_BRANCH | tr '[:punct:]' '-'` +rsync_stage () { + rsync -e "ssh -p 2022" -r --delete-after -v $1 root@z52da5wt.xyz:/data/$APP_NAME/$DOMAIN/$2 +} if [[ $TRAVIS_OS_NAME == "osx" ]]; then - rsync $RSYNC_OPTIONS aeternity.app.tar.gz $UPLOAD_PATH + rsync_stage aeternity.app.tar.gz artifacts/ elif [[ $ANDROID_HOME != "" ]]; then - rsync $RSYNC_OPTIONS aeternity.apk $UPLOAD_PATH + rsync_stage aeternity.apk artifacts/ else if [[ $TRAVIS_TAG != "" ]]; then tar -czvf aeternity.tar.gz dist + rsync_stage aeternity.tar.gz artifacts/ fi - rsync $RSYNC_OPTIONS dist/* $UPLOAD_PATH + rsync_stage dist/ + + URL=$DOMAIN.$APP_NAME.z52da5wt.xyz + echo "Deployed to $URL" + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST \ + -d "{\"body\": \"Deployed to [$URL](https://$URL), [artifacts](https://$URL/artifacts)\"}" \ + "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/commits/${TRAVIS_COMMIT}/comments" fi From 973a501dc56924009fccf9c1f1afe159a863d98f Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Thu, 16 Apr 2020 18:01:18 +1000 Subject: [PATCH 02/25] networksRegistry: Update middleware url --- src/lib/networksRegistry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/networksRegistry.js b/src/lib/networksRegistry.js index e0cdb802a..92a8e3a53 100644 --- a/src/lib/networksRegistry.js +++ b/src/lib/networksRegistry.js @@ -1,6 +1,6 @@ import { pick } from 'lodash-es'; -const getMiddlewareUrl = networkName => `https://${networkName}.aeternal.io`; +const getMiddlewareUrl = networkName => `https://${networkName}.aeternity.io`; const genNetwork = (name, { pathName = name.toLowerCase(), ...options } = {}) => ({ name, From a033d92d5fc1cd24dc084be7ffbdbf824b258ed2 Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Thu, 30 Apr 2020 17:29:28 +1000 Subject: [PATCH 03/25] Add migration for new network url --- src/store/migrations/05-update-sdk-url-2.js | 10 ++++++++++ src/store/migrations/index.js | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 src/store/migrations/05-update-sdk-url-2.js diff --git a/src/store/migrations/05-update-sdk-url-2.js b/src/store/migrations/05-update-sdk-url-2.js new file mode 100644 index 000000000..ab86cf139 --- /dev/null +++ b/src/store/migrations/05-update-sdk-url-2.js @@ -0,0 +1,10 @@ +export default { + migrate(state) { + const newState = { ...state }; + newState.sdkUrl = { + 'https://mainnet.aeternal.io': 'https://mainnet.aeternity.io', + 'https://testnet.aeternal.io': 'https://testnet.aeternity.io', + }[newState.sdkUrl] || newState.sdkUrl; + return newState; + }, +}; diff --git a/src/store/migrations/index.js b/src/store/migrations/index.js index e8826a3d8..86a596ad2 100644 --- a/src/store/migrations/index.js +++ b/src/store/migrations/index.js @@ -4,11 +4,13 @@ import resetAppsStateField from './01-reset-apps-state-field'; import buildAccountsArray from './02-build-accounts-array'; import setMnemonicBackedUp from './03-set-mnemonic-backed-up'; import updateSdkUrl from './04-update-sdk-url'; +import updateSdkUrl2 from './05-update-sdk-url-2'; registerMigration(fixEasCounterIssue); registerMigration(resetAppsStateField); registerMigration(buildAccountsArray); registerMigration(setMnemonicBackedUp); registerMigration(updateSdkUrl); +registerMigration(updateSdkUrl2); export default runMigrations; From d761b2fb5686ac22a759d647657b8c9ca7d8edb4 Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Mon, 6 Apr 2020 20:35:31 +1000 Subject: [PATCH 04/25] Add CreateOrRecover component --- src/components/desktop/CreateOrRecover.vue | 63 ++++++++++++++++++++++ src/pages/RecoverMixin.js | 18 +++++++ src/pages/mobile/Recover.vue | 17 +----- 3 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 src/components/desktop/CreateOrRecover.vue create mode 100644 src/pages/RecoverMixin.js diff --git a/src/components/desktop/CreateOrRecover.vue b/src/components/desktop/CreateOrRecover.vue new file mode 100644 index 000000000..0806e490d --- /dev/null +++ b/src/components/desktop/CreateOrRecover.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/pages/RecoverMixin.js b/src/pages/RecoverMixin.js new file mode 100644 index 000000000..ec7a69243 --- /dev/null +++ b/src/pages/RecoverMixin.js @@ -0,0 +1,18 @@ +import dizzySymbolEmoji from 'emoji-datasource-apple/img/apple/64/1f4ab.png'; + +export default { + data() { + return { + dizzySymbolEmoji, + mnemonic: '', + error: false, + }; + }, + methods: { + async setMnemonic() { + if (!await this.$validator.validateAll()) return; + + await this.$store.dispatch('accounts/hdWallet/createWallet', this.mnemonic); + }, + }, +}; diff --git a/src/pages/mobile/Recover.vue b/src/pages/mobile/Recover.vue index 123de9e2f..6226e65ce 100644 --- a/src/pages/mobile/Recover.vue +++ b/src/pages/mobile/Recover.vue @@ -38,7 +38,7 @@ From 6ecfa3e23606379086d73466f59965f6e76c80b4 Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Mon, 6 Apr 2020 20:35:51 +1000 Subject: [PATCH 05/25] Add hdWalletRemote account type --- src/store/modules/accounts/hdWalletRemote.js | 45 ++++++++++++++++++++ src/store/modules/accounts/index.js | 5 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/store/modules/accounts/hdWalletRemote.js diff --git a/src/store/modules/accounts/hdWalletRemote.js b/src/store/modules/accounts/hdWalletRemote.js new file mode 100644 index 000000000..bd30419f9 --- /dev/null +++ b/src/store/modules/accounts/hdWalletRemote.js @@ -0,0 +1,45 @@ +/* eslint no-param-reassign: ['error', { 'ignorePropertyModificationsFor': ['state'] }] */ + +import { getDesktopRemoveSignAction } from './utils'; +import { i18n } from '../../plugins/ui/languages'; + +export default { + namespaced: true, + + account: { + type: `hd-wallet${process.env.IS_MOBILE_DEVICE ? '-desktop' : ''}`, + getTypeVerbose: () => i18n.t('hd-wallet.account-name'), + color: 'primary', + }, + + actions: { + async isAccountUsed({ rootState: { sdk } }, address) { + const { api } = sdk.then ? await sdk : sdk; + return api.getAccountByPubkey(address).then(() => true, () => false); + }, + + async checkPreviousAndCreate({ type }, { dispatch, rootGetters }) { + const { address } = rootGetters['accounts/getByType'](type).pop(); + if (!await dispatch('isAccountUsed', address)) { + await dispatch( + 'modals/open', + { + name: 'confirm', + text: i18n.t('hd-wallet.new-account-warning'), + primaryButtonText: i18n.t('im-sure'), + }, + { root: true }, + ); + } + return dispatch('create'); + }, + + create({ dispatch }) { + return dispatch('remoteConnection/call', { name: 'createAccount' }, { root: true }); + }, + ...!process.env.IS_MOBILE_DEVICE && { + sign: getDesktopRemoveSignAction('sign'), + signTransaction: getDesktopRemoveSignAction('signTransaction'), + }, + }, +}; diff --git a/src/store/modules/accounts/index.js b/src/store/modules/accounts/index.js index dabf0edbd..c5d893c0d 100644 --- a/src/store/modules/accounts/index.js +++ b/src/store/modules/accounts/index.js @@ -2,9 +2,12 @@ import airGap from './airGap'; import hdWallet from './hdWallet'; +import hdWalletRemote from './hdWalletRemote'; import ledger from './ledger'; -const modules = { airGap, hdWallet, ledger }; +const modules = { + airGap, hdWallet, hdWalletRemote, ledger, +}; export default { namespaced: true, From cff27026cd2fb0f3ac0260cd7a9b108fca657e65 Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Mon, 6 Apr 2020 20:37:35 +1000 Subject: [PATCH 06/25] Enable using desktop version without mobile --- src/components/desktop/AccountSwitcher.vue | 15 +- src/components/desktop/AccountTypeMixin.js | 9 + src/components/desktop/ConnectGuide.vue | 7 +- src/components/desktop/Sidebar.vue | 34 +- src/locales/cn.json | 3 +- src/locales/en.json | 3 +- src/locales/es.json | 3 +- src/locales/ru.json | 3 +- src/store/modules/accounts/hdWallet.js | 391 ++++++++++----------- 9 files changed, 245 insertions(+), 223 deletions(-) create mode 100644 src/components/desktop/AccountTypeMixin.js diff --git a/src/components/desktop/AccountSwitcher.vue b/src/components/desktop/AccountSwitcher.vue index 61ef2b7ed..3095d1cde 100644 --- a/src/components/desktop/AccountSwitcher.vue +++ b/src/components/desktop/AccountSwitcher.vue @@ -36,6 +36,7 @@ - - diff --git a/src/locales/cn.json b/src/locales/cn.json index b864be3f3..fd5c48706 100644 --- a/src/locales/cn.json +++ b/src/locales/cn.json @@ -299,13 +299,6 @@ } }, - "migrated-balance": { - "title": "迁移中的数量", - "subtitle": "未显示为上述余额", - "note": "正在迁移中。他们将在下一次硬分叉后可使用。", - "to-migrations": "查看迁移" - }, - "redeem-balance": { "title": "Redeem Balance", "subtitle": "Scan QR code to redeem", diff --git a/src/locales/en.json b/src/locales/en.json index c9a2484ba..6fbf18115 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -299,13 +299,6 @@ } }, - "migrated-balance": { - "title": "Tokens in migration", - "subtitle": "Not shown as balance above", - "note": "are in migration now. They will be available after the next hardfork.", - "to-migrations": "See migrations" - }, - "redeem-balance": { "title": "Redeem Balance", "subtitle": "Scan QR code to redeem", diff --git a/src/locales/es.json b/src/locales/es.json index 08b1d7de7..75d617808 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -299,13 +299,6 @@ } }, - "migrated-balance": { - "title": "Tokens migrados", - "subtitle": "No se muestra como saldo arriba", - "note": "están en la migración ahora estarán disponibles después del próxima. Hardfork.", - "to-migrations": "Ver migraciones" - }, - "redeem-balance": { "title": "Redeem Balance", "subtitle": "Scan QR code to redeem", diff --git a/src/locales/ru.json b/src/locales/ru.json index 326b51ce6..ce0b6b3be 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -299,13 +299,6 @@ } }, - "migrated-balance": { - "title": "Жетоны в миграции", - "subtitle": "Не отображаются как баланс выше", - "note": "в настоящее время мигрируются. Они будут доступны после следующего хардфорка.", - "to-migrations": "Открыть миграции" - }, - "redeem-balance": { "title": "Redeem баланс", "subtitle": "Сканируйте QR-код, для выкупа", diff --git a/src/pages/mobile/Transfer.vue b/src/pages/mobile/Transfer.vue index 0cc6fec0f..ef43e7d3c 100644 --- a/src/pages/mobile/Transfer.vue +++ b/src/pages/mobile/Transfer.vue @@ -49,18 +49,6 @@ > - - - - { registerModal({ name: 'accountSwitcher', component: AccountSwitcherModal }); registerModal({ name: 'proposeToOpenSecurityCourses', component: SecurityCourseModal, allowRedirect: true }); - registerModal({ name: 'migratedBalance', component: MigratedBalanceModal }); registerModal({ name: 'confirmAccountAccess', component: ConfirmAccountAccessModal }); registerModal({ name: 'confirmSign', component: ConfirmSignModal, hidePage: true }); registerModal({ name: 'confirmTransactionSign', component: ConfirmTransactionSignModal, hidePage: true }); diff --git a/src/stories/AeModal.stories.js b/src/stories/AeModal.stories.js index 358af6441..59ce3f3be 100644 --- a/src/stories/AeModal.stories.js +++ b/src/stories/AeModal.stories.js @@ -3,7 +3,6 @@ import Vuex from 'vuex'; import { storiesOf } from '@storybook/vue'; import { action } from '@storybook/addon-actions'; import AeButton from '../components/AeButton.vue'; -import MigratedBalanceModal from '../components/mobile/MigratedBalanceModal.vue'; import LedgerModal from '../components/desktop/LedgerModal.vue'; import LedgerAddressConfirmModal from '../components/desktop/LedgerAddressConfirmModal.vue'; import LedgerSignTransactionModal from '../components/desktop/LedgerSignTransactionModal.vue'; @@ -12,16 +11,6 @@ import ModalSpendSuccess from '../components/desktop/ModalSpendSuccess.vue'; import { account, amount, transactionHash } from './mock-data'; storiesOf('AeModal', module) - .add('MigratedBalanceModal', () => ({ - components: { MigratedBalanceModal }, - template: '', - methods: { resolve: action('resolve') }, - store: new Vuex.Store({ - getters: { - 'accounts/active': () => account, - }, - }), - })) .add('LedgerModal', () => ({ components: { LedgerModal, AeButton }, template: ` @@ -31,7 +20,7 @@ storiesOf('AeModal', module) @close="action" > Content - + Date: Thu, 21 May 2020 22:29:11 +1000 Subject: [PATCH 12/25] Remove analytics completelly --- .env | 2 -- package-lock.json | 5 ----- package.json | 1 - src/setupAnalytics.js | 47 ------------------------------------------- src/ui.js | 4 ---- 5 files changed, 59 deletions(-) delete mode 100644 src/setupAnalytics.js diff --git a/.env b/.env index 2b5b3972c..0e5218808 100644 --- a/.env +++ b/.env @@ -3,6 +3,4 @@ VUE_APP_MIGRATION_PHASE=0 UNFINISHED_FEATURES=true VUE_APP_REMOTE_CONNECTION_BACKEND_URL=https://stage-signaling.aepps.com VUE_APP_VAPID_PUBLIC_KEY=BJP4PnSPRizQofIOBhe8o-AlaElRYbp7Mi_nirXzPYkJPkZfu-ONL7M14Y2c_q9LfU1K3XUcwzfx3lNM_jBLJrc -VUE_APP_MATOMO_URL=https://analytics-other.aepps.com -VUE_APP_MATOMO_SITE_ID=1 VUE_APP_HOME_PAGE_URL=https://registry.aepps.tech diff --git a/package-lock.json b/package-lock.json index 6434253a2..ae2effeda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24235,11 +24235,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-matomo": { - "version": "3.9.1-2", - "resolved": "https://registry.npmjs.org/vue-matomo/-/vue-matomo-3.9.1-2.tgz", - "integrity": "sha512-wq9DtgV6yp86xKw4O0s+3DWcG+wjiCYlHoalzFTTqcRPpkWiZl1esWYsvWkDYxVHXzzfAWjS+4bYK65cvFUBoA==" - }, "vue-router": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", diff --git a/package.json b/package.json index dcfd213d7..478f86da9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "vue-focus": "^2.1.0", "vue-hoc": "^0.4.7", "vue-i18n": "^8.15.1", - "vue-matomo": "^3.9.1-2", "vue-router": "^3.1.3", "vue-rx": "^6.2.0", "vuex": "^3.1.2", diff --git a/src/setupAnalytics.js b/src/setupAnalytics.js deleted file mode 100644 index fd4679e16..000000000 --- a/src/setupAnalytics.js +++ /dev/null @@ -1,47 +0,0 @@ -import { defer } from 'lodash-es'; -import Matomo from 'vue-matomo/src/matomo'; -import routerPromise from './router'; -import store from './store'; - -export default async () => { - const router = await routerPromise; - const matomo = Matomo.getTracker( - `${process.env.VUE_APP_MATOMO_URL}/piwik.php`, - process.env.VUE_APP_MATOMO_SITE_ID, - ); - - const trackPageView = (route) => { - let fullPath = window.location.toString(); - switch (route.name) { - case 'send-to': - case 'send-confirm': - fullPath = fullPath.replace(route.params.to, ''); - break; - case 'transaction-details': - fullPath = fullPath.replace(route.params.hash, ''); - break; - default: - } - matomo.setCustomUrl(fullPath); - matomo.setDocumentTitle(route.name); - matomo.trackPageView(); - }; - - matomo.disableCookies(); - matomo.setCustomDimension(1, process.env.IS_MOBILE_DEVICE); - matomo.setCustomDimension(2, process.env.IS_PWA); - matomo.setCustomDimension(3, process.env.IS_IOS); - matomo.setCustomDimension(4, process.env.npm_package_version); - matomo.setCustomDimension(5, process.env.IS_CORDOVA); - matomo.setCustomVariable(1, 'accounts-count', store.state.accounts.list.length); - trackPageView(router.currentRoute); - matomo.enableLinkTracking(); - matomo.enableJSErrorTracking(); - - router.afterEach(to => defer(trackPageView, to)); - - store.subscribeAction(({ type, payload }) => { - if (type !== 'modals/open') return; - matomo.trackEvent('modal', 'open', payload.name); - }); -}; diff --git a/src/ui.js b/src/ui.js index 247622df8..0c5416e70 100644 --- a/src/ui.js +++ b/src/ui.js @@ -13,10 +13,6 @@ const AppDesktop = () => import(/* webpackChunkName: "ui-desktop" */ './AppDeskt Vue.use(Router); -if (!process.env.IS_MASTER) { - import(/* webpackChunkName: "analytics" */ './setupAnalytics').then(module => module.default()); -} - (async () => { const [router] = await Promise.all([routerPromise, registerModals()]); sync(store, router); From 33d1202441e2d519866c197ab7d14cdbe3182c14 Mon Sep 17 00:00:00 2001 From: Dmitry Kostin Date: Thu, 30 Apr 2020 14:14:47 +1000 Subject: [PATCH 13/25] Update SDK to 7.3.1 --- package-lock.json | 82 ++++++++++++------------------ package.json | 2 +- src/pages/mobile/AppBrowser.vue | 18 ++++++- src/store/plugins/initSdk/index.js | 37 ++++++++++++-- src/store/plugins/reverseIframe.js | 8 ++- 5 files changed, 89 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae2effeda..7b2427a53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,11 @@ "requires": true, "dependencies": { "@aeternity/aepp-sdk": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-6.1.3.tgz", - "integrity": "sha512-I8rJEMaHEvkcWEvMWJp4qGpqTlhSUjdPWiN/6vfuDN+qwpZndLNW74vwnfDKHm7LTxDhTLVq7/Y4xcPTSo8h1A==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-7.3.1.tgz", + "integrity": "sha512-aaAfFZCT5tdj1e0hVROqW0S+vVg0pg6OZDt0HEK9sraOYXqkox1RreqVKMxPCzZYGa2OHNzSw8gzxT5AB9PPWQ==", "requires": { "@aeternity/bip39": "^0.1.0", - "@babel/runtime": "^7.7.2", "@stamp/it": "^1.0.3", "@stamp/required": "^1.0.1", "aes-js": "^3.1.1", @@ -19,37 +18,28 @@ "bip32-path": "^0.4.2", "blakejs": "^1.1.0", "bs58check": "^2.1.1", - "commander": "^4.0.0", - "ed2curve": "^0.2.1", + "ed2curve": "^0.3.0", "joi-browser": "^13.4.0", "libsodium-wrappers-sumo": "0.7.6", - "ramda": "^0.26.1", + "ramda": "^0.27.0", "rlp": "2.2.4", - "serialize-javascript": "^2.1.2", + "serialize-javascript": "^3.0.0", "sha.js": "^2.4.11", "tweetnacl": "^1.0.0", "tweetnacl-auth": "^1.0.1", - "uuid": "^3.3.2", + "uuid": "^8.0.0", "websocket": "^1.0.26" }, "dependencies": { - "@babel/runtime": { - "version": "7.7.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.6.tgz", - "integrity": "sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - }, - "commander": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz", - "integrity": "sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==" - }, "serialize-javascript": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz", + "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==" + }, + "uuid": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz", + "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==" } } }, @@ -5571,12 +5561,11 @@ "dev": true }, "axios": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", - "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" + "follow-redirects": "1.5.10" } }, "babel-code-frame": { @@ -6341,9 +6330,9 @@ } }, "base-x": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz", - "integrity": "sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz", + "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==", "requires": { "safe-buffer": "^5.0.1" } @@ -10027,18 +10016,11 @@ } }, "ed2curve": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.2.1.tgz", - "integrity": "sha1-Iuaqo1aePE2/Tu+ilhLsMp5YGQw=", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ed2curve/-/ed2curve-0.3.0.tgz", + "integrity": "sha512-8w2fmmq3hv9rCrcI7g9hms2pMunQr1JINfcjwR9tAyZqhtyaMN991lF/ZfHfr5tzZQ8c7y7aBgZbjfbd0fjFwQ==", "requires": { - "tweetnacl": "0.x.x" - }, - "dependencies": { - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - } + "tweetnacl": "1.x.x" } }, "editor": { @@ -14205,7 +14187,8 @@ "is-buffer": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==", + "dev": true }, "is-callable": { "version": "1.1.4", @@ -19600,9 +19583,9 @@ "dev": true }, "ramda": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", - "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==" + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.0.tgz", + "integrity": "sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA==" }, "randomatic": { "version": "3.1.1", @@ -23907,7 +23890,8 @@ "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "dev": true }, "valid-identifier": { "version": "0.0.2", diff --git a/package.json b/package.json index 478f86da9..80ab66a6e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "i18n:report": "vue-i18n-extract report --vueFiles './src/**/*.?(js|vue)' --languageFiles './src/locales/**/*.json'" }, "dependencies": { - "@aeternity/aepp-sdk": "^6.1.3", + "@aeternity/aepp-sdk": "^7.3.1", "@aeternity/bip39": "^0.1.0", "@aeternity/hd-wallet": "^0.2.0", "@aeternity/ledger-app-api": "0.1.0", diff --git a/src/pages/mobile/AppBrowser.vue b/src/pages/mobile/AppBrowser.vue index f289f5348..2be60f645 100644 --- a/src/pages/mobile/AppBrowser.vue +++ b/src/pages/mobile/AppBrowser.vue @@ -51,6 +51,7 @@ diff --git a/src/pages/mobile/SettingsPasswordSet.vue b/src/pages/mobile/SettingsPasswordSet.vue index 0c9eef3ad..0333597e2 100644 --- a/src/pages/mobile/SettingsPasswordSet.vue +++ b/src/pages/mobile/SettingsPasswordSet.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/mobile/VaultSetupMethod.vue b/src/pages/mobile/VaultSetupMethod.vue index 826a06f00..221bf9d45 100644 --- a/src/pages/mobile/VaultSetupMethod.vue +++ b/src/pages/mobile/VaultSetupMethod.vue @@ -1,5 +1,5 @@