[pyth] Remove transfer and get_balance commands.

Author: mass

pc/request.cpp

@@ -1440,133 +1440,6 @@ void upd_test::on_response( rpc::account_update *res )
   st_ = e_done;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// transfer
-
-transfer::transfer()
-: st_( e_sent ),
-  cmt_( commitment::e_confirmed )
-{
-}
-
-void transfer::set_receiver( pub_key *pkey )
-{
-  req_->set_receiver( pkey );
-}
-
-void transfer::set_lamports( uint64_t funds )
-{
-  req_->set_lamports( funds );
-}
-
-void transfer::set_commitment( commitment cmt )
-{
-  cmt_ = cmt;
-}
-
-void transfer::on_response( rpc::transfer *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_sent ) {
-    st_ = e_sig;
-    sig_->set_commitment( cmt_ );
-    sig_->set_signature( res->get_signature() );
-    get_rpc_client()->send( sig_ );
-  }
-}
-
-void transfer::on_response( rpc::signature_subscribe *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_sig ) {
-    st_ = e_done;
-    on_response_sub( this );
-  }
-}
-
-void transfer::submit()
-{
-  manager *cptr = get_manager();
-  key_pair *pkey = cptr->get_publish_key_pair();
-  if ( !pkey ) {
-    on_error_sub( "missing or invalid publish key [" +
-        cptr->get_publish_key_pair_file() + "]", this );
-    return;
-  }
-  req_->set_sender( pkey );
-  req_->set_sub( this );
-  sig_->set_sub( this );
-
-  // get recent block hash and submit request
-  st_ = e_sent;
-  req_->set_block_hash( cptr->get_recent_block_hash() );
-  get_rpc_client()->send( req_ );
-}
-
-bool transfer::get_is_done() const
-{
-  return st_ == e_done;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// balance
-
-balance::balance()
-: st_( e_sent ),
-  pub_( nullptr )
-{
-}
-
-void balance::set_pub_key( pub_key *pkey )
-{
-  pub_ = pkey;
-}
-
-uint64_t balance::get_lamports() const
-{
-  return req_->get_lamports();
-}
-
-void balance::on_response( rpc::get_account_info *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_sent ) {
-    st_ = e_done;
-    on_response_sub( this );
-  }
-}
-
-void balance::submit()
-{
-  if ( pub_ ) {
-    req_->set_account( pub_ );
-  } else {
-    manager *cptr = get_manager();
-    pub_key *pkey = cptr->get_publish_pub_key();
-    if ( !pkey ) {
-      on_error_sub( "missing or invalid publish key [" +
-          cptr->get_publish_key_pair_file() + "]", this );
-      return;
-    }
-    req_->set_account( pkey );
-  }
-  st_ = e_sent;
-  req_->set_sub( this );
-  req_->set_commitment( get_manager()->get_commitment() );
-  get_rpc_client()->send( req_ );
-}
-
-bool balance::get_is_done() const
-{
-  return st_ == e_done;
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // get_block
 

pc/request.hpp

@@ -473,56 +473,6 @@ namespace pc
     rpc::account_subscribe   areq_[1];
   };
 
-
-  // transfer SOL from publisher to other account
-  class transfer : public request,
-                   public rpc_sub_i<rpc::transfer>,
-                   public rpc_sub_i<rpc::signature_subscribe>
-  {
-  public:
-    transfer();
-    void set_receiver( pub_key * );
-    void set_lamports( uint64_t funds );
-    void set_commitment( commitment );
-
-  public:
-    void on_response( rpc::transfer *msg ) override;
-    void on_response( rpc::signature_subscribe * ) override;
-    bool get_is_done() const override;
-    void submit() override;
-
-  private:
-    typedef enum { e_sent, e_sig, e_done, e_error } state_t;
-
-    state_t                  st_;
-    commitment               cmt_;
-    key_pair                 akey_;
-    key_pair                 skey_;
-    rpc::transfer            req_[1];
-    rpc::signature_subscribe sig_[1];
-  };
-
-  // get account balance
-  class balance : public request,
-                  public rpc_sub_i<rpc::get_account_info>
-  {
-  public:
-    balance();
-    void set_pub_key( pub_key * );
-    uint64_t get_lamports() const;
-
-  public:
-    void submit() override;
-    void on_response( rpc::get_account_info * ) override;
-    bool get_is_done() const override;
-
-  private:
-    typedef enum { e_sent, e_done, e_error } state_t;
-    state_t  st_;
-    pub_key *pub_;
-    rpc::get_account_info req_[1];
-  };
-
   // get transactions in single block
   class get_block : public request,
                     public rpc_sub_i<rpc::get_block>

