diff --git a/src/SerializedTypes.h b/src/SerializedTypes.h index e505409bd6..8454fd7615 100644 --- a/src/SerializedTypes.h +++ b/src/SerializedTypes.h @@ -247,8 +247,9 @@ protected: public: - STHash128(const uint128& v=uint128()) : value(v) { ; } - STHash128(const char *n, const uint128& v=uint128()) : SerializedType(n), value(v) { ; } + STHash128(const uint128& v) : value(v) { ; } + STHash128(const char *n, const uint128& v) : SerializedType(n), value(v) { ; } + STHash128(const char *n) : SerializedType(n) { ; } STHash128() { ; } static STHash128* construct(SerializerIterator&, const char *name = NULL); @@ -273,8 +274,9 @@ protected: public: - STHash160(const uint160& v=uint160()) : value(v) { ; } - STHash160(const char *n, const uint160& v=uint160()) : SerializedType(n), value(v) { ; } + STHash160(const uint160& v) : value(v) { ; } + STHash160(const char *n, const uint160& v) : SerializedType(n), value(v) { ; } + STHash160(const char *n) : SerializedType(n) { ; } STHash160() { ; } static STHash160* construct(SerializerIterator&, const char *name = NULL); @@ -300,7 +302,8 @@ protected: public: STHash256(const uint256& v) : value(v) { ; } - STHash256(const char *n, const uint256& v=uint256()) : SerializedType(n), value(v) { ; } + STHash256(const char *n, const uint256& v) : SerializedType(n), value(v) { ; } + STHash256(const char *n) : SerializedType(n) { ; } STHash256() { ; } static STHash256* construct(SerializerIterator&, const char *name = NULL); diff --git a/src/TransactionFormats.cpp b/src/TransactionFormats.cpp index a851c24893..c891e52d0b 100644 --- a/src/TransactionFormats.cpp +++ b/src/TransactionFormats.cpp @@ -13,7 +13,7 @@ TransactionFormat InnerTxnFormats[]= { S_FIELD(SourceTag), STI_UINT32, SOE_IFFLAG, 2 }, { S_FIELD(TargetLedger), STI_UINT32, SOE_IFFLAG, 4 }, { S_FIELD(InvoiceID), STI_HASH256, SOE_IFFLAG, 8 }, - { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x01000000 }, + { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x02000000 }, { sfInvalid, NULL, STI_DONE, SOE_NEVER, -1 } } }, { "Claim", ttCLAIM, { @@ -32,7 +32,7 @@ TransactionFormat InnerTxnFormats[]= { S_FIELD(Destination), STI_ACCOUNT, SOE_IFFLAG, 4 }, { S_FIELD(TargetLedger), STI_UINT32, SOE_IFFLAG, 8 }, { S_FIELD(Identifier), STI_VL, SOE_IFFLAG, 16 }, - { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x01000000 }, + { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x02000000 }, { sfInvalid, NULL, STI_DONE, SOE_NEVER, -1 } } }, { "Offer", ttEXCHANGE_OFFER, { @@ -46,7 +46,7 @@ TransactionFormat InnerTxnFormats[]= { S_FIELD(TargetLedger), STI_UINT32, SOE_IFFLAG, 32 }, { S_FIELD(ExpireLedger), STI_UINT32, SOE_IFFLAG, 64 }, { S_FIELD(Identifier), STI_VL, SOE_IFFLAG, 128 }, - { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x01000000 }, + { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x02000000 }, { sfInvalid, NULL, STI_DONE, SOE_NEVER, -1 } } }, { NULL, ttINVALID }