fixed sale contracts encoding

Author: andygruening

Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp

@@ -97,7 +97,7 @@ void ABI::Decode(TArray<uint8> Data, TArray<TSharedPtr<ABIElement>> Args)
 
 bool ABI::IsValidSignature(FString Signature)
 {
-	const FRegexPattern FunctionABIRegex(TEXT("^[A-Z|a-z|,-|0-9]+(([A-Z|a-z|0-9]+(, [A-Z|a-z|0-9]+))?)$"));
+	const FRegexPattern FunctionABIRegex(TEXT("^[a-z]+\\(([a-z0-9\\[\\]]+(,[a-z0-9\\[\\]]+)*)\\)$"));
 	FRegexMatcher MyMatcher(FunctionABIRegex, Signature);
 	return MyMatcher.FindNext();
 }

Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC1155SaleContract.cpp

@@ -1,5 +1,6 @@
 #include "Types/ERC1155SaleContract.h"
 #include "ABI/ABI.h"
+#include "Util/Log.h"
 
 UERC1155SaleContract::UERC1155SaleContract()
 {
@@ -16,28 +17,28 @@ UERC1155SaleContract::UERC1155SaleContract(FString ContractAddress, FString Paym
 FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToAddress, const TArray<int32>& TokenIds, const TArray<int32>& Amounts, const TArray<FString>& Proof)
 {
 	FString FunctionSignature = "mint(address,uint256[],uint256[],bytes,address,uint256,bytes32[])";
-
+	
 	FString WalletAddress = ToAddress;
 	FString WalletAddressNoPrefix = WalletAddress.Mid(2, WalletAddress.Len());
 	FAddress WalletAddressBytes = FAddress::From(WalletAddressNoPrefix);
 
-	TFixedABIData ABIAccount = ABI::Address(WalletAddressBytes);
+	TSharedPtr<TFixedABIData> ABIAccount = MakeShared<TFixedABIData>(ABI::Address(WalletAddressBytes));
 
 	TArray<TSharedPtr<ABIElement>> TokenIdsArray;
 	for (uint32 TokenId : TokenIds)
 	{
 		const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));
 		TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));
 	}
-	TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);
+	TSharedPtr<TDynamicABIArray> ABIArrayTokenIds = MakeShared<TDynamicABIArray>(TokenIdsArray);
 
 	TArray<TSharedPtr<ABIElement>> AmountsArray;
 	for (uint32 Amount : Amounts)
 	{
 		const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));
 		AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));
 	}
-	TDynamicABIArray ABIArrayAmounts(AmountsArray);
+	TSharedPtr<TDynamicABIArray> ABIArrayAmounts = MakeShared<TDynamicABIArray>(AmountsArray);
 
 	TArray<TSharedPtr<ABIElement>> ProofArray;
 	for (const FString& ProofEntry : Proof)
@@ -49,28 +50,33 @@ FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToA
 		const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);
 		ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));
 	}
-	TDynamicABIArray ABIArrayProof(ProofArray);
-
-	TDynamicABIData ABIData = ABI::String(Data);
-	TFixedABIData ABIAddressPayment = ABI::Address(FAddress::From(PaymentToken.Mid(2, PaymentToken.Len())));
-	TFixedABIData ABIAmount = ABI::UInt32(MaxTotal);
+	TSharedPtr<TDynamicABIArray> ABIArrayProof = MakeShared<TDynamicABIArray>(ProofArray);
 
+	TSharedPtr<TDynamicABIData> ABIData = MakeShared<TDynamicABIData>(ABI::String(Data));
+	TSharedPtr<TFixedABIData> ABIAddressPayment = MakeShared<TFixedABIData>(ABI::Address(FAddress::From(PaymentToken.Mid(2, PaymentToken.Len()))));
+	TSharedPtr<TFixedABIData> ABIAmount = MakeShared<TFixedABIData>(ABI::UInt32(MaxTotal));
 
-	TArray<ABIElement*> Arr;
-	Arr.Add(&ABIAccount);
-	Arr.Add(&ABIArrayTokenIds);
-	Arr.Add(&ABIArrayAmounts);
-	Arr.Add(&ABIData);
-	Arr.Add(&ABIAddressPayment);
-	Arr.Add(&ABIAmount);
-	Arr.Add(&ABIArrayProof);
 
