Remove resize logic (#316)

* Remove resize logic

* Cleanup

* Cleanup

Author: guibescos

docker/Dockerfile

@@ -57,8 +57,6 @@ export PYTHONPATH=\"\${PYTHONPATH:+\$PYTHONPATH:}\${HOME}/pyth-client\"\n\
 
 COPY --chown=pyth:pyth . pyth-client/
 
-RUN pip3 install solana
-
 # Build off-chain binaries.
 RUN cd pyth-client && ./scripts/build.sh
 

program/rust/src/processor.rs

@@ -22,7 +22,6 @@ mod del_product;
 mod del_publisher;
 mod init_mapping;
 mod init_price;
-mod resize_price_account;
 mod set_min_pub;
 mod upd_permissions;
 mod upd_price;
@@ -38,7 +37,6 @@ pub use {
     del_publisher::del_publisher,
     init_mapping::init_mapping,
     init_price::init_price,
-    resize_price_account::resize_price_account,
     set_min_pub::set_min_pub,
     upd_permissions::upd_permissions,
     upd_price::{
@@ -72,7 +70,7 @@ pub fn process_instruction(
         UpdTest => Err(OracleError::UnrecognizedInstruction.into()),
         SetMinPub => set_min_pub(program_id, accounts, instruction_data),
         UpdPriceNoFailOnError => upd_price_no_fail_on_error(program_id, accounts, instruction_data),
-        ResizePriceAccount => resize_price_account(program_id, accounts, instruction_data),
+        ResizePriceAccount => Err(OracleError::UnrecognizedInstruction.into()),
         DelPrice => del_price(program_id, accounts, instruction_data),
         DelProduct => del_product(program_id, accounts, instruction_data),
         UpdPermissions => upd_permissions(program_id, accounts, instruction_data),

program/rust/src/processor/resize_price_account.rs

@@ -9,7 +9,6 @@ mod test_del_publisher;
 mod test_init_mapping;
 mod test_init_price;
 mod test_permission_migration;
-mod test_resize_account;
 mod test_set_min_pub;
 mod test_sizes;
 mod test_sma;

program/rust/src/tests/mod.rs

@@ -331,32 +331,6 @@ impl PythSimulator {
         .await
     }
 
-    /// Resize a price account (using the resize_price_account
-    /// instruction).
-    pub async fn resize_price_account(
-        &mut self,
-        price_keypair: &Keypair,
-    ) -> Result<(), BanksClientError> {
-        let cmd: CommandHeader = OracleCommand::ResizePriceAccount.into();
-        let instruction = Instruction::new_with_bytes(
-            self.program_id,
-            bytes_of(&cmd),
-            vec![
-                AccountMeta::new(self.genesis_keypair.pubkey(), true),
-                AccountMeta::new(price_keypair.pubkey(), true),
-                AccountMeta::new(system_program::id(), false),
-            ],
-        );
-
-        self.process_ix(
-            instruction,
-            &vec![price_keypair],
-            &copy_keypair(&self.genesis_keypair),
-        )
-        .await
-    }
-
-
     /// Update permissions (using the upd_permissions intruction) and return the pubkey of the
     /// permissions account
     pub async fn upd_permissions(

program/rust/src/tests/pyth_simulator.rs

@@ -25,7 +25,6 @@ use {
                 DelPublisher,
                 InitMapping,
                 InitPrice,
-                ResizePriceAccount,
                 SetMinPub,
                 UpdProduct,
             },
@@ -226,20 +225,6 @@ fn test_permission_migration() {
         Err(OracleError::PermissionViolation.into())
     );
 
-    assert_eq!(
-        process_instruction(
-            &program_id,
-            &[
-                attacker_account.clone(),
-                price_account.clone(),
-                price_account.clone(), // Mock system program
-                permissions_account.clone()
-            ],
-            bytes_of::<CommandHeader>(&ResizePriceAccount.into())
-        ),
-        Err(OracleError::PermissionViolation.into())
-    );
-
     assert_eq!(
         process_instruction(
             &program_id,

program/rust/src/tests/test_permission_migration.rs

@@ -1,13 +1,3 @@
-from typing import Dict
-from construct import Bytes, Int32sl, Int32ul, Struct
-from solana.publickey import PublicKey
-from solana.transaction import AccountMeta, TransactionInstruction, Transaction
-from solana.keypair import Keypair
-from solana.rpc.api import Client
-import base64
-import os
-import asyncio
-
 import json
 import time
 from subprocess import check_call, check_output
@@ -29,58 +19,6 @@ def get_price_acct():
         output = output.decode('ascii')
         output = json.loads(output)
         return output['price_accounts'][0]
-    
-    def get_key_pair(path_to_file):
-        with  open(path_to_file) as key_file:
-            key_data = json.load(key_file)
-        return Keypair.from_secret_key(key_data)
-    
-    def get_path_to_pythdir_pair(account_addr):
-        return os.path.join(pyth_dir, "account_" + str(account_addr) + ".json")
-
-
-    
-    def resize_account(price_account_address):
-        """
-        given a string with the pubkey of a price account it calls the resize instruction of the Oracle on it
-        """
-        #constants from oracle.h
-        PROGRAM_VERSION = 2 #TODO: update this
-        COMMAND_UPD_ACCOUNT = 14
-        SYSTEM_PROGRAM = "11111111111111111111111111111111"
-
-        #update version of price accounts to make sure they resize
-        layout = Struct("version" / Int32ul, "command" / Int32sl)
-        data = layout.build(dict(version=PROGRAM_VERSION, command=COMMAND_UPD_ACCOUNT))
-        funding_key = PublicKey(solana_keygen[0])
-        price_key = PublicKey(price_account_address)
-        system_key = PublicKey(SYSTEM_PROGRAM)
-        resize_instruction = TransactionInstruction(
-            data=data,
-            keys=[
-                AccountMeta(pubkey=funding_key, is_signer=True, is_writable=True),
-                AccountMeta(pubkey=price_key, is_signer=True, is_writable=True),
-                AccountMeta(pubkey=system_key, is_signer=False, is_writable=False),
-            ],
-            program_id = PublicKey(solana_program_deploy),
-        )
-        txn = Transaction().add(resize_instruction)
-        txn.fee_payer = funding_key
-        funding_key_pair = get_key_pair(solana_keygen[1])
-        path_to_price =  get_path_to_pythdir_pair(price_key)
-        price_key_pair = get_key_pair(path_to_price)
-        solana_client = Client("http://localhost:8899")
-        solana_client.send_transaction(txn, funding_key_pair, price_key_pair)
-
-    def get_account_size(acc_address):
-        """
-        given a string with the pubkey of an account, return its size
-        """
-        PublicKey(acc_address)
-        solana_client = Client("http://localhost:8899")
-        data = solana_client.get_account_info(PublicKey(acc_address), encoding = 'base64').value.data
-        return len(data)
-        
 
     before = get_price_acct()
     assert before['publisher_accounts'][0]['price'] == 0
@@ -116,15 +54,6 @@ def get_account_size(acc_address):
     assert after['publisher_accounts'][0]['conf'] == 7
     assert after['publisher_accounts'][0]['status'] == 'trading'
 
-    resize_account(pyth_init_price['LTC'])
-    time.sleep(20)
-    #defined in oracle.h
-    new_account_size = 7584
-    assert get_account_size(pyth_init_price['LTC']) == new_account_size
-
-
-    
-    #try adding a new price to the resized accounts
     cmd = [
         'pyth', 'upd_price_val',
         pyth_init_price['LTC'],