From 8beff36d99d9024ff51f593fe56f8412f91d78ab Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Fri, 26 Jul 2024 07:28:36 +0200 Subject: [PATCH] v24.2 program id change to boost Signed-off-by: microwavedcola1 --- Anchor.toml | 4 ++-- README.md | 4 ++-- RELEASING.md | 6 +++--- anchor-tests/test.ts | 2 +- bin/service-mango-fills/conf/example-config.toml | 2 +- bin/service-mango-orderbook/conf/example-config.toml | 2 +- bin/service-mango-pnl/src/main.rs | 2 +- programs/mango-v4/src/lib.rs | 2 +- programs/mango-v4/tests/cases/test_ix_gate_set.rs | 2 +- programs/mango-v4/tests/cases/test_replay.rs | 2 +- release-to-devnet.sh | 2 +- run-anchor-tests.sh | 2 +- ts/client/ids.json | 2 +- ts/client/src/constants/index.ts | 6 +++--- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index e95cfb6a76..5056fc0aad 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -2,10 +2,10 @@ exclude = ["programs/margin-trade"] [programs.localnet] -mango_v4 = "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg" +mango_v4 = "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25" [programs.devnet] -mango_v4 = "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg" +mango_v4 = "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25" [features] seeds = true diff --git a/README.md b/README.md index d3bccefe87..0719539070 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,8 @@ See DEVELOPING.md and FAQ-DEV.md ### Deployments -- devnet: 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg -- mainnet-beta: 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg +- devnet: zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 +- mainnet-beta: zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 - primary mango group on mainnet-beta: 78b8f4cGCwmZ9ysPFMWLaLTkkaYnUjwMJYStWe5RTSSX ### Release diff --git a/RELEASING.md b/RELEASING.md index 9d50e15c12..4202114cf2 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -4,7 +4,7 @@ - $KEY as a path to a keypair (needs around 20 SOL for the buffer) - $RPC_URL as a url to an RPC node - - 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg is the address of the Mango v4 Program + - zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 is the address of the Mango v4 Program - FP4PxqHTVzeG2c6eZd7974F9WvKUSdBeduUK3rjYyvBw is the address of the Mango v4 Program Governance - Assuming there's a release branch (like release/program-v0.22.0) @@ -46,13 +46,13 @@ - Create IDL buffer - anchor idl write-buffer --provider.cluster $RPC_URL --provider.wallet $KEY --filepath target/idl/mango_v4_no_docs.json 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg + anchor idl write-buffer --provider.cluster $RPC_URL --provider.wallet $KEY --filepath target/idl/mango_v4_no_docs.json zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 Save the returned address as $IDL_BUFFER - Set IDL buffer authority - anchor idl set-authority --provider.cluster $RPC_URL --provider.wallet $KEY --program-id 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg --new-authority FP4PxqHTVzeG2c6eZd7974F9WvKUSdBeduUK3rjYyvBw $IDL_BUFFER + anchor idl set-authority --provider.cluster $RPC_URL --provider.wallet $KEY --program-id zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 --new-authority FP4PxqHTVzeG2c6eZd7974F9WvKUSdBeduUK3rjYyvBw $IDL_BUFFER - Make a gist for the proposal description, ideally based on previous upgrade proposals diff --git a/anchor-tests/test.ts b/anchor-tests/test.ts index 9da2171cb9..87c06cb221 100644 --- a/anchor-tests/test.ts +++ b/anchor-tests/test.ts @@ -29,7 +29,7 @@ enum MINTS { BTC = 'BTC', } const NUM_USERS = 4; -const PROGRAM_ID = '4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg'; +const PROGRAM_ID = 'zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25'; interface TestUser { keypair: anchor.web3.Keypair; diff --git a/bin/service-mango-fills/conf/example-config.toml b/bin/service-mango-fills/conf/example-config.toml index dd053f4416..0175d7e39a 100644 --- a/bin/service-mango-fills/conf/example-config.toml +++ b/bin/service-mango-fills/conf/example-config.toml @@ -32,4 +32,4 @@ retry_connection_sleep_secs = 30 [source.snapshot] rpc_http_url = "http://mango.rpcpool.com/" -program_id = "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg" +program_id = "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25" diff --git a/bin/service-mango-orderbook/conf/example-config.toml b/bin/service-mango-orderbook/conf/example-config.toml index dbd834266c..88c33e82ae 100644 --- a/bin/service-mango-orderbook/conf/example-config.toml +++ b/bin/service-mango-orderbook/conf/example-config.toml @@ -17,4 +17,4 @@ retry_connection_sleep_secs = 30 [source.snapshot] rpc_http_url = "http://mango.rpcpool.com/" -program_id = "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg" +program_id = "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25" diff --git a/bin/service-mango-pnl/src/main.rs b/bin/service-mango-pnl/src/main.rs index 49869f379d..3c4f3b122c 100644 --- a/bin/service-mango-pnl/src/main.rs +++ b/bin/service-mango-pnl/src/main.rs @@ -316,7 +316,7 @@ async fn main() -> anyhow::Result<()> { let (account_write_queue_sender, slot_queue_sender) = memory_target::init(chain_data).await?; let filter_config = FilterConfig { entity_filter: EntityFilter::filter_by_program_id( - "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg", + "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25", ), }; grpc_plugin_source::process_events( diff --git a/programs/mango-v4/src/lib.rs b/programs/mango-v4/src/lib.rs index ac27e52a7e..e1214ac9cc 100644 --- a/programs/mango-v4/src/lib.rs +++ b/programs/mango-v4/src/lib.rs @@ -39,7 +39,7 @@ use state::{ TokenIndex, TCS_START_INCENTIVE, }; -declare_id!("4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg"); +declare_id!("zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25"); #[program] pub mod mango_v4 { diff --git a/programs/mango-v4/tests/cases/test_ix_gate_set.rs b/programs/mango-v4/tests/cases/test_ix_gate_set.rs index 6727b85f7c..4e4c134fff 100644 --- a/programs/mango-v4/tests/cases/test_ix_gate_set.rs +++ b/programs/mango-v4/tests/cases/test_ix_gate_set.rs @@ -162,7 +162,7 @@ async fn test_ix_gate_set() -> Result<(), TransportError> { // // test cu budget, ix has a lot of logging - // e.g. Program 4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg consumed 66986 of 75000 compute units + // e.g. Program zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 consumed 66986 of 75000 compute units send_tx( solana, IxGateSetInstruction { diff --git a/programs/mango-v4/tests/cases/test_replay.rs b/programs/mango-v4/tests/cases/test_replay.rs index 881bbdf972..936df89b87 100644 --- a/programs/mango-v4/tests/cases/test_replay.rs +++ b/programs/mango-v4/tests/cases/test_replay.rs @@ -82,7 +82,7 @@ async fn test_replay() -> anyhow::Result<()> { let known_accounts = [ "ComputeBudget111111111111111111111111111111", "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL", - "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg", + "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25", "11111111111111111111111111111111", "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", ] diff --git a/release-to-devnet.sh b/release-to-devnet.sh index b28821bb67..71a487046c 100755 --- a/release-to-devnet.sh +++ b/release-to-devnet.sh @@ -3,7 +3,7 @@ set -ex pipefail WALLET_WITH_FUNDS=~/.config/solana/mango-mainnet-1.json -PROGRAM_ID=4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg +PROGRAM_ID=zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 # build program, anchor build -- --features enable-gpl diff --git a/run-anchor-tests.sh b/run-anchor-tests.sh index 88f873de07..606118c767 100755 --- a/run-anchor-tests.sh +++ b/run-anchor-tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # WALLET_WITH_FUNDS=~/.config/solana/mango-devnet.json -# PROGRAM_ID=4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg +# PROGRAM_ID=zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25 anchor build -- --features enable-gpl ./idl-fixup.sh diff --git a/ts/client/ids.json b/ts/client/ids.json index 7f3abe94e2..8f1ea38f39 100644 --- a/ts/client/ids.json +++ b/ts/client/ids.json @@ -5,7 +5,7 @@ "name": "mainnet-beta.clarkeni", "publicKey": "DLdcpC6AsAJ9xeKMR3WhHrN5sM5o7GVVXQhQ5vwisTtz", "serum3ProgramId": "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin", - "mangoProgramId": "4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg", + "mangoProgramId": "zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25", "banks": [ { "name": "SOL", diff --git a/ts/client/src/constants/index.ts b/ts/client/src/constants/index.ts index 3aaf739bb6..68dc9dfbab 100644 --- a/ts/client/src/constants/index.ts +++ b/ts/client/src/constants/index.ts @@ -21,9 +21,9 @@ export const OPENBOOK_PROGRAM_ID = { }; export const MANGO_V4_ID = { - testnet: new PublicKey('4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg'), - devnet: new PublicKey('4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg'), - 'mainnet-beta': new PublicKey('4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg'), + testnet: new PublicKey('zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25'), + devnet: new PublicKey('zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25'), + 'mainnet-beta': new PublicKey('zF2vSz6V9g1YHGmfrzsY497NJzbRr84QUrPry4bLQ25'), }; export const MANGO_V4_MAIN_GROUP = new PublicKey(