⚠️ Third Party Wallet Support [PAY-2949][PAY-2948][PAY-2950]

.vscode/settings.json

@@ -5,17 +5,13 @@
     "reportMissingModuleSource": "none"
   },
   "python.languageServer": "Pylance",
-  "python.linting.enabled": true,
-  "python.linting.flake8Enabled": true,
-  "python.linting.flake8Args": [
+  "mypy-type-checker.args": [
     "--config",
     "packages/discovery-provider/setup.cfg"
   ],
-  "python.linting.lintOnSave": true,
-  "python.linting.mypyEnabled": true,
+  "flake8.args": ["--config", "packages/discovery-provider/setup.cfg"],
+
   "isort.args": ["--settings-path", "packages/discovery-provider/setup.cfg"],
-  "mypy.configFile": "packages/discovery-provider/setup.cfg",
-  "mypy.runUsingActiveInterpreter": true,
   "python.analysis.indexing": true,
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,

packages/commands/src/upload-track.mjs

@@ -231,7 +231,7 @@ program
             genre:
               genre ||
               Genre[
-                Object.keys(Genre)[randomInt(Object.keys(Genre).length - 1)]
+              Object.keys(Genre)[randomInt(Object.keys(Genre).length - 2) + 1]
               ],
             mood: mood || `mood ${rand}`,
             credits_splits: '',

packages/discovery-provider/ddl/migrations/0073_user_usdc_payout_address_history.sql

@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS user_payout_wallet_history (
+    user_id INTEGER NOT NULL,
+    spl_usdc_payout_wallet VARCHAR NOT NULL,
+    blocknumber INTEGER NOT NULL,
+    block_timestamp TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+    created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    PRIMARY KEY (user_id, block_timestamp),
+    CONSTRAINT user_payout_wallet_history_blocknumber_fkey FOREIGN KEY (blocknumber) REFERENCES blocks("number") ON DELETE CASCADE
+);

packages/discovery-provider/ddl/migrations/0074_usdc_purchase_splits_user_ids.sql

@@ -0,0 +1,175 @@
+BEGIN TRANSACTION;
+
+-- Update track stream price history
+WITH updated_track_stream_splits AS (
+    SELECT
+        track_id,
+        stream_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object('user_id', owner_id, 'percentage', 100.0000)
+        ) as splits
+    FROM
+        tracks
+    WHERE
+        jsonb_typeof(stream_conditions -> 'usdc_purchase' -> 'splits') = 'object'
+)
+UPDATE
+    track_price_history
+SET
+    splits = updated_track_stream_splits.splits
+FROM
+    updated_track_stream_splits
+WHERE
+    updated_track_stream_splits.track_id = track_price_history.track_id
+    AND track_price_history.access = 'stream';
+
+-- Update track stream conditions
+WITH updated_track_stream_splits AS (
+    SELECT
+        track_id,
+        stream_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object('user_id', owner_id, 'percentage', 100.0000)
+        ) as splits
+    FROM
+        tracks
+    WHERE
+        jsonb_typeof(stream_conditions -> 'usdc_purchase' -> 'splits') = 'object'
+)
+UPDATE
+    tracks
+SET
+    stream_conditions = jsonb_build_object(
+        'usdc_purchase',
+        jsonb_build_object(
+            'price',
+            updated_track_stream_splits.price,
+            'splits',
+            updated_track_stream_splits.splits
+        )
+    )
+FROM
+    updated_track_stream_splits
+WHERE
+    updated_track_stream_splits.track_id = tracks.track_id;
+
+-- Update track download price history
+WITH updated_track_download_splits AS (
+    SELECT
+        track_id,
+        download_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object('user_id', owner_id, 'percentage', 100.0000)
+        ) as splits
+    FROM
+        tracks
+    WHERE
+        jsonb_typeof(
+            download_conditions -> 'usdc_purchase' -> 'splits'
+        ) = 'object'
+)
+UPDATE
+    track_price_history
+SET
+    splits = updated_track_download_splits.splits
+FROM
+    updated_track_download_splits
+WHERE
+    updated_track_download_splits.track_id = track_price_history.track_id
+    AND track_price_history.access = 'download';
+
+-- Update track download conditions
+WITH updated_track_download_splits AS (
+    SELECT
+        track_id,
+        download_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object('user_id', owner_id, 'percentage', 100.0000)
+        ) as splits
+    FROM
+        tracks
+    WHERE
+        jsonb_typeof(
+            download_conditions -> 'usdc_purchase' -> 'splits'
+        ) = 'object'
+)
+UPDATE
+    tracks
+SET
+    download_conditions = jsonb_build_object(
+        'usdc_purchase',
+        jsonb_build_object(
+            'price',
+            updated_track_download_splits.price,
+            'splits',
+            updated_track_download_splits.splits
+        )
+    )
+FROM
+    updated_track_download_splits
+WHERE
+    updated_track_download_splits.track_id = tracks.track_id;
+
+COMMIT;
+
+-- Update album price history
+WITH updated_album_stream_splits AS (
+    SELECT
+        playlist_id,
+        stream_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object(
+                'user_id',
+                playlist_owner_id,
+                'percentage',
+                100.0000
+            )
+        ) as splits
+    FROM
+        playlists
+    WHERE
+        jsonb_typeof(stream_conditions -> 'usdc_purchase' -> 'splits') = 'object'
+)
+UPDATE
+    album_price_history
+SET
+    splits = updated_album_stream_splits.splits
+FROM
+    updated_album_stream_splits
+WHERE
+    updated_album_stream_splits.playlist_id = album_price_history.playlist_id;
+
+-- Update album stream conditions
+WITH updated_album_stream_splits AS (
+    SELECT
+        playlist_id,
+        stream_conditions -> 'usdc_purchase' -> 'price' AS price,
+        jsonb_build_array(
+            jsonb_build_object(
+                'user_id',
+                playlist_owner_id,
+                'percentage',
+                100.0000
+            )
+        ) as splits
+    FROM
+        playlists
+    WHERE
+        jsonb_typeof(stream_conditions -> 'usdc_purchase' -> 'splits') = 'object'
+)
+UPDATE
+    playlists
+SET
+    stream_conditions = jsonb_build_object(
+        'usdc_purchase',
+        jsonb_build_object(
+            'price',
+            updated_album_stream_splits.price,
+            'splits',
+            updated_album_stream_splits.splits
+        )
+    )
+FROM
+    updated_album_stream_splits
+WHERE
+    updated_album_stream_splits.playlist_id = playlists.playlist_id;

