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
3a1e91e7
Commit
3a1e91e7
authored
Jun 13, 2017
by
Jeremy Bokobza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated NTumbleBit code changes
parent
065a6810
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
14 deletions
+101
-14
EscrowInitiator.cs
Breeze/src/NTumbleBit/EscrowInitiator.cs
+2
-1
Extensions.cs
Breeze/src/NTumbleBit/Extensions.cs
+29
-0
PromiseClientSession.cs
Breeze/src/NTumbleBit/PuzzlePromise/PromiseClientSession.cs
+6
-1
SolverClientSession.cs
Breeze/src/NTumbleBit/PuzzleSolver/SolverClientSession.cs
+15
-4
SolverServerSession.cs
Breeze/src/NTumbleBit/PuzzleSolver/SolverServerSession.cs
+49
-8
No files found.
Breeze/src/NTumbleBit/EscrowInitiator.cs
View file @
3a1e91e7
...
...
@@ -71,8 +71,9 @@ namespace NTumbleBit
tx
.
Inputs
.
Add
(
new
TxIn
(
coin
.
Outpoint
));
tx
.
Inputs
[
0
].
Sequence
=
0
;
tx
.
Outputs
.
Add
(
new
TxOut
(
coin
.
Amount
,
redeemDestination
));
var
vSize
=
tx
.
GetVirtualSize
()
+
80
;
tx
.
Inputs
[
0
].
ScriptSig
=
EscrowScriptBuilder
.
GenerateScriptSig
(
new
TransactionSignature
[]
{
null
})
+
Op
.
GetPushOp
(
coin
.
Redeem
.
ToBytes
());
var
vSize
=
tx
.
GetVirtualSize
()
+
80
;
// Size without signature + the signature size
tx
.
Outputs
[
0
].
Value
-=
feeRate
.
GetFee
(
vSize
);
var
redeemTransaction
=
new
TrustedBroadcastRequest
...
...
Breeze/src/NTumbleBit/Extensions.cs
View file @
3a1e91e7
using
NBitcoin.RPC
;
using
Newtonsoft.Json.Linq
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
...
...
@@ -16,5 +17,33 @@ namespace NTumbleBit
Params
=
parameters
},
throwIfRPCError
:
false
);
}
public
static
JArray
ListTransactions
(
this
RPCClient
rpcClient
)
{
JArray
array
=
new
JArray
();
int
count
=
100
;
int
skip
=
0
;
int
highestConfirmation
=
0
;
while
(
true
)
{
var
result
=
rpcClient
.
SendCommandNoThrows
(
"listtransactions"
,
"*"
,
count
,
skip
,
true
);
skip
+=
count
;
if
(
result
.
Error
!=
null
)
return
null
;
var
transactions
=
(
JArray
)
result
.
Result
;
foreach
(
var
obj
in
transactions
)
{
array
.
Add
(
obj
);
if
(
obj
[
"confirmations"
]
!=
null
)
{
highestConfirmation
=
Math
.
Max
(
highestConfirmation
,
(
int
)
obj
[
"confirmations"
]);
}
}
if
(
transactions
.
Count
<
count
||
highestConfirmation
>=
1400
)
break
;
}
return
array
;
}
}
}
Breeze/src/NTumbleBit/PuzzlePromise/PromiseClientSession.cs
View file @
3a1e91e7
...
...
@@ -245,7 +245,12 @@ namespace NTumbleBit.PuzzlePromise
Transaction
cashout
=
new
Transaction
();
cashout
.
AddInput
(
new
TxIn
(
InternalState
.
EscrowedCoin
.
Outpoint
,
Script
.
Empty
));
cashout
.
AddOutput
(
new
TxOut
(
Money
.
Zero
,
cashoutDestination
));
var
fee
=
feeRate
.
GetFee
(
cashout
.
GetVirtualSize
());
var
tb
=
new
TransactionBuilder
();
tb
.
Extensions
.
Add
(
new
EscrowBuilderExtension
());
tb
.
AddCoins
(
InternalState
.
EscrowedCoin
);
var
size
=
tb
.
EstimateSize
(
cashout
,
true
);
var
fee
=
feeRate
.
GetFee
(
size
);
cashout
.
Outputs
[
0
].
Value
=
InternalState
.
EscrowedCoin
.
Amount
-
fee
;
...
...
Breeze/src/NTumbleBit/PuzzleSolver/SolverClientSession.cs
View file @
3a1e91e7
...
...
@@ -318,6 +318,15 @@ namespace NTumbleBit.PuzzleSolver
return
signature
;
}
public
TransactionSignature
SignEscape
()
{
AssertState
(
SolverClientStates
.
Completed
);
var
dummy
=
new
Transaction
();
dummy
.
Inputs
.
Add
(
new
TxIn
(
InternalState
.
EscrowedCoin
.
Outpoint
));
dummy
.
Outputs
.
Add
(
new
TxOut
());
return
dummy
.
SignInput
(
InternalState
.
EscrowKey
,
InternalState
.
EscrowedCoin
,
SigHash
.
None
|
SigHash
.
AnyoneCanPay
);
}
private
Transaction
CreateUnsignedOfferTransaction
()
{
Script
offer
=
CreateOfferScript
();
...
...
@@ -333,15 +342,17 @@ namespace NTumbleBit.PuzzleSolver
{
var
coin
=
CreateUnsignedOfferTransaction
().
Outputs
.
AsCoins
().
First
().
ToScriptCoin
(
CreateOfferScript
());
var
unknownOutpoints
=
new
OutPoint
(
uint256
.
Zero
,
0
);
Transaction
tx
=
new
Transaction
();
tx
.
LockTime
=
CreateOfferScriptParameters
().
Expiration
;
tx
.
Inputs
.
Add
(
new
TxIn
(
coin
.
Outpoint
));
tx
.
Inputs
.
Add
(
new
TxIn
(
unknownOutpoints
));
tx
.
Inputs
[
0
].
Sequence
=
0
;
tx
.
Outputs
.
Add
(
new
TxOut
(
coin
.
Amount
,
redeemDestination
));
var
vSize
=
tx
.
GetVirtualSize
()
+
80
;
tx
.
Outputs
[
0
].
Value
-=
feeRate
.
GetFee
(
vSize
);
tx
.
Inputs
[
0
].
ScriptSig
=
new
Script
(
OpcodeType
.
OP_0
)
+
Op
.
GetPushOp
(
coin
.
Redeem
.
ToBytes
());
var
vSize
=
tx
.
GetVirtualSize
()
+
80
;
// Size without signature + the signature size
tx
.
Outputs
[
0
].
Value
-=
feeRate
.
GetFee
(
vSize
);
var
redeemTransaction
=
new
TrustedBroadcastRequest
{
Key
=
InternalState
.
RedeemKey
,
...
...
@@ -349,7 +360,7 @@ namespace NTumbleBit.PuzzleSolver
Transaction
=
tx
};
//Strip redeem script information so we check if TrustedBroadcastRequest can sign correctly
redeemTransaction
.
Transaction
=
redeemTransaction
.
ReSign
(
new
Coin
(
coin
.
Outpoint
,
coin
.
TxOut
));
redeemTransaction
.
Transaction
=
redeemTransaction
.
ReSign
(
new
Coin
(
unknownOutpoints
,
coin
.
TxOut
));
return
redeemTransaction
;
}
...
...
Breeze/src/NTumbleBit/PuzzleSolver/SolverServerSession.cs
View file @
3a1e91e7
...
...
@@ -20,6 +20,7 @@ namespace NTumbleBit.PuzzleSolver
WaitingRevelation
,
WaitingBlindFactor
,
WaitingFulfillment
,
WaitingEscape
,
Completed
}
public
class
SolverServerSession
:
EscrowReceiver
...
...
@@ -289,7 +290,7 @@ namespace NTumbleBit.PuzzleSolver
public
TrustedBroadcastRequest
GetSignedOfferTransaction
()
{
AssertState
(
SolverServerStates
.
Completed
);
AssertState
(
SolverServerStates
.
WaitingEscape
);
var
offerTransaction
=
GetUnsignedOfferTransaction
();
TransactionBuilder
txBuilder
=
new
TransactionBuilder
();
txBuilder
.
Extensions
.
Add
(
new
EscrowBuilderExtension
());
...
...
@@ -307,7 +308,7 @@ namespace NTumbleBit.PuzzleSolver
public
SolutionKey
[]
GetSolutionKeys
()
{
AssertState
(
SolverServerStates
.
Completed
);
AssertState
(
SolverServerStates
.
WaitingEscape
);
return
InternalState
.
SolvedPuzzles
.
Select
(
s
=>
s
.
SolutionKey
).
ToArray
();
}
...
...
@@ -330,30 +331,36 @@ namespace NTumbleBit.PuzzleSolver
Script
offerScript
=
GetOfferScript
();
var
offer
=
GetUnsignedOfferTransaction
();
PubKey
clientKey
=
AssertValidSignature
(
clientSignature
,
offer
);
TransactionBuilder
builder
=
new
TransactionBuilder
();
builder
.
StandardTransactionPolicy
.
CheckFee
=
false
;
builder
.
Extensions
.
Add
(
new
EscrowBuilderExtension
());
builder
.
AddCoins
(
InternalState
.
EscrowedCoin
);
builder
.
AddKeys
(
InternalState
.
EscrowKey
);
var
clientKey
=
InternalState
.
GetClientEscrowPubKey
();
builder
.
AddKnownSignature
(
clientKey
,
clientSignature
);
builder
.
SignTransactionInPlace
(
offer
);
if
(!
builder
.
Verify
(
offer
))
throw
new
PuzzleException
(
"invalid-signature"
);
throw
new
PuzzleException
(
"invalid-
tumbler-
signature"
);
var
offerCoin
=
offer
.
Outputs
.
AsCoins
().
First
().
ToScriptCoin
(
offerScript
);
var
solutions
=
InternalState
.
SolvedPuzzles
.
Select
(
s
=>
s
.
SolutionKey
).
ToArray
();
Transaction
fulfill
=
new
Transaction
();
fulfill
.
Inputs
.
Add
(
new
TxIn
(
offerCoin
.
Outpoint
));
fulfill
.
Outputs
.
Add
(
new
TxOut
(
offerCoin
.
Amount
,
cashout
));
var
size
=
new
OfferBuilderExtension
().
EstimateScriptSigSize
(
offerCoin
.
Redeem
);
fulfill
.
Outputs
[
0
].
Value
-=
feeRate
.
GetFee
(
size
);
var
fulfillScript
=
SolverScriptBuilder
.
CreateFulfillScript
(
NBitcoin
.
BuilderExtensions
.
BuilderExtension
.
DummySignature
,
solutions
);
fulfill
.
Inputs
[
0
].
ScriptSig
=
fulfillScript
+
Op
.
GetPushOp
(
offerCoin
.
Redeem
.
ToBytes
());
fulfill
.
Outputs
[
0
].
Value
-=
feeRate
.
GetFee
(
fulfill
.
GetVirtualSize
());
var
signature
=
fulfill
.
Inputs
.
AsIndexedInputs
().
First
().
Sign
(
InternalState
.
FulfillKey
,
offerCoin
,
SigHash
.
All
);
var
fulfillScript
=
SolverScriptBuilder
.
CreateFulfillScript
(
signature
,
solutions
);
fulfillScript
=
SolverScriptBuilder
.
CreateFulfillScript
(
signature
,
solutions
);
fulfill
.
Inputs
[
0
].
ScriptSig
=
fulfillScript
+
Op
.
GetPushOp
(
offerCoin
.
Redeem
.
ToBytes
());
InternalState
.
OfferClientSignature
=
clientSignature
;
InternalState
.
Status
=
SolverServerStates
.
Completed
;
InternalState
.
Status
=
SolverServerStates
.
WaitingEscape
;
return
new
TrustedBroadcastRequest
{
Key
=
InternalState
.
FulfillKey
,
...
...
@@ -362,6 +369,40 @@ namespace NTumbleBit.PuzzleSolver
};
}
private
PubKey
AssertValidSignature
(
TransactionSignature
clientSignature
,
Transaction
offer
)
{
var
signedHash
=
offer
.
Inputs
.
AsIndexedInputs
().
First
().
GetSignatureHash
(
InternalState
.
EscrowedCoin
,
clientSignature
.
SigHash
);
var
clientKey
=
InternalState
.
GetClientEscrowPubKey
();
if
(!
clientKey
.
Verify
(
signedHash
,
clientSignature
.
Signature
))
throw
new
PuzzleException
(
"invalid-client-signature"
);
return
clientKey
;
}
public
Transaction
GetSignedEscapeTransaction
(
TransactionSignature
clientSignature
,
Script
cashout
)
{
AssertState
(
SolverServerStates
.
WaitingEscape
);
var
escapeTx
=
GetUnsignedOfferTransaction
();
escapeTx
.
Outputs
[
0
].
ScriptPubKey
=
cashout
;
var
clientKey
=
AssertValidSignature
(
clientSignature
,
escapeTx
);
TransactionBuilder
builder
=
new
TransactionBuilder
();
builder
.
StandardTransactionPolicy
.
CheckFee
=
false
;
builder
.
Extensions
.
Add
(
new
EscrowBuilderExtension
());
builder
.
AddCoins
(
InternalState
.
EscrowedCoin
);
builder
.
AddKnownSignature
(
clientKey
,
clientSignature
);
//This add the known signature if correct SigHash
builder
.
SignTransactionInPlace
(
escapeTx
,
SigHash
.
None
|
SigHash
.
AnyoneCanPay
);
//This sign SigHash.All
builder
.
AddKeys
(
InternalState
.
EscrowKey
);
builder
.
SignTransactionInPlace
(
escapeTx
);
if
(!
builder
.
Verify
(
escapeTx
))
throw
new
PuzzleException
(
"invalid-tumbler-signature"
);
return
escapeTx
;
}
private
Script
GetOfferScript
()
{
var
escrow
=
EscrowScriptBuilder
.
ExtractEscrowScriptPubKeyParameters
(
InternalState
.
EscrowedCoin
.
Redeem
);
...
...
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