Перевести shine_payments на новый program id и подтвердить e2e

2026-06-07 10:00:39 +04:00
parent d25c19cdaa
commit b0b8c7a445
20 changed files with 47 additions and 22 deletions
@@ -6,12 +6,12 @@ resolution = true
 skip-lint = false

 [programs.devnet]
-shine_payments = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"
+shine_payments = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"
 shine_users = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm"
 shine_login_guard = "3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo"

 [programs.localnet]
-shine_payments = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"
+shine_payments = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"
 shine_users = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm"
 shine_login_guard = "3xkopA7cXagxzMFrKdv3NCBfV6BKiRJCk69kr27M2sRo"

@@ -46,5 +46,5 @@ tasks.register("checkUiRemote", Exec) {
            "grep -n 'test-solana-tickets.shineup.me\\|test-solana-tickets.shiningpeople.ru' /home/player/SHiNE/caddy/Caddyfile; " +
            "echo; " +
            "echo 'Program ID в загруженных html:'; " +
-            "grep -R -n 'm48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR' /home/player/sites/test-solana-tickets.shineup.me/*.html"
+            "grep -R -n 'c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW' /home/player/sites/test-solana-tickets.shineup.me/*.html"
 }
@@ -22,7 +22,7 @@

 Текущий program id:

- `m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR`
+- `c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW`

 ## 2. Основная модель

@@ -6,7 +6,7 @@
 // =========================

 /// `SHINE_PAYMENTS_PROGRAM_ID` — адрес программы `shine_payments` для текущего окружения.
-pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR";
+pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW";

 /// `SHINE_USERS_PROGRAM_ID` — адрес программы `shine_users` для текущего окружения.
 pub const SHINE_USERS_PROGRAM_ID: &str = "FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm";
@@ -14,7 +14,7 @@ use std::str::FromStr;

 pub mod settings;

-solana_program::declare_id!("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+solana_program::declare_id!("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
 entrypoint!(process_instruction);

 const IX_INIT: u8 = 1;
@@ -110,7 +110,7 @@

  <script src="https://unpkg.com/@solana/web3.js@1.95.3/lib/index.iife.min.js"></script>
  <script>
-    const PROGRAM_ID = new solanaWeb3.PublicKey("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+    const PROGRAM_ID = new solanaWeb3.PublicKey("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
    const USERS_PROGRAM_ID = new solanaWeb3.PublicKey("FZS1YctoeEhCkZ5VTjsysUFAXR8CqxYztcLboXcg2Rpm");
    const RPC_URL = "https://api.devnet.solana.com";
    const connection = new solanaWeb3.Connection(RPC_URL, "confirmed");
@@ -79,7 +79,7 @@

  <script src="https://unpkg.com/@solana/web3.js@1.95.3/lib/index.iife.min.js"></script>
  <script>
-    const PROGRAM_ID = new solanaWeb3.PublicKey("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+    const PROGRAM_ID = new solanaWeb3.PublicKey("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
    const RPC_URL = "https://api.devnet.solana.com";
    const ORACLE_ACCOUNT = new solanaWeb3.PublicKey("7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE");
    const connection = new solanaWeb3.Connection(RPC_URL, "confirmed");
@@ -84,7 +84,7 @@

  <script src="https://unpkg.com/@solana/web3.js@1.95.3/lib/index.iife.min.js"></script>
  <script>
-    const PROGRAM_ID = new solanaWeb3.PublicKey("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+    const PROGRAM_ID = new solanaWeb3.PublicKey("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
    const RPC_URL = "https://api.devnet.solana.com";
    const connection = new solanaWeb3.Connection(RPC_URL, "confirmed");
    const SEEDS = {
@@ -77,7 +77,7 @@

  <script src="https://unpkg.com/@solana/web3.js@1.95.3/lib/index.iife.min.js"></script>
  <script>
-    const PROGRAM_ID = new solanaWeb3.PublicKey("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+    const PROGRAM_ID = new solanaWeb3.PublicKey("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
    const RPC_URL = "https://api.devnet.solana.com";
    const connection = new solanaWeb3.Connection(RPC_URL, "confirmed");
    const SEEDS = {
@@ -77,7 +77,7 @@

  <script src="https://unpkg.com/@solana/web3.js@1.95.3/lib/index.iife.min.js"></script>
  <script>
-    const PROGRAM_ID = new solanaWeb3.PublicKey("m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR");
+    const PROGRAM_ID = new solanaWeb3.PublicKey("c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW");
    const RPC_URL = "https://api.devnet.solana.com";
    const ORACLE_ACCOUNT = new solanaWeb3.PublicKey("7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE");
    const connection = new solanaWeb3.Connection(RPC_URL, "confirmed");
@@ -11,7 +11,7 @@ pub const USERS_ECONOMY_CONFIG_SPACE: usize = 32;
 pub const DAO_AUTHORITY: &str = "FUc28vNixp7F3nnkpGVt6nuJbgvJ4429v4B5wS52Df6P";

 /// Адрес программы `shine_payments`, от которой вычисляется PDA inflow-вольта.
-pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR";
+pub const SHINE_PAYMENTS_PROGRAM_ID: &str = "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW";
 /// Seed inflow-вольта в программе `shine_payments`.
 pub const SHINE_PAYMENTS_INFLOW_VAULT_SEED: &[u8] = b"shine_payments_inflow_vault";
 /// Адрес отдельной программы проверки премиальности логина.
@@ -31,7 +31,7 @@ const LIMIT_STEP = 10_000n;
 const START_BONUS_LIMIT = 100_000n;
 const USERS_ECONOMY_CONFIG_SEED = "shine_users_economy_config";
 const SHINE_PAYMENTS_PROGRAM_ID = new PublicKey(
-  "m48pWRGWrMj3TEHjuU4zsp5Gju4e7ZaPovk8RcVt7kR"
+  "c4yTa4JT9EtQDCBX9LmWFK6T2gp4JGsuymFbom2EudW"
 );
 const SHINE_PAYMENTS_INFLOW_VAULT_SEED = "shine_payments_inflow_vault";