Skip to content

fixed marketplace return types for ListAllListingsForCollectible and ListAllOffersForCollectible #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andygruening merged 1 commit into from
Oct 24, 2025
Merged

fixed marketplace return types for ListAllListingsForCollectible and ListAllOffersForCollectible #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,18 +284,18 @@ void USequenceMarketplace::ListListingsForCollectible(const int64 ChainID, const

void USequenceMarketplace::ListAllListingsForCollectible(const int64 ChainID,
const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter,
TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)
TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)
{
const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});
OrderArray.Empty();
RawOrderArray.Empty();

return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, const bool IsDone)
return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, const bool IsDone)
{
OrderArray.Append(Orders);
RawOrderArray.Append(Orders);

if(IsDone)
{
OnSuccess(OrderArray);
OnSuccess(RawOrderArray);
}
}, OnFailure);
}
Expand All @@ -313,18 +313,18 @@ void USequenceMarketplace::ListOffersForCollectible(const int64 ChainID, const F
}, OnFailure);
}

void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)
void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)
{
const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});
OrderArray.Empty();
RawOrderArray.Empty();

return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, bool IsDone)
return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, bool IsDone)
{
OrderArray.Append(Orders);
RawOrderArray.Append(Orders);

if(IsDone)
{
OnSuccess(OrderArray);
OnSuccess(RawOrderArray);
}
}, OnFailure);
}
Expand Down Expand Up @@ -402,7 +402,7 @@ void USequenceMarketplace::GetCollectibleOrder(const int64 ChainID, const FStrin

void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,
const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,
TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
{
ListListingsForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleListingsReturn& CollectiblesReturn)
{
Expand All @@ -422,7 +422,7 @@ void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 Chain

void USequenceMarketplace::ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,
const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,
TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
{
ListOffersForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleOffersReturn& CollectiblesReturn)
{
Expand Down
4 changes: 2 additions & 2 deletions Plugins/SequencePlugin/Source/SequencePlugin/Private/Subsystems/SequenceMarketplaceBP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void USequenceMarketplaceBP::ListListingsForCollectible(const FString& ContractA

void USequenceMarketplaceBP::ListAllListingsForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllListingsForCollectible OnSuccess, FOnFailure OnFailure)
{
const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Listings)
const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Listings)
{
OnSuccess.ExecuteIfBound(Listings);
};
Expand Down Expand Up @@ -204,7 +204,7 @@ void USequenceMarketplaceBP::ListOffersForCollectible(const FString& ContractAdd

void USequenceMarketplaceBP::ListAllOffersForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllOffersForCollectible OnSuccess, FOnFailure OnFailure)
{
const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Offers)
const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Offers)
{
OnSuccess.ExecuteIfBound(Offers);
};
Expand Down
9 changes: 5 additions & 4 deletions Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
const FString PATH = "/rpc/Marketplace/";

TArray<FSeqCollectibleOrder> OrderArray;
TArray<FSeqOrder> RawOrderArray;

//private functions

Expand All @@ -37,8 +38,8 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
void ListAllCollectibleOffersWithHighestPricedOfferFirstHelper(const int64 ChainID, const FString& ContractAddress, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
void GetCollectibleOrder(int64 ChainID, const FString& Endpoint, const FSeqGetCollectibleOrderArgs& Args,
TSuccessCallback<FSeqCollectibleOrder> OnSuccess, const FFailureCallback& OnFailure);
void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);

public:

Expand Down Expand Up @@ -183,7 +184,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
* @param OnSuccess handler for success, takes in a TArray of FSeqCollectibleOrder
* @param OnFailure handler for failure, takes in a FSequenceError
*/
void ListAllListingsForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure);
void ListAllListingsForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure);

/**
* Get offers for a collectible
Expand All @@ -206,7 +207,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
* @param OnSuccess handler for success, takes in a TArray of FSeqCollectibleOrder
* @param OnFailure handler for failure, takes in a FSequenceError
*/
void ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure);
void ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure);

/**
* Get the floor order for a collectible
Expand Down
4 changes: 2 additions & 2 deletions ...lugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleListingsReturn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn
public:

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
TArray<FSeqCollectibleOrder> Listings;
TArray<FSeqOrder> Listings;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
FSeqMarketplacePage Page;
Expand All @@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn

// Convert CollectibleOrders array to JSON
TArray<TSharedPtr<FJsonObject>> collectibleOrdersList;
for (FSeqCollectibleOrder order : Listings)
for (FSeqOrder order : Listings)
{
collectibleOrdersList.Add(order.GetJson());
}
Expand Down
4 changes: 2 additions & 2 deletions ...ePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleOffersReturn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleOffersReturn
public:

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
TArray<FSeqCollectibleOrder> Offers;
TArray<FSeqOrder> Offers;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
FSeqMarketplacePage Page;
Expand All @@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleOffersReturn

// Convert CollectibleOrders array to JSON
TArray<TSharedPtr<FJsonObject>> collectibleOrdersList;
for (FSeqCollectibleOrder order : Offers)
for (FSeqOrder order : Offers)
{
collectibleOrdersList.Add(order.GetJson());
}
Expand Down
8 changes: 4 additions & 4 deletions Plugins/SequencePlugin/Source/SequencePlugin/Public/Subsystems/SequenceMarketplaceBP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ class SEQUENCEPLUGIN_API USequenceMarketplaceBP : public UGameInstanceSubsystem
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetHighestPriceOfferForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetLowestPriceListingForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetHighestPriceListingForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListListingsForCollectible, const TArray<FSeqCollectibleOrder>&, Orders, FSeqMarketplacePage, Page);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray<FSeqCollectibleOrder>&, Orders);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray<FSeqCollectibleOrder>&, Orders, FSeqMarketplacePage, Page);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray<FSeqCollectibleOrder>&, Orders);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListListingsForCollectible, const TArray<FSeqOrder>&, Orders, FSeqMarketplacePage, Page);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray<FSeqOrder>&, Orders);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray<FSeqOrder>&, Orders, FSeqMarketplacePage, Page);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray<FSeqOrder>&, Orders);
DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetFloorOrder, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
DECLARE_DYNAMIC_DELEGATE_OneParam(FOnFailure, FString, Error);

Expand Down
4 changes: 2 additions & 2 deletions ...urce/SequenceTests/Private/MarketplaceEndToEndTests/ListAllListingsForCollectibleTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)

UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);

const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)
const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)
{
if(Orders.Num() == 0)
{
Expand All @@ -62,7 +62,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)
else
{
FString Message;
for(FSeqCollectibleOrder Order : Orders)
for(FSeqOrder Order : Orders)
{
Message += USequenceSupport::StructToString(Order) + "\n";
}
Expand Down
4 changes: 2 additions & 2 deletions ...Source/SequenceTests/Private/MarketplaceEndToEndTests/ListAllOffersForCollectibleTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)

UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);

const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)
const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)
{
if(Orders.Num() == 0)
{
Expand All @@ -62,7 +62,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)
else
{
FString Message;
for(FSeqCollectibleOrder Order : Orders)
for(FSeqOrder Order : Orders)
{
Message += USequenceSupport::StructToString(Order) + "\n";
}
Expand Down