Skip to content

Commit

Permalink
Merge pull request #164 from Chia-Network/develop
Browse files Browse the repository at this point in the history
Release 1.1.27
  • Loading branch information
TheLastCicada authored Nov 13, 2023
2 parents 2f17cd5 + c0c5f69 commit 98cb240
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 24 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/build-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == 'refs/heads/main' && github.sha || '' }}
cancel-in-progress: true

permissions:
id-token: write
contents: write

defaults:
run:
shell: bash
Expand Down Expand Up @@ -152,8 +156,6 @@ jobs:
- name: Prep .env file
run: |
cp .env.example .env
# back to this once we have a lock: npm ci
npm install
- name: Populate .env file for custom builds
run: |
Expand All @@ -162,7 +164,6 @@ jobs:
cat .env
if: matrix.preconfiguration.name != 'default'


- name: Import Apple installer signing certificate
if: matrix.os.matrix == 'macos'
uses: Apple-Actions/import-codesign-certs@v2
Expand All @@ -183,6 +184,7 @@ jobs:
- name: Build electron app
if: matrix.os.matrix != 'macos'
run: |
npm install
npm run build
npm run package-none -- ${{ matrix.os.electron-builder-options }} ${{ matrix.arch.electron-builder-options }}
Expand All @@ -192,6 +194,7 @@ jobs:
# macos
CSC_FOR_PULL_REQUEST: 'true'
run: |
npm install
npm run build
npm run package-none -- ${{ matrix.os.electron-builder-options }} ${{ matrix.arch.electron-builder-options }}
Expand Down Expand Up @@ -254,7 +257,6 @@ jobs:
path: 'artifacts/*'
if: matrix.preconfiguration.name != 'default'


# We want to delete this no matter what happened in the previous steps (failures, success, etc)
- name: Delete signing keychain
if: always()
Expand All @@ -276,7 +278,10 @@ jobs:
run: |
echo "TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3)" >>$GITHUB_OUTPUT
- name: Gets JWT Token from GitHub
uses: Chia-Network/actions/github/jwt@main

