fixup

Author: tompntn

pc/request.cpp

@@ -700,12 +700,7 @@ bool price::update(
   if ( mgr->get_do_tx() )
     mgr->submit( preq_ );
   else {
-    get_rpc_client()->send(
-      (pc::rpc::upd_price **)(&preq_),
-      1,
-      get_manager()->get_requested_upd_price_cu_units(),
-      get_manager()->get_requested_upd_price_cu_price()
-    );
+    get_rpc_client()->send( preq_ );
     tvec_.emplace_back( std::string( 100, '\0' ), preq_->get_sent_time() );
     preq_->get_signature()->enc_base58( tvec_.back().first );
     PC_LOG_DBG( "sent price update transaction" )

pc/rpc_client.cpp

@@ -923,19 +923,24 @@ bool rpc::upd_price::build_tx(
   tx.add( *first.bhash_ ); // recent block hash
 
   // instructions section
-  unsigned instruction_count = n + 1; // 1 compute limit instruction, n upd_price instruction(s)
+  unsigned instruction_count = n; // n upd_price instruction(s)
+  if ( cu_units > 0 ) {
+    instruction_count += 1; // Extra instruction for specifying number of cus per instructions
+  }
   if ( cu_price > 0 ) {
     instruction_count += 1; // Extra instruction for specifying compute unit price 
   }
   tx.add_len( instruction_count ); // 1 compute limit instruction, 1 compute unit price instruction, n upd_price instruction(s)
 
   // Set compute limit
-  tx.add( (uint8_t)( n + 3 ) ); // compute budget program id index in accounts list
-  tx.add_len<0>(); // no accounts
-  // compute limit instruction parameters
-  tx.add_len<sizeof(uint8_t) + sizeof(uint32_t)>(); // uint8_t enum variant + uint32_t requested compute units
-  tx.add( (uint8_t) 2 ); // SetComputeLimit enum variant
-  tx.add( (uint32_t) ( cu_units * n ) ); // the budget (scaled for number of instructions)
+  if ( cu_units > 0 ) {
+    tx.add( (uint8_t)( n + 3 ) ); // compute budget program id index in accounts list
+    tx.add_len<0>(); // no accounts
+    // compute limit instruction parameters
+    tx.add_len<sizeof(uint8_t) + sizeof(uint32_t)>(); // uint8_t enum variant + uint32_t requested compute units
+    tx.add( (uint8_t) 2 ); // SetComputeLimit enum variant
+    tx.add( (uint32_t) ( cu_units * n ) ); // the budget (scaled for number of instructions)
+  }
 
   // Set compute unit price
   if ( cu_price > 0 ) {
@@ -974,13 +979,24 @@ bool rpc::upd_price::build_tx(
   return true;
 }
 
-void rpc::upd_price::build( net_wtr& )
+void rpc::upd_price::build( net_wtr& wtr )
 {
+  upd_price* upds[] = { this };
+  build( wtr, upds, 1 );
 }
 
 
-void rpc::upd_price::request( json_wtr& )
+void rpc::upd_price::request( json_wtr& msg )
 {
+  upd_price* upds[] = { this };
+  request( msg, upds, 1 );
+}
+
+bool rpc::upd_price::build(
+  net_wtr& wtr, upd_price* upds[], const unsigned n
+)
+{
+  return build( wtr, upds, n, 0, 0 );
 }
 
 bool rpc::upd_price::build(
@@ -996,6 +1012,12 @@ bool rpc::upd_price::build(
   return true;
 }
 
+bool rpc::upd_price::request(
+  json_wtr& msg, upd_price* upds[], const unsigned n
+) {
+  return request( msg, upds, n, 0, 0 );
+}
+
 bool rpc::upd_price::request(
   json_wtr& msg, upd_price* upds[], const unsigned n, unsigned cu_units, unsigned cu_price
 )

pc/rpc_client.hpp

@@ -425,6 +425,9 @@ namespace pc
       void request( json_wtr& ) override;
       void response( const jtree& ) override;
 
+      static bool build( net_wtr&, upd_price*[], unsigned n  );
+      static bool request( json_wtr&, upd_price*[], const unsigned n );
+
       static bool build( net_wtr&, upd_price*[], unsigned n, unsigned cu_units, unsigned cu_price  );
       static bool request( json_wtr&, upd_price*[], const unsigned n, unsigned cu_units, unsigned cu_price );