-	FUnsizedData EncodedData = ABI::Encode(FunctionSignature, Arr);
+	TArray<TSharedPtr<ABIElement>> Arr;
+	Arr.Add(ABIAccount);
+	Arr.Add(ABIArrayTokenIds);
+	Arr.Add(ABIArrayAmounts);
+	Arr.Add(ABIData);
+	Arr.Add(ABIAddressPayment);
+	Arr.Add(ABIAmount);
+	Arr.Add(ABIArrayProof);
 
+	TOptional<FUnsizedData> EncodedData = ABI::Encode(FunctionSignature, Arr);
 	FRawTransaction T;
+	
+	if (!EncodedData.IsSet())
+	{
+		SEQ_LOG(Display, TEXT("Encoded data is invalid"));
+		return T;
+	}
 
 	T.to = ContractAddress;
-	T.data = "0x" + EncodedData.ToHex();
+	T.data = "0x" + EncodedData.GetValue().ToHex();
 	T.value = "0";
     return T;
 }

Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC721SaleContract.cpp

@@ -1,5 +1,6 @@
 #include "Types/ERC721SaleContract.h"
 #include "ABI/ABI.h"
+#include "Util/Log.h"
 
 UERC721SaleContract::UERC721SaleContract()
 {
@@ -19,39 +20,45 @@ FRawTransaction UERC721SaleContract::MakePurchaseTransaction(const FString& ToAd
 
     FString ToAddressNoPrefix = ToAddress.Mid(2, ToAddress.Len());
     FAddress ToAddressBytes = FAddress::From(ToAddressNoPrefix);
-    TFixedABIData ABIAccountTo = ABI::Address(ToAddressBytes);
+    TSharedPtr<TFixedABIData> ABIAccountTo = MakeShared<TFixedABIData>(ABI::Address(ToAddressBytes));
 
-    TFixedABIData ABIAmount = ABI::Int32(Amount); 
+    TSharedPtr<TFixedABIData> ABIAmount = MakeShared<TFixedABIData>(ABI::Int32(Amount)); 
 
     FString PaymentTokenNoPrefix = PaymentToken.Mid(2, PaymentToken.Len());
     FAddress PaymentTokenBytes = FAddress::From(PaymentTokenNoPrefix);
-    TFixedABIData ABIAddressPayment = ABI::Address(PaymentTokenBytes);
+    TSharedPtr<TFixedABIData> ABIAddressPayment = MakeShared<TFixedABIData>(ABI::Address(PaymentTokenBytes));
 
-    TFixedABIData ABIMaxTotal = ABI::Int32(MaxTotal);
+    TSharedPtr<TFixedABIData> ABIMaxTotal = MakeShared<TFixedABIData>(ABI::Int32(MaxTotal));
 
     TArray<TSharedPtr<ABIElement>> ProofArray;
     for (const FString& ProofEntry : Proof)
     {
         TArray<uint8> ProofBytes;
         ProofBytes.SetNumUninitialized(32);
         FMemory::Memcpy(ProofBytes.GetData(), TCHAR_TO_UTF8(*ProofEntry), FMath::Min(ProofEntry.Len(), 32));
-        
+
         const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);
         ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));
     }
-    TDynamicABIArray ABIArrayProof(ProofArray);
-
-    TArray<ABIElement*> Arr;
-    Arr.Add(&ABIAccountTo);      
-    Arr.Add(&ABIAmount);         
-    Arr.Add(&ABIAddressPayment); 
-    Arr.Add(&ABIMaxTotal);       
-    Arr.Add(&ABIArrayProof);     
+    TSharedPtr<TDynamicABIArray> ABIArrayProof = MakeShared<TDynamicABIArray>(ProofArray);
 
-    FUnsizedData EncodedData = ABI::Encode(FunctionSignature, Arr);
+    TArray<TSharedPtr<ABIElement>> Arr;
+    Arr.Add(ABIAccountTo);      
+    Arr.Add(ABIAmount);         
+    Arr.Add(ABIAddressPayment); 
+    Arr.Add(ABIMaxTotal);       
+    Arr.Add(ABIArrayProof);     
 
+    TOptional<FUnsizedData> EncodedData = ABI::Encode(FunctionSignature, Arr);
     FRawTransaction T;
-    T.data = "0x" + EncodedData.ToHex();
+	
+    if (!EncodedData.IsSet())
+    {
+        SEQ_LOG(Display, TEXT("Encoded data is invalid"));
+        return T;
+    }
+
+    T.data = "0x" + EncodedData.GetValue().ToHex();
     T.to = ContractAddress;
     T.value = "0";