Merge pull request #161 from Chia-Network/EL.update-chia-2.2.1

Update to chia-blockchain 2.2.1 along with other dependency updates

app/api/v1/cron.py

@@ -4,7 +4,7 @@
 import json
 from typing import List
 
-from blspy import G1Element
+from chia_rs import G1Element
 from chia.consensus.block_record import BlockRecord
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.util.byte_types import hexstr_to_bytes

app/api/v1/keys.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from blspy import G1Element, PrivateKey
+from chia_rs import G1Element, PrivateKey
 from chia.consensus.coinbase import create_puzzlehash_for_pk
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.types.blockchain_format.sized_bytes import bytes32

app/api/v1/tokens.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any, Dict, Tuple
 
-from blspy import G1Element, G2Element
+from chia_rs import G1Element, G2Element
 from chia.rpc.wallet_rpc_client import WalletRpcClient
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_spend import CoinSpend

app/core/chialisp/tail.py

@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from blspy import G1Element
+from chia_rs import G1Element
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
 

app/core/climate_wallet/wallet.py

@@ -4,7 +4,7 @@
 import time
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
-from blspy import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
 from chia.consensus.constants import ConsensusConstants
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.rpc.wallet_rpc_client import WalletRpcClient
@@ -13,7 +13,7 @@
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.coin_spend import CoinSpend
-from chia.types.spend_bundle import SpendBundle
+from chia.types.spend_bundle import SpendBundle, estimate_fees
 from chia.util.bech32m import bech32_decode, bech32_encode, convertbits
 from chia.util.ints import uint32, uint64
 from chia.wallet.cat_wallet.cat_utils import (
@@ -502,7 +502,7 @@ async def parse_detokenization_request(
                 "mode": mode,
                 "from_puzzle_hash": inner_puzzle_hash,
                 "amount": amount,
-                "fee": spend_bundle.fees() - amount,
+                "fee": estimate_fees(spend_bundle) - amount,
                 "asset_id": asset_id,
                 "gateway_coin_spend": coin_spend,
             }
@@ -564,7 +564,7 @@ async def sign_and_send_detokenization_request(
             created_at_time=uint64(int(time.time())),
             to_puzzle_hash=gateway_coin_spend.coin.puzzle_hash,
             amount=uint64(gateway_coin_spend.coin.amount),
-            fee_amount=uint64(spend_bundle.fees() - gateway_coin_spend.coin.amount),
+            fee_amount=uint64(estimate_fees(spend_bundle) - gateway_coin_spend.coin.amount),
             confirmed=False,
             sent=uint32(0),
             spend_bundle=spend_bundle,
@@ -642,7 +642,7 @@ async def get_activities(
         gateway_cat_puzzle: Program = construct_cat_puzzle(
             mod_code=CAT_MOD,
             limitations_program_hash=self.tail_program_hash,
-            inner_puzzle=gateway_puzzle,
+            inner_puzzle_or_hash=gateway_puzzle,
         )
         gateway_cat_puzzle_hash: bytes32 = gateway_cat_puzzle.get_tree_hash()
 

app/core/climate_wallet/wallet_utils.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
-from blspy import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import INFINITE_COST, Program
 from chia.types.blockchain_format.sized_bytes import bytes32
@@ -47,7 +47,7 @@ def create_gateway_request_and_spend(
     gateway_cat_puzzle: Program = construct_cat_puzzle(
         mod_code=CAT_MOD,
         limitations_program_hash=tail_program_hash,
-        inner_puzzle=gateway_puzzle,
+        inner_puzzle_or_hash=gateway_puzzle,
     )
     gateway_cat_puzzle_hash: bytes32 = gateway_cat_puzzle.get_tree_hash()
 

app/core/derive_keys.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from blspy import PrivateKey
+from chia_rs import PrivateKey
 from chia.wallet.derive_keys import _derive_path_unhardened
 
 

app/core/utils.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Dict, List, Optional
 
-from blspy import G1Element, PrivateKey
+from chia_rs import G1Element, PrivateKey
 from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.rpc.wallet_rpc_client import WalletRpcClient

app/crud/chia.py

@@ -6,7 +6,7 @@
 from urllib.parse import urlencode, urlparse
 
 import requests
-from blspy import G1Element
+from chia_rs import G1Element
 from chia.rpc.full_node_rpc_client import FullNodeRpcClient
 from chia.types.blockchain_format.coin import Coin
 from chia.types.coin_record import CoinRecord