From 189b11551351abca2da09530df13644768e4b035 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 5 Jun 2012 13:03:47 -0700 Subject: [PATCH] Fix serialized format for nicknames. --- src/LedgerFormats.cpp | 5 ++--- src/SerializedObject.h | 1 - src/TransactionFormats.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp index df6fb2350e..afee90b4c9 100644 --- a/src/LedgerFormats.cpp +++ b/src/LedgerFormats.cpp @@ -35,17 +35,16 @@ LedgerEntryFormat LedgerFormats[]= }, { "GeneratorMap", ltGENERATOR_MAP, { { S_FIELD(Flags), STI_UINT32, SOE_FLAGS, 0 }, - { S_FIELD(GeneratorID), STI_HASH160, SOE_REQUIRED, 0 }, +// { S_FIELD(GeneratorID), STI_HASH160, SOE_REQUIRED, 0 }, { S_FIELD(Generator), STI_VL, SOE_REQUIRED, 0 }, { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x01000000 }, { sfInvalid, NULL, STI_DONE, SOE_NEVER, -1 } } }, { "Nickname", ltNICKNAME, { { S_FIELD(Flags), STI_UINT32, SOE_FLAGS, 0 }, - { S_FIELD(Nickname), STI_HASH256, SOE_REQUIRED, 0 }, +// { S_FIELD(Nickname), STI_HASH256, SOE_REQUIRED, 0 }, { S_FIELD(Account), STI_ACCOUNT, SOE_REQUIRED, 0 }, { S_FIELD(MinimumOffer), STI_AMOUNT, SOE_IFFLAG, 1 }, - { S_FIELD(OfferCurrency), STI_HASH160, SOE_IFFLAG, 2 }, { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x01000000 }, { sfInvalid, NULL, STI_DONE, SOE_NEVER, -1 } } }, diff --git a/src/SerializedObject.h b/src/SerializedObject.h index de9f3d2b7f..3c322486da 100644 --- a/src/SerializedObject.h +++ b/src/SerializedObject.h @@ -72,7 +72,6 @@ enum SOE_Field sfNextTransitStart, sfNickname, sfOfferCurrency, - sfOfferMin, sfPaths, sfPubKey, sfSendMax, diff --git a/src/TransactionFormats.cpp b/src/TransactionFormats.cpp index c0f2f73a51..cddcafcf6c 100644 --- a/src/TransactionFormats.cpp +++ b/src/TransactionFormats.cpp @@ -47,7 +47,7 @@ TransactionFormat InnerTxnFormats[]= { "NicknameSet", ttNICKNAME_SET, { { S_FIELD(Flags), STI_UINT32, SOE_FLAGS, 0 }, { S_FIELD(Nickname), STI_HASH256, SOE_IFFLAG, 8 }, - { S_FIELD(OfferMin), STI_AMOUNT, SOE_IFFLAG, 1 }, + { S_FIELD(MinimumOffer), STI_AMOUNT, SOE_IFFLAG, 1 }, { S_FIELD(Signature), STI_VL, SOE_IFFLAG, 2 }, { S_FIELD(SourceTag), STI_UINT32, SOE_IFFLAG, 1 }, { S_FIELD(Extensions), STI_TL, SOE_IFFLAG, 0x02000000 },