diff --git a/rippled b/rippled index 63547c0b..0ec275bc 160000 --- a/rippled +++ b/rippled @@ -1 +1 @@ -Subproject commit 63547c0b631b4225ed4561221da0a45799e07858 +Subproject commit 0ec275bc48b5ee657549ee65151b12b14071013a diff --git a/src/backend/BackendInterface.cpp b/src/backend/BackendInterface.cpp index dd1d11c3..6721ef6c 100644 --- a/src/backend/BackendInterface.cpp +++ b/src/backend/BackendInterface.cpp @@ -39,20 +39,15 @@ void BackendInterface::writeLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const + std::string&& blob) const { + assert(key.size() == sizeof(rippled::uint256)); ripple::uint256 key256 = ripple::uint256::fromVoid(key.data()); indexer_.addKey(std::move(key256)); doWriteLedgerObject( std::move(key), seq, - std::move(blob), - isCreated, - isDeleted, - std::move(book)); + std::move(blob)); } std::optional BackendInterface::hardFetchLedgerRangeNoThrow() const diff --git a/src/backend/BackendInterface.h b/src/backend/BackendInterface.h index cdcf02a7..9a6b5b6b 100644 --- a/src/backend/BackendInterface.h +++ b/src/backend/BackendInterface.h @@ -204,10 +204,7 @@ protected: writeLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const; + std::string&& blob) const; virtual void writeTransaction( @@ -263,10 +260,7 @@ private: doWriteLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const = 0; + std::string&& blob) const = 0; virtual bool doFinishWrites() const = 0; diff --git a/src/backend/CassandraBackend.cpp b/src/backend/CassandraBackend.cpp index 2cd13b7b..af365a9b 100644 --- a/src/backend/CassandraBackend.cpp +++ b/src/backend/CassandraBackend.cpp @@ -148,10 +148,7 @@ void CassandraBackend::doWriteLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const + std::string&& blob) const { BOOST_LOG_TRIVIAL(trace) << "Writing ledger object to cassandra"; makeAndExecuteAsyncWrite( diff --git a/src/backend/CassandraBackend.h b/src/backend/CassandraBackend.h index b15a1938..19e1e660 100644 --- a/src/backend/CassandraBackend.h +++ b/src/backend/CassandraBackend.h @@ -833,10 +833,7 @@ public: doWriteLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const override; + std::string&& blob) const override; void writeAccountTransactions( diff --git a/src/backend/PostgresBackend.cpp b/src/backend/PostgresBackend.cpp index af0e2dfd..d846a705 100644 --- a/src/backend/PostgresBackend.cpp +++ b/src/backend/PostgresBackend.cpp @@ -60,10 +60,7 @@ void PostgresBackend::doWriteLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const + std::string&& blob) const { if (abortWrite_) return; diff --git a/src/backend/PostgresBackend.h b/src/backend/PostgresBackend.h index 3fa7e9a3..dcf06f2c 100644 --- a/src/backend/PostgresBackend.h +++ b/src/backend/PostgresBackend.h @@ -79,10 +79,7 @@ public: doWriteLedgerObject( std::string&& key, uint32_t seq, - std::string&& blob, - bool isCreated, - bool isDeleted, - std::optional&& book) const override; + std::string&& blob) const override; void writeTransaction( diff --git a/src/etl/ETLSource.cpp b/src/etl/ETLSource.cpp index 3248df27..c8926292 100644 --- a/src/etl/ETLSource.cpp +++ b/src/etl/ETLSource.cpp @@ -435,22 +435,10 @@ public: BOOST_LOG_TRIVIAL(trace) << "Writing objects"; for (auto& obj : *(cur_->mutable_ledger_objects()->mutable_objects())) { - std::optional book = {}; - - short offer_bytes = (obj.data()[1] << 8) | obj.data()[2]; - if (offer_bytes == 0x006f) - { - ripple::SerialIter it{obj.data().data(), obj.data().size()}; - ripple::SLE sle{it, {}}; - book = sle.getFieldH256(ripple::sfBookDirectory); - } backend.writeLedgerObject( std::move(*obj.mutable_key()), request_.ledger().sequence(), - std::move(*obj.mutable_data()), - true, - false, - std::move(book)); + std::move(*obj.mutable_data())); } BOOST_LOG_TRIVIAL(trace) << "Wrote objects"; diff --git a/src/etl/ReportingETL.cpp b/src/etl/ReportingETL.cpp index 8626525f..73fed626 100644 --- a/src/etl/ReportingETL.cpp +++ b/src/etl/ReportingETL.cpp @@ -294,34 +294,11 @@ ReportingETL::buildNextLedger(org::xrpl::rpc::v1::GetLedgerResponse& rawData) for (auto& obj : *(rawData.mutable_ledger_objects()->mutable_objects())) { - bool isCreated = false; - bool isDeleted = false; - if (obj.mod_type() == org::xrpl::rpc::v1::RawLedgerObject::CREATED) - isCreated = true; - else if ( - obj.mod_type() == org ::xrpl::rpc::v1::RawLedgerObject::DELETED) - isDeleted = true; - std::optional bookDir; - if (isCreated) - { - if (isOffer(obj.data())) - bookDir = getBook(obj.data()); - } - else if (obj.book_of_deleted_offer().size()) - { - bookDir = - ripple::uint256::fromVoid(obj.book_of_deleted_offer().data()); - } - - assert(not(isCreated and isDeleted)); backend_->writeLedgerObject( std::move(*obj.mutable_key()), lgrInfo.seq, - std::move(*obj.mutable_data()), - isCreated, - isDeleted, - std::move(bookDir)); + std::move(*obj.mutable_data())); } BOOST_LOG_TRIVIAL(debug) << __func__ << " : " diff --git a/src/rpc/handlers/Ledger.cpp b/src/rpc/handlers/Ledger.cpp index c24ab683..d432ebae 100644 --- a/src/rpc/handlers/Ledger.cpp +++ b/src/rpc/handlers/Ledger.cpp @@ -97,7 +97,7 @@ doLedger(Context const& context) entry["tx_blob"] = ripple::strHex(obj.transaction); entry["meta"] = ripple::strHex(obj.metadata); } - entry["ledger_index"] = obj.ledgerSequence; + //entry["ledger_index"] = obj.ledgerSequence; return entry; }); } diff --git a/unittests/main.cpp b/unittests/main.cpp index a55f778f..8853e76f 100644 --- a/unittests/main.cpp +++ b/unittests/main.cpp @@ -253,10 +253,7 @@ TEST(BackendTest, Basic) backend->writeLedgerObject( std::move(std::string{accountIndexBlob}), lgrInfoNext.seq, - std::move(std::string{accountBlob}), - true, - false, - {}); + std::move(std::string{accountBlob})); ASSERT_TRUE(backend->finishWrites(lgrInfoNext.seq)); } @@ -324,10 +321,7 @@ TEST(BackendTest, Basic) backend->writeLedgerObject( std::move(std::string{accountIndexBlob}), lgrInfoNext.seq, - std::move(std::string{accountBlob}), - true, - false, - {}); + std::move(std::string{accountBlob})); ASSERT_TRUE(backend->finishWrites(lgrInfoNext.seq)); } @@ -474,10 +468,7 @@ TEST(BackendTest, Basic) backend->writeLedgerObject( std::move(key), lgrInfo.seq, - std::move(obj), - true, - false, - std::move(bookDir)); + std::move(obj)); } backend->writeAccountTransactions(std::move(accountTx));