diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml index ebe999a..4f82629 100644 --- a/.github/workflows/build-wheels.yaml +++ b/.github/workflows/build-wheels.yaml @@ -21,13 +21,13 @@ permissions: jobs: build-wheels: runs-on: ubuntu-latest - container: quay.io/pypa/manylinux_2_24_x86_64 + container: quay.io/pypa/manylinux_2_28_x86_64 steps: - name: Add safe git directory uses: Chia-Network/actions/git-mark-workspace-safe@main - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -57,7 +57,7 @@ jobs: - build-wheels steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/cic/cli/main.py b/cic/cli/main.py index 955ffa2..3a1ab9d 100644 --- a/cic/cli/main.py +++ b/cic/cli/main.py @@ -15,7 +15,7 @@ from datetime import datetime from operator import attrgetter from pathlib import Path -from typing import Dict, Iterable, List, Optional, Union +from typing import Any, Dict, Iterable, List, Optional, Union from chia.types.blockchain_format.coin import Coin from chia.types.blockchain_format.program import Program, INFINITE_COST @@ -73,6 +73,17 @@ else: from cic.cli.clients import get_node_and_wallet_clients, get_node_client, get_additional_data +# Newer versions of chia should use the modern keys and the version bundled here uses the old keys +original_to_json_dict = SpendBundle.to_json_dict + + +def patched_to_json_dict(self, include_legacy_keys: bool = False, exclude_modern_keys: bool = False) -> Dict[str, Any]: + # Call the original method with different defaults + return original_to_json_dict(self, include_legacy_keys=include_legacy_keys, exclude_modern_keys=exclude_modern_keys) + + +SpendBundle.to_json_dict = patched_to_json_dict + CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])