From e0a6dd0a9a52a85bae99ed03278e346e05617dc1 Mon Sep 17 00:00:00 2001 From: Baptiste Oueriagli Date: Mon, 27 Oct 2025 18:57:46 +0100 Subject: [PATCH 1/2] chore(solana): minor changes to makefiles --- solana/MCM.mk | 28 ++++++++++++++-------------- solana/Makefile | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/solana/MCM.mk b/solana/MCM.mk index 505346a7..adefd714 100644 --- a/solana/MCM.mk +++ b/solana/MCM.mk @@ -63,7 +63,7 @@ mcm-multisig-init: --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID) \ --chain-id $(MCM_CHAIN_ID)" \ - output=artifacts/mcm-multisig-init.json + output=$(or $(MCM_MULTISIG_INIT_ARTIFACT),artifacts/mcm-multisig-init.json) .PHONY: mcm-signers-init mcm-signers-init: @@ -75,7 +75,7 @@ mcm-signers-init: --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID) \ --total $(MCM_SIGNER_COUNT)" \ - output=artifacts/mcm-signers-init.json + output=$(or $(MCM_SIGNERS_INIT_ARTIFACT),artifacts/mcm-signers-init.json) .PHONY: mcm-signers-append mcm-signers-append: @@ -87,7 +87,7 @@ mcm-signers-append: --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID) \ --signers $(MCM_SIGNERS)" \ - output=artifacts/mcm-signers-append.json + output=$(or $(MCM_SIGNERS_APPEND_ARTIFACT),artifacts/mcm-signers-append.json) .PHONY: mcm-signers-finalize mcm-signers-finalize: @@ -98,7 +98,7 @@ mcm-signers-finalize: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID)" \ - output=artifacts/mcm-signers-finalize.json + output=$(or $(MCM_SIGNERS_FINALIZE_ARTIFACT),artifacts/mcm-signers-finalize.json) .PHONY: mcm-signers-clear mcm-signers-clear: @@ -109,7 +109,7 @@ mcm-signers-clear: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID)" \ - output=artifacts/mcm-signers-clear.json + output=$(or $(MCM_SIGNERS_CLEAR_ARTIFACT),artifacts/mcm-signers-clear.json) .PHONY: mcm-signers-set-config mcm-signers-set-config: @@ -124,7 +124,7 @@ mcm-signers-set-config: --group-quorums $(MCM_GROUP_QUORUMS) \ --group-parents $(MCM_GROUP_PARENTS) \ $(if $(filter true,$(MCM_CLEAR_ROOT)),--clear-root)" \ - output=artifacts/mcm-signers-set-config.json + output=$(or $(MCM_SIGNERS_SET_CONFIG_ARTIFACT),artifacts/mcm-signers-set-config.json) .PHONY: mcm-signatures-init mcm-signatures-init: @@ -136,7 +136,7 @@ mcm-signatures-init: --authority $(AUTHORITY) \ --proposal $(MCM_PROPOSAL_OUTPUT) \ --total $(MCM_SIGNATURES_COUNT)" \ - output=artifacts/mcm-signatures-init.json + output=$(or $(MCM_SIGNATURES_INIT_ARTIFACT),artifacts/mcm-signatures-init.json) .PHONY: mcm-signatures-append mcm-signatures-append: @@ -148,7 +148,7 @@ mcm-signatures-append: --authority $(AUTHORITY) \ --proposal $(MCM_PROPOSAL_OUTPUT) \ --signatures $(MCM_SIGNATURES)" \ - output=artifacts/mcm-signatures-append.json + output=$(or $(MCM_SIGNATURES_APPEND_ARTIFACT),artifacts/mcm-signatures-append.json) .PHONY: mcm-signatures-finalize mcm-signatures-finalize: @@ -159,7 +159,7 @@ mcm-signatures-finalize: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --proposal $(MCM_PROPOSAL_OUTPUT)" \ - output=artifacts/mcm-signatures-finalize.json + output=$(or $(MCM_SIGNATURES_FINALIZE_ARTIFACT),artifacts/mcm-signatures-finalize.json) .PHONY: mcm-signatures-clear mcm-signatures-clear: @@ -170,7 +170,7 @@ mcm-signatures-clear: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --proposal $(MCM_PROPOSAL_OUTPUT)" \ - output=artifacts/mcm-signatures-clear.json + output=$(or $(MCM_SIGNATURES_CLEAR_ARTIFACT),artifacts/mcm-signatures-clear.json) .PHONY: mcm-ownership-transfer mcm-ownership-transfer: @@ -182,7 +182,7 @@ mcm-ownership-transfer: --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID) \ --proposed-owner $(MCM_PROPOSED_OWNER)" \ - output=artifacts/mcm-ownership-transfer.json + output=$(or $(MCM_OWNERSHIP_TRANSFER_ARTIFACT),artifacts/mcm-ownership-transfer.json) .PHONY: mcm-ownership-accept mcm-ownership-accept: @@ -193,7 +193,7 @@ mcm-ownership-accept: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --multisig-id $(MCM_MULTISIG_ID)" \ - output=artifacts/mcm-ownership-accept.json + output=$(or $(MCM_OWNERSHIP_ACCEPT_ARTIFACT),artifacts/mcm-ownership-accept.json) .PHONY: mcm-proposal-set-root mcm-proposal-set-root: @@ -204,7 +204,7 @@ mcm-proposal-set-root: --mcm-program-id $(MCM_PROGRAM_ID) \ --authority $(AUTHORITY) \ --proposal $(MCM_PROPOSAL_OUTPUT)" \ - output=artifacts/mcm-proposal-set-root.json + output=$(or $(MCM_PROPOSAL_SET_ROOT_ARTIFACT),artifacts/mcm-proposal-set-root.json) .PHONY: mcm-proposal-execute mcm-proposal-execute: @@ -217,7 +217,7 @@ mcm-proposal-execute: --proposal $(MCM_PROPOSAL_OUTPUT) \ $(if $(MCM_START_INDEX),--start-index $(MCM_START_INDEX)) \ $(if $(MCM_OPERATION_COUNT),--operation-count $(MCM_OPERATION_COUNT))" \ - output=artifacts/mcm-proposal-execute.json + output=$(or $(MCM_PROPOSAL_EXECUTE_ARTIFACT),artifacts/mcm-proposal-execute.json) ## # Proposal creation commands (read-only, create proposal files) diff --git a/solana/Makefile b/solana/Makefile index 88bf1461..fd783058 100644 --- a/solana/Makefile +++ b/solana/Makefile @@ -73,7 +73,7 @@ sol-confirm-cmd: sol-confirm: @echo "==> Confirming signature: $$SIG"; \ mkdir -p $(dir $(output)); \ - solana confirm $$SIG -v --output json --url $(SOL_RPC_URL) >> $(output) + solana confirm $$SIG -v --output json --url $(SOL_RPC_URL) > $(output) ## # Solana Native Commands From 43dd152bf0fec7118bcf102a16f96fcce6589795 Mon Sep 17 00:00:00 2001 From: Baptiste Oueriagli Date: Tue, 28 Oct 2025 11:35:44 +0100 Subject: [PATCH 2/2] chore: bump mcmctl dependency version and fix update signers template --- solana/MCM.mk | 3 ++- solana/Makefile | 2 +- solana/setup-templates/template-mcm-signers-update/.env | 3 +++ .../template-mcm-signers-update/FACILITATORS.md | 1 + solana/setup-templates/template-mcm-signers-update/Makefile | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/solana/MCM.mk b/solana/MCM.mk index adefd714..33aa511c 100644 --- a/solana/MCM.mk +++ b/solana/MCM.mk @@ -246,7 +246,8 @@ mcm-proposal-update-signers: --signer-groups $(MCM_SIGNER_GROUPS) \ --group-quorums $(MCM_GROUP_QUORUMS) \ --group-parents $(MCM_GROUP_PARENTS) \ - $(if $(filter true,$(MCM_CLEAR_ROOT)),--clear-root) + $(if $(filter true,$(MCM_CLEAR_ROOT)),--clear-root) \ + $(if $(filter true,$(MCM_CLEAR_SIGNERS)),--clear-signers) .PHONY: mcm-proposal-bridge-pause mcm-proposal-bridge-pause: diff --git a/solana/Makefile b/solana/Makefile index fd783058..2456bca9 100644 --- a/solana/Makefile +++ b/solana/Makefile @@ -37,7 +37,7 @@ install-eip712sign: .PHONY: install-mcmctl install-mcmctl: - go install github.com/base/mcm-go/cmd/mcmctl@89e88905998a0dd10fe75dad99b8121bfe5dca93 + go install github.com/base/mcm-go/cmd/mcmctl@66ad0d9e28ecc1ef0b3b1504bdc5d40da413b678 .PHONY: deps deps: install-mcmctl install-eip712sign diff --git a/solana/setup-templates/template-mcm-signers-update/.env b/solana/setup-templates/template-mcm-signers-update/.env index 61a9f70d..91b673a0 100644 --- a/solana/setup-templates/template-mcm-signers-update/.env +++ b/solana/setup-templates/template-mcm-signers-update/.env @@ -39,5 +39,8 @@ MCM_SIGNER_GROUPS= MCM_GROUP_QUORUMS= MCM_GROUP_PARENTS= +# Set to true to clear the previous pending signers when registering the new signers, omit or set to false otherwise +MCM_CLEAR_SIGNERS= + # Set to true to clear the previous root when registering the new signers, omit or set to false otherwise MCM_CLEAR_ROOT= diff --git a/solana/setup-templates/template-mcm-signers-update/FACILITATORS.md b/solana/setup-templates/template-mcm-signers-update/FACILITATORS.md index da028aae..caf692a8 100644 --- a/solana/setup-templates/template-mcm-signers-update/FACILITATORS.md +++ b/solana/setup-templates/template-mcm-signers-update/FACILITATORS.md @@ -42,6 +42,7 @@ MCM_NEW_SIGNERS=0xADDRESS1,0xADDRESS2,0xADDRESS3 MCM_SIGNER_GROUPS=0,0,1 MCM_GROUP_QUORUMS=2,1 MCM_GROUP_PARENTS=0,0 +MCM_CLEAR_SIGNERS=false # or true if needed MCM_CLEAR_ROOT=false # or true if needed ``` diff --git a/solana/setup-templates/template-mcm-signers-update/Makefile b/solana/setup-templates/template-mcm-signers-update/Makefile index 15391353..707f445c 100644 --- a/solana/setup-templates/template-mcm-signers-update/Makefile +++ b/solana/setup-templates/template-mcm-signers-update/Makefile @@ -24,4 +24,4 @@ sign: step3-execute-proposal: @echo "==> Step 3: Executing MCM proposal..." make mcm-all - make mcm-print-config + make mcm-signers-print-config