Merge pull request #799 from alephium/next

Next -> master: prepare for mobile wallet and explorer release
alephium · Aug 28, 2024 · 6cf9bed · 6cf9bed
2 parents 3b31372 + 0815e71
commit 6cf9bed
Show file tree

Hide file tree

Showing 52 changed files with 582 additions and 411 deletions.
diff --git a/.github/workflows/deploy-mainnet-explorer.yml b/.github/workflows/deploy-mainnet-explorer.yml
@@ -9,7 +9,7 @@ env:
   AWS_DEFAULT_REGION: eu-central-1
   AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID_MAINNET }}
   AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME_MAINNET }}
-  VITE_BACKEND_URL: https://backend.mainnet.alephium.org
+  VITE_BACKEND_URL: https://backend-8dce19.alephium.org
   VITE_NETWORK_TYPE: mainnet
   VITE_NODE_URL: https://node.mainnet.alephium.org
 

diff --git a/apps/desktop-wallet/locales/de-DE/translation.json b/apps/desktop-wallet/locales/de-DE/translation.json
@@ -452,5 +452,6 @@
   "Copy ID": "ID kopieren",
   "To delete this wallet use it without a passphrase": "Um diese Wallet zu löschen, verwenden Sie sie ohne Passphrase",
   "To export this wallet use it without a passphrase": "Um diese Wallet zu exportieren, verwenden Sie sie ohne Passphrase",
-  "The proposal does not include a list of required chains": "Der Vorschlag enthält keine Liste der erforderlichen Blockchains"
+  "The proposal does not include a list of required chains": "Der Vorschlag enthält keine Liste der erforderlichen Blockchains",
+  "All UTXOs are already consolidated for this address. No consolidation is needed.": "Alle UTXOs sind für diese Adresse bereits konsolidiert. Es ist keine Konsolidierung erforderlich."
 }
diff --git a/apps/desktop-wallet/package.json b/apps/desktop-wallet/package.json
@@ -61,8 +61,8 @@
     "@alephium/shared-react": "workspace:*",
     "@alephium/token-list": "^0.0.19",
     "@alephium/typescript-config": "workspace:*",
-    "@alephium/walletconnect-provider": "1.2.3",
-    "@alephium/web3": "1.2.3",
+    "@alephium/walletconnect-provider": "1.5.1",
+    "@alephium/web3": "1.5.1",
     "@electron/notarize": "^1.2.3",
     "@json-rpc-tools/utils": "^1.7.6",
     "@reduxjs/toolkit": "^1.9.1",
@@ -83,12 +83,12 @@
     "@vitejs/plugin-react": "^4.0.0",
     "@vitest/coverage-c8": "^0.30.1",
     "@vitest/web-worker": "^0.30.1",
-    "@walletconnect/core": "2.13.3",
+    "@walletconnect/core": "2.15.1",
     "@walletconnect/keyvaluestorage": "1.1.1",
-    "@walletconnect/react-native-compat": "2.13.3",
-    "@walletconnect/sign-client": "2.13.3",
-    "@walletconnect/types": "2.13.3",
-    "@walletconnect/utils": "2.13.3",
+    "@walletconnect/react-native-compat": "2.15.1",
+    "@walletconnect/sign-client": "2.15.1",
+    "@walletconnect/types": "2.15.1",
+    "@walletconnect/utils": "2.15.1",
     "@yaireo/tagify": "^4.18.3",
     "ajv": "^8.12.0",
     "better-sqlite3": "^8.3.0",

diff --git a/apps/explorer/CHANGELOG.md b/apps/explorer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @alephium/explorer
 
+## 1.10.2
+
+### Patch Changes
+
+- 90935e0: Add anonymous web analytics for explorer.alephium.org
+
 ## 1.10.0
 
 ### Minor Changes

diff --git a/apps/explorer/index.html b/apps/explorer/index.html
@@ -29,5 +29,6 @@
     <div id="root"></div>
     <!-- Add entry point -->
     <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="/analytics.js"></script>
   </body>
 </html>
