Skip to content

Commit fd62c5f

Browse files
andygrueningandygruening
committed
Merge branch 'bigint-as-strings' into ecosystem-wallets
2 parents d3a9ff8 + 5c31d91 commit fd62c5f

77 files changed

Lines changed: 530 additions & 756 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Plugins/SequencePlugin/Content/Boilerplates/EmbeddedWalletHome.uasset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b51cafbe3f87943edcdc5bbbef263f68062239189bf4b0b103ed4ecab3b776f4
3-
size 170268
2+
oid sha256:38091cd08c03c48d2b700d9584c0add8dedf981f632dbcff0f2b814f975d1c36
3+
size 169604

‎Plugins/SequencePlugin/Content/Boilerplates/SequencePlayerProfile.uasset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:498cc72dea4f7ee18576ece374046d44b21846971c2f19160f8778591b783a84
3-
size 403566
2+
oid sha256:b4384dbc39e60cd23385c36147b63ebc6d5049c74decee229c94546ea7260dbd
3+
size 419571

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/Checkout/SequenceCheckout.cpp‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
#include "Checkout/Structs/GetCheckoutOptionsResponse.h"
1010
#include "Checkout/Structs/GetPrimarySaleCheckoutOptionsArgs.h"
1111
#include "Checkout/Structs/OrderData.h"
12+
#include "Util/ChainCollection.h"
1213
#include "Util/Log.h"
1314

