diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index cbcb9295..f8095f0a 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -15,6 +15,8 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #include #include #include diff --git a/libraries/chain/protocol/transaction.cpp b/libraries/chain/protocol/transaction.cpp index bab09c2c..6e295032 100644 --- a/libraries/chain/protocol/transaction.cpp +++ b/libraries/chain/protocol/transaction.cpp @@ -208,18 +208,24 @@ void verify_authority( const vector& ops, const flat_set signed_transaction::get_signature_keys()const auto d = digest(); flat_set result; for( const auto& sig : signatures ) + { FC_ASSERT( result.insert( fc::ecc::public_key(sig,d) ).second, "Duplicate Signature detected" ); + } return result; } FC_CAPTURE_AND_RETHROW() } diff --git a/libraries/db/include/graphene/db/index.hpp b/libraries/db/include/graphene/db/index.hpp index f0dc243a..514a79e5 100644 --- a/libraries/db/include/graphene/db/index.hpp +++ b/libraries/db/include/graphene/db/index.hpp @@ -49,7 +49,7 @@ namespace graphene { namespace db { * @brief abstract base class for accessing objects indexed in various ways. * * All indexes assume that there exists an object ID space that will grow - * for ever in a seqential manner. These IDs are used to identify the + * forever in a seqential manner. These IDs are used to identify the * index, type, and instance of the object. * * Items in an index can only be modified via a call to modify and diff --git a/libraries/fc b/libraries/fc index e9eeb330..a31f0f50 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit e9eeb3300c59bca19b8c79c14ed85226d2262c63 +Subproject commit a31f0f503df4d70ebb5960803c7092dc170bee92 diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index dbec6b36..832729cf 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -2983,7 +2983,9 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label, if( broadcast ) { for( const auto& out : confirm.outputs ) + { try { receive_blind_transfer( out.confirmation_receipt, from_key_or_label, "" ); } catch ( ... ){} + } } return confirm; @@ -3070,7 +3072,9 @@ blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name if( broadcast ) { for( const auto& out : confirm.outputs ) + { try { receive_blind_transfer( out.confirmation_receipt, "@"+from_account.name, "from @"+from_account.name ); } catch ( ... ){} + } } return confirm;