diff --git a/apps/explorer/locales/it-IT/translation.json b/apps/explorer/locales/it-IT/translation.json
@@ -23,9 +23,7 @@
   "Fiat price": "Prezzo Fiat",
   "Gas Amount": "Quantità di Gas",
   "Gas Price": "Prezzo del Gas",
-  "Hash": "Hash",
   "Hashrate": "Tasso di Hashrate",
-  "Hashrate per": "Hashrate per",
   "Hash & Time": "Hash e Tempo",
   "Height": "Altezza",
   "Hourly": "Ogni ora",
@@ -50,14 +48,12 @@
   "Pending": "In attesa",
   "Previous": "Precedente",
   "Script execution failed": "L'esecuzione dello script non è riuscita",
-  "Search for an address or a tx...": "Cerca un indirizzo o un TX...",
   "Search": "Ricerca",
   "See more": "Vedi altro",
   "Self transfer": "Autotrasferimento",
   "Status": "Stato",
   "Success": "Successo",
   "Supply": "Fornitura",
-  "Timestamp": "Timestamp",
   "Tokens": "Gettoni",
   "Total Amount": "Importo Totale",
   "Total Amounts": "Importi Totali",
@@ -69,7 +65,6 @@
   "Transactions per hour": "Transazioni all'ora",
   "Hashrate per day": "Hashrate al giorno",
   "Hashrate per hour": "Hashrate all'ora",
-  "Txn": "Txn",
   "Unknown": "Sconosciuto",
   "dApp operation": "Operazione dApp",
   "from": "da",
@@ -138,4 +133,3 @@
   "Unsupported media type": "Tipo di contenuto multimediale non supportato",
   "Video thumbnail": "Miniatura video"
 }
