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

Release 1.0.40 #209

Merged
merged 49 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b336d9a
build: specify Intel macs in ci with new format
TheLastCicada May 17, 2024
3f3f3f6
Merge pull request #184 from Chia-Network/intel-mac
TheLastCicada May 17, 2024
83f1de8
Update chia-blockchain to 2.4.3
Quexington Sep 4, 2024
3935fc0
repin chia-blockchain
Quexington Sep 4, 2024
731cc2c
poetry lock
Quexington Sep 4, 2024
23f3769
add server port to .env generation
Quexington Sep 4, 2024
0588fed
set default port
Quexington Sep 4, 2024
0b2029d
Downgrade unnecessary dependencies
Quexington Sep 4, 2024
8104d7d
Remove breakpoint
Quexington Sep 4, 2024
5bd46ce
Remove unnecessary indentation
Quexington Sep 3, 2024
314fd06
Port `test_cat_tokenization_workflow`
Quexington Sep 4, 2024
cb93f6c
Port `test_cat_detokenization_workflow`
Quexington Sep 4, 2024
554dec0
Port `test_cat_permissionless_retirement_workflow`
Quexington Sep 5, 2024
a280302
ci: Use GitHub Glue Action for requests instead of curl
Starttoaster Sep 24, 2024
613a5da
feat: added /activities/by-cw-unit-id resource
wwills2 Oct 7, 2024
dc17882
Merge branch 'develop' into wwills2/activity-by-warehouseUnitId
wwills2 Oct 7, 2024
f270468
feat: revised /by-cw-unit-id resource response
wwills2 Oct 8, 2024
da92a0f
feat: get activity by warehouseUnitId working
wwills2 Oct 9, 2024
130f34f
feat: revised by-cw-unit-id endpoint to select by warehouseUnitId, ac…
wwills2 Oct 14, 2024
90bfd34
feat: revised by-cw-unit-id endpoint to select by warehouseUnitId, ac…
wwills2 Oct 14, 2024
d014d3c
Merge remote-tracking branch 'origin/wwills2/activity-by-warehouseUni…
wwills2 Oct 14, 2024
a10a4b8
feat: swapped asset id for coin_id in activities/activity-record
wwills2 Oct 15, 2024
1d94055
feat: swapped asset id for coin_id in activities/activity-record
wwills2 Oct 15, 2024
21933be
Merge remote-tracking branch 'origin/wwills2/activity-by-warehouseUni…
wwills2 Oct 15, 2024
6970991
feat: added organizations passthrough resource
wwills2 Oct 16, 2024
0a8cc7d
Merge pull request #204 from Chia-Network/wwills2/activity-by-warehou…
TheLastCicada Oct 18, 2024
9774a02
Merge pull request #206 from Chia-Network/wwills2/organizations-proxy
TheLastCicada Oct 18, 2024
3487b31
Merge pull request #200 from Chia-Network/quex.wtf_tests
TheLastCicada Oct 18, 2024
0af4955
chore: version bump
TheLastCicada Oct 18, 2024
4c48e58
Merge pull request #208 from Chia-Network/1040
TheLastCicada Oct 18, 2024
1bf9b88
Merge remote-tracking branch 'origin/develop' into quex.actually_wtf_…
Quexington Oct 18, 2024
90785d7
update to 2.4.4
Quexington Oct 18, 2024
77bf4df
fix tests
Quexington Oct 18, 2024
6fd5b64
Update submodule
Quexington Oct 18, 2024
9d7e9d8
Use macos-13
emlowe Oct 18, 2024
48e8392
Merge pull request #211 from Chia-Network/quex.2.4.4
TheLastCicada Oct 23, 2024
d8e4df1
Merge remote-tracking branch 'origin/develop' into quex.actually_wtf_…
Quexington Oct 23, 2024
bda687a
Use new full node rpc client
Quexington Oct 23, 2024
d732e78
Update app/core/climate_wallet/wallet.py
Quexington Oct 23, 2024
039ad28
Update app/core/climate_wallet/wallet.py
Quexington Oct 23, 2024
3c061d3
Fix usage of BlockRecord
emlowe Oct 24, 2024
e5f48a1
Merge pull request #214 from Chia-Network/EL.blockrecord-fix
TheLastCicada Oct 25, 2024
11434fc
Merge pull request #210 from Chia-Network/quex.actually_wtf_tests
TheLastCicada Oct 25, 2024
b3d697d
fix: fixes needed for compatibility with chia-blockchain 2.4.4
emlowe Oct 28, 2024
ed45bc2
ci: pre-commit jobs
emlowe Oct 30, 2024
a04776b
chore: update dependencies
emlowe Oct 30, 2024
a2480de
chore: remove chia blockchain submodule
emlowe Oct 30, 2024
09f5155
ci: exclude changelog.md from linter
emlowe Oct 30, 2024
f2c60a5
chore: Update dependencies with poetry update (#219)
emlowe Oct 31, 2024
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
MODE="dev"
CHIA_ROOT="~/.chia/testnet10"
CONFIG_PATH="climate_token/config/config.yaml"
SERVER_PORT=31999
2 changes: 1 addition & 1 deletion .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Python
uses: Chia-Network/actions/setup-python@main
with:
python-version: '3'
python-version: "3"

- name: Install commitizen
run: |
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/build-installers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
branches:
- stage
tags:
- '**'
- "**"
pull_request:
branches:
- '**'
- "**"
workflow_dispatch: {}

concurrency:
Expand All @@ -32,22 +32,22 @@ jobs:
app-name: climate-tokenization-chia
app-mode: registry
app-description: "Carbon tokenization application on the Chia blockchain"
add-to-apt: 'true'
add-to-apt: "true"
- name: explorer
app-name: climate-explorer-chia
app-mode: explorer
app-description: "Interface for tracking Chia on-chain carbon tokens"
add-to-apt: 'true'
add-to-apt: "true"
- name: client
app-name: climate-token-driver
app-mode: client
app-description: "Embedded climate token driver for carbon tokens on the Chia blockchain"
add-to-apt: 'false'
add-to-apt: "false"
- name: dev
app-name: dev-token-driver-chia
app-mode: dev
app-description: "Token driver in dev mode"
add-to-apt: 'false'
add-to-apt: "false"

os:
- name: Linux
Expand All @@ -57,22 +57,22 @@ jobs:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
artifact-os-name: linux
executable-extension: ''
executable-extension: ""
- name: macOS
matrix: macos
emoji: 🍎
runs-on:
arm: [macOS, ARM64]
intel: [macos-latest]
arm: [macos-13-arm64]
intel: [macos-13]
artifact-os-name: macos
executable-extension: ''
executable-extension: ""
- name: Windows
matrix: windows
emoji: 🪟
runs-on:
intel: [windows-latest]
artifact-os-name: windows
executable-extension: '.exe'
executable-extension: ".exe"
arch:
- name: ARM
matrix: arm
Expand All @@ -86,9 +86,9 @@ jobs:
electron-builder-options: --x64
preconfiguration:
- name: default
cadt-api-server-host: 'https://observer.climateactiondata.org/api'
cadt-api-server-host: "https://observer.climateactiondata.org/api"
- name: testneta
cadt-api-server-host: 'https://chia-cadt-demo.chiamanaged.com/observer'
cadt-api-server-host: "https://chia-cadt-demo.chiamanaged.com/observer"
exclude:
- os:
matrix: windows
Expand All @@ -111,18 +111,19 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
with:
submodules: 'recursive'
submodules: "recursive"

- name: Setup Python
uses: Chia-Network/actions/setup-python@main
with:
python-version: '3.10'
python-version: "3.10"

- name: Create .env file
run: |
echo "MODE=${{ matrix.config.app-mode }}" > .env
echo 'CHIA_ROOT="~/.chia/mainnet"' >> .env
echo 'CONFIG_PATH="climate_token/config/config.yaml"' >> .env
echo 'SERVER_PORT=31999' >> .env

- name: Apply preconfigurations
if: matrix.preconfiguration.name != 'default'
Expand Down Expand Up @@ -242,9 +243,9 @@ jobs:
- name: Create zip files for release
uses: thedoctor0/[email protected]
with:
type: 'zip'
type: "zip"
filename: ${{ matrix.config.app-name }}_${{ matrix.os.artifact-os-name }}_${{ steps.tag-name.outputs.TAGNAME || github.sha }}_${{ matrix.arch.artifact-name }}.zip
directory: 'artifacts'
directory: "artifacts"
if: startsWith(github.ref, 'refs/tags/') && matrix.preconfiguration.name == 'default'

- name: Release executable
Expand Down Expand Up @@ -275,7 +276,6 @@ jobs:
retention-days: 1
if: startsWith(github.ref, 'refs/tags/') && matrix.os.matrix == 'linux' && matrix.config.add-to-apt == 'true' && matrix.arch.name == 'Intel' && matrix.preconfiguration.name == 'default'


apt-upload:
name: Trigger update in apt repo
runs-on: ubuntu-latest
Expand Down Expand Up @@ -318,11 +318,11 @@ jobs:
echo "Array being passed is ${APPS_ARRAY}"
echo "APPLICATIONS=${APPS_ARRAY}" >> $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 ${{ env.JWT_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","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":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"available"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/success/deploy
if: startsWith(github.ref, 'refs/tags/')
uses: Chia-Network/actions/github/glue@main
with:
json_data: '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"${{ steps.apt-metadata.outputs.APPLICATIONS }}","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"available"}'
glue_url: ${{ secrets.GLUE_API_URL }}
glue_project: "climate-tokenization"
glue_path: "trigger"
2 changes: 1 addition & 1 deletion .github/workflows/ensure-version-increment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Check Version Increment
on:
pull_request:
branches:
- 'main'
- "main"

concurrency:
# SHA is added to the end if on `main` to let all main workflows run
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: 🚨 pre-commit

on:
pull_request:
push:
branches:
- "long_lived/**"
- main
- "release/**"

concurrency:
group: ${{ github.event_name == 'pull_request' && format('{0}-{1}', github.workflow_ref, github.event.pull_request.number) || github.run_id }}
cancel-in-progress: true

jobs:
pre-commit:
name: ${{ matrix.os.name }} ${{ matrix.python.major_dot_minor }}
runs-on: ${{ matrix.os.runs-on }}
timeout-minutes: 20
strategy:
fail-fast: false
matrix:
os:
- name: Linux
matrix: linux
runs-on: ubuntu-latest
- name: macOS
matrix: macos
runs-on: macos-13-arm64
python:
- major_dot_minor: "3.10"
- major_dot_minor: "3.11"
- major_dot_minor: "3.12"

steps:
- name: Clean workspace
uses: Chia-Network/actions/clean-workspace@main

- uses: Chia-Network/actions/git-mark-workspace-safe@main

- name: disable git autocrlf
run: |
git config --global core.autocrlf false

- uses: actions/checkout@v4

- uses: Chia-Network/actions/setup-python@main
with:
python-version: ${{ matrix.python.major_dot_minor }}

- name: Create virtual environment
uses: Chia-Network/actions/create-venv@main
id: create-venv

- name: Activate virtual environment
uses: Chia-Network/actions/activate-venv@main
with:
directories: ${{ steps.create-venv.outputs.activate-venv-directories }}

- name: Run poetry install
uses: Chia-Network/actions/poetry@main
with:
poetry-command: "install --with dev"

- env:
CHIA_MANAGE_CLVM_CHECK_USE_CACHE: "false"
CHIA_MANAGE_MYPY_CHECK_EXCLUSIONS: "true"
run: poetry run pre-commit run --all-files --verbose
4 changes: 2 additions & 2 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Create release notes
on:
push:
tags:
- '**'
- "**"

permissions:
contents: write
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Setup Python
uses: Chia-Network/actions/setup-python@main
with:
python-version: '3'
python-version: "3"

- name: Install commitizen
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- stage
pull_request:
branches:
- '**'
- "**"

jobs:
test:
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup Python
uses: Chia-Network/actions/setup-python@main
with:
python-version: '3.10'
python-version: "3.10"

- name: Create virtual environment
uses: Chia-Network/actions/create-venv@main
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "chia-blockchain"]
path = chia-blockchain
url = ../chia-blockchain.git
76 changes: 40 additions & 36 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
repos:
- hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
- hooks:
- id: flake8
repo: https://github.com/pycqa/flake8
rev: 6.1.0
- hooks:
- args:
- --profile
- black
id: isort
repo: https://github.com/pycqa/isort
rev: 5.12.0
- hooks:
- id: black
repo: https://github.com/psf/black
rev: 23.7.0
- hooks:
- entry: mypy
id: mypy
language: system
name: mypy
types:
- python
- pyi
repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.4.1
- hooks:
- id: commitizen
stages:
- commit-msg
repo: https://github.com/commitizen-tools/commitizen
rev: v2.27.1
- hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
- hooks:
- id: flake8
repo: https://github.com/pycqa/flake8
rev: 6.1.0
- hooks:
- args:
- --profile
- black
id: isort
repo: https://github.com/pycqa/isort
rev: 5.12.0
- hooks:
- id: black
repo: https://github.com/psf/black
rev: 23.7.0
- hooks:
- entry: mypy
id: mypy
language: system
name: mypy
pass_filenames: false
repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.11.1
- hooks:
- id: commitizen
stages:
- commit-msg
repo: https://github.com/commitizen-tools/commitizen
rev: v2.27.1
- hooks:
- id: prettier
types_or: [ini, json, toml, yaml, markdown]
exclude: CHANGELOG.md
repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

### Fix

- update climate warehouse and ui parameter names
- update climate warehouse and ui parameter names
- add exit code for incorrect host configuration
- format host conditional
- require localhost unless running in explorer mode
Expand Down
Loading
Loading