Rename config var

smartcontractkit · Feb 9, 2025 · c665e52 · c665e52
1 parent ed7ca6e
commit c665e52
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/chains/solana/contracts/programs/base-token-pool/src/common.rs b/chains/solana/contracts/programs/base-token-pool/src/common.rs
@@ -34,8 +34,8 @@ pub struct BaseConfig {
     pub owner: Pubkey,
     pub proposed_owner: Pubkey,
     pub rate_limit_admin: Pubkey,
-    pub onramp_authority: Pubkey, // signer for CCIP onramp calls
-    pub router: Pubkey,           // router address
+    pub router_onramp_authority: Pubkey, // signer PDA for CCIP onramp calls
+    pub router: Pubkey,                  // router address
 
     // rebalancing - only used for lock/release pools
     pub rebalancer: Pubkey,
@@ -73,7 +73,7 @@ impl BaseConfig {
         self.owner = owner;
         self.rate_limit_admin = owner;
         self.router = router;
-        (self.onramp_authority, _) =
+        (self.router_onramp_authority, _) =
             Pubkey::find_program_address(&[EXTERNAL_TOKENPOOL_SIGNER], &router);
 
         Ok(())
@@ -115,7 +115,8 @@ impl BaseConfig {
 
         let old_router = self.router;
         self.router = new_router;
-        (self.onramp_authority, _) = Pubkey::find_program_address(&[POOL_SIGNER_SEED], &new_router);
+        (self.router_onramp_authority, _) =
+            Pubkey::find_program_address(&[POOL_SIGNER_SEED], &new_router);
         emit!(RouterUpdated {
             old_router,
             new_router,

diff --git a/chains/solana/contracts/programs/example-burnmint-token-pool/src/context.rs b/chains/solana/contracts/programs/example-burnmint-token-pool/src/context.rs
@@ -131,7 +131,7 @@ pub struct TokenOfframp<'info> {
 #[instruction(lock_or_burn: LockOrBurnInV1)]
 pub struct TokenOnramp<'info> {
     // CCIP accounts ------------------------
-    #[account(address = state.config.onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
+    #[account(address = state.config.router_onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
     pub authority: Signer<'info>,
 
     // Token pool accounts ------------------

diff --git a/chains/solana/contracts/programs/example-lockrelease-token-pool/src/context.rs b/chains/solana/contracts/programs/example-lockrelease-token-pool/src/context.rs
@@ -135,7 +135,7 @@ pub struct TokenOfframp<'info> {
 #[instruction(lock_or_burn: LockOrBurnInV1)]
 pub struct TokenOnramp<'info> {
     // CCIP accounts ------------------------
-    #[account(address = state.config.onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
+    #[account(address = state.config.router_onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
     pub authority: Signer<'info>,
 
     // Token pool accounts ------------------

diff --git a/chains/solana/contracts/programs/test-token-pool/src/context.rs b/chains/solana/contracts/programs/test-token-pool/src/context.rs
@@ -117,7 +117,7 @@ pub struct TokenOfframp<'info> {
 #[instruction(lock_or_burn: LockOrBurnInV1)]
 pub struct TokenOnramp<'info> {
     // CCIP accounts ------------------------
-    #[account(address = state.config.onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
+    #[account(address = state.config.router_onramp_authority @ CcipTokenPoolError::InvalidPoolCaller)]
     pub authority: Signer<'info>,
 
     // Token pool accounts ------------------

diff --git a/chains/solana/contracts/target/idl/base_token_pool.json b/chains/solana/contracts/target/idl/base_token_pool.json
@@ -41,7 +41,7 @@
             "type": "publicKey"
           },
           {
-            "name": "onrampAuthority",
+            "name": "routerOnrampAuthority",
             "type": "publicKey"
           },
           {

diff --git a/chains/solana/gobindings/base_token_pool/types.go b/chains/solana/gobindings/base_token_pool/types.go