-
diff --git a/apps/explorer/package.json b/apps/explorer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@alephium/explorer",
   "description": "The Alephium explorer frontend",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "private": true,
   "scripts": {
     "start": "turbo start:app",
@@ -39,7 +39,7 @@
     "@alephium/shared-crypto": "workspace:*",
     "@alephium/shared-react": "workspace:*",
     "@alephium/token-list": "^0.0.19",
-    "@alephium/web3": "1.2.3",
+    "@alephium/web3": "1.5.1",
     "@tanstack/query-sync-storage-persister": "5.45.0",
     "@tanstack/react-query": "5.45.0",
     "@tanstack/react-query-persist-client": "^5.45.0",

diff --git a/apps/explorer/public/analytics.js b/apps/explorer/public/analytics.js
@@ -0,0 +1,27 @@
+/*
+Copyright 2018 - 2024 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the library. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Created as a separate script to avoid inline scripts due to CSP
+if (window.location.host === 'explorer.alephium.org') {
+  const s = document.createElement('script')
+  s.setAttribute('type', 'text/javascript')
+  s.setAttribute('async', '')
+  s.setAttribute('src', 'https://gc.zgo.at/count.js')
+  s.setAttribute('data-goatcounter', 'https://alephium-explorer.goatcounter.com/count')
+  document.body.appendChild(s)
+}
diff --git a/apps/explorer/src/components/AppFooter.tsx b/apps/explorer/src/components/AppFooter.tsx
@@ -47,10 +47,9 @@ const AppFooter = ({ className }: AppFooterProps) => {
       </LeftGroup>
       <RightGroup>
         <Version>v{version}</Version>
-        <span>
-          <ExternalLink href="https://github.com/alephium/explorer">{t('Source code')} ↗</ExternalLink>
-        </span>
+        <ExternalLink href="https://github.com/alephium/explorer">{t('Source code')} ↗</ExternalLink>
         <ExternalLink href="https://alephium.org">Alephium.org ↗</ExternalLink>
+        <ExternalLink href="https://alephium.org/privacy-policy/">Privacy Policy ↗</ExternalLink>
         <SocialMediaIconList>
           {socialMediaData.map((d) => (
             <ExternalLink href={d.link} key={d.name}>

diff --git a/apps/explorer/tsconfig.json b/apps/explorer/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "@alephium/typescript-config/react",
-  "include": ["**/*.ts", "**/*.tsx"],
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js"],
   "exclude": ["node_modules"],
   "compilerOptions": {
     "baseUrl": ".",

diff --git a/apps/mobile-wallet/CHANGELOG.md b/apps/mobile-wallet/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @alephium/mobile-wallet
 
+## 1.1.4
+
+### Patch Changes
+
+- 18ddd26: Fix authentication issues
+
 ## 1.1.3
 
 ### Patch Changes

diff --git a/apps/mobile-wallet/android/app/build.gradle b/apps/mobile-wallet/android/app/build.gradle
@@ -89,7 +89,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.1.3"
+        versionName "1.1.4"
     }
     signingConfigs {
         debug {

diff --git a/apps/mobile-wallet/app.config.js b/apps/mobile-wallet/app.config.js
@@ -21,7 +21,7 @@ export default {
     name: 'Alephium',
     owner: 'alephium-dev',
     slug: 'alephium-mobile-wallet',
-    version: '1.1.3',
+    version: '1.1.4',
     orientation: 'portrait',
     icon: './assets/icon.png',
     scheme: ['wc', 'alephium'],

diff --git a/apps/mobile-wallet/ios/Alephium/Info.plist b/apps/mobile-wallet/ios/Alephium/Info.plist
@@ -23,7 +23,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.1.3</string>
+    <string>1.1.4</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>

diff --git a/apps/mobile-wallet/locales/de-DE/translation.json b/apps/mobile-wallet/locales/de-DE/translation.json
@@ -265,6 +265,7 @@
   "Paste a WalletConnect URI": "WalletConnect-URI einfügen",
   "This is not a valid WalletConnect URI": "Dies ist keine gültige WalletConnect-URI",
   "Paste the WalletConnect URI you copied from the dApp": "Fügen Sie die von der dApp kopierte WalletConnect URI ein",
+  "WalletConnect URI": "WalletConnect URI",
   "Do you want to activate biometric security?": "Möchten Sie die biometrische Sicherheit aktivieren?",
   "Use fingerprint or face recognition instead of the pin to unlock the wallet": "Fingerabdruck oder Gesichtserkennung anstelle des Pins zum Entsperren der Brieftasche verwenden",
   "Could not proceed": "Konnte nicht fortfahren",
@@ -318,8 +319,12 @@
   "Analytics": "Analysen",
   "Help us improve your experience!": "Helfen Sie uns, Ihr Erlebnis zu verbessern!",
   "Require biometrics to open app": "Biometrie zum Öffnen der App erforderlich",
+  "Require device passcode to open app": "Geräte-Zugangscode zum Öffnen der App erforderlich",
+  "Require device screen lock code or pattern to open app": "Gerät Displaysperre Code oder Muster zum Öffnen der App erforderlich",
   "App access": "App-Zugriff",
   "Require biometrics to transact": "Benötigt biometrische Daten für Transaktionen",
+  "Require device passcode to transact": "Geräte-Zugangscode für Transaktionen erforderlich",
+  "Require device screen lock code or pattern to transact": "Gerät Displaysperre Code oder Muster für Transaktionen erforderlich",
   "Your device supports biometrics but none is enrolled. Enable them by adding a fingerprint or Face ID in your device's settings.": "Ihr Gerät unterstützt biometrische Daten, aber keine sind hinterlegt. Aktivieren Sie sie, indem Sie einen Fingerabdruck oder eine Gesichts-ID in den Einstellungen Ihres Geräts hinzufügen.",
   "Enhance your security": "Verbessern Sie Ihre Sicherheit",
   "Auto-lock": "Automatisch sperren",

diff --git a/apps/mobile-wallet/locales/en-US/translation.json b/apps/mobile-wallet/locales/en-US/translation.json
@@ -364,5 +364,8 @@
   "Error while copying address": "Error while copying address",
   "This address is not valid": "This address is not valid",
   "A number is expected": "A number is expected",
-  "View full size": "View full size"
+  "View full size": "View full size",
+  "Disclaimer": "Disclaimer",
+  "Buy": "Buy",
+  "banxaDisclaimer": "You are about to access 3rd party services provided by <1>Banxa.com</1> through an in-app browser. Alephium does not control Banxa’s services. Banxa’s terms and conditions will apply, so please read and understand them before proceeding."
 }
diff --git a/apps/mobile-wallet/package.json b/apps/mobile-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alephium/mobile-wallet",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "private": true,
   "main": "index.ts",
   "scripts": {
@@ -21,8 +21,8 @@
     "@alephium/shared-crypto": "workspace:*",
     "@alephium/shared-react": "workspace:*",
     "@alephium/token-list": "^0.0.19",
-    "@alephium/walletconnect-provider": "1.2.3",
-    "@alephium/web3": "1.2.3",
+    "@alephium/walletconnect-provider": "1.5.1",
+    "@alephium/web3": "1.5.1",
     "@expo/vector-icons": "^14.0.2",
     "@json-rpc-tools/utils": "^1.7.6",
     "@react-native-async-storage/async-storage": "1.23.1",
@@ -36,12 +36,12 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@shopify/flash-list": "^1.6.4",
     "@shopify/react-native-skia": "1.2.3",
-    "@walletconnect/core": "2.13.3",
+    "@walletconnect/core": "2.15.1",
     "@walletconnect/jsonrpc-types": "^1.0.4",
     "@walletconnect/keyvaluestorage": "1.1.1",
-    "@walletconnect/react-native-compat": "2.13.3",
-    "@walletconnect/sign-client": "2.13.3",
-    "@walletconnect/utils": "2.13.3",
+    "@walletconnect/react-native-compat": "2.15.1",
+    "@walletconnect/sign-client": "2.15.1",
+    "@walletconnect/utils": "2.15.1",
     "big-integer": "^1.6.51",
     "colord": "^2.9.3",
     "dayjs": "^1.10.7",
@@ -116,7 +116,7 @@
     "@types/react-native-background-timer": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
-    "@walletconnect/types": "2.13.3",
+    "@walletconnect/types": "2.15.1",
     "babel-plugin-module-resolver": "^5.0.2",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",

diff --git a/apps/mobile-wallet/src/components/AddressBadge.tsx b/apps/mobile-wallet/src/components/AddressBadge.tsx
@@ -100,7 +100,7 @@ const AddressBadge = ({
       {showCopyBtn && address?.hash && (
         <CopyAddressButton
           onPress={() => copyAddressToClipboard(address?.hash)}
-          iconProps={{ name: 'copy-outline' }}
+          iconProps={{ name: 'clipboard' }}
           type="transparent"
           color={color}
           round

diff --git a/apps/mobile-wallet/src/components/AddressCard.tsx b/apps/mobile-wallet/src/components/AddressCard.tsx
@@ -156,7 +156,7 @@ const AddressCard = ({ style, addressHash, onSettingsPress }: AddressCardProps)
               round
             />
             <Button
-              iconProps={{ name: 'settings-outline' }}
+              iconProps={{ name: 'settings' }}
               color={textColor}
               onPress={onSettingsPress}
               style={{ backgroundColor: buttonsBackground }}
@@ -190,15 +190,15 @@ const AddressCard = ({ style, addressHash, onSettingsPress }: AddressCardProps)
             <Button
               title="Send"
               onPress={handleSendPress}
-              iconProps={{ name: 'arrow-up-outline' }}
+              iconProps={{ name: 'send' }}
               flex
               type="transparent"
               color={textColor}
             />
             <Button
               title="Receive"
               onPress={handleReceivePress}
-              iconProps={{ name: 'arrow-down-outline' }}
+              iconProps={{ name: 'download' }}
               flex
               type="transparent"
               color={textColor}

diff --git a/apps/mobile-wallet/src/components/AddressesTokensList.tsx b/apps/mobile-wallet/src/components/AddressesTokensList.tsx
@@ -200,8 +200,6 @@ const TabBarStyled = styled(TabBar)`
 
 const ListContainer = styled(Animated.View)`
   border-radius: ${BORDER_RADIUS_BIG}px;
-  margin: 0 ${DEFAULT_MARGIN}px;
-  background-color: ${({ theme }) => theme.bg.primary};
   overflow: hidden;
   position: relative;
 `