chore(solana): simplify deployment to same address

Author: xenoliss

solana/mainnet/2025-10-27-deploy-mcm/.env

@@ -4,7 +4,6 @@ ANCHOR_VERSION=0.29.0
 # Variables for cloning the MCM repo
 MCM_REPO=https://github.com/base/chainlink-ccip/
 MCM_COMMIT=efe0405f3e2fa6789a57ec510e101828040a384b
-ID_PATCH=patches/id.patch
 
 # Variables for deploying and sending transactions
 CLUSTER=mainnet
@@ -19,8 +18,8 @@ MCM_PROGRAM_ID=Ea5qsVs2kwQXi7LMAh3Qg5YKpuPQbW7oqvYaPXUwBwoX # Same as devnet
 MCM_MULTISIG_ID_0=0x0000000000000000000000000000000000000000000000000000000000000000
 MCM_MULTISIG_ID_1=0x0000000000000000000000000000000000000000000000000000000000000001
 MCM_CHAIN_ID=1
-MCM_AUTHORITY_0=
-MCM_AUTHORITY_1=
+MCM_AUTHORITY_0=D5XP8THXxEhwJ9ajZDHVtRjMZ9u2YxYCUQ65reoQBobr
+MCM_AUTHORITY_1=2RQyJmfANnkq39hpbKP4pCMQVjaxrUVmfezdAc4WJLpV
 MCM_MULTISIG_INIT_ARTIFACT_0=artifacts/mcm-multisig-init-0.json
 MCM_MULTISIG_INIT_ARTIFACT_1=artifacts/mcm-multisig-init-1.json
 

solana/mainnet/2025-10-27-deploy-mcm/Makefile

@@ -33,8 +33,7 @@ step1-clone-and-patch:
 	rm -rf chainlink-ccip
 	git clone --filter=blob:none $(MCM_REPO) chainlink-ccip
 	cd chainlink-ccip && \
-		git checkout $(MCM_COMMIT) && \
-		git apply ../$(ID_PATCH)
+		git checkout $(MCM_COMMIT)
 
 # Step 2: Build and deploy the MCM program
 .PHONY: step2-build-and-deploy
@@ -43,6 +42,7 @@ step2-build-and-deploy:
 	mkdir -p chainlink-ccip/chains/solana/contracts/target/deploy/ && \
 		cp $(MCM_KEYPAIR) chainlink-ccip/chains/solana/contracts/target/deploy/mcm-keypair.json
 	cd chainlink-ccip/chains/solana/contracts && \
+		anchor keys sync && \
 		anchor build -p mcm && \
 		anchor deploy --provider.cluster $(CLUSTER) --provider.wallet $(AUTHORITY) -p mcm