Skip to content

Commit

Permalink
chore: make things pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
kalvkusk committed Feb 22, 2024
1 parent 2c4a942 commit f9f99d7
Show file tree
Hide file tree
Showing 27 changed files with 37,753 additions and 143 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
extraFileExtensions: ['.svelte'],
},
rules: {
"svelte/no-at-html-tags" : "off" // we use @html for translations only
'svelte/no-at-html-tags': 'off', // we use @html for translations only
},
env: {
browser: true,
Expand All @@ -31,4 +31,4 @@ module.exports = {
},
},
],
}
}
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: "\U0001F41B Carpe Bug report"
about: Create a bug report to help improve Carpe
title: "[Bug]"
title: '[Bug]'
labels: bug
assignees: ''

---

# 🐛 Bug
Expand All @@ -15,8 +14,8 @@ assignees: ''

**Steps to reproduce**


**Print screen or Debug/Console error message**

```
// Paste the output here
```
Expand All @@ -28,6 +27,7 @@ assignees: ''
## System information

**Please complete the following information:**

- <!-- Carpe Version -->
- <!-- Computer OS -->

Expand Down
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: "\U0001F680 Carpe Feature request"
about: Suggest a new feature in Carpe
title: "[Feature Request]"
title: '[Feature Request]'
labels: enhancement
assignees: ''

---

# 🚀 Feature Request
Expand All @@ -14,15 +13,18 @@ assignees: ''
## Motivation

**Is your feature request related to a problem? Please describe.**

<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
<!-- Please link to any relevant issues or other PRs! -->

## Pitch

**Describe the solution you'd like**

<!-- A clear and concise description of what you want to happen. -->

**Describe alternatives you've considered**

<!-- A clear and concise description of any alternative solutions or features you've considered. -->

**Are you willing to open a pull request?** (See [CONTRIBUTING](../../CONTRIBUTING.md))
Expand Down
38 changes: 18 additions & 20 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ on:
tags:
- '*'
branches:
- '*'
- '*'
pull_request:
types:
- opened
branches:
- 'release**'
- 'main'

jobs:
build:
build:
strategy:
fail-fast: false
matrix:
os: [ windows-latest, macos-latest ]
os: [windows-latest, macos-latest]
name: build ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -34,10 +34,10 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0

- name: Set rust_version from rust_toolchain file
run: echo "RUST_VERSION=$(cat src-tauri/rust-toolchain)" >> $GITHUB_ENV

- name: Set rust_version from rust_toolchain file
if: matrix.os == 'windows-latest'
run: |
Expand All @@ -47,9 +47,9 @@ jobs:
- uses: actions-rs/[email protected]
with:
profile: minimal
toolchain: "${{ env.RUST_VERSION }}"
toolchain: '${{ env.RUST_VERSION }}'
override: true

# Setup Node.js
- name: setup node
uses: actions/[email protected]
Expand All @@ -60,7 +60,7 @@ jobs:
if: matrix.os == 'windows-latest'
uses: KyleMayes/install-llvm-action@v1
with:
version: "11.0"
version: '11.0'
directory: ${{ runner.temp }}/llvm

- name: Set LIBCLANG_PATH
Expand All @@ -74,18 +74,16 @@ jobs:
$var = (get-item $(rustup which rustc)).Directory.Parent.FullName+ '\lib\rustlib\' + (rustc -vV | findstr "host:*").split(':')[1].Trim() + '\lib'
Copy-Item ('${{ github.workspace }}' + '\redist' + '\x86_64\*') -Destination $var -Recurse
######## CACHE ########
######## CACHE ########

- uses: Swatinem/rust-cache@v2
with:
workspaces: ./src-tauri
shared-key: "${{ matrix.os }}"
cache-all-crates: true
cache-on-failure: true

workspaces: ./src-tauri
shared-key: '${{ matrix.os }}'
cache-all-crates: true
cache-on-failure: true

######## BUILD ########
######## BUILD ########

- name: yarn installation
run: yarn install
Expand All @@ -97,6 +95,6 @@ jobs:
- name: build tauri
run: yarn run build:github-pr
env:
# Mocked keys.
TAURI_PRIVATE_KEY: "dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5ZUYrUFF0RS9ZbU5EN0VFWk52TmpDRDQvTFFWOHhqSXNkZFVvUjZSRWNJc0FBQkFBQUFBQUFBQUFBQUlBQUFBQTZhNUxkYVFJWDNWTENKR2tSNzFVcDhsRzcvd0lKeWRGcytBZDNyZ3o3OWRXOWVmbmZCQktJYk8xOHVHWG5CZ25XN1pBOXM3SjMyWW1DRFNZWFJ5WGxsd3B6d3RvOEtTNHFFbFM5VE5obmNEZ1dHeEljVFRhZ2FXa0RzNHZOVkNESE5DdDArUmkvUUE9Cg=="
TAURI_KEY_PASSWORD: "mock"
# Mocked keys.
TAURI_PRIVATE_KEY: 'dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5ZUYrUFF0RS9ZbU5EN0VFWk52TmpDRDQvTFFWOHhqSXNkZFVvUjZSRWNJc0FBQkFBQUFBQUFBQUFBQUlBQUFBQTZhNUxkYVFJWDNWTENKR2tSNzFVcDhsRzcvd0lKeWRGcytBZDNyZ3o3OWRXOWVmbmZCQktJYk8xOHVHWG5CZ25XN1pBOXM3SjMyWW1DRFNZWFJ5WGxsd3B6d3RvOEtTNHFFbFM5VE5obmNEZ1dHeEljVFRhZ2FXa0RzNHZOVkNESE5DdDArUmkvUUE9Cg=='
TAURI_KEY_PASSWORD: 'mock'
17 changes: 8 additions & 9 deletions .github/workflows/gmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
fail-fast: false
matrix:
config:
# - os: ubuntu-20.04
# vcpkg_triplet: x64-linux-release
- os: macos-11
vcpkg_triplet: x64-osx-dynamic
- os: windows-2019
vcpkg_triplet: x64-windows-release
# - os: ubuntu-20.04
# vcpkg_triplet: x64-linux-release
- os: macos-11
vcpkg_triplet: x64-osx-dynamic
- os: windows-2019
vcpkg_triplet: x64-windows-release
steps:
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
allowUpdates: true
tag: gmp-libraries-${{ matrix.config.os }}
commit: ${{github.ref}}
body: "gmp libs built from source"
body: 'gmp libs built from source'
artifacts: ${{ github.workspace }}/vcpkg/installed/x64-osx*/**/*.dylib, ${{ github.workspace }}/vcpkg/installed/x64-osx*/**/*.a

- name: release win
Expand All @@ -69,6 +69,5 @@ jobs:
allowUpdates: true
tag: gmp-libraries-${{ matrix.config.os }}
commit: ${{github.ref}}
body: "gmp libs built from source"
body: 'gmp libs built from source'
artifacts: ${{ github.workspace }}\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}/**/*gmp*.lib, ${{ github.workspace }}\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}/**/*gmp*.dll

11 changes: 5 additions & 6 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
ts-lint:
runs-on: ubuntu-latest
steps:

# Setup Node.js
- name: setup node
uses: actions/[email protected]
Expand Down Expand Up @@ -44,10 +43,10 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0

- name: Set rust_version from rust_toolchain file
run: echo "RUST_VERSION=$(cat src-tauri/rust-toolchain)" >> $GITHUB_ENV

- uses: actions-rs/[email protected]
with:
profile: minimal
Expand All @@ -61,12 +60,12 @@ jobs:
- name: cache rust
uses: Swatinem/rust-cache@v2
with:
shared-key: "libra" # to share across CI builds, so it is not job-id specific
shared-key: 'libra' # to share across CI builds, so it is not job-id specific
cache-on-failure: true

- name: check format
working-directory: ./src-tauri
run: cargo fmt --all -- --check
run: cargo fmt --all -- --check

- name: lint
working-directory: ./src-tauri
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ on:
- 'release-[0-9]+.[0-9]+.[0-9]+'
- 'ci'
jobs:
build-and-publish:
build-and-publish:
strategy:
fail-fast: false
matrix:
os: [ windows-latest, macos-latest ]
os: [windows-latest, macos-latest]
name: build ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
if: matrix.os == 'windows-latest'
uses: KyleMayes/install-llvm-action@v1
with:
version: "11.0"
version: '11.0'
directory: ${{ runner.temp }}/llvm

