From 6dee4aa0fd062929b2e52f656a633c0c776a9593 Mon Sep 17 00:00:00 2001 From: vishal <1117327+vishalchangrani@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:07:24 -0800 Subject: [PATCH 1/3] Transaction for nov 25 --- .../remove-keys/2024/{nov-19 => nov-27}/README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename transactions/remove-keys/2024/{nov-19 => nov-27}/README.md (57%) diff --git a/transactions/remove-keys/2024/nov-19/README.md b/transactions/remove-keys/2024/nov-27/README.md similarity index 57% rename from transactions/remove-keys/2024/nov-19/README.md rename to transactions/remove-keys/2024/nov-27/README.md index e7f18d6a..edb5abfd 100644 --- a/transactions/remove-keys/2024/nov-19/README.md +++ b/transactions/remove-keys/2024/nov-27/README.md @@ -1,12 +1,12 @@ -# FLIP 310: Removing Equilibrium as multi-signer +# Implementation of FLIP 310 and FLIP 311 -This transaction is to implement the [FLIP 310](https://github.com/onflow/flips/pull/311) +This transaction is to implement [FLIP 310](https://github.com/onflow/flips/pull/311) and [FLIP 311](https://github.com/onflow/flips/pull/312) ## Transaction to execute Key to remove: -1. Service account Index 8 -2. Staking account Index 2 +1. Service account Index 8 and 10 +2. Staking account Index 2 and 4 ### Transaction for service account @@ -14,6 +14,7 @@ Key to remove: transaction { prepare(signer: auth(RevokeKey) &Account) { signer.keys.revoke(keyIndex: 8) + signer.keys.revoke(keyIndex: 10) } } ``` @@ -24,6 +25,7 @@ transaction { transaction { prepare(signer: auth(RevokeKey) &Account) { signer.keys.revoke(keyIndex: 2) + signer.keys.revoke(keyIndex: 4) } } ``` From c0f521f15ac0a3cbb0b081dcb29914a6c0f6a665 Mon Sep 17 00:00:00 2001 From: vishal <1117327+vishalchangrani@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:50:26 -0800 Subject: [PATCH 2/3] removing animoca and equilibirum keys from flow.json, flow-staking.json; updating readme --- README.md | 2 +- flow-staking.json | 32 -------------------------------- flow.json | 20 -------------------- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/README.md b/README.md index 5e8ce0fb..a2d749bf 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Flow employs a community-driven, multi-signature process to execute essential pr Notably, the multi-sig process on Flow is associated with two principal accounts that oversee critical aspects of the Flow protocol: the service account, responsible for actions related to protocol parameters, and the staking account, which holds resources linked to staked nodes within the network. These accounts are collectively overseen by multiple signatories - representatives from the Flow ecosystem - who participate in meetings where transactions are simultaneously authorized (or rejected) and submitted only if there’s quorum. -At present, representatives from Blocto, Equilibrium, Ichi, Find, Flow Foundation, and an individual member (@bluesign) collectively hold multi-sig authority over the service account. Each signer is allocated a weight of 250 units, and to validate a transaction, a cumulative total of 1000 units is necessary. Therefore, a minimum of four signers must jointly provide their signatures to authorize the transaction. The transactions deliberated by these signatories may be related to setting transaction fees, managing/ slashing rewards, updating network-level contracts, adding new nodes, driving height coordinated and other node software upgrades, etc; see [account page](https://developers.flow.com/build/basics/accounts#service-accounts) for more details on the powers and abilities of the Flow service account. +At present, representatives from Blocto, Ichi, FindLabs, Flow Foundation, and an individual member (`@bluesign`) collectively hold multi-sig authority over the service account. Each signer is allocated a weight of 250 units, and to validate a transaction, a cumulative total of 1000 units is necessary. Therefore, a minimum of four signers must jointly provide their signatures to authorize the transaction. The transactions deliberated by these signatories may be related to setting transaction fees, managing/ slashing rewards, updating network-level contracts, adding new nodes, driving height coordinated and other node software upgrades, etc; see [account page](https://developers.flow.com/build/basics/accounts#service-accounts) for more details on the powers and abilities of the Flow service account. **Role of a multi-signer** diff --git a/flow-staking.json b/flow-staking.json index 13919bf0..357f4284 100644 --- a/flow-staking.json +++ b/flow-staking.json @@ -22,22 +22,6 @@ ], "chain": "flow-mainnet" }, - "equilibrium": { - "address": "8624b52f9ddcd04a", - "keys": [ - { - "type": "google-kms", - "index": 2, - "signatureAlgorithm": "ECDSA_secp256k1", - "hashAlgorithm": "SHA2_256", - "context": { - "resourceName": "projects/flow-service-account-mgt/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - }, - "resourceID": "projects/flow-service-account-mgt/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - } - ], - "chain": "flow-mainnet" - }, "ichi": { "address": "8624b52f9ddcd04a", "keys": [ @@ -54,22 +38,6 @@ ], "chain": "flow-mainnet" }, - "animoca": { - "address": "8624b52f9ddcd04a", - "keys": [ - { - "type": "google-kms", - "index": 4, - "signatureAlgorithm": "ECDSA_secp256k1", - "hashAlgorithm": "SHA2_256", - "context": { - "resourceName": "projects/ab1-flow-service-account/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - }, - "resourceID": "projects/ab1-flow-service-account/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - } - ], - "chain": "flow-mainnet" - }, "kan": { "address": "8624b52f9ddcd04a", "keys": [ diff --git a/flow.json b/flow.json index 4ebc1890..517563ed 100644 --- a/flow.json +++ b/flow.json @@ -22,16 +22,6 @@ "resourceID": "projects/portto-prod/locations/global/keyRings/flow-keys/cryptoKeys/flow-admin-committee/cryptoKeyVersions/1" } }, - "equilibrium": { - "address": "e467b9dd11fa00df", - "key": { - "type": "google-kms", - "index": 8, - "signatureAlgorithm": "ECDSA_secp256k1", - "hashAlgorithm": "SHA2_256", - "resourceID": "projects/flow-service-account-mgt/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - } - }, "ichi": { "address": "e467b9dd11fa00df", "key": { @@ -42,16 +32,6 @@ "resourceID": "projects/dappersig/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" } }, - "animoca": { - "address": "e467b9dd11fa00df", - "key": { - "type": "google-kms", - "index": 10, - "signatureAlgorithm": "ECDSA_secp256k1", - "hashAlgorithm": "SHA2_256", - "resourceID": "projects/ab1-flow-service-account/locations/global/keyRings/flow/cryptoKeys/service-account/cryptoKeyVersions/1" - } - }, "kan": { "address": "e467b9dd11fa00df", "key": { From 824a76cb0fe23fc023fcbe92bb05bd0573cea027 Mon Sep 17 00:00:00 2001 From: vishal <1117327+vishalchangrani@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:47:01 -0800 Subject: [PATCH 3/3] adding transaction IDs --- transactions/remove-keys/2024/nov-27/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/transactions/remove-keys/2024/nov-27/README.md b/transactions/remove-keys/2024/nov-27/README.md index edb5abfd..0b34a388 100644 --- a/transactions/remove-keys/2024/nov-27/README.md +++ b/transactions/remove-keys/2024/nov-27/README.md @@ -33,6 +33,8 @@ transaction { ## Result: 1. Transaction for service account +https://www.flowscan.io/tx/3969c4e8172afe32866c40dd16dbe3e591de42d336db32739c376d0351044434 -2. Transaction for staking account \ No newline at end of file +2. Transaction for staking account +https://www.flowscan.io/tx/c1b06e5a3a52c4bc526aac42189fe12ae8a7983752fe40d5560d670cb7ca06f1 \ No newline at end of file