packages/discovery-provider/src/api/v1/helpers.py

@@ -11,6 +11,7 @@
 from src.api.v1.models.common import full_response
 from src.models.rewards.challenge import ChallengeType
 from src.queries.get_challenges import ChallengeResponse
+from src.queries.get_extended_purchase_gate import get_extended_purchase_gate
 from src.queries.get_support_for_user import SupportResponse
 from src.queries.get_undisbursed_challenges import UndisbursedChallengeResponse
 from src.queries.query_helpers import (
@@ -391,6 +392,16 @@ def extend_track(track):
             duration += float(segment["duration"])
         track["duration"] = round(duration)
 
+    # Transform new format of splits to legacy format for client compatibility
+    if "stream_conditions" in track:
+        track["stream_conditions"] = get_extended_purchase_gate(
+            track["stream_conditions"], legacy=True
+        )
+    if "download_conditions" in track:
+        track["download_conditions"] = get_extended_purchase_gate(
+            track["download_conditions"], legacy=True
+        )
+
     return track
 
 
@@ -652,7 +663,7 @@ def __init__(
 
     @property
     def __schema__(self):
-        if self.doc == False:
+        if self.doc is False:
             return None
         param = super().__schema__
         param["description"] = self.description

packages/discovery-provider/src/api/v1/models/access_gate.py

@@ -47,6 +47,14 @@
 )
 ns.add_model("wild_card_split", wild_card_split)
 
+payment_split = ns.model(
+    "payment_split",
+    {
+        "user_id": fields.Integer(required=True),
+        "percentage": fields.Float(required=True),
+    },
+)
+
 usdc_gate = ns.model(
     "usdc_gate",
     {
@@ -77,3 +85,47 @@
         ],
     ),
 )
+
+
+extended_payment_split = ns.clone(
+    "extended_payment_split",
+    payment_split,
+    {
+        "eth_wallet": fields.String(required=True),
+        "payout_wallet": fields.String(required=True),
+        "amount": fields.Integer(required=True),
+    },
+)
+
+
+extended_usdc_gate = ns.model(
+    "extended_usdc_gate",
+    {
+        "price": fields.Integer(required=True),
+        "splits": fields.List(fields.Nested(extended_payment_split), required=True),
+    },
+)
+
+extended_purchase_gate = ns.model(
+    "extended_purchase_gate",
+    {
+        "usdc_purchase": fields.Nested(
+            extended_usdc_gate,
+            required=True,
+            description="Must pay the total price and split to the given addresses to unlock",
+        )
+    },
+)
+
+extended_access_gate = ns.add_model(
+    "extended_access_gate",
+    OneOfModel(
+        "extended_access_gate",
+        [
+            fields.Nested(tip_gate),
+            fields.Nested(follow_gate),
+            fields.Nested(extended_purchase_gate),
+            fields.Nested(nft_gate),
+        ],
+    ),
+)

packages/discovery-provider/src/api/v1/models/extensions/fields.py

@@ -86,16 +86,18 @@ def output(self, key, data, **kwargs):
                 return None
             elif self.default is not None:
                 return self.default
+        logs = []
         for field in self.model.fields:
             try:
                 marshalled = marshal(value, field.nested)
                 if value == marshalled:
                     return value
+                logs.append(f"marshalled={marshalled}")
             except fields.MarshallingError as e:
                 logger.error(
                     f"fields.py | NestedOneOf | Failed to marshal key={key} value={value} error={e.msg}"
                 )
         logger.error(
-            f"fields.py | NestedOneOf | Failed to marshal key={key} value={data}: No matching models."
+            f"fields.py | NestedOneOf | Failed to marshal key={key} value={value}: No matching models. {logs}"
         )
         return value

packages/discovery-provider/src/api/v1/models/playlists.py

@@ -1,10 +1,10 @@
 from flask_restx import fields
 
-from src.api.v1.models.access_gate import access_gate
 from src.api.v1.models.extensions.fields import NestedOneOf
 from src.api.v1.models.tracks import track_full
 from src.api.v1.models.users import user_model, user_model_full
 
+from .access_gate import access_gate, extended_access_gate
 from .common import favorite, ns, repost
 
 playlist_artwork = ns.model(
@@ -91,3 +91,26 @@
         "tracks": fields.List(fields.Nested(track_full), required=True),
     },
 )
+
+album_access_info = ns.model(
+    "album_access_info",
+    {
+        "access": fields.Nested(
+            access, description="Describes what access the given user has"
+        ),
+        "user_id": fields.String(
+            required=True, description="The user ID of the owner of this album"
+        ),
+        "blocknumber": fields.Integer(
+            required=True, description="The blocknumber this album was last updated"
+        ),
+        "is_stream_gated": fields.Boolean(
+            description="Whether or not the owner has restricted streaming behind an access gate"
+        ),
+        "stream_conditions": NestedOneOf(
+            extended_access_gate,
+            allow_null=True,
+            description="How to unlock stream access to the track",
+        ),
+    },
+)