refactor: remove mapping account usage

Cargo.toml

@@ -1,16 +1,12 @@
 [package]
 name = "pyth-agent"
-version = "2.11.1"
+version = "2.12.0"
 edition = "2021"
 
 [[bin]]
 name = "agent"
 path = "src/bin/agent.rs"
 
-[[bin]]
-name = "agent-migrate-config"
-path = "src/bin/agent_migrate_config.rs"
-
 [dependencies]
 anyhow = "1.0.81"
 serde = { version = "1.0.197", features = ["derive"] }

config/config.sample.pythnet.toml

@@ -17,9 +17,6 @@ key_store.publish_keypair_path = "/path/to/keypair.json"
 # Oracle program pubkey
 key_store.program_key = "FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH"
 
-# Oracle mapping pubkey
-key_store.mapping_key = "AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J"
-
 # Compute unit per price update.
 exporter.compute_unit_limit = 5000
 

config/config.sample.pythtest.toml

@@ -18,10 +18,6 @@ key_store.publish_keypair_path = "/path/to/keypair.json"
 key_store.program_key = "8tfDNiaEyrV6Q1U4DEXrEigs9DoDtkugzFbybENEbCDz" # conformance
 # key_store.program_key = "gSbePebfvPy7tRqimPoVecS2UsBvYv46ynrzWocc92s" # cross-chain
 
-# Oracle mapping pubkey
-key_store.mapping_key = "AFmdnt9ng1uVxqCmqwQJDAYC5cKTkw8gJKSM5PnzuF6z" # conformance
-# key_store.mapping_key = "BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2" # cross-chain
-
 # Pythtest accumulator key (only for the cross-chain oracle)
 # key_store.accumulator_key = "7Vbmv1jt4vyuqBZcpYPpnVhrqVe5e6ZPb6JxDcffRHUM"
 

config/config.toml

@@ -47,9 +47,6 @@ key_store.publish_keypair_path = "/path/to/keypair.json"
 # Public key of the oracle program
 key_store.program_key = "RelevantOracleProgramAddress"
 
-# Public key of the root mapping account
-key_store.mapping_key = "RelevantOracleMappingAddress"
-
 ### Optional fields of primary/secondary network config ###
 
 # Pubkey of accumulator message buffer program ID. Setting this

integration-tests/tests/test_integration.py

@@ -359,21 +359,6 @@ def agent_publish_keypair(self, agent_keystore_path, sync_accounts):
         LOGGER.debug(f"Publisher {address.stdout.strip()} balance: {balance.stdout.strip()}")
         time.sleep(8)
 
-    @pytest.fixture
-    def agent_keystore(self, agent_keystore_path, agent_publish_keypair):
-        self.run(
-            f"../scripts/init_key_store.sh localnet {agent_keystore_path}")
-
-        if USE_ACCUMULATOR:
-            path = os.path.join(agent_keystore_path, "accumulator_program_key.json")
-
-            with open(path, 'w') as f:
-                f.write(MESSAGE_BUFFER_PROGRAM)
-
-        if os.path.exists("keystore"):
-            os.remove("keystore")
-        os.symlink(agent_keystore_path, "keystore")
-
     @pytest_asyncio.fixture
     async def initialize_message_buffer_program(self, funding_keypair, sync_key_path, sync_accounts):
 
