merge 2.4.0rc1 (#704)

stellar · Sep 19, 2023 · 2ac9a01 · 2ac9a01
1 parent 6a0d9b0
commit 2ac9a01
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 71 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/polaris/__init__.py b/polaris/__init__.py
@@ -1 +1 @@
-__version__ = "2.3.8"
+__version__ = "2.4.0-rc1"
diff --git a/polaris/sep24/deposit.py b/polaris/sep24/deposit.py
@@ -23,8 +23,7 @@
 from stellar_sdk.strkey import StrKey
 from stellar_sdk.exceptions import (
     Ed25519PublicKeyInvalidError,
-    MuxedEd25519AccountInvalidError,
-    ValueError as StellarSdkValueError,
+    MuxedEd25519AccountInvalidError
 )
 
 from polaris import settings
@@ -476,7 +475,7 @@ def deposit(token: SEP10Token, request: Request) -> Response:
     if destination_account.startswith("M"):
         try:
             stellar_account = StrKey.decode_muxed_account(destination_account).ed25519
-        except (MuxedEd25519AccountInvalidError, StellarSdkValueError):
+        except (MuxedEd25519AccountInvalidError, ValueError):
             return render_error_response(_("invalid 'account'"))
     else:
         try:

diff --git a/polaris/sep24/withdraw.py b/polaris/sep24/withdraw.py
@@ -21,8 +21,7 @@
 from stellar_sdk.strkey import StrKey
 from stellar_sdk.exceptions import (
     Ed25519PublicKeyInvalidError,
-    MuxedEd25519AccountInvalidError,
-    ValueError as StellarSdkValueError,
+    MuxedEd25519AccountInvalidError
 )
 
 from polaris import settings
@@ -469,7 +468,7 @@ def withdraw(
     if source_account and source_account.startswith("M"):
         try:
             StrKey.decode_muxed_account(source_account)
-        except (MuxedEd25519AccountInvalidError, StellarSdkValueError):
+        except (MuxedEd25519AccountInvalidError, ValueError):
             return render_error_response(_("invalid 'account'"))
     elif source_account:
         try:

diff --git a/polaris/sep6/deposit.py b/polaris/sep6/deposit.py
@@ -15,8 +15,7 @@
 from stellar_sdk.exceptions import (
     MemoInvalidException,
     Ed25519PublicKeyInvalidError,
-    MuxedEd25519AccountInvalidError,
-    ValueError as StellarSdkValueError,
+    MuxedEd25519AccountInvalidError
 )
 
 from polaris import settings
@@ -220,7 +219,7 @@ def parse_request_args(
     if account.startswith("M"):
         try:
             StrKey.decode_muxed_account(account)
-        except (MuxedEd25519AccountInvalidError, StellarSdkValueError):
+        except (MuxedEd25519AccountInvalidError, ValueError):
             return {"error": render_error_response(_("invalid 'account'"))}
     else:
         try:

diff --git a/polaris/sep6/withdraw.py b/polaris/sep6/withdraw.py
@@ -14,8 +14,7 @@
 from stellar_sdk.exceptions import (
     MemoInvalidException,
     Ed25519PublicKeyInvalidError,
-    MuxedEd25519AccountInvalidError,
-    ValueError as StellarSdkValueError,
+    MuxedEd25519AccountInvalidError
 )
 
 from polaris import settings
@@ -163,7 +162,7 @@ def parse_request_args(
     if account and account.startswith("M"):
         try:
             StrKey.decode_muxed_account(account)
-        except (MuxedEd25519AccountInvalidError, StellarSdkValueError):
+        except (MuxedEd25519AccountInvalidError, ValueError):
             return {"error": render_error_response(_("invalid 'account'"))}
     elif account:
         try:

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "django-polaris"
-version = "2.3.8"
+version = "2.4.0-rc1"
 description = "An extendable Django server for Stellar Ecosystem Proposals."
 license = "Apache-2.0"
 authors = ["Stellar Development Foundation <jake@stellar.org>"]
@@ -43,7 +43,7 @@ django-environ = "*"
 django-model-utils = "^4.1"
 djangorestframework = "^3.12"
 whitenoise = "^5.3"
-stellar-sdk = "^8.0"
+stellar-sdk = { version = "9.0.0-a2", extras=["aiohttp"] }
 aiohttp = "^3.7"
 django-cors-headers = "^3.7"
 toml = "*"