pc/rpc_client.cpp

@@ -11,7 +11,6 @@ enum system_instruction : uint32_t
 {
   e_create_account,
   e_assign,
-  e_transfer
 };
 
 static hash gen_sys_id()
@@ -729,97 +728,6 @@ void rpc::get_slot_leaders::response( const jtree& jt )
   on_response( this );
 }
 
-///////////////////////////////////////////////////////////////////////////
-// transfer
-
-void rpc::transfer::set_block_hash( hash *bhash )
-{
-  bhash_ = bhash;
-}
-
-void rpc::transfer::set_sender( key_pair *snd )
-{
-  snd_ = snd;
-}
-
-void rpc::transfer::set_receiver( pub_key *rcv )
-{
-  rcv_ = rcv;
-}
-
-void rpc::transfer::set_lamports( uint64_t funds )
-{
-  lamports_ = funds;
-}
-
-signature *rpc::transfer::get_signature()
-{
-  return &sig_;
-}
-
-void rpc::transfer::enc_signature( std::string& sig )
-{
-  sig_.enc_base58( sig );
-}
-
-
-rpc::transfer::transfer()
-: lamports_( 0UL )
-{
-}
-
-void rpc::transfer::request( json_wtr& msg )
-{
-  // construct binary transaction
-  net_buf *bptr = net_buf::alloc();
-  bincode tx( bptr->buf_ );
-
-  // signatures section
-  tx.add_len<1>();      // one signature
-  size_t sign_idx = tx.reserve_sign();
-
-  // message header
-  size_t tx_idx = tx.get_pos();
-  tx.add( (uint8_t)1 ); // signing accounts
-  tx.add( (uint8_t)0 ); // read-only signed accounts
-  tx.add( (uint8_t)1 ); // read-only unsigned accounts
-
-  // accounts
-  tx.add_len<3>();      // 3 accounts: sender, receiver, program
-  tx.add( *snd_ );      // sender account
-  tx.add( *rcv_ );      // receiver account
-  tx.add( sys_id );     // system programid
-
-  // recent block hash
-  tx.add( *bhash_ );    // recent block hash
-
-  // instructions section
-  tx.add_len<1>();      // one instruction
-  tx.add( (uint8_t)2);  // program_id index
-  tx.add_len<2>();      // 2 accounts: sender, receiver
-  tx.add( (uint8_t)0 ); // index of sender account
-  tx.add( (uint8_t)1 ); // index of receiver account
-
-  // instruction parameter section
-  tx.add_len<12>();     // size of data array
-  tx.add( (uint32_t)system_instruction::e_transfer );
-  tx.add( (uint64_t)lamports_ );
-
-  // sign message
-  tx.sign( sign_idx, tx_idx, *snd_ );
-  sig_.init_from_buf( (const uint8_t*)(tx.get_buf() + sign_idx) );
-
-  // encode transaction and add to json params
-  send_transaction( msg, tx, false );
-  bptr->dealloc();
-}
-
-void rpc::transfer::response( const jtree& jt )
-{
-  if ( on_error( jt, this ) ) return;
-  on_response( this );
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // account_update
 

pc/rpc_client.hpp

@@ -529,32 +529,6 @@ namespace pc
       commitment  cmt_;
     };
 
-    // transaction to transfer funds between accounts
-    class transfer : public rpc_request
-    {
-    public:
-      // parameters
-      void set_block_hash( hash * );
-      void set_sender( key_pair * );
-      void set_receiver( pub_key * );
-      void set_lamports( uint64_t funds );
-
-      // results
-      signature *get_signature();
-      void enc_signature( std::string& );
-
-      transfer();
-      void request( json_wtr& ) override;
-      void response( const jtree& ) override;
-
-    private:
-      hash     *bhash_;
-      key_pair *snd_;
-      pub_key  *rcv_;
-      uint64_t  lamports_;
-      signature sig_;
-    };
-
     // create new account and assign ownership to some (program) key
     class create_account : public rpc_request
     {