diff --git a/README.md b/README.md index 5732189..4e1dbde 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ This command runs the mint on your local computer. Skip this step if you want to ## Docker ``` -docker run -d -p 3338:3338 --name nutshell -e MINT_BACKEND_BOLT11_SAT=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.16.6 poetry run mint +docker run -d -p 3338:3338 --name nutshell -e MINT_BACKEND_BOLT11_SAT=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.17.0 poetry run mint ``` ## From this repository diff --git a/cashu/core/base.py b/cashu/core/base.py index 508ecff..397eb4c 100644 --- a/cashu/core/base.py +++ b/cashu/core/base.py @@ -354,10 +354,10 @@ class MeltQuote(LedgerEvent): quote=melt_quote_resp.quote, method="bolt11", request=melt_quote_resp.request - or request, # BACKWARDS COMPATIBILITY mint response < 0.16.6 + or request, # BACKWARDS COMPATIBILITY mint response < 0.17.0 checking_id="", unit=melt_quote_resp.unit - or unit, # BACKWARDS COMPATIBILITY mint response < 0.16.6 + or unit, # BACKWARDS COMPATIBILITY mint response < 0.17.0 amount=melt_quote_resp.amount, fee_reserve=melt_quote_resp.fee_reserve, state=MeltQuoteState(melt_quote_resp.state), @@ -471,9 +471,9 @@ class MintQuote(LedgerEvent): request=mint_quote_resp.request, checking_id="", unit=mint_quote_resp.unit - or unit, # BACKWARDS COMPATIBILITY mint response < 0.16.6 + or unit, # BACKWARDS COMPATIBILITY mint response < 0.17.0 amount=mint_quote_resp.amount - or amount, # BACKWARDS COMPATIBILITY mint response < 0.16.6 + or amount, # BACKWARDS COMPATIBILITY mint response < 0.17.0 state=MintQuoteState(mint_quote_resp.state), mint=mint, expiry=mint_quote_resp.expiry, diff --git a/cashu/core/models.py b/cashu/core/models.py index 70ca8d2..ca73e81 100644 --- a/cashu/core/models.py +++ b/cashu/core/models.py @@ -144,10 +144,10 @@ class PostMintQuoteResponse(BaseModel): request: str # input payment request amount: Optional[ int - ] # output amount (optional for BACKWARDS COMPAT mint response < 0.16.6) + ] # output amount (optional for BACKWARDS COMPAT mint response < 0.17.0) unit: Optional[ str - ] # output unit (optional for BACKWARDS COMPAT mint response < 0.16.6) + ] # output unit (optional for BACKWARDS COMPAT mint response < 0.17.0) state: Optional[str] # state of the quote (optional for backwards compat) expiry: Optional[int] # expiry of the quote pubkey: Optional[str] = None # NUT-20 quote lock pubkey @@ -231,10 +231,10 @@ class PostMeltQuoteResponse(BaseModel): amount: int # input amount unit: Optional[ str - ] # input unit (optional for BACKWARDS COMPAT mint response < 0.16.6) + ] # input unit (optional for BACKWARDS COMPAT mint response < 0.17.0) request: Optional[ str - ] # output payment request (optional for BACKWARDS COMPAT mint response < 0.16.6) + ] # output payment request (optional for BACKWARDS COMPAT mint response < 0.17.0) fee_reserve: int # input fee reserve paid: Optional[bool] = ( None # whether the request has been paid # DEPRECATED as per NUT PR #136 diff --git a/cashu/core/settings.py b/cashu/core/settings.py index 5c15df6..a97069d 100644 --- a/cashu/core/settings.py +++ b/cashu/core/settings.py @@ -8,7 +8,7 @@ from pydantic import BaseSettings, Extra, Field env = Env() -VERSION = "0.16.6" +VERSION = "0.17.0" def find_env_file(): diff --git a/cashu/wallet/wallet.py b/cashu/wallet/wallet.py index d3d8b41..6ffeb97 100644 --- a/cashu/wallet/wallet.py +++ b/cashu/wallet/wallet.py @@ -541,12 +541,12 @@ class Wallet( amount=( mint_quote_response.amount or mint_quote_local.amount if mint_quote_local - else 0 # BACKWARD COMPATIBILITY mint response < 0.16.6 + else 0 # BACKWARD COMPATIBILITY mint response < 0.17.0 ), unit=( mint_quote_response.unit or mint_quote_local.unit if mint_quote_local - else self.unit.name # BACKWARD COMPATIBILITY mint response < 0.16.6 + else self.unit.name # BACKWARD COMPATIBILITY mint response < 0.17.0 ), ) if mint_quote_local and mint_quote_local.privkey: @@ -760,9 +760,9 @@ class Wallet( melt_quote_resp, self.url, unit=melt_quote_resp.unit - or self.unit.name, # BACKWARD COMPATIBILITY mint response < 0.16.6 + or self.unit.name, # BACKWARD COMPATIBILITY mint response < 0.17.0 request=melt_quote_resp.request - or invoice, # BACKWARD COMPATIBILITY mint response < 0.16.6 + or invoice, # BACKWARD COMPATIBILITY mint response < 0.17.0 ) return melt_quote @@ -783,12 +783,12 @@ class Wallet( unit=( melt_quote_resp.unit or melt_quote_local.unit if melt_quote_local - else self.unit.name # BACKWARD COMPATIBILITY mint response < 0.16.6 + else self.unit.name # BACKWARD COMPATIBILITY mint response < 0.17.0 ), request=( melt_quote_resp.request or melt_quote_local.request if (melt_quote_local and melt_quote_local.request) - else "None" # BACKWARD COMPATIBILITY mint response < 0.16.6 + else "None" # BACKWARD COMPATIBILITY mint response < 0.17.0 ), ) diff --git a/pyproject.toml b/pyproject.toml index ec2dac2..a38f4a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cashu" -version = "0.16.6" +version = "0.17.0" description = "Ecash wallet and mint" authors = ["calle "] license = "MIT" diff --git a/setup.py b/setup.py index 6f5d566..b7a16cd 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ entry_points = {"console_scripts": ["cashu = cashu.wallet.cli.cli:cli"]} setuptools.setup( name="cashu", - version="0.16.6", + version="0.17.0", description="Ecash wallet and mint", long_description=long_description, long_description_content_type="text/markdown",