- name: Set LIBCLANG_PATH
Expand All @@ -59,17 +59,16 @@ jobs:
$var = (get-item $(rustup which rustc)).Directory.Parent.FullName+ '\lib\rustlib\' + (rustc -vV | findstr "host:*").split(':')[1].Trim() + '\lib'
Copy-Item ('${{ github.workspace }}' + '\redist' + '\x86_64\*') -Destination $var -Recurse
######## CACHE ########
######## CACHE ########

- uses: Swatinem/rust-cache@v2
with:
workspaces: ./src-tauri
shared-key: "${{ matrix.os }}"
cache-all-crates: true
cache-on-failure: true
workspaces: ./src-tauri
shared-key: '${{ matrix.os }}'
cache-all-crates: true
cache-on-failure: true

######## BUILD ########
######## BUILD ########

- name: yarn installation
run: yarn install
Expand All @@ -82,9 +81,9 @@ jobs:
id: build-tauri
uses: tauri-apps/[email protected]
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
TAURI_PRIVATE_KEY: "${{secrets.TAURI_PRIVATE_KEY}}"
TAURI_KEY_PASSWORD: "${{secrets.TAURI_KEY_PASSWORD}}"
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
TAURI_PRIVATE_KEY: '${{secrets.TAURI_PRIVATE_KEY}}'
TAURI_KEY_PASSWORD: '${{secrets.TAURI_KEY_PASSWORD}}'
with:
args: ${{contains(github.ref, 'canary') && '--config src-tauri/tauri.conf.canary.json --features carpe-canary' || '' }}
# pass the rust feature flags for canary if the tag includes "canary"
Expand All @@ -95,4 +94,3 @@ jobs:
releaseDraft: true
prerelease: false
includeUpdaterJson: true

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ Currently Windows and Mac are supported:

- [Download MacOs 11+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0/carpe_1.0.0_x64.dmg) and read the [Mac instructions](docs/start-carpe-mac.md)


On Windows, currently, Microsoft Edge WebView2 must be installed manually first.
https://developer.microsoft.com/en-us/microsoft-edge/webview2/consumer

# About
Carpe is a desktop "wallet" that connects to the 0L network and lets you create accounts, do some account management. It also is a light "miner" allowing you to mine coins! To learn more about 0L itself follow the link: [0L introduction](https://github.com/OLSF/libra#readme).

Carpe is a desktop "wallet" that connects to the 0L network and lets you create accounts, do some account management. It also is a light "miner" allowing you to mine coins! To learn more about 0L itself follow the link: [0L introduction](https://github.com/OLSF/libra#readme).

# Creating Accounts

Like any account-based blockchain, any new account address you create in the Carpe app will initially be inactive. For the account to become active, someone needs to send you at least one coin to it. Until that happens your account does not exist "on chain". If you don't know anyone yet on 0L, come into the Discord chat and just ask anyone there. Many people will be happy to help get you onboarded. Otherwise the app should guide you through it.

[Join us on Discord and get onboarded](https://discord.gg/AzCp63pggW)
Expand All @@ -27,6 +28,3 @@ If you want to help test upcoming versions, you should install the [Canary Relea
## Development

If you are a developer and want to contribute to the project, please continue with the [development environment setup](docs/devs/get-started.md).



2 changes: 1 addition & 1 deletion autoupdater/autoupdater_payload_canary.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0-11-canary/carpe-canary_1.0.0-11_x64-setup.nsis.zip"
}
}
}
}
8 changes: 4 additions & 4 deletions carpe.code-workspace
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"folders": [
{
"path": "."
}
]
}
"path": ".",
},
],
}
27,808 changes: 27,807 additions & 1 deletion dist/assets/index-d5120c7d.js

Large diffs are not rendered by default.

9,793 changes: 9,792 additions & 1 deletion dist/assets/index-e225b5d2.css

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script type="module" crossorigin src="/assets/index-d5120c7d.js"></script>
<link rel="stylesheet" href="/assets/index-e225b5d2.css">
<link rel="stylesheet" href="/assets/index-e225b5d2.css" />
</head>
<body>

</body>
</html>
<body></body>
</html>
4 changes: 0 additions & 4 deletions docs/canary-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@ Canary version allows you to have both installations side-by-side without interf
Canary versions will receive Over-The-Air updates just like the production version.

[Download Carpe Canary Here](https://github.com/0LNetworkCommunity/carpe/releases/tag/v1.0.0-16-canary)




Loading

0 comments on commit f9f99d7

Please sign in to comment.