Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main -> release 1.0.8 #290

Merged
merged 6 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:

- name: Build Tauri
id: build-tauri
uses: tauri-apps/tauri-action@v0.5.0
uses: tauri-apps/tauri-action@v0.5.1
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
TAURI_PRIVATE_KEY: '${{secrets.TAURI_PRIVATE_KEY}}'
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@

Currently Windows and Mac are supported:

- [Download Windows 10+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.2/carpe_1.0.2_x64_en-US.msi) and read the [Windows instructions](docs/start-carpe-windows.md)
- [Download Windows 10+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.7/carpe_1.0.7_x64_en-US.msi)

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

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. To learn more about 0L itself, you can check out the official website of the project : [0L Network website](https://0l.network/).

# Creating Accounts

Expand Down
12 changes: 6 additions & 6 deletions autoupdater/autoupdater_payload.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "1.0.6",
"notes": "Bugfixes",
"version": "1.0.7",
"notes": "Miner sunset",
"pub_date": "2024-03-11T10:57:15.333Z",
"platforms": {
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHFML2t4OFFGUG1RUFNWVkJYbXJISnJnQkg2Y0QxVmF4OHVjbUFuenpkMGJmMDdZVzYzN0tHbk5iY2RsMXhRUTRUQlBSNFVzcGhZdm9iSUpOb00xSWdrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzEwMTU4NzUyCWZpbGU6Y2FycGVfMS4wLjZfeDY0X2VuLVVTLm1zaS56aXAKbjFTMGxsKytJQVJ1UW91VFZTYnEvSTZwTDFFdzVLR3phNzk5MHBEVEpQaTl6bnRYMk12VXJLcEdxNHpjcEpOODBadGZ3TTl6T1RsUmZFOWl3UjRWQlE9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.6/carpe_1.0.6_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHIveDg4cERZS0RPbkN4bGNHYmZhaHdpZm5EREk0MExoOWYxejFwZnVtNHZZMUhEaE9kTXJPMnlkbE0wd1BRenRDUno4T2s3WmJvaDJCMjl1L0dWVlEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzEyODQ4NTQ3CWZpbGU6Y2FycGVfMS4wLjdfeDY0X2VuLVVTLm1zaS56aXAKUVhIcHM0b0hPWmlZZi9vRmdqSmxmTWF2WUtqQnMzTWdVRyt2QmhIUkxWZ0hHeHVqalZSVmNEVnltcUFmS0swdlJBb3EvTVR2QVhzM3pLS2d3dVVHREE9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.7/carpe_1.0.7_x64_en-US.msi.zip"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbG9TM0gzY0RuUFI2SVVSM2xVUnFvb2JNcUx6Q3paK2Y0ZzVrZlNrN0ZSV3N5ckR4MnhWRnZjbUVpdWpOblQvME54eHZGc3JEY1hHQjI5TS9jWlZ4MGdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzEwMTYxODIyCWZpbGU6Y2FycGUuYXBwLnRhci5negpvSmo4QnZmMW92VFQwbFJWWHVHOFRNZG0wanJhZFlLSHNxZmVLendSYzNmRWlqV1JiRnpDQkhTbndyTjBYWHNPbjhVa0s3eFpXKzdLR2dnWkxFREFDdz09Cg==",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.6/carpe_x64.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHI0RXZ6L24vczhRaWNCOStEMmVkV3RNemNmcVBLSHlFMlM2STRKL0pycjUwbkZoTVVUd2hFVjk2YVhuVHJwNUtCVEtYNThnNWFMb25SOGxIU3hRNEFvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzEyODQ4NzM4CWZpbGU6Y2FycGUuYXBwLnRhci5negpYRVk4dnBmMVNPdXd6TnA5UnlzV1lzbHZJd210ZUdwRE4rbndyN3JtSkt4eGhFeDFtZU1RSHpQNUx0cnF3enJPMWZGQVJzekU2dkR6M3Ywd0JLRThCZz09Cg==",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.7/carpe_x64.app.tar.gz"
}
}
}
2 changes: 1 addition & 1 deletion docs/canary-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ 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)
[Download Carpe Canary Here](https://github.com/0LNetworkCommunity/carpe/releases/tag/v1.0.1-3-canary)
6 changes: 3 additions & 3 deletions docs/devs/get-started.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Developing and Building Carpe with Tauri and Svelte

Carpe leverages the power of [Tauri](https://tauri.studio) for building secure, lightweight desktop applications and [Svelte](https://svelte.dev) for creating efficient, reactive web interfaces. The template for Carpe can be found at: https://github.com/jbarszczewski/tauri-svelte-template.
Carpe leverages the power of [Tauri](https://tauri.app/) for building secure, lightweight desktop applications and [Svelte](https://svelte.dev) for creating efficient, reactive web interfaces. The template for Carpe can be found at: https://github.com/jbarszczewski/tauri-svelte-template.

## Get Started

Expand All @@ -16,7 +16,7 @@ Ensure you have the following prerequisites installed:

Additionally, you'll need to set up your environment for Tauri development:

- Follow the Tauri setup guide: [Setting up your environment](https://tauri.studio/en/docs/getting-started/intro#setting-up-your-environment).
- Follow the Tauri setup guide: [Setting up your environment](https://tauri.app/v1/guides/).
- For Windows users, a specific guide is available: [Windows development environment setup](./windows-dev-setup.md).

### Installation Steps
Expand Down Expand Up @@ -55,6 +55,6 @@ This generates an optimized version of your application, including standalone ex

## Additional Resources

- [Tauri Studio](https://tauri.studio): Official Tauri project website with comprehensive documentation.
- [Tauri Studio](https://tauri.app/): Official Tauri project website with comprehensive documentation.
- [Svelte](https://svelte.dev): Home of the Svelte framework, with guides, tutorials, and API documentation.
- [Sveltestrap](https://sveltestrap.js.org): Bootstrap 4 components for Svelte, facilitating quick and responsive UI development.
2 changes: 1 addition & 1 deletion docs/devs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ Before creating a new TAG, please confirm that Cargo.toml file is pointing to th
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.

https://tauri.studio/docs/guides/icons/
[https://tauri.studio/docs/guides/icons/](https://tauri.app/v1/guides/features/icons/#__docusaurus_skipToContent_fallback)
2 changes: 1 addition & 1 deletion docs/devs/windows-dev-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ The MS compiler toolchain requires various environment variables set correctly.
Carpe can now be cloned from GitHub and built, in the shell opened in step 7, with the same commands as used for the Linux and MacOS builds:

```
git clone [git@github.com:OLSF/carpe.git](https://github.com/OLSF/carpe.git)
git clone https://github.com/0LNetworkCommunity/carpe.git
cd carpe
cd cd src-tauri
cargo build
Expand Down
2 changes: 1 addition & 1 deletion docs/start-carpe-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
You can find the installable Mac package in the releases folder:

macOS version 10.15 or higher
https://github.com/OLSF/carpe/releases/download/v0.3.0/carpe-macos-10.15.dmg
[https://github.com/OLSF/carpe/releases/download/v0.3.0/carpe-macos-10.15.dmg](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.7/carpe_1.0.7_x64.dmg)

## Allow App Permissions

Expand Down
2 changes: 1 addition & 1 deletion docs/start-carpe-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

You can find the Windows 10 installer in the releases folder:

https://github.com/OLSF/carpe/releases/download/v0.3.0/carpe_0.3.0_x64.msi
[https://github.com/OLSF/carpe/releases/download/v0.3.0/carpe_0.3.0_x64.msi](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.7/carpe_1.0.7_x64_en-US.msi)

# Important:

Expand Down
10 changes: 2 additions & 8 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,13 @@ On MacOS you will be prompted for your OS login password (on Windows and Ubuntu

![screen01](./img/keyring.png)

## Get a friend to onboard
## Get onboard

Until you can use the newly created account, you need some 0L user who "onboards" you. Please send the displayed "authkey" to this person.

After the onboarding transaction has been done, the wallet will show some BALANCE for your account and no longer the text "Account not on chain".

If you don't yet have a friend on 0L, come to the [Discord Server](https://discord.gg/AzCp63pggW) and make a new friend that can send your onboarding transaction.

## Mining

After your account has been onboarded, new menus appear on top of the screen. Switch to "MINER" to earn coins.

To start mining, just click on the red toggle button, so it turns into green color.
If you don't yet have a friend on 0L, come to the [Discord Server](https://discord.gg/AzCp63pggW) and send your 0L public adress in the onboarding channel.

## DANGER

Expand Down
14 changes: 7 additions & 7 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ gmp-mpfr-sys = { version = "1.6", default-features = false }
openssl-sys = "0.9.98"

[dependencies]
libra-query = { git = "https://github.com/0LNetworkCommunity/libra-framework.git", rev = "da8bcdb4" }
libra-tower = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }
libra-types = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }
libra-txs = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }
libra-wallet = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }
libra-query = { git = "https://github.com/0LNetworkCommunity/libra-framework.git", rev = "7ce1536" }
libra-tower = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "7ce1536" }
libra-types = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "7ce1536" }
libra-txs = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "7ce1536" }
libra-wallet = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "7ce1536" }

# without these pinned versions, poem-openapi-types fail
poem = { version = "=1.3.55", features = ["anyhow", "rustls"] }
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/commands/preferences.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ pub fn debug_preferences_path() -> Result<PathBuf, CarpeError> {
/// refreshes statistics and returns the synced peers
pub async fn refresh_upstream_peer_stats() -> Result<Vec<Url>, CarpeError> {
let mut app_cfg = get_cfg()?;
app_cfg.refresh_network_profile_and_save(None).await?; // uses app_cfg.chain_info_chain_id
let np = app_cfg.get_network_profile(None)?;
// dbg!(&np);

let np = app_cfg.refresh_network_profile_and_save(None).await?; // uses app_cfg.chain_info_chain_id
app_cfg.network_playlist = vec![np.clone()];
app_cfg.save_file()?;

let peers = match np.the_good_ones() {
Expand Down
3 changes: 2 additions & 1 deletion src-tauri/src/commands/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub async fn coin_transfer(
_sender: AccountAddress,
receiver: &str,
amount: u64,
legacy: bool,
) -> Result<(), CarpeError> {
// NOTE: unsure Serde was catching all cases check serialization
let receiver_account = match AccountAddress::from_str(receiver) {
Expand All @@ -30,7 +31,7 @@ pub async fn coin_transfer(

let mut config = get_cfg()?;
inject_private_key_to_cfg(&mut config)?;
let mut sender = Sender::from_app_cfg(&config, None).await?;
let mut sender = Sender::from_app_cfg(&config, None, legacy).await?;
sender
.transfer(receiver_account, amount as f64, false)
.await?;
Expand Down
Loading
Loading