Skip to content

Commit

Permalink
canary -> main sync (#255)
Browse files Browse the repository at this point in the history
* ci: fix warnings and PR build (#232) (#237)

* CI: Fix warnings, add PR Build check

* ci: mocked keys

* feat: get privatekey (#236)

* fix: linter errors

* bump canary version

* Node playlists (#238)

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows

* Update networks.ts

Should ensure that the defaultPlaylist function is correctly returning a NetworkPlaylist object with the default network settings.

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows
And modified the code to follow better practices for the defaultPlaylist and updateNetwork functions, to hopefully run better and not be caught by the linters

* Update networks.ts

Fallbacks for the playlist with network functionality deferred to rust

* bump canary version

* Node playlists (#239)

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows

* Update networks.ts

Should ensure that the defaultPlaylist function is correctly returning a NetworkPlaylist object with the default network settings.

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows
And modified the code to follow better practices for the defaultPlaylist and updateNetwork functions, to hopefully run better and not be caught by the linters

* Update networks.ts

Fallbacks for the playlist with network functionality deferred to rust

* Update networks.ts

Replaced get with fetch and bypassed the http calls by retuning the embedded node list directly as it matches the expected behavior in rust

* chore: make things pretty

* Node playlists (#240)

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows

* Update networks.ts

Should ensure that the defaultPlaylist function is correctly returning a NetworkPlaylist object with the default network settings.

* Update networks.ts

Added fallback nodes and modified initNetwork for better functionality and enhanced test flows
And modified the code to follow better practices for the defaultPlaylist and updateNetwork functions, to hopefully run better and not be caught by the linters

* ci: fix warnings and PR build (#232)

* CI: Fix warnings, add PR Build check

* ci: mocked keys

* Update networks.ts

Fallbacks for the playlist with network functionality deferred to rust

* Update networks.ts

Replaced get with fetch and bypassed the http calls by retuning the embedded node list directly as it matches the expected behavior in rust

---------

Co-authored-by: Kalvis Kuskis <[email protected]>

* Fix transfers for rotated authkeys (#241)

* Revert "Fix transfers for rotated authkeys (#241)" (#242)

This reverts commit 43644ba.

* Fix mining issue (#244)

* fix: signingAccount data not synchronized  (#225)

* fix: mining UI issue (#193)

* fix: mining issue (#225  #224 #213  #210  #207 #204 #191  #190)

* fix: form submit issue (#208)

* feat: Copy address to clipboard (#248)

* fix: Compatible with chain_name in libra.yaml and chain_id in TS code.

* feat: Copy address to clipboard

* fix: when MINER is on, it accidentally switches accounts (#219) (#253)

---------

Co-authored-by: BBK <[email protected]>
Co-authored-by: teisnilsson <[email protected]>
Co-authored-by: Zaki Manian <[email protected]>
  • Loading branch information
4 people authored Feb 29, 2024
1 parent 4160b04 commit 35886ea
Show file tree
Hide file tree
Showing 55 changed files with 38,063 additions and 185 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
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

3 changes: 1 addition & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
ts-lint:
runs-on: ubuntu-latest
steps:

# Setup Node.js
- name: setup node
uses: actions/[email protected]
Expand Down Expand Up @@ -62,7 +61,7 @@ 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
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

jobs:
build-and-publish:
build-and-publish:
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -36,7 +36,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 @@ -50,16 +50,15 @@ 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-on-failure: true

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

- name: yarn installation
run: yarn install
Expand All @@ -72,9 +71,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 @@ -85,4 +84,3 @@ jobs:
releaseDraft: true
prerelease: false
includeUpdaterJson: true

16 changes: 0 additions & 16 deletions DEVELOPMENT.md

This file was deleted.

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)




23 changes: 12 additions & 11 deletions docs/devs/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ Additionally, you'll need to set up your environment for Tauri development:

1. **Install Rust Dependencies**: Navigate to the `src-tauri/` directory and build the Rust codebase:

```bash
cd src-tauri/
cargo build
```
```bash
cd src-tauri/
cargo build
```

2. **Install JavaScript Dependencies**: Return to the project root directory and install the JavaScript dependencies using Yarn:

```bash
cd ..
yarn
```
```bash
cd ..
yarn
```

3. **Start the Development Server**: Launch the development server with:

```bash
yarn dev
```
```bash
yarn dev
```

Closing the app window exits the development/debug mode.

Expand All @@ -50,6 +50,7 @@ Compile and package your Carpe application for production with:
```bash
yarn build
```

This generates an optimized version of your application, including standalone executables and installers, in the `src-tauri/target/release` directory.

## Additional Resources
Expand Down
3 changes: 1 addition & 2 deletions docs/devs/npm-port.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
You should check that the npm dev mode is serving on 5050. Sometimes NPM may start with a random port if you have a previous process that hasn't been killed which was using 5050.


```
Your application is ready~! 🚀
- Local: http://localhost:5050
```
```
34 changes: 23 additions & 11 deletions docs/devs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,45 @@
Before creating a new TAG, please confirm that Cargo.toml file is pointing to the right libra branch.

## Create a Candidate Release

1. Update app version on files (i.e.: “0.3.0”):
- src-tauri/Cargo.toml
- src-tauri/tauri.conf.json

- src-tauri/Cargo.toml
- src-tauri/tauri.conf.json

2. Create first candidate release TAG. i.e.: v0.3.0-rc.0
- mark TAG checkbox “pre-release”
- github actions will generate builds for OSs

- mark TAG checkbox “pre-release”
- github actions will generate builds for OSs

3. Share builds link on the #carpe-test channel and get feedback from tests

## Update Candidate Release

1. Merge PRs with fixes or improvements
2. Create TAG. i.e.: v0.3.0-rc.1 -> v0.3.0-rc.2 -> v0.3.0-rc.3
- mark TAG checkbox “pre-release”
- github actions will generate builds for OSs

- mark TAG checkbox “pre-release”
- github actions will generate builds for OSs

3. Share builds link on the #carpe-test channel and get feedback from tests

## Publish a Release

1. Create release TAG. i.e.: v0.3.0
2. Update docs with new installer links
- README
- Win
- Mac
- Debian

- README
- Win
- Mac
- Debian

3. Update auto updater version and links

__________
---

## Icons

If the app icon design will be changed, the high resolution file needs to be in `./app-icon.png`.
Then simply run `yarn tauri icon`, and all the icon formats will be created.

Expand Down
Loading

0 comments on commit 35886ea

Please sign in to comment.