Add wallet type stats to redis and GA

vacuumlabs · Nov 12, 2020 · 70a6408 · 70a6408
1 parent 2f38e35
commit 70a6408
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 13 deletions.
diff --git a/app/frontend/actions.ts b/app/frontend/actions.ts
@@ -161,7 +161,7 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
       const walletInfo = await wallet.getWalletInfo()
       const conversionRatesPromise = getConversionRates(state)
       const usingHwWallet = wallet.isHwWallet()
-      const hwWalletName = usingHwWallet ? wallet.getHwWalletName() : undefined
+      const hwWalletName = usingHwWallet ? wallet.getWalletName() : undefined
       if (usingHwWallet) loadingAction(state, `Waiting for ${hwWalletName}...`)
       const demoRootSecret = (await mnemonicToWalletSecretDef(
         ADALITE_CONFIG.ADALITE_DEMO_WALLET_MNEMONIC

diff --git a/app/frontend/wallet/blockchain-explorer.ts b/app/frontend/wallet/blockchain-explorer.ts
@@ -132,7 +132,7 @@ const blockchainExplorer = (ADALITE_CONFIG) => {
     return balance
   }
 
-  async function submitTxRaw(txHash, txBody) {
+  async function submitTxRaw(txHash, txBody, params) {
     const token = ADALITE_CONFIG.ADALITE_BACKEND_TOKEN
     const response = await request(
       `${ADALITE_CONFIG.ADALITE_SERVER_URL}/api/txs/submit`,
@@ -143,6 +143,7 @@ const blockchainExplorer = (ADALITE_CONFIG) => {
       }),
       {
         'Content-Type': 'application/json',
+        ...params,
         ...(token ? {token} : {}),
       }
     )

diff --git a/app/frontend/wallet/cardano-wallet.ts b/app/frontend/wallet/cardano-wallet.ts
@@ -123,13 +123,13 @@ const CardanoWallet = (options) => {
     return cryptoProvider.isHwWallet()
   }
 
-  function getHwWalletName() {
+  function getWalletName() {
     return isHwWallet ? (cryptoProvider as any).getHwWalletName() : undefined
   }
 
   function submitTx(signedTx): Promise<any> {
     const {txBody, txHash} = signedTx
-    return blockchainExplorer.submitTxRaw(txHash, txBody)
+    return blockchainExplorer.submitTxRaw(txHash, txBody, {})
   }
 
   function getWalletSecretDef() {
@@ -261,7 +261,7 @@ const CardanoWallet = (options) => {
 
   return {
     isHwWallet,
-    getHwWalletName,
+    getWalletName,
     getWalletSecretDef,
     submitTx,
     signTxAux,

diff --git a/app/frontend/wallet/shelley-wallet.ts b/app/frontend/wallet/shelley-wallet.ts
@@ -204,13 +204,14 @@ const ShelleyWallet = ({
     return cryptoProvider.isHwWallet()
   }
 
-  function getHwWalletName() {
-    return isHwWallet ? (cryptoProvider as any).getHwWalletName() : undefined
+  function getWalletName() {
+    return cryptoProvider.getWalletName()
   }
 
   function submitTx(signedTx): Promise<any> {
+    const params = {walletType: getWalletName()}
     const {txBody, txHash} = signedTx
-    return blockchainExplorer.submitTxRaw(txHash, txBody)
+    return blockchainExplorer.submitTxRaw(txHash, txBody, params)
   }
 
   function getWalletSecretDef() {
@@ -472,7 +473,7 @@ const ShelleyWallet = ({
 
   return {
     isHwWallet,
-    getHwWalletName,
+    getWalletName,
     getWalletSecretDef,
     submitTx,
     signTxAux,

diff --git a/app/frontend/wallet/shelley/shelley-js-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-js-crypto-provider.ts
@@ -30,6 +30,8 @@ const ShelleyJsCryptoProvider = ({
 
   const isHwWallet = () => false
 
+  const getWalletName = () => 'Mnemonic'
+
   const getWalletSecret = () => masterHdNode.toBuffer()
 
   const getDerivationScheme = () => derivationScheme
@@ -132,6 +134,7 @@ const ShelleyJsCryptoProvider = ({
     network,
     signTx,
     getWalletSecret,
+    getWalletName,
     getDerivationScheme,
     deriveXpub,
     isHwWallet,

diff --git a/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-ledger-crypto-provider.ts
@@ -54,7 +54,7 @@ const ShelleyLedgerCryptoProvider = async ({network, config, isWebUSB}) => {
   checkVersion()
 
   const isHwWallet = () => true
-  const getHwWalletName = () => 'Ledger'
+  const getWalletName = () => 'Ledger'
 
   const deriveXpub = CachedDeriveXpubFactory(derivationScheme, async (absDerivationPath) => {
     const response = await ledger.getExtendedPublicKey(absDerivationPath)
@@ -256,7 +256,7 @@ const ShelleyLedgerCryptoProvider = async ({network, config, isWebUSB}) => {
     displayAddressForPath,
     deriveXpub,
     isHwWallet,
-    getHwWalletName,
+    getWalletName,
     _sign: sign,
     _deriveHdNode: deriveHdNode,
     checkVersion,

diff --git a/app/frontend/wallet/shelley/shelley-trezor-crypto-provider.ts b/app/frontend/wallet/shelley/shelley-trezor-crypto-provider.ts
@@ -16,7 +16,7 @@ const CardanoTrezorCryptoProvider = ({network, config}) => {
   })
 
   const isHwWallet = () => true
-  const getHwWalletName = () => 'Trezor'
+  const getWalletName = () => 'Trezor'
 
   const deriveXpub = CachedDeriveXpubFactory(derivationScheme, async (absDerivationPath) => {
     const response = await TrezorConnect.cardanoGetPublicKey({
@@ -220,7 +220,7 @@ const CardanoTrezorCryptoProvider = ({network, config}) => {
     displayAddressForPath,
     deriveXpub,
     isHwWallet,
-    getHwWalletName,
+    getWalletName,
     _sign: sign,
     _deriveHdNode: deriveHdNode,
     network,

diff --git a/server/middlewares/statsGoogleAnalytics.js b/server/middlewares/statsGoogleAnalytics.js
@@ -77,6 +77,7 @@ const trackTxSubmissions = mung.jsonAsync(async (body, req, res) => {
         ? 'txSubmissions'
         : 'otherTxSubmissions'
     const txSubmissionSuccess = body.Right ? 'successful' : 'unsuccessful'
+    const txWalletType = req.get('walletType')
 
     try {
       const baseEventData = {
@@ -85,6 +86,13 @@ const trackTxSubmissions = mung.jsonAsync(async (body, req, res) => {
         originTestSuccess: tokenMatched,
       }
 
+      await trackEvent({
+        ...baseEventData,
+        action: `${txSubmissionType}:${txWalletType}`,
+        label: 'Wallet type',
+        value: undefined,
+      })
+
       if (txSubmissionSuccess === 'successful') {
         const {txBody} = req.body
 

diff --git a/server/middlewares/statsRedis.js b/server/middlewares/statsRedis.js
@@ -56,6 +56,9 @@ const trackTxSubmissions = mung.json((body, req, res) => {
 
     incrCountersBy(`${txSubmissionType}:${txSubmissionSuccess}`, 1)
 
+    const txWalletType = req.get('walletType')
+    incrCountersBy(`${txSubmissionType}:${txWalletType}`, 1)
+
     if (txSubmissionSuccess === 'successful') {
       const {txBody} = req.body
       let txOutAmount = 0

diff --git a/server/statsPageRedis.js b/server/statsPageRedis.js
@@ -19,6 +19,15 @@ const getStats = async () => {
       'sentTotal:total': [],
       'sentTotal:monthly': [],
       'sentTotal:daily': [],
+      'Ledger:total': [],
+      'Ledger:mothly': [],
+      'Ledger:daily': [],
+      'Trezor:total': [],
+      'Trezor:mothly': [],
+      'Trezor:daily': [],
+      'Mnemonic:total': [],
+      'Mnemonic:mothly': [],
+      'Mnemonic:daily': [],
     },
     otherTxSubmissions: {
       'successful:total': [],