ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin into serialize

Browse Source 
Conflicts:
	src/TransactionFormats.cpp

Fast forward.
This commit is contained in:
JoelKatz
2012-09-30 22:38:31 -07:00
parent 98655aed4d 0c3a3e6591
commit a4b330e9bc
8 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TransactionFormats.cpp
View File

@@ -1,5 +1,4 @@
#include "TransactionFormats.h"
#include "TransactionFormats.h"
#define TF_BASE \
{ sfTransactionType, SOE_REQUIRED }, \
@@ -9,7 +8,7 @@
{ sfSequence, SOE_REQUIRED }, \
{ sfFee, SOE_REQUIRED }, \
{ sfSigningPubKey, SOE_REQUIRED }, \
{ sfSignature, SOE_OPTIONAL },
{ sfTxnSignature, SOE_OPTIONAL },
TransactionFormat InnerTxnFormats[]=
{
@@ -26,10 +25,10 @@ TransactionFormat InnerTxnFormats[]=
{ "Claim", ttCLAIM, { TF_BASE
{ sfGenerator, SOE_REQUIRED },
{ sfPublicKey, SOE_REQUIRED },
{ sfSignature, SOE_REQUIRED },
{ sfInvalid, SOE_END } }
},
{ "CreditSet", ttCREDIT_SET, { TF_BASE
{ sfDestination, SOE_REQUIRED },
{ sfLimitAmount, SOE_OPTIONAL },
{ sfQualityIn, SOE_OPTIONAL },
{ sfQualityOut, SOE_OPTIONAL },