Skip to content

Commit a3564c6

Browse files
committed
post merge fixes
1 parent 4fc6b06 commit a3564c6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Plugins/SequencePlugin/Source/SequencePlugin/Public/Util/ChainCollection.cpp renamed to Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/ChainCollection.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ChainCollection.h"
1+
#include "Util/ChainCollection.h"
22

33
TArray<FChainConfig> FChainCollection::ChainConfigs = {
44
FChainConfig(ENetwork::Ethereum, TEXT("1"), TEXT("Ethereum"), TEXT("mainnet")),
@@ -18,14 +18,14 @@ TArray<FChainConfig> FChainCollection::ChainConfigs = {
1818
FChainConfig(ENetwork::Avalanche, TEXT("43114"), TEXT("Avalanche"), TEXT("avalanche")),
1919
FChainConfig(ENetwork::Blast, TEXT("81457"), TEXT("Blast"), TEXT("blast")),
2020
FChainConfig(ENetwork::Xai, TEXT("660279"), TEXT("Xai"), TEXT("xai")),
21-
FChainConfig(ENetwork::LAOS, TEXT("6283"), TEXT("LAOS"), TEXT("laos")),
22-
FChainConfig(ENetwork::Root, TEXT("7668"), TEXT("Root Network"), TEXT("rootnet")),
2321
FChainConfig(ENetwork::Soneium, TEXT("1868"), TEXT("Soneium"), TEXT("soneium")),
2422
FChainConfig(ENetwork::Telos, TEXT("40"), TEXT("Telos"), TEXT("telos")),
2523
FChainConfig(ENetwork::Moonbeam, TEXT("1284"), TEXT("Moonbeam"), TEXT("moonbeam")),
2624
FChainConfig(ENetwork::Etherlink, TEXT("42793"), TEXT("Etherlink"), TEXT("etherlink")),
2725
FChainConfig(ENetwork::XR1, TEXT("273"), TEXT("XR1"), TEXT("xr1")),
2826
FChainConfig(ENetwork::Somnia, TEXT("5031"), TEXT("Somnia"), TEXT("somnia")),
27+
FChainConfig(ENetwork::Monad, TEXT("143"), TEXT("Monad"), TEXT("monad")),
28+
FChainConfig(ENetwork::Incentiv, TEXT("24101"), TEXT("Incentiv"), TEXT("incentiv")),
2929

3030
// --- TESTNETS ---
3131
FChainConfig(ENetwork::Sepolia, TEXT("11155111"), TEXT("Sepolia"), TEXT("sepolia")),
@@ -50,10 +50,10 @@ TArray<FChainConfig> FChainCollection::ChainConfigs = {
5050
FChainConfig(ENetwork::EtherlinkTestnet, TEXT("128123"), TEXT("Etherlink Testnet"), TEXT("etherlink-testnet")),
5151
FChainConfig(ENetwork::MonadTestnet, TEXT("10143"), TEXT("Monad Testnet"), TEXT("monad-testnet")),
5252
FChainConfig(ENetwork::SomniaTestnet, TEXT("50312"), TEXT("Somnia Testnet"), TEXT("somnia-testnet")),
53-
FChainConfig(ENetwork::FrequencyTestnet, TEXT("53716"), TEXT("Frequency Testnet"), TEXT("frequency-testnet")),
54-
FChainConfig(ENetwork::IncentivTestnet, TEXT("11690"), TEXT("Incentiv Testnet"), TEXT("incentiv-testnet")),
5553
FChainConfig(ENetwork::IncentivTestnetV2, TEXT("28802"), TEXT("Incentiv v2 Testnet"), TEXT("incentiv-testnet-v2")),
56-
FChainConfig(ENetwork::SandboxTestnet, TEXT("6252"), TEXT("Sandbox Testnet"), TEXT("sandbox-testnet"))
54+
FChainConfig(ENetwork::SandboxTestnet, TEXT("6252"), TEXT("Sandbox Testnet"), TEXT("sandbox-testnet")),
55+
FChainConfig(ENetwork::ArcTestnet, TEXT("5042002"), TEXT("Arc Testnet"), TEXT("arc-testnet")),
56+
FChainConfig(ENetwork::EtherlinkShadownetTestnet, TEXT("127823"), TEXT("Etherlink Shadownet Testnet"), TEXT("etherlink-shadownet-testnet"))
5757
};
5858

5959
TMap<ENetwork, FString> FChainCollection::NameOf;

Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
184184
* @param OnSuccess handler for success, takes in a TArray of FSeqCollectibleOrder
185185
* @param OnFailure handler for failure, takes in a FSequenceError
186186
*/
187-
void ListAllListingsForCollectible(const FString ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure);
187+
void ListAllListingsForCollectible(const FString ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure);
188188

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

212212
/**
213213
* Get the floor order for a collectible

0 commit comments

Comments
 (0)