Skip to content

Commit 00dfd6e

Browse files
committed
v2.1.2
1 parent cfc3a47 commit 00dfd6e

File tree

69 files changed

+54
-2830
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+54
-2830
lines changed

ReleaseNotes.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Release notes 2.1.2
2+
3+
- Updated crawler public key
4+
- Daemon stability improvements
5+
16
Release notes 2.1.1
27

38
- Updated RocksDB to release 4.11.2

include/BlockchainExplorerData.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,8 @@ struct KeyInputDetails {
5555
TransactionOutputReferenceDetails output;
5656
};
5757

58-
struct MultisignatureInputDetails {
59-
MultisignatureInput input;
60-
TransactionOutputReferenceDetails output;
61-
};
6258

63-
typedef boost::variant<BaseInputDetails, KeyInputDetails, MultisignatureInputDetails> TransactionInputDetails;
59+
typedef boost::variant<BaseInputDetails, KeyInputDetails> TransactionInputDetails;
6460

6561
struct TransactionExtraDetails {
6662
Crypto::PublicKey publicKey;

include/CryptoNote.h

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,13 @@ struct KeyInput {
3333
Crypto::KeyImage keyImage;
3434
};
3535

36-
struct MultisignatureInput {
37-
uint64_t amount;
38-
uint8_t signatureCount;
39-
uint32_t outputIndex;
40-
};
41-
4236
struct KeyOutput {
4337
Crypto::PublicKey key;
4438
};
4539

46-
struct MultisignatureOutput {
47-
std::vector<Crypto::PublicKey> keys;
48-
uint8_t requiredSignatureCount;
49-
};
50-
51-
typedef boost::variant<BaseInput, KeyInput, MultisignatureInput> TransactionInput;
40+
typedef boost::variant<BaseInput, KeyInput> TransactionInput;
5241

53-
typedef boost::variant<KeyOutput, MultisignatureOutput> TransactionOutputTarget;
42+
typedef boost::variant<KeyOutput> TransactionOutputTarget;
5443

5544
struct TransactionOutput {
5645
uint64_t amount;

include/INode.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ class INode {
111111
virtual void getTransactionOutsGlobalIndices(const Crypto::Hash& transactionHash, std::vector<uint32_t>& outsGlobalIndices, const Callback& callback) = 0;
112112
virtual void queryBlocks(std::vector<Crypto::Hash>&& knownBlockIds, uint64_t timestamp, std::vector<BlockShortEntry>& newBlocks, uint32_t& startHeight, const Callback& callback) = 0;
113113
virtual void getPoolSymmetricDifference(std::vector<Crypto::Hash>&& knownPoolTxIds, Crypto::Hash knownBlockId, bool& isBcActual, std::vector<std::unique_ptr<ITransactionReader>>& newTxs, std::vector<Crypto::Hash>& deletedTxIds, const Callback& callback) = 0;
114-
virtual void getMultisignatureOutputByGlobalIndex(uint64_t amount, uint32_t gindex, MultisignatureOutput& out, const Callback& callback) = 0;
115114

116115
virtual void getBlocks(const std::vector<uint32_t>& blockHeights, std::vector<std::vector<BlockDetails>>& blocks, const Callback& callback) = 0;
117116
virtual void getBlocks(const std::vector<Crypto::Hash>& blockHashes, std::vector<BlockDetails>& blocks, const Callback& callback) = 0;

include/ITransaction.h

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace CryptoNote {
2828

2929
namespace TransactionTypes {
3030

31-
enum class InputType : uint8_t { Invalid, Key, Multisignature, Generating };
32-
enum class OutputType : uint8_t { Invalid, Key, Multisignature };
31+
enum class InputType : uint8_t { Invalid, Key, Generating };
32+
enum class OutputType : uint8_t { Invalid, Key };
3333

3434
struct GlobalOutput {
3535
Crypto::PublicKey targetKey;
@@ -74,14 +74,12 @@ class ITransactionReader {
7474
virtual uint64_t getInputTotalAmount() const = 0;
7575
virtual TransactionTypes::InputType getInputType(size_t index) const = 0;
7676
virtual void getInput(size_t index, KeyInput& input) const = 0;
77-
virtual void getInput(size_t index, MultisignatureInput& input) const = 0;
7877

7978
// outputs
8079
virtual size_t getOutputCount() const = 0;
8180
virtual uint64_t getOutputTotalAmount() const = 0;
8281
virtual TransactionTypes::OutputType getOutputType(size_t index) const = 0;
8382
virtual void getOutput(size_t index, KeyOutput& output, uint64_t& amount) const = 0;
84-
virtual void getOutput(size_t index, MultisignatureOutput& output, uint64_t& amount) const = 0;
8583

8684
// signatures
8785
virtual size_t getRequiredSignaturesCount(size_t inputIndex) const = 0;
@@ -114,21 +112,16 @@ class ITransactionWriter {
114112

115113
// Inputs/Outputs
116114
virtual size_t addInput(const KeyInput& input) = 0;
117-
virtual size_t addInput(const MultisignatureInput& input) = 0;
118115
virtual size_t addInput(const AccountKeys& senderKeys, const TransactionTypes::InputKeyInfo& info, KeyPair& ephKeys) = 0;
119116

120117
virtual size_t addOutput(uint64_t amount, const AccountPublicAddress& to) = 0;
121-
virtual size_t addOutput(uint64_t amount, const std::vector<AccountPublicAddress>& to, uint32_t requiredSignatures) = 0;
122118
virtual size_t addOutput(uint64_t amount, const KeyOutput& out) = 0;
123-
virtual size_t addOutput(uint64_t amount, const MultisignatureOutput& out) = 0;
124119

125120
// transaction info
126121
virtual void setTransactionSecretKey(const Crypto::SecretKey& key) = 0;
127122

128123
// signing
129124
virtual void signInputKey(size_t input, const TransactionTypes::InputKeyInfo& info, const KeyPair& ephKeys) = 0;
130-
virtual void signInputMultisignature(size_t input, const Crypto::PublicKey& sourceTransactionKey, size_t outputIndex, const AccountKeys& accountKeys) = 0;
131-
virtual void signInputMultisignature(size_t input, const KeyPair& ephemeralKeys) = 0;
132125
};
133126

134127
class ITransaction :

include/ITransfersContainer.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ struct TransactionOutputInformation {
5454
Crypto::Hash transactionHash;
5555
Crypto::PublicKey transactionPublicKey;
5656

57-
union {
58-
Crypto::PublicKey outputKey; // Type: Key
59-
uint32_t requiredSignatures; // Type: Multisignature
60-
};
57+
Crypto::PublicKey outputKey;
6158
};
6259

6360
struct TransactionSpentOutputInformation: public TransactionOutputInformation {
@@ -78,7 +75,6 @@ class ITransfersContainer : public IStreamSerializable {
7875
IncludeStateSpent = 0x08,
7976
// output type
8077
IncludeTypeKey = 0x100,
81-
IncludeTypeMultisignature = 0x200,
8278
// combinations
8379
IncludeStateAll = 0xff,
8480
IncludeTypeAll = 0xff00,

0 commit comments

Comments
 (0)