Merge pull request #343 from planetarium/release/2.2.0

Backmerge 2.2.0
planetarium · Nov 29, 2024 · 67d1365 · 67d1365
2 parents 1051b91 + 0a1cec3
commit 67d1365
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 139 deletions.
diff --git a/common/utils/transaction.py b/common/utils/transaction.py
@@ -48,8 +48,8 @@ def get_genesis_block_hash(planet_id: PlanetID) -> bytes:
         PlanetID.HEIMDALL: bytes.fromhex("729fa26958648a35b53e8e3905d11ec53b1b4929bf5f499884aed7df616f5913"),
         PlanetID.HEIMDALL_INTERNAL: bytes.fromhex("729fa26958648a35b53e8e3905d11ec53b1b4929bf5f499884aed7df616f5913"),
         # FIXME: Set to right genesis hash
-        PlanetID.THOR: bytes.fromhex("abc123"),
-        PlanetID.THOR_INTERNAL: bytes.fromhex("d55426c88650a1cb2cebc883e79721a4fad2ad5a62103fba5e899736b94bbacf"),
+        PlanetID.THOR: bytes.fromhex("bde462fd59de5ccba8495ebb163b124bf77ddc82cfc8b2f9fb57c00fc6e133b7"),
+        PlanetID.THOR_INTERNAL: bytes.fromhex("bde462fd59de5ccba8495ebb163b124bf77ddc82cfc8b2f9fb57c00fc6e133b7"),
     }
 
     if planet_id not in switcher:

diff --git a/iap/api/purchase.py b/iap/api/purchase.py
@@ -399,7 +399,7 @@ def request_product(receipt_data: ReceiptSchema,
                                  "agent_addr": receipt.agent_addr.lower(),
                                  "avatar_addr": receipt.avatar_addr.lower(),
                                  "pass_type": pass_type,
-                                 "season_id": int(season_index),
+                                 "season_index": int(season_index),
                                  "is_premium": season_pass_type in ("", "all", "premium"),
                                  "is_premium_plus": season_pass_type in ("plus", "all", "premium"),
                                  "g_sku": product.google_sku, "a_sku": product.apple_sku,