14-
FString USequenceCheckout::Url(const int64& TargetChainID, const FString& EndPoint) const
15+
FString USequenceCheckout::Url(const FString& TargetChainID, const FString& EndPoint) const
1516
{
1617
FString Out_URL = HostName(TargetChainID);
1718
Out_URL.Append(this->Path);
@@ -23,15 +24,15 @@ FString USequenceCheckout::Url(const int64& TargetChainID, const FString& EndPoi
2324
return Out_URL;
2425
}
2526

26-
FString USequenceCheckout::HostName(int64 TargetChainID)
27+
FString USequenceCheckout::HostName(FString TargetChainID)
2728
{
2829
FString Hostname = "https://";
2930
Hostname.Append("marketplace-api.sequence.app/");
30-
Hostname.Append(USequenceSupport::GetNetworkNameForUrl(TargetChainID));
31+
Hostname.Append(FChainCollection::GetNetworkNameForUrl(TargetChainID));
3132
return Hostname;
3233
}
3334

34-
void USequenceCheckout::HTTPPost(const int64& TargetChainID, const FString& Endpoint, const FString& Args,
35+
void USequenceCheckout::HTTPPost(const FString& TargetChainID, const FString& Endpoint, const FString& Args,
3536
const TSuccessCallback<FString>& OnSuccess, const FFailureCallback& OnFailure) const
3637
{
3738
const FString RequestURL = this->Url(TargetChainID, Endpoint);
@@ -141,7 +142,7 @@ template<typename T> T USequenceCheckout::BuildResponse(const FString Text) cons
141142
return Ret_Struct;
142143
}
143144

144-
void USequenceCheckout::GetCheckoutOptions(const int64 ChainID, const FString& WalletAddress, const TArray<FCheckoutOptionsMarketplaceOrder>& Orders, const int64 AdditionalFeeBps,
145+
void USequenceCheckout::GetCheckoutOptions(const FString ChainID, const FString& WalletAddress, const TArray<FCheckoutOptionsMarketplaceOrder>& Orders, const int64 AdditionalFeeBps,
145146
TSuccessCallback<FGetCheckoutOptionsResponse> OnSuccess, const FFailureCallback& OnFailure) const
146147
{
147148
if (Orders.IsEmpty())
@@ -161,7 +162,7 @@ void USequenceCheckout::GetCheckoutOptions(const int64 ChainID, const FString& W
161162
OnFailure);
162163
}
163164

164-
void USequenceCheckout::GetCheckoutOptionsByOrders(const int64 ChainID, const FString& WalletAddress, const TArray<FSeqOrder>& Orders, const int64 AdditionalFeeBps,
165+
void USequenceCheckout::GetCheckoutOptionsByOrders(const FString ChainID, const FString& WalletAddress, const TArray<FSeqOrder>& Orders, const int64 AdditionalFeeBps,
165166
const TSuccessCallback<FGetCheckoutOptionsResponse> OnSuccess, const FFailureCallback& OnFailure) const
166167
{
167168
TArray<FCheckoutOptionsMarketplaceOrder> Options;
@@ -174,7 +175,7 @@ void USequenceCheckout::GetCheckoutOptionsByOrders(const int64 ChainID, const FS
174175
GetCheckoutOptions(ChainID, WalletAddress, Options, AdditionalFeeBps, OnSuccess, OnFailure);
175176
}
176177

177-
void USequenceCheckout::GetCheckoutOptionsByTokenIdAmounts(const int64 ChainID, const FString& WalletAddress,
178+
void USequenceCheckout::GetCheckoutOptionsByTokenIdAmounts(const FString ChainID, const FString& WalletAddress,
178179
const UERC1155SaleContract* SaleContract, const FString& CollectionAddress, const TMap<FString, int64> AmountsByTokenId,
179180
TSuccessCallback<FGetCheckoutOptionsResponse> OnSuccess, const FFailureCallback& OnFailure) const
180181
{
@@ -192,7 +193,7 @@ void USequenceCheckout::GetCheckoutOptionsByTokenIdAmounts(const int64 ChainID,
192193
});
193194
}
194195

195-
void USequenceCheckout::GetCheckoutOptionsByERC1155Contract(const int64 ChainID, const FString& WalletAddress,
196+
void USequenceCheckout::GetCheckoutOptionsByERC1155Contract(const FString ChainID, const FString& WalletAddress,
196197
const UERC1155SaleContract* SaleContract, const FString& CollectionAddress, const FString& TokenId,
197198
const int64 Amount, const TSuccessCallback<FGetCheckoutOptionsResponse> OnSuccess, const FFailureCallback& OnFailure) const
198199
{
@@ -202,7 +203,7 @@ void USequenceCheckout::GetCheckoutOptionsByERC1155Contract(const int64 ChainID,
202203
GetCheckoutOptionsByTokenIdAmounts(ChainID, WalletAddress, SaleContract, CollectionAddress, Amounts, OnSuccess, OnFailure);
203204
}
204205

205-
void USequenceCheckout::GetCheckoutOptionsByERC721Contract(const int64 ChainID, const FString& WalletAddress,
206+
void USequenceCheckout::GetCheckoutOptionsByERC721Contract(const FString ChainID, const FString& WalletAddress,
206207
const UERC721SaleContract* SaleContract, const FString& CollectionAddress, const FString& TokenId,
207208
const int64 Amount, TSuccessCallback<FGetCheckoutOptionsResponse> OnSuccess, const FFailureCallback& OnFailure) const
208209
{
@@ -218,7 +219,7 @@ void USequenceCheckout::GetCheckoutOptionsByERC721Contract(const int64 ChainID,
218219
}
219220

220221

221-
void USequenceCheckout::GenerateBuyTransaction(const int64 ChainID, const FString& WalletAddress, const FSeqOrder& Order, const int64 Amount, const FAdditionalFee& AdditionalFee, const EWalletKind WalletKind,
222+
void USequenceCheckout::GenerateBuyTransaction(const FString ChainID, const FString& WalletAddress, const FSeqOrder& Order, const int64 Amount, const FAdditionalFee& AdditionalFee, const EWalletKind WalletKind,
222223
TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure) const
223224
{
224225
TArray<FOrderData> OrdersData;
@@ -243,7 +244,7 @@ void USequenceCheckout::GenerateBuyTransaction(const int64 ChainID, const FStrin
243244
OnFailure);
244245
}
245246

246-
void USequenceCheckout::GenerateSellTransaction(const int64 ChainID, const FString& WalletAddress, const FSeqOrder& Order, const int64 Amount, const FAdditionalFee& AdditionalFee, const EWalletKind WalletKind,
247+
void USequenceCheckout::GenerateSellTransaction(const FString ChainID, const FString& WalletAddress, const FSeqOrder& Order, const int64 Amount, const FAdditionalFee& AdditionalFee, const EWalletKind WalletKind,
247248
TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure) const
248249
{
249250
TArray<FOrderData> OrdersData;
@@ -268,15 +269,15 @@ void USequenceCheckout::GenerateSellTransaction(const int64 ChainID, const FStri
268269
OnFailure);
269270
}
270271

271-
void USequenceCheckout::GenerateListingTransaction(const int64 ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& TokenId, const int64 Amount, const EContractType ContractType,
272-
const FString& CurrencyTokenAddress, const int64 PricePerToken, const FDateTime Expiry, const EOrderbookKind OrderbookKind, const EWalletKind WalletKind,
272+
void USequenceCheckout::GenerateListingTransaction(const FString ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& TokenId, const int64 Amount, const EContractType ContractType,
273+
const FString& CurrencyTokenAddress, const FString PricePerToken, const FDateTime Expiry, const EOrderbookKind OrderbookKind, const EWalletKind WalletKind,
273274
TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure) const
274275
{
275276
const int64 EpochTime = Expiry.ToUnixTimestamp();
276277
const FString Endpoint = "GenerateListingTransaction";
277278
const FString Args = BuildArgs<FGenerateListingTransactionArgs>(FGenerateListingTransactionArgs {
278279
CollectionAddress, WalletAddress, ContractType, OrderbookKind, FCreateReq {
279-
TokenId, FString::Printf(TEXT("%lld"), Amount), FString::Printf(TEXT("%lld"), EpochTime), CurrencyTokenAddress, FString::Printf(TEXT("%lld"), PricePerToken)
280+
TokenId, FString::Printf(TEXT("%lld"), Amount), FString::Printf(TEXT("%lld"), EpochTime), CurrencyTokenAddress, FString::Printf(TEXT("%s"), *PricePerToken)
280281
}, WalletKind
281282
});
282283

@@ -288,15 +289,15 @@ void USequenceCheckout::GenerateListingTransaction(const int64 ChainID, const FS
288289
OnFailure);
289290
}
290291

291-
void USequenceCheckout::GenerateOfferTransaction(const int64 ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& TokenId, const int64 Amount,
292-
const EContractType ContractType, const FString& CurrencyTokenAddress, const int64 PricePerToken, const FDateTime Expiry,
292+
void USequenceCheckout::GenerateOfferTransaction(const FString ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& TokenId, const int64 Amount,
293+
const EContractType ContractType, const FString& CurrencyTokenAddress, const FString PricePerToken, const FDateTime Expiry,
293294
const EOrderbookKind OrderbookKind, const EWalletKind WalletKind, TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure) const
294295
{
295296
const int64 EpochTime = Expiry.ToUnixTimestamp();
296297
const FString Endpoint = "GenerateOfferTransaction";
297298
const FString Args = BuildArgs<FGenerateOfferTransactionArgs>(FGenerateOfferTransactionArgs {
298299
CollectionAddress, WalletAddress, ContractType, OrderbookKind, FCreateReq {
299-
TokenId, FString::Printf(TEXT("%lld"), Amount), FString::Printf(TEXT("%lld"), EpochTime), CurrencyTokenAddress, FString::Printf(TEXT("%lld"), PricePerToken)
300+
TokenId, FString::Printf(TEXT("%lld"), Amount), FString::Printf(TEXT("%lld"), EpochTime), CurrencyTokenAddress, FString::Printf(TEXT("%s"), *PricePerToken)
300301
}, WalletKind
301302
});
302303

@@ -308,7 +309,7 @@ void USequenceCheckout::GenerateOfferTransaction(const int64 ChainID, const FStr
308309
OnFailure);
309310
}
310311

311-
void USequenceCheckout::GenerateCancelTransaction(const int64 ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& OrderId,
312+
void USequenceCheckout::GenerateCancelTransaction(const FString ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FString& OrderId,
312313
const EMarketplaceKind MarketplaceKind, TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure) const
313314
{
314315
const FString Endpoint = "GenerateCancelTransaction";
@@ -324,7 +325,7 @@ void USequenceCheckout::GenerateCancelTransaction(const int64 ChainID, const FSt
324325
OnFailure);
325326
}
326327

327-
void USequenceCheckout::GenerateCancelTransactionByOrder(const int64 ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FSeqOrder& Order,
328+
void USequenceCheckout::GenerateCancelTransactionByOrder(const FString ChainID, const FString& WalletAddress, const FString& CollectionAddress, const FSeqOrder& Order,
328329
const EMarketplaceKind MarketplaceKind, TSuccessCallback<FGenerateTransactionResponse> OnSuccess, const FFailureCallback& OnFailure)
329330
{
330331
GenerateCancelTransaction(ChainID, WalletAddress, CollectionAddress, Order.OrderId, MarketplaceKind, OnSuccess, OnFailure);

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/Authentication/LocalhostListener.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,13 @@ void ULocalhostListener::WaitForResponse(TSuccessCallback<FString> OnSuccess, FF
4242
return;
4343
}
4444

45-
TWeakObjectPtr<ULocalhostListener> WeakThis(this);
46-
4745
const FHttpPath RootPath(TEXT("/api"));
4846
RouteHandle = Router->BindRoute(
4947
RootPath,
5048
EHttpServerRequestVerbs::VERB_GET,
51-
FHttpRequestHandler::CreateLambda([WeakThis](const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete) -> bool
49+
FHttpRequestHandler::CreateLambda([this](const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete) -> bool
5250
{
53-
if (!WeakThis.IsValid())
54-
{
55-
return false;
56-
}
57-
58-
return WeakThis->HandleAnyRequest(Request, OnComplete);
51+
return this->HandleAnyRequest(Request, OnComplete);
5952
})
6053
);
6154

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/Authentication/LocalhostListener.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "IHttpRouter.h"
77
#include "UObject/Object.h"
88
#include "Util/Async.h"
9+
#include "Subsystems/GameInstanceSubsystem.h"
910
#include "LocalhostListener.generated.h"
1011

1112
UCLASS()

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/EcosystemClient.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ UEcosystemClient::UEcosystemClient()
2626
void UEcosystemClient::CreateNewSession(ESessionCreationType Type, const FString& PreferredLoginMethod, const FString& Email,
2727
const TScriptInterface<IPermissions>& Permissions, const TSuccessCallback<bool>& OnSuccess, const FFailureCallback& OnFailure)
2828
{
29-
const FString ChainIdStr = SequenceSdk::GetChainIdString();
29+
const FString ChainIdStr = SequenceSdk::GetChainId();
3030
UCryptoWallet* SessionWallet = UCryptoWallet::Make();
3131
FString SessionAddress = SessionWallet->GetWalletAddress().ToHexWithPrefix();
3232

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/FeeOptionService.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FCall FFeeOptionService::BuildCallForNativeTokenOption()
2121
ValueForwarder,
2222
EncodedFeeOptionData,
2323
FBigInt(FeeOption.Value),
24-
FBigInt(FValueUtils::Int32ToString(FeeOption.GasLimit)),
24+
FBigInt(FeeOption.GasLimit),
2525
false, false, "1"
2626
};
2727
}
@@ -35,7 +35,7 @@ FCall FFeeOptionService::BuildCallForCustomTokenOption()
3535
FeeOption.Token.ContractAddress,
3636
EncodedFeeOptionData,
3737
FBigInt("0"),
38-
FBigInt(FValueUtils::Int32ToString(FeeOption.GasLimit)),
38+
FBigInt(FeeOption.GasLimit),
3939
false, false, "1"
4040
};
4141
}

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/Requests/SendTransactionArgs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct FSendTransactionArgs
2929

3030
public:
3131
UPROPERTY()
32-
int64 ChainId;
32+
FString ChainId;
3333

3434
UPROPERTY()
3535
FString Address;

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/Requests/SignMessageArgs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct FSignMessageArgs
1010

1111
public:
1212
UPROPERTY()
13-
int64 ChainId;
13+
FString ChainId;
1414

1515
UPROPERTY()
1616
FString Address;

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/EcosystemWallet/SequenceWallet.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void USequenceWallet::GetFeeOptions(const TScriptInterface<ISeqTransactionBase>&
5555

5656
const TArray<FSessionSigner> Signers = FSessionStorage::GetStoredSigners();
5757

58-
const FBigInt ChainId = FBigInt(SequenceSdk::GetChainIdString());
58+
const FBigInt ChainId = FBigInt(SequenceSdk::GetChainId());
5959

6060
FTransactionService TransactionService = FTransactionService(Signers, this->WalletState);
6161
TransactionService.SignAndBuild(ChainId, Calls.Calls, true, [OnSuccess, OnInternalFailure](TTuple<FString, FString> Result)
@@ -117,7 +117,7 @@ void USequenceWallet::SendTransaction(const TScriptInterface<ISeqTransactionBase
117117
{
118118
const TArray<FSessionSigner> Signers = FSessionStorage::GetStoredSigners();
119119

120-
const FBigInt ChainId = FBigInt(SequenceSdk::GetChainIdString());
120+
const FBigInt ChainId = FBigInt(SequenceSdk::GetChainId());
121121

122122
FTransactionService TransactionService = FTransactionService(Signers, this->WalletState);
123123
TransactionService.SignAndBuild(ChainId, Calls.Calls, true, [OnSuccess, OnInternalFailure](TTuple<FString, FString> Result)

0 commit comments

Comments
 (0)