@@ -429,18 +414,15 @@ async def initialize_message_buffer_program(self, funding_keypair, sync_key_path
         await provider.send(tx, [parsed_funding_keypair])
 
     @pytest.fixture
-    def agent_config(self, agent_keystore, agent_keystore_path, tmp_path):
+    def agent_config(self, agent_keystore_path, agent_publish_keypair, tmp_path):
         with open("agent_conf.toml") as config_file:
             agent_config = config_file.read()
 
             publish_keypair_path = os.path.join(agent_keystore_path, "publish_key_pair.json")
 
-            mapping_keypair = Keypair.from_secret_key(MAPPING_KEYPAIR)
-
             agent_config += f"""
 key_store.publish_keypair_path = "{publish_keypair_path}"
 key_store.program_key = "{ORACLE_PROGRAM}"
-key_store.mapping_key = "{mapping_keypair.public_key}"
 """
 
             # Add accumulator setting if option is enabled
@@ -457,32 +439,7 @@ def agent_config(self, agent_keystore, agent_keystore_path, tmp_path):
             return path
 
     @pytest.fixture
-    def agent_legacy_config(self, agent_keystore, agent_keystore_path, tmp_path):
-        """
-        Prepares a legacy v1.x.x config for testing agent-migrate-config
-        """
-        with open("agent_conf.toml") as config_file:
-            agent_config = config_file.read()
-
-            agent_config += f'\nkey_store.root_path = "{agent_keystore_path}"'
-
-            if USE_ACCUMULATOR:
-                # Add accumulator setting to verify that it is inlined as well
-                agent_config += f'\nkey_store.accumulator_key_path = "accumulator_program_key.json"'
-
-            LOGGER.debug(f"Built legacy agent config:\n{agent_config}")
-
-            path = os.path.join(tmp_path, "agent_conf_legacy.toml")
-
-            with open(path, 'w') as f:
-                f.write(agent_config)
-
-            return path
-
-
-
-    @pytest.fixture
-    def agent(self, sync_accounts, agent_keystore, tmp_path, initialize_message_buffer_program, agent_config):
+    def agent(self, sync_accounts, tmp_path, initialize_message_buffer_program, agent_config):
         LOGGER.debug("Building agent binary")
         self.run("cargo build --release --bin agent")
 
@@ -496,7 +453,7 @@ def agent(self, sync_accounts, agent_keystore, tmp_path, initialize_message_buff
             yield
 
     @pytest.fixture
-    def agent_hotload(self, sync_accounts, agent_keystore, agent_keystore_path, tmp_path, initialize_message_buffer_program, agent_config):
+    def agent_hotload(self, sync_accounts, agent_keystore_path, tmp_path, initialize_message_buffer_program, agent_config):
         """
         Spawns an agent without a publish keypair, used for keypair hotloading testing
         """
@@ -726,44 +683,6 @@ async def test_publish_forever(self, client: PythAgentClient, tmp_path):
             await client.update_price(price_account, 47, 2, "trading")
             time.sleep(1)
 
-    @pytest.mark.asyncio
-    async def test_agent_migrate_config(self,
-                                        agent_keystore,
-                                        agent_legacy_config,
-                                        agent_migrate_config_binary,
-                                        client_no_spawn: PythAgentClient,
-                                        initialize_message_buffer_program,
-                                        sync_accounts,
-                                        tmp_path,
-                                        ):
-        os.environ["RUST_BACKTRACE"] = "full"
-        os.environ["RUST_LOG"] = "debug"
-
-        # Migrator must run successfully (run() raises on error)
-        new_config = self.run(f"{agent_migrate_config_binary} -c {agent_legacy_config}").stdout.strip()
-
-        LOGGER.debug(f"Successfully migrated legacy config to:\n{new_config}")
-
-        # Overwrite legacy config with the migrated version.
-        #
-        # NOTE: assumes 'w' erases the file before access)
-        with open(agent_legacy_config, 'w') as f:
-            f.write(new_config)
-            f.flush()
-
-        self.run("cargo build --release --bin agent")
-
-        log_dir = os.path.join(tmp_path, "agent_logs")
-
-        # We start the agent manually to pass it the updated legacy config
-        with self.spawn(f"../target/release/agent --config {agent_legacy_config}", log_dir=log_dir):
-            time.sleep(3)
-            await client_no_spawn.connect()
-
-            # Continue with the simple test case, which must succeed
-            await self.test_update_price_simple(client_no_spawn)
-            await client_no_spawn.close()
-
     @pytest.mark.asyncio
     async def test_agent_respects_market_hours(self, client: PythAgentClient):
         '''

src/agent/services/oracle.rs

@@ -60,7 +60,7 @@ where
         config.clone(),
         network,
         state.clone(),
-        key_store.mapping_key,
+        key_store.pyth_oracle_program_key,
         key_store.publish_keypair,
         key_store.pyth_price_store_program_key,
         config.oracle.max_lookup_batch_size,
@@ -152,13 +152,13 @@ where
     Ok(())
 }
 
-/// On poll lookup all Pyth Mapping/Product/Price accounts and sync.
+/// On poll lookup all Pyth Product/Price accounts and sync.
 #[instrument(skip(config, publish_keypair, state))]
 async fn poller<S>(
     config: Config,
     network: Network,
     state: Arc<S>,
-    mapping_key: Pubkey,
+    oracle_program_key: Pubkey,
     publish_keypair: Option<Keypair>,
     pyth_price_store_program_key: Option<Pubkey>,
     max_lookup_batch_size: usize,
@@ -183,7 +183,7 @@ async fn poller<S>(
             Oracle::poll_updates(
                 &*state,
                 network,
-                mapping_key,
+                oracle_program_key,
                 publish_keypair.as_ref(),
                 pyth_price_store_program_key,
                 &client,

src/agent/solana.rs

@@ -103,12 +103,6 @@ pub mod key_store {
             default
         )]
         pub pyth_price_store_program_key: Option<Pubkey>,
-        /// The public key of the root mapping account
-        #[serde(
-            serialize_with = "pubkey_string_ser",
-            deserialize_with = "pubkey_string_de"
-        )]
-        pub mapping_key:                  Pubkey,
         /// The public key of the accumulator program.
         #[serde(
             serialize_with = "opt_pubkey_string_ser",
@@ -127,8 +121,6 @@ pub mod key_store {
         pub pyth_oracle_program_key:      Pubkey,
         /// Public key of the pyth-price-store program
         pub pyth_price_store_program_key: Option<Pubkey>,
-        /// Public key of the root mapping account
-        pub mapping_key:                  Pubkey,
         /// Public key of the accumulator program (if provided)
         pub accumulator_key:              Option<Pubkey>,
     }
@@ -151,7 +143,6 @@ pub mod key_store {
                 publish_keypair,
                 pyth_oracle_program_key: config.pyth_oracle_program_key,
                 pyth_price_store_program_key: config.pyth_price_store_program_key,
-                mapping_key: config.mapping_key,
                 accumulator_key: config.accumulator_key,
             })
         }