Skip to content

Port stratis fixes for OP_RETURN in transaction building #224

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
dangershony merged 2 commits into from
Oct 7, 2020
Merged

Port stratis fixes for OP_RETURN in transaction building #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d29f52
Add opreturn amounts from stratis fix
xandronus Oct 2, 2020
1f0584f
OP_RETURN fixes from stratis 3.0.8.0 release branch
xandronus Oct 2, 2020
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
2 changes: 0 additions & 2 deletions src/Features/Blockcore.Features.Wallet/Api/Models/RequestModels.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ public TxFeeEstimateRequest()
/// recipient will receive in STRAT (or a sidechain coin). If the transaction was realized,
/// both the values would be used to create the UTXOs for the transaction recipients.
/// </summary>
[Required(ErrorMessage = "A list of recipients is required.")]
[MinLength(1)]
public List<RecipientModel> Recipients { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Features/Blockcore.Features.Wallet/WalletTransactionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ protected void AddCoins(TransactionBuildContext context)

// Get total spendable balance in the account.
long balance = context.UnspentOutputs.Sum(t => t.Transaction.Amount);
long totalToSend = context.Recipients.Sum(s => s.Amount);
long totalToSend = context.Recipients.Sum(s => s.Amount) + (context.OpReturnAmount ?? Money.Zero);
if (balance < totalToSend)
throw new WalletException("Not enough funds.");

Expand Down
6 changes: 3 additions & 3 deletions src/Tests/Blockcore.Features.Wallet.Tests/WalletControllerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ public void BuildTransactionWithChangeAddressReturnsWalletBuildTransactionModel(
IActionResult result = controller.BuildTransaction(new BuildTransactionRequest
{
AccountName = "Account 0",
Recipients = new List<RecipientModel>(),
Recipients = new List<RecipientModel>() { new RecipientModel() { Amount = "1.0", DestinationAddress = new Key().PubKey.Hash.GetAddress(this.Network).ToString() } },
WalletName = walletName,
ChangeAddress = usedReceiveAddress.Address
});
Expand Down Expand Up @@ -1676,7 +1676,7 @@ public void BuildTransactionWithChangeAddressNotInWalletReturnsBadRequest()
IActionResult result = controller.BuildTransaction(new BuildTransactionRequest
{
AccountName = "Account 0",
Recipients = new List<RecipientModel>(),
Recipients = new List<RecipientModel>() { new RecipientModel() { Amount = "1.0", DestinationAddress = new Key().PubKey.Hash.GetAddress(this.Network).ToString() } },
WalletName = walletName,
ChangeAddress = addressNotInWallet.Address
});
Expand Down Expand Up @@ -1713,7 +1713,7 @@ public void BuildTransactionWithChangeAddressAccountNotInWalletReturnsBadRequest
IActionResult result = controller.BuildTransaction(new BuildTransactionRequest
{
AccountName = "Account 0",
Recipients = new List<RecipientModel>(),
Recipients = new List<RecipientModel>() { new RecipientModel() { Amount = "1.0", DestinationAddress = new Key().PubKey.Hash.GetAddress(this.Network).ToString() } },
WalletName = walletName,
ChangeAddress = addressNotInWallet.Address
});
Expand Down