From ad86e17920e55d28e27938f7ae418284f240aa7a Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 18 Jun 2012 16:58:21 -0700 Subject: [PATCH] Make validation code work. --- SConstruct | 2 +- src/SerializedValidation.cpp | 4 ++-- src/SerializedValidation.h | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 820d9e2328..34908985e5 100644 --- a/SConstruct +++ b/SConstruct @@ -68,7 +68,7 @@ PROTO_SRCS = env.Protoc([], 'src/newcoin.proto', PROTOCOUTDIR='obj', PROTOCP env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc') # Remove unused source files. -UNUSED_SRCS = ['src/HttpReply.cpp', 'src/ValidationCollection.cpp'] +UNUSED_SRCS = ['src/HttpReply.cpp'] for file in UNUSED_SRCS: NEWCOIN_SRCS.remove(file) diff --git a/src/SerializedValidation.cpp b/src/SerializedValidation.cpp index a6c8e8c040..7647be4833 100644 --- a/src/SerializedValidation.cpp +++ b/src/SerializedValidation.cpp @@ -13,13 +13,13 @@ const uint32 SerializedValidation::sFullFlag = 0x00010000; const uint32 SerializedValidation::sValidationMagic = 0x4c575200; // "LGR" SerializedValidation::SerializedValidation(SerializerIterator& sit, bool checkSignature) - : STObject(sValidationFormat, sit), mSignature(sit, "Signature") + : STObject(sValidationFormat, sit), mSignature(sit, "Signature"), mTrusted(false) { if (!isValid()) throw std::runtime_error("Invalid validation"); } SerializedValidation::SerializedValidation(const uint256& ledgerHash, const NewcoinAddress& naSeed, bool isFull) - : STObject(sValidationFormat), mSignature("Signature") + : STObject(sValidationFormat), mSignature("Signature"), mTrusted(false) { setValueFieldH256(sfLedgerHash, ledgerHash); setValueFieldVL(sfSigningKey, NewcoinAddress::createNodePublic(naSeed).getNodePublic()); diff --git a/src/SerializedValidation.h b/src/SerializedValidation.h index 594504c874..987a883234 100644 --- a/src/SerializedValidation.h +++ b/src/SerializedValidation.h @@ -8,6 +8,9 @@ class SerializedValidation : public STObject { protected: STVariableLength mSignature; + bool mTrusted; + + void setNode(); public: typedef boost::shared_ptr pointer; @@ -26,9 +29,11 @@ public: NewcoinAddress getSignerPublic() const; bool isValid() const; bool isFull() const; + bool isTrusted() const { return mTrusted; } CKey::pointer getSigningKey() const; uint256 getSigningHash() const; + void setTrusted() { mTrusted = true; } void addSigned(Serializer&) const; void addSignature(Serializer&) const; std::vector getSigned() const;