Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
4a8ef7cb
Commit
4a8ef7cb
authored
May 15, 2017
by
Jeremy Bokobza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added transactionId to the "build transaction" return message
parent
a17b5dd1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
WalletController.cs
Breeze/src/Breeze.Wallet/Controllers/WalletController.cs
+2
-1
IWalletManager.cs
Breeze/src/Breeze.Wallet/IWalletManager.cs
+1
-1
WalletBuildTransactionModel.cs
...e/src/Breeze.Wallet/Models/WalletBuildTransactionModel.cs
+5
-2
WalletManager.cs
Breeze/src/Breeze.Wallet/WalletManager.cs
+2
-2
No files found.
Breeze/src/Breeze.Wallet/Controllers/WalletController.cs
View file @
4a8ef7cb
...
...
@@ -280,7 +280,8 @@ namespace Breeze.Wallet.Controllers
var
model
=
new
WalletBuildTransactionModel
{
Hex
=
transactionResult
.
hex
,
Fee
=
transactionResult
.
fee
Fee
=
transactionResult
.
fee
,
TransactionId
=
transactionResult
.
transactionId
};
return
this
.
Json
(
model
);
}
...
...
Breeze/src/Breeze.Wallet/IWalletManager.cs
View file @
4a8ef7cb
...
...
@@ -135,7 +135,7 @@ namespace Breeze.Wallet
/// <param name="feeType">The type of fee to be included.</param>
/// <param name="allowUnconfirmed">Whether or not we allow this transaction to rely on unconfirmed outputs.</param>
/// <returns></returns>
(
string
hex
,
Money
fee
)
BuildTransaction
(
string
walletName
,
string
accountName
,
CoinType
coinType
,
string
password
,
string
destinationAddress
,
Money
amount
,
string
feeType
,
bool
allowUnconfirmed
);
(
string
hex
,
uint256
transactionId
,
Money
fee
)
BuildTransaction
(
string
walletName
,
string
accountName
,
CoinType
coinType
,
string
password
,
string
destinationAddress
,
Money
amount
,
string
feeType
,
bool
allowUnconfirmed
);
/// <summary>
/// Sends a transaction to the network.
...
...
Breeze/src/Breeze.Wallet/Models/WalletBuildTransactionModel.cs
View file @
4a8ef7cb
...
...
@@ -14,5 +14,8 @@ namespace Breeze.Wallet.Models
[
JsonProperty
(
PropertyName
=
"hex"
)]
public
string
Hex
{
get
;
set
;
}
[
JsonProperty
(
PropertyName
=
"transactionId"
)]
public
uint256
TransactionId
{
get
;
set
;
}
}
}
Breeze/src/Breeze.Wallet/WalletManager.cs
View file @
4a8ef7cb
...
...
@@ -325,7 +325,7 @@ namespace Breeze.Wallet
}
/// <inheritdoc />
public
(
string
hex
,
Money
fee
)
BuildTransaction
(
string
walletName
,
string
accountName
,
CoinType
coinType
,
string
password
,
string
destinationAddress
,
Money
amount
,
string
feeType
,
bool
allowUnconfirmed
)
public
(
string
hex
,
uint256
transactionId
,
Money
fee
)
BuildTransaction
(
string
walletName
,
string
accountName
,
CoinType
coinType
,
string
password
,
string
destinationAddress
,
Money
amount
,
string
feeType
,
bool
allowUnconfirmed
)
{
if
(
amount
==
Money
.
Zero
)
{
...
...
@@ -388,7 +388,7 @@ namespace Breeze.Wallet
throw
new
Exception
(
"Could not build transaction, please make sure you entered the correct data."
);
}
return
(
tx
.
ToHex
(),
calculationResult
.
fee
);
return
(
tx
.
ToHex
(),
tx
.
GetHash
(),
calculationResult
.
fee
);
}
/// <summary>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment