Fix cli wallet update_witness command serialization steemit#2527

Project-Mansa · Jun 6, 2018 · d95c46f · d95c46f
1 parent 9686a40
commit d95c46f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...pis/condenser_api/include/steem/plugins/condenser_api/condenser_api_legacy_operations.hpp b/...pis/condenser_api/include/steem/plugins/condenser_api/condenser_api_legacy_operations.hpp
@@ -91,6 +91,15 @@ namespace steem { namespace plugins { namespace condenser_api {
          sbd_interest_rate( c.sbd_interest_rate )
       {}
 
+      operator legacy_chain_properties() const
+      {
+         legacy_chain_properties props;
+         props.account_creation_fee = legacy_steem_asset::from_asset( asset( account_creation_fee ) );
+         props.maximum_block_size = maximum_block_size;
+         props.sbd_interest_rate = sbd_interest_rate;
+         return props;
+      }
+
       legacy_asset   account_creation_fee;
       uint32_t       maximum_block_size = STEEM_MIN_BLOCK_SIZE_LIMIT * 2;
       uint16_t       sbd_interest_rate = STEEM_DEFAULT_SBD_INTEREST_RATE;

diff --git a/libraries/wallet/include/steem/wallet/wallet.hpp b/libraries/wallet/include/steem/wallet/wallet.hpp
@@ -592,7 +592,7 @@ class wallet_api
          string witness_name,
          string url,
          public_key_type block_signing_key,
-         const legacy_chain_properties& props,
+         const condenser_api::api_chain_properties& props,
          bool broadcast = false);
 
       /** Set the voting proxy for an account.

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -1666,7 +1666,7 @@ condenser_api::legacy_signed_transaction wallet_api::update_witness(
    string witness_account_name,
    string url,
    public_key_type block_signing_key,
-   const legacy_chain_properties& props,
+   const condenser_api::api_chain_properties& props,
    bool broadcast  )
 {
    FC_ASSERT( !is_locked() );