From e07fcc1c31ee69ad5234d4c1d2864f50d58abf06 Mon Sep 17 00:00:00 2001 From: JP Lomas Date: Mon, 8 Nov 2021 20:42:07 +0000 Subject: [PATCH 01/18] Bump to meteor 2.5, move grpc -> grpc-js, add UI placeholder for token adding/NFT creation --- .meteor/packages | 6 +- .meteor/release | 2 +- .meteor/versions | 89 +- imports/startup/both/index.js | 6 +- imports/startup/client/routes.js | 30 + imports/startup/server/index.js | 2 +- imports/ui/pages/tools/NFT/NFT.html | 4 + imports/ui/pages/tools/NFT/NFT.js | 5 + .../ui/pages/tools/addTokens/addTokens.html | 4 + imports/ui/pages/tools/addTokens/addTokens.js | 5 + imports/ui/pages/tools/tools.html | 18 + package-lock.json | 5780 +++++------------ package.json | 5 +- yarn.lock | 409 +- 14 files changed, 2124 insertions(+), 4241 deletions(-) create mode 100644 imports/ui/pages/tools/NFT/NFT.html create mode 100644 imports/ui/pages/tools/NFT/NFT.js create mode 100644 imports/ui/pages/tools/addTokens/addTokens.html create mode 100644 imports/ui/pages/tools/addTokens/addTokens.js diff --git a/.meteor/packages b/.meteor/packages index dd37b304..eeb805b6 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -4,13 +4,13 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base@1.4.0 # Packages every Meteor app needs to have +meteor-base@1.5.1 # Packages every Meteor app needs to have mobile-experience@1.1.0 # Packages for a great mobile UX blaze-html-templates # Compile .html files into Meteor Blaze views tracker@1.2.0 # Meteor's client-side reactive programming library -standard-minifier-js@2.6.0 # JS minifier run for production mode +standard-minifier-js@2.7.1 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers -ecmascript@0.14.4 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.16.0 # Enable ECMAScript2015+ syntax in app code kadira:flow-router # FlowRouter is a very simple router for Meteor kadira:blaze-layout # Layout manager for blaze (works well with FlowRouter) diff --git a/.meteor/release b/.meteor/release index 24493339..55995295 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.12 +METEOR@2.5 diff --git a/.meteor/versions b/.meteor/versions index f546e877..cc3d43f3 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,32 +1,32 @@ allow-deny@1.1.0 audit-argument-checks@1.0.7 -autoupdate@1.6.0 -babel-compiler@7.5.4 +autoupdate@1.8.0 +babel-compiler@7.7.0 babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 -blaze@2.3.4 -blaze-html-templates@1.1.2 -blaze-tools@1.0.10 +blaze@2.5.0 +blaze-html-templates@1.2.1 +blaze-tools@1.1.2 boilerplate-generator@1.7.1 browser-policy-common@1.0.11 browser-policy-content@1.1.1 browser-policy-framing@1.1.0 caching-compiler@1.2.2 -caching-html-compiler@1.1.3 -callback-hook@1.3.0 +caching-html-compiler@1.2.0 +callback-hook@1.4.0 check@1.3.1 ddp@1.4.0 -ddp-client@2.3.3 +ddp-client@2.5.0 ddp-common@1.4.0 -ddp-server@2.3.2 +ddp-server@2.5.0 deps@1.0.12 diff-sequence@1.1.1 -dynamic-import@0.5.4 -ecmascript@0.14.4 -ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.11.0 -ecmascript-runtime-server@0.10.0 +dynamic-import@0.7.2 +ecmascript@0.16.0 +ecmascript-runtime@0.8.0 +ecmascript-runtime-client@0.12.1 +ecmascript-runtime-server@0.11.0 ejson@1.1.1 es5-shim@4.8.0 fastclick@1.0.13 @@ -36,10 +36,10 @@ force-ssl-common@1.1.0 frozeman:storage@0.1.9 geojson-utils@1.0.10 hot-code-push@1.0.4 -html-tools@1.0.11 -htmljs@1.0.11 -http@1.4.2 -id-map@1.1.0 +html-tools@1.1.2 +htmljs@1.1.1 +http@1.4.4 +id-map@1.1.1 inter-process-messaging@0.1.1 jayuda:flx-qrcode@0.0.1 johanbrook:publication-collector@1.1.0 @@ -47,54 +47,55 @@ jquery@1.11.11 juliancwirko:postcss@1.3.0 kadira:blaze-layout@2.3.0 kadira:flow-router@2.12.1 -launch-screen@1.2.0 +launch-screen@1.3.0 less@2.8.0 livedata@1.0.18 localstorage@1.2.0 -logging@1.1.20 -meteor@1.9.3 -meteor-base@1.4.0 +logging@1.3.1 +meteor@1.10.0 +meteor-base@1.5.1 meteor-platform@1.2.6 -minifier-css@1.5.3 -minifier-js@2.6.0 -minimongo@1.6.1 +minifier-css@1.6.0 +minifier-js@2.7.1 +minimongo@1.7.0 mobile-experience@1.1.0 mobile-status-bar@1.1.0 -modern-browsers@0.1.5 -modules@0.15.0 +modern-browsers@0.1.7 +modules@0.17.0 modules-runtime@0.12.0 momentjs:moment@2.29.1 -mongo@1.10.1 +mongo@1.13.0 mongo-decimal@0.1.2 mongo-dev-server@1.1.0 -mongo-id@1.0.7 -npm-mongo@3.8.1 -observe-sequence@1.0.16 +mongo-id@1.0.8 +npm-mongo@3.9.1 +observe-sequence@1.0.19 ordered-dict@1.1.0 -promise@0.11.2 +promise@0.12.0 qrl:browser-policy@1.1.1 qrl:browser-policy-common@1.0.13 random@1.2.0 +react-fast-refresh@0.2.0 reactive-dict@1.3.0 reactive-var@1.0.11 reload@1.3.1 retry@1.1.0 -routepolicy@1.1.0 +routepolicy@1.1.1 semantic:ui@2.3.1 semantic:ui-data@2.3.1 session@1.2.0 -socket-stream-client@0.3.1 -spacebars@1.0.15 -spacebars-compiler@1.1.3 -standard-minifier-js@2.6.0 +socket-stream-client@0.4.0 +spacebars@1.2.0 +spacebars-compiler@1.2.1 +standard-minifier-js@2.7.1 steeve:jquery-qrcode@0.2.2 -templating@1.3.2 -templating-compiler@1.3.3 -templating-runtime@1.3.2 -templating-tools@1.1.2 +templating@1.4.1 +templating-compiler@1.4.1 +templating-runtime@1.5.0 +templating-tools@1.2.0 tracker@1.2.0 ui@1.0.13 underscore@1.0.10 -url@1.3.1 -webapp@1.9.1 -webapp-hashing@1.0.9 +url@1.3.2 +webapp@1.13.0 +webapp-hashing@1.1.0 diff --git a/imports/startup/both/index.js b/imports/startup/both/index.js index 60623440..2dc32386 100644 --- a/imports/startup/both/index.js +++ b/imports/startup/both/index.js @@ -191,7 +191,7 @@ QRLPROTO_SHA256 = [ protoSha256: '0d70a3372c4668a1bf4fd42983ae01f2e0fb54b4030b808bbea78e5adadb23f0', objectSha256: - '7fe0b06018c4b455dcf45ee573d6307d470814d7fc469e735144959a034f1bce', + '31aecf09345df75e08f2bb406df3f06dc6e438ab85989ed213884f040ca8c8d9', }, // development .proto { @@ -227,14 +227,14 @@ QRLPROTO_SHA256 = [ protoSha256: '0d70a3372c4668a1bf4fd42983ae01f2e0fb54b4030b808bbea78e5adadb23f0', objectSha256: - '7fe0b06018c4b455dcf45ee573d6307d470814d7fc469e735144959a034f1bce', + '31aecf09345df75e08f2bb406df3f06dc6e438ab85989ed213884f040ca8c8d9', }, { version: '2.1.2 python', protoSha256: '0d70a3372c4668a1bf4fd42983ae01f2e0fb54b4030b808bbea78e5adadb23f0', objectSha256: - '7fe0b06018c4b455dcf45ee573d6307d470814d7fc469e735144959a034f1bce', + '31aecf09345df75e08f2bb406df3f06dc6e438ab85989ed213884f040ca8c8d9', }, // testnet public release { diff --git a/imports/startup/client/routes.js b/imports/startup/client/routes.js index d7bb73c3..e8908149 100644 --- a/imports/startup/client/routes.js +++ b/imports/startup/client/routes.js @@ -36,6 +36,10 @@ import '../../ui/pages/tools/multisig/multisigSpend.html' import '../../ui/pages/tools/multisig/multisigSpend.js' import '../../ui/pages/tools/multisig/multisigVote.html' import '../../ui/pages/tools/multisig/multisigVote.js' +import '../../ui/pages/tools/addTokens/addTokens.html' +import '../../ui/pages/tools/addTokens/addTokens.js' +import '../../ui/pages/tools/NFT/NFT.html' +import '../../ui/pages/tools/NFT/NFT.js' import '../../ui/pages/tokens/tokenCreate.js' import '../../ui/pages/tokens/tokenCreateConfirm.js' @@ -325,6 +329,32 @@ FlowRouter.route('/tools/notarise/result', { }, }) +// Add tokens to list +FlowRouter.route('/tools/addTokens', { + name: 'App.addTokens', + action() { + if (Session.get('walletStatus').unlocked === false) { FlowRouter.go('/open') } + if (useMobile()) { + BlazeLayout.render('appBody', { main: 'appAddTokens' }) + } else { + BlazeLayout.render('mobile', { main: 'appAddTokens' }) + } + }, +}) + +// Add tokens to list +FlowRouter.route('/tools/NFT', { + name: 'App.NFT', + action() { + if (Session.get('walletStatus').unlocked === false) { FlowRouter.go('/open') } + if (useMobile()) { + BlazeLayout.render('appBody', { main: 'appNFT' }) + } else { + BlazeLayout.render('mobile', { main: 'appNFT' }) + } + }, +}) + // Ledger Nano XMSS Index Update FlowRouter.route('/tools/xmssindex/update', { name: 'App.xmssIndexUpdate', diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index c063b565..c07793fb 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor' import { check } from 'meteor/check' import { BrowserPolicy } from 'meteor/browser-policy-common' import helpers from '@theqrl/explorer-helpers' -import grpc from 'grpc' +import grpc from '@grpc/grpc-js' import protoloader from '@grpc/proto-loader' import tmp from 'tmp' import fs from 'fs' diff --git a/imports/ui/pages/tools/NFT/NFT.html b/imports/ui/pages/tools/NFT/NFT.html new file mode 100644 index 00000000..9422e5fc --- /dev/null +++ b/imports/ui/pages/tools/NFT/NFT.html @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/imports/ui/pages/tools/NFT/NFT.js b/imports/ui/pages/tools/NFT/NFT.js new file mode 100644 index 00000000..d76b5d66 --- /dev/null +++ b/imports/ui/pages/tools/NFT/NFT.js @@ -0,0 +1,5 @@ +Template.appNFT.helpers({ + hello() { + return 'world' + }, +}) diff --git a/imports/ui/pages/tools/addTokens/addTokens.html b/imports/ui/pages/tools/addTokens/addTokens.html new file mode 100644 index 00000000..824218ee --- /dev/null +++ b/imports/ui/pages/tools/addTokens/addTokens.html @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/imports/ui/pages/tools/addTokens/addTokens.js b/imports/ui/pages/tools/addTokens/addTokens.js new file mode 100644 index 00000000..0184e073 --- /dev/null +++ b/imports/ui/pages/tools/addTokens/addTokens.js @@ -0,0 +1,5 @@ +Template.appAddTokens.helpers({ + hello() { + return 'world' + }, +}) diff --git a/imports/ui/pages/tools/tools.html b/imports/ui/pages/tools/tools.html index 69b177fc..94a330da 100644 --- a/imports/ui/pages/tools/tools.html +++ b/imports/ui/pages/tools/tools.html @@ -94,6 +94,24 @@