- name: Trigger apt repo update
run: |
curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"[\"climate-wallet\"]","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"false","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/start
curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"[\"climate-wallet\"]","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"false","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/success/deploy
curl -s -XPOST -H "Authorization: Bearer ${{ env.JWT_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"[\"climate-wallet\"]","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"false","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/start
curl -s -XPOST -H "Authorization: Bearer ${{ env.JWT_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"[\"climate-wallet\"]","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"false","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/success/deploy
36 changes: 19 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
# Climate Wallet

![Minimum Chia Version](https://raw.githubusercontent.com/Chia-Network/core-registry-api/main/minimumChiaVersion.svg)
![Tested Up to Chia Version](https://raw.githubusercontent.com/Chia-Network/core-registry-api/main/testedChiaVersion.svg)

This repository holds the source code for the Climate Wallet in the Climate Tokenization Suite. Related programs are:
* [Climate Tokenization Engine](https://github.com/Chia-Network/Climate-Tokenization-Engine) and [UI](https://github.com/Chia-Network/Climate-Tokenization-Engine-UI)
* [Climate Token Driver](https://github.com/Chia-Network/climate-token-driver)
* [CADT](https://github.com/Chia-Network/cadt) and [UI](https://github.com/Chia-Network/cadt-ui)
* [Chia Blockchain](https://github.com/Chia-Network/chia-blockchain)

- [Climate Tokenization Engine](https://github.com/Chia-Network/Climate-Tokenization-Engine) and [UI](https://github.com/Chia-Network/Climate-Tokenization-Engine-UI)
- [Climate Token Driver](https://github.com/Chia-Network/climate-token-driver)
- [CADT](https://github.com/Chia-Network/cadt) and [UI](https://github.com/Chia-Network/cadt-ui)
- [Chia Blockchain](https://github.com/Chia-Network/chia-blockchain)

Note this wallet is an independent plugin to the latest official [Chia Wallet](https://www.chia.net/downloads/).

*Note: Version 1.1.0 contains breaking changes. Configuration variables are renamed in the config.yaml file and are best handled by taking a backup of the Climate Wallet config.yaml file, unistalling the Climate Wallet and deleting the climate-wallet config.yaml file, then reinstalling and reconfiguring.*
_Note: Version 1.1.0 contains breaking changes. Configuration variables are renamed in the config.yaml file and are best handled by taking a backup of the Climate Wallet config.yaml file, unistalling the Climate Wallet and deleting the climate-wallet config.yaml file, then reinstalling and reconfiguring._

# Usage

The Climate Wallet connects with the official [Chia Wallet](https://www.chia.net/downloads/) running on localhost. The Climate Wallet also needs to connect to a [CADT](https://github.com/Chia-Network/cadt) node, which could be a publicly available observer node.
The Climate Wallet connects with the official [Chia Wallet](https://www.chia.net/downloads/) running on localhost. The Climate Wallet also needs to connect to a [CADT](https://github.com/Chia-Network/cadt) node, which could be a publicly available observer node.

## Installation

Precompiled binaries and installers are available for x86 and ARM versions of MacOS, Windows, and Debian-based Linux distros (Ubuntu, Mint, PopOS, etc) on the [releases](https://github.com/Chia-Network/Climate-Wallet/releases) page.

#### Using APT on Debian-based Linux Distros (Ubuntu, Mint, etc)

The Climate Wallet can be installed with `apt`.
The Climate Wallet can be installed with `apt`.

1. Start by updating apt and allowing repository download over HTTPS:

Expand Down Expand Up @@ -48,16 +52,16 @@ sudo apt-get update
sudo apt-get install climate-wallet
```

5. Run the Climate Wallet from your OS launcher or at the command line with `climate-wallet`.
5. Run the Climate Wallet from your OS launcher or at the command line with `climate-wallet`.

## Configuration

A config.yaml file located at `./chia/mainnet/climate-wallet`. This config file is created when the application is first run. When configuration changes are made, the application must be restarted before they take effect. The default values in this file:
A config.yaml file located at `./chia/mainnet/climate-wallet`. This config file is created when the application is first run. When configuration changes are made, the application must be restarted before they take effect. The default values in this file:

- `cadtApiServerHosts`: List of CADT API servers
- `apiTimeout`: API request timeout
- `cadtUiHost`: CADT UI host
- `version`: Climate Wallet version
- `cadtApiServerHosts`: List of CADT API servers
- `apiTimeout`: API request timeout
- `cadtUiHost`: CADT UI host
- `version`: Climate Wallet version

# Developer Guide

Expand All @@ -77,7 +81,6 @@ A config.yaml file located at `./chia/mainnet/climate-wallet`. This config file
- `types`: typescript types
- `util`: this project utilities


## Prerequisite

You will need a running instance of [Chia Wallet](https://www.chia.net/downloads/) before the next steps.
Expand All @@ -102,7 +105,6 @@ You will need a running instance of [Chia Wallet](https://www.chia.net/downloads

submodule used `Climate Token Driver Suite` client service port `31314`


### Run from source for development

- [Install nodejs](https://nodejs.org/en/) or [NVM](https://github.com/nvm-sh/nvm)
Expand Down Expand Up @@ -170,8 +172,8 @@ The first part of this is the commit "type". The most common types are "feat" fo
- `chore` is for changes that don't modify code, like a version bump
- `revert` is for reverting a previous commit

After the type and scope there should be a colon. The "subject" of the commit follows. It should be a short indication of the change. The commit convention prefers that this is written in the present-imperative tense.
After the type and scope there should be a colon. The "subject" of the commit follows. It should be a short indication of the change. The commit convention prefers that this is written in the present-imperative tense.

### Branch Layout

All pull requests should be made against the `develop` branch. Commits to the `main` branch will trigger a release, so the `main` branch is always the code in the latest release.
All pull requests should be made against the `develop` branch. Commits to the `main` branch will trigger a release, so the `main` branch is always the code in the latest release.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Chia Network <hello@chia.net> (https://chia.net/)",
"description": "Climate Wallet for Chia Blockchain",
"productName": "Climate Wallet",
"version": "1.1.26",
"version": "1.1.27",
"private": true,
"homepage": "./",
"main": "build/electron/main.js",
Expand Down

0 comments on commit 98cb240

Please sign in to comment.