Skip to content

Commit

Permalink
Merge branch 'main' into feat-handle-logout
Browse files Browse the repository at this point in the history
  • Loading branch information
brianp authored Dec 24, 2024
2 parents 8b37bce + 94188ef commit a44e64b
Show file tree
Hide file tree
Showing 197 changed files with 2,183 additions and 1,071 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
AIRDROP_BASE_URL: ${{ secrets.BETA_AIRDROP_BASE_URL }}
AIRDROP_API_BASE_URL: ${{ secrets.BETA_AIRDROP_API_BASE_URL }}
AIRDROP_TWITTER_AUTH_URL: ${{ secrets.BETA_AIRDROP_TWITTER_AUTH_URL }}
AIRDROP_WEBSOCKET_CRYPTO_KEY: ${{ secrets.DEV_AIRDROP_WEBSOCKET_CRYPTO_KEY }}
shell: bash
run: |
#set -xueo pipefail
Expand All @@ -67,6 +68,7 @@ jobs:
echo "AIRDROP_BASE_URL=${{ env.AIRDROP_BASE_URL }}" >> $GITHUB_ENV
echo "AIRDROP_API_BASE_URL=${{ env.AIRDROP_API_BASE_URL }}" >> $GITHUB_ENV
echo "AIRDROP_TWITTER_AUTH_URL=${{ env.AIRDROP_TWITTER_AUTH_URL }}" >> $GITHUB_ENV
echo "AIRDROP_WEBSOCKET_CRYPTO_KEY=${{ env.AIRDROP_WEBSOCKET_CRYPTO_KEY }}" >> $GITHUB_ENV
echo "TS_FEATURES=release-ci-beta, airdrop-env" >> $GITHUB_ENV
# numeric-only and cannot be greater than 65535 for msi target
export BETA_DATE=$(date +%m%d)
Expand All @@ -85,6 +87,8 @@ jobs:
- name: RELEASE Builds - Set environment variables
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
env:
AIRDROP_WEBSOCKET_CRYPTO_KEY: ${{ secrets.PROD_AIRDROP_WEBSOCKET_CRYPTO_KEY }}
shell: bash
run: |
#set -xueo pipefail
Expand All @@ -94,12 +98,14 @@ jobs:
#echo "releaseId=" >> $GITHUB_ENV
echo "TARI_NETWORK=nextnet" >> $GITHUB_ENV
echo "TARI_TARGET_NETWORK=nextnet" >> $GITHUB_ENV
echo "AIRDROP_WEBSOCKET_CRYPTO_KEY=${{ env.AIRDROP_WEBSOCKET_CRYPTO_KEY }}" >> $GITHUB_ENV
cd "${GITHUB_WORKSPACE}/src-tauri"
TU_VERSION=$(jq -r .version tauri.conf.json)
# Don't mess with the double quotes and inner escaped quotes
yq eval ".productName = \"Tari Universe\"" -i tauri.conf.json
yq eval ".mainBinaryName = \"Tari Universe\"" -i tauri.conf.json
yq eval ".app.windows[0].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
yq eval ".app.windows[1].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
yq eval ".app.windows[0].title = \"Tari Universe v${TU_VERSION} | Testnet\"" -i tauri.conf.json
yq eval ".app.windows[1].title = \"Tari Universe v${TU_VERSION} | Testnet\"" -i tauri.conf.json
yq eval ".identifier = \"com.tari.universe\"" -i tauri.conf.json
yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/main/.updater/latest.json\", \"https://cdn-universe.tari.com/tari-project/universe/updater/latest.json\"]" \
-i tauri.conf.json
Expand Down
28 changes: 14 additions & 14 deletions .updater/alpha-latest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": "0.8.24",
"version": "0.8.30",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-12-13T16:13:58.065Z",
"pub_date": "2024-12-19T14:07:35.303Z",
"platforms": {
"linux-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRCS1A5K3c3cVlxYlFXWXgrdCt1L0s2NWcwUGJzaEZ1RXpScnpQMTM5S05va3NDcjFDWmp3TTRNYXFDb1RVSkI1eGZiNWpDUUZYZkx5NVE3aGRyQUFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA0MTcxCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjRfYW1kNjQuQXBwSW1hZ2UKL3d4aTJzMHNoeFVwdmpTMU5QV2tnY0tMM1VHaXI3L2tobXJybnVFWFJTN0JjUjlTNTFZUXVsQWx1OFA2OXNOTGFHWkFvcHBrSkMyUnk3K1ZSc0hhQUE9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_0.8.24_amd64.AppImage"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRRRU13V255QmZ1TnQ1YW9XeitIQjBrcE1iOHJHMEwvbXRIKzR2bHNJSUtReSt5YlJkU1lSZ3hRS21CeWJXejlHRnZJSTdjeG4wbVZBSGJoNGxVcXdvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA1MTQ4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjRfeDY0X2VuLVVTLm1zaS56aXAKQzQzcThJdkJ1Q053cmhDVnVlVEo1MnNtdWZTV2QySmc3ZTVHL0Jaakt0Qk5tY1U1L0tONGdUaGFqNzRROHBZTTlwdXJsSjhMT3lHQXNGMFVPSjdqRHc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_0.8.24_x64_en-US.msi.zip"
},
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJYNTgvNEZaVzdKMWN5akZYZDBUdXlYeUREbWtzeHdoRFdzQzMyWnpINEs1M3VQMHVVU0F5NUIrMnp5YmwwUUdReEJzLzVIbGdzMlZxaENFNktSQWdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA2NDA4CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnM2OHdiMlphckxET0NtVDhmVUp5alR3YXpoNW1Xa3BWTERraXBIT1VzdERYbFYvOEE4NjhFOHZrVVFvbUtvZkdTeWpYeUY2bUJQQlZwTm96bEl2RER3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFVFRkw3Y1VlbVZXekpXWFpPNWNkZ0wwU0hxMXZlRFlXL1FVbmtvdGpCRmJjQkJXV3FWUmtMalhnTmNRRitSRS9TQ0F3MFVGQjdINm44VW1ObjIyZFFFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NjEwNjc0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CjdEeEhwd1Y2VE5GdmUxQnBjcEV1ZkRTM2VoN1dCclVEN1RxUWhPY2s4OFVLZ0NFQnIwcld4aHhBZEdBc1JrOCt5QXVDS1huaitLUzJENU40ZUExT0FRPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.30/Tari.Universe_universal.app.tar.gz"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJYNTgvNEZaVzdKMWN5akZYZDBUdXlYeUREbWtzeHdoRFdzQzMyWnpINEs1M3VQMHVVU0F5NUIrMnp5YmwwUUdReEJzLzVIbGdzMlZxaENFNktSQWdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA2NDA4CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnM2OHdiMlphckxET0NtVDhmVUp5alR3YXpoNW1Xa3BWTERraXBIT1VzdERYbFYvOEE4NjhFOHZrVVFvbUtvZkdTeWpYeUY2bUJQQlZwTm96bEl2RER3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFVFRkw3Y1VlbVZXekpXWFpPNWNkZ0wwU0hxMXZlRFlXL1FVbmtvdGpCRmJjQkJXV3FWUmtMalhnTmNRRitSRS9TQ0F3MFVGQjdINm44VW1ObjIyZFFFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NjEwNjc0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CjdEeEhwd1Y2VE5GdmUxQnBjcEV1ZkRTM2VoN1dCclVEN1RxUWhPY2s4OFVLZ0NFQnIwcld4aHhBZEdBc1JrOCt5QXVDS1huaitLUzJENU40ZUExT0FRPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.30/Tari.Universe_universal.app.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZEZXl2d0FUQTEyNlZteENvTzNHdy9NUTN0a0Q5bmlQL1NPVm9xMld6aFNuYkd2c0hHZ0RKaHVwRDRsMkxVaDFPMTExZlBaTTNKT0tQV1FUbzNHOUF3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NjExMzEyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzBfeDY0X2VuLVVTLm1zaS56aXAKVXZCQ0wyYldRNUFoZWtqMGNwT1hqcE8wRS9aT1k1aTV6K1RoRmxaYWtrMzNOR1gwL2JKMnNLV3dDNjdXQUg1bVdITmV5bmhGVU9tUWFlRGR0cTNiREE9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.30/Tari.Universe_0.8.30_x64_en-US.msi.zip"
},
"linux-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFJWL0dXby9vRDltWG9OQjNwcnBpQ3hIRnhaUkRmT09BSnBBSThaakh3TUg3R0dzN1BaZnRZZnh1cWJPaXRiSk9rSWZGaHF2UVkwWDViQnNaUmlYUmdzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NjE3MjE5CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMzBfYW1kNjQuQXBwSW1hZ2UKQWcwMmdsUHRpVEhkbU0xeXN3bFR6WGM2RzM4L2hwTFdOL1o3SDMxMUdKZDZiTmZiY3ZINEZPN1AwTk8vL0MvMkJJZEREV0wrNnFsZmhZWlQ5N3VYRHc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.30/Tari.Universe_0.8.30_amd64.AppImage"
}
}
}
24 changes: 12 additions & 12 deletions .updater/latest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": "0.8.14",
"version": "0.8.27",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-12-12T15:32:52.685Z",
"pub_date": "2024-12-18T11:30:40.243Z",
"platforms": {
"linux-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFdxc25aNzUzc3NiY1NWelVhWkZpSCtrdFU3dlpLR0dGOGdaTVF3b0FMUXpubWFaRkNTeFN1bk5zQ0lNQzBnVWdJS1lUdlNkR3dxWGlaNDJDYkdBM0EwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE2NTg4CWZpbGU6dGFyaS11bml2ZXJzZV8wLjguMTRfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CjdieFJvcXJzanl5UGtBeVAzMXF5NlhVNktPb2F1RWliTDI0QUEzQW9VSUVVeitNQVd3VCtQL2EraHRvbU5veDhjaCs1VXJIWUlFaEMwY25LREM0TENRPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.14/tari-universe_0.8.14_amd64.AppImage.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJtOWdzNXVaUEZSekNtNUt4MUtkZGU3M2IxSm1FaGxQM2g0QmJKT0tsaUd5aWVkTkJhM2U5bER3VVlnbmh1a2RjbGhiUGZlTFpaV1JaK2pYcFQ5UVFFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTE5MjQ4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjdfYW1kNjQuQXBwSW1hZ2UKUXlzZmZDbW5BRk91SXY1TXZmcVQ2dGkzdUs1ZDlER3djNHF2cjYwaEVRVnRYRXJYckN4UzBvRkhQMDZsYkg3bjdPV2FwaE00TS93L0t4V0hpYnFXQVE9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_0.8.27_amd64.AppImage"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFNZ3JMb0hhd0JHUmxtU0xWbEhlRmM4ZkVjRGlLSE1wcXB1MlIxbDcyZ2FWNTRHYXc3TkllQWYrK3ZCaDcxY2V6LzlzMHk2VldlbVhCOXRrZFUzK0FnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIwMTYyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjdfeDY0X2VuLVVTLm1zaS56aXAKY2J0QzUycXBXR3hzWmxwMUNZUUcwQTRtZm5naW41bnQzQmozM1B6YVZuKzZGYm5NZ0J6SG12dGxEanFpcWRGZWsrSWZUUXRNSFhKOTNQRFc0OGxVQXc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_0.8.27_x64_en-US.msi.zip"
},
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRXWnord2poTnQ3RnVoRkhuSjJjVTVydWhGbU1MVzh5V3dSWTNXN25BTzM5RWs1ZWMwRDBzQzh3bUwzZ3IrVWg5T3RQWml1ZWR4azg3bldqL29xVGdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3MTMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck9LSzJDSEQ3ZFFPZ2RFa3RCaTUzT2VNUVNEN2toSUJjR1FoTmVQcjYrcFl3N3NPZmhMeUtRekFrd3p2MkIwYy84V3c3cG5ONXAzRFQvWTdMZjYxTEFnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJyK2lyWmN5MlpFV3U5dFlZWk9oVS9yMUFFaXVxU29kK1NXR0crYzRWSXE2aDlCOVVFQkRJVGt5b3djOHRqSEdUUUdmWWRUUjg5OVVlc3dLT2Z3aUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIxNDMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkFiblZ2STdGeFcreUFwZU14TnpUU1FKNzExVHYxUzRPY0FLVVY3eWp1MFhJcUxodWFOdFM5Q2R5dDh5dTdIdTJ6bU0zRTlTMXRCYVozY1JrZTM1ZEJ3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_universal.app.tar.gz"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRXWnord2poTnQ3RnVoRkhuSjJjVTVydWhGbU1MVzh5V3dSWTNXN25BTzM5RWs1ZWMwRDBzQzh3bUwzZ3IrVWg5T3RQWml1ZWR4azg3bldqL29xVGdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3MTMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck9LSzJDSEQ3ZFFPZ2RFa3RCaTUzT2VNUVNEN2toSUJjR1FoTmVQcjYrcFl3N3NPZmhMeUtRekFrd3p2MkIwYy84V3c3cG5ONXAzRFQvWTdMZjYxTEFnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_universal.app.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGVYcmZGWmV2cWZndkJTeDJDcWwxNmJLVFkrbTJueTgxTU11SlpDZytKd1lTZUJXMDRkL0k3UElpdWZiMW0wR3JGS0dnL2pTNjU5R243TWF2STlZU2dzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3NTY3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMTRfeDY0X2VuLVVTLm1zaS56aXAKWVVReWR1cFQ0N0thTmlybllVT1VxcWxjN3dQK3NNamFEZFdpamN4Yk5mKzNPRFZkc21kYVNweG1IWXdpb0cveHpsR01rV1VWRlg3NThwUitrL25zQkE9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_0.8.14_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJyK2lyWmN5MlpFV3U5dFlZWk9oVS9yMUFFaXVxU29kK1NXR0crYzRWSXE2aDlCOVVFQkRJVGt5b3djOHRqSEdUUUdmWWRUUjg5OVVlc3dLT2Z3aUE0PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0NTIxNDMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CkFiblZ2STdGeFcreUFwZU14TnpUU1FKNzExVHYxUzRPY0FLVVY3eWp1MFhJcUxodWFOdFM5Q2R5dDh5dTdIdTJ6bU0zRTlTMXRCYVozY1JrZTM1ZEJ3PT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.27/Tari.Universe_universal.app.tar.gz"
}
}
}
40 changes: 39 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,42 @@
# Tari Universe - Testnet v0.8.7: "The Deep Conclave"
# Tari Universe - Testnet v0.8.25

_December 17, 2024_

## 🎮 GPU Mining Enhancements

- **Mac Optimization**
- Resolved 60% nonce discard issue
- Enhanced proof of work processing efficiency
- Improved true hash rate efficiency by 60%

- **OpenSSL Updates**
- Enhanced GPU recognition system
- Fixed M Mac-specific issues

## 🛠️ Platform Updates

- **Framework Improvements**
- Upgraded to Tauri V2
- Enhanced backend library integration
- Added opt-in alpha release channel in Settings
- Reduced installation error rate by 30%

- **UI Enhancements**
- Improved p2pool statistics display
- Resolved full-screen window issues
- Added orphan chain fix suggestions

## ⚠️ Known Issues

- P2pool optimization pending for low hash mining (<~1000 h/s CPU)
- Latent shares may occur until next update
- 30-60 minute sync time with auto solo mining during sync
- Intermittent hash power cycling
- Minor window sizing issues persist

---

# Tari Universe - Testnet v0.8.7

_December 6, 2024_

Expand Down
81 changes: 54 additions & 27 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,20 @@
<link rel="icon" type="image/svg+xml" href="/tari.svg" />

<!-- Preload Poppins fonts -->
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Regular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Medium.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-SemiBold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Bold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-ExtraBold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Regular.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Medium.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/Poppins/Poppins-SemiBold.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/Poppins/Poppins-Bold.woff2" as="font" type="font/woff2" crossorigin />

<!-- Preload Druk fonts -->
<link rel="preload" href="/assets/fonts/Druk/DrukLCG-Bold.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Medium.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Bold.ttf" as="font" type="font/ttf" crossorigin>
<link rel="preload" href="/assets/fonts/Druk/DrukLCG-Bold.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/Druk/DrukWideLCG-Bold.woff2" as="font" type="font/woff2" crossorigin />

<!-- Google Fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap" rel="stylesheet">
<!-- Preload IBM Plex Mono fonts -->
<link rel="preload" href="/assets/fonts/IBMPlexMono/IBMPlexMono-Regular.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/IBMPlexMono/IBMPlexMono-Medium.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/IBMPlexMono/IBMPlexMono-SemiBold.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/assets/fonts/IBMPlexMono/IBMPlexMono-Bold.woff2" as="font" type="font/woff2" crossorigin />

<script type="module" crossorigin src="/assets/glApp.js"></script>
<title>Tari Universe | Testnet</title>
Expand Down Expand Up @@ -67,42 +66,70 @@
url("/assets/fonts/Poppins/Poppins-Bold.ttf") format("truetype");
font-display: swap;
}

/* Druk Font Faces */
@font-face {
font-family: "Poppins";
font-weight: 800;
font-family: "Druk";
src:
url("/assets/fonts/Druk/DrukLCG-Bold.woff2") format("woff2"),
url("/assets/fonts/Druk/DrukLCG-Bold.woff") format("woff"),
url("/assets/fonts/Druk/DrukLCG-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: "DrukWide";
src:
url("/assets/fonts/Poppins/Poppins-ExtraBold.woff2") format("woff2"),
url("/assets/fonts/Poppins/Poppins-ExtraBold.woff") format("woff"),
url("/assets/fonts/Poppins/Poppins-ExtraBold.ttf") format("truetype");
url("/assets/fonts/Druk/DrukWideLCG-Bold.woff2") format("woff2"),
url("/assets/fonts/Druk/DrukWideLCG-Bold.woff") format("woff"),
url("/assets/fonts/Druk/DrukWideLCG-Bold.ttf") format("truetype");
font-weight: 800;
font-style: normal;
font-display: swap;
}


/* Druk Font Faces */
/* IBM Plex Mono Fonts */

@font-face {
font-family: "Druk";
src: url("/assets/fonts/Druk/DrukLCG-Bold.ttf") format("truetype");
font-weight: 700;
font-family: "IBM Plex Mono";
src: url("/assets/fonts/IBMPlexMono/IBMPlexMono-Regular.woff2") format("woff2"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Regular.woff") format("woff"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "DrukWide";
src: url("/assets/fonts/Druk/DrukWideLCG-Medium.ttf") format("truetype");
font-family: "IBM Plex Mono";
src: url("/assets/fonts/IBMPlexMono/IBMPlexMono-Medium.woff2") format("woff2"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Medium.woff") format("woff"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Medium.ttf") format("truetype");
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "DrukWide";
src: url("/assets/fonts/Druk/DrukWideLCG-Bold.ttf") format("truetype");
font-weight: 700;
font-family: "IBM Plex Mono";
src: url("/assets/fonts/IBMPlexMono/IBMPlexMono-SemiBold.woff2") format("woff2"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-SemiBold.woff") format("woff"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-SemiBold.ttf") format("truetype");
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "IBM Plex Mono";
src: url("/assets/fonts/IBMPlexMono/IBMPlexMono-Bold.woff2") format("woff2"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Bold.woff") format("woff"),
url("/assets/fonts/IBMPlexMono/IBMPlexMono-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
font-display: swap;
}

/* Existing styles */
body,
Expand Down
Loading

0 comments on commit a44e64b

Please sign in to comment.