From 4953d44569819f7a8f2094b76c402b4639aaa444 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Tue, 3 Dec 2024 13:06:19 +0100
Subject: [PATCH 1/9] List community RPC nodes

---
 .../validatorgroup/rpc-urls-l2.test.ts        | 132 ++++++++++++++++++
 .../commands/validatorgroup/rpc-urls.test.ts  | 132 ++++++++++++++++++
 .../src/commands/validatorgroup/rpc-urls.ts   |  90 ++++++++++++
 3 files changed, 354 insertions(+)
 create mode 100644 packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
 create mode 100644 packages/cli/src/commands/validatorgroup/rpc-urls.test.ts
 create mode 100644 packages/cli/src/commands/validatorgroup/rpc-urls.ts

diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts b/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
new file mode 100644
index 000000000..88f3fd27f
--- /dev/null
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
@@ -0,0 +1,132 @@
+import { newKitFromWeb3 } from '@celo/contractkit'
+import { AccountsWrapper } from '@celo/contractkit/lib/wrappers/Accounts'
+import { testWithAnvilL2, withImpersonatedAccount } from '@celo/dev-utils/lib/anvil-test'
+import { ClaimTypes, IdentityMetadataWrapper } from '@celo/metadata-claims'
+import { ux } from '@oclif/core'
+import { setupGroupAndAffiliateValidator } from '../../test-utils/chain-setup'
+import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
+import RpcUrls from './rpc-urls'
+
+testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
+  jest.spyOn(IdentityMetadataWrapper, 'fetchFromURL').mockImplementation(async (_, url) => {
+    const validatorAddress = url.split('/').pop()
+
+    return new IdentityMetadataWrapper({
+      claims: [
+        {
+          type: ClaimTypes.RPC_URL,
+          timestamp: Date.now(),
+          rpcUrl: `https://example.com:8545/${validatorAddress}`,
+        },
+      ],
+    } as any) // that data is enough
+  })
+
+  const setMetadataUrlForValidator = async (
+    accountsWrapper: AccountsWrapper,
+    validator: string
+  ) => {
+    await withImpersonatedAccount(
+      web3,
+      validator,
+      async () => {
+        await accountsWrapper
+          .setMetadataURL(`https://example.com/metadata/${validator}`)
+          .sendAndWaitForReceipt({
+            from: validator,
+          })
+      },
+      1_000_000_000_000_000n
+    )
+  }
+
+  const EXISTING_VALIDATORS = [
+    '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65',
+    '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
+    '0x976EA74026E726554dB657fA54763abd0C3a0aa9',
+  ]
+
+  beforeEach(async () => {
+    const kit = newKitFromWeb3(web3)
+    const accountsWrapper = await kit.contracts.getAccounts()
+
+    const [nonElectedGroupAddress, validatorAddress] = await web3.eth.getAccounts()
+
+    await setupGroupAndAffiliateValidator(kit, nonElectedGroupAddress, validatorAddress)
+    await accountsWrapper
+      .setName('Test group')
+      .sendAndWaitForReceipt({ from: nonElectedGroupAddress })
+
+    for (const validator of [...EXISTING_VALIDATORS, validatorAddress]) {
+      await setMetadataUrlForValidator(accountsWrapper, validator)
+    }
+  })
+
+  it('shows the RPC URLs of the elected validator groups', async () => {
+    const logMock = jest.spyOn(console, 'log')
+    const writeMock = jest.spyOn(ux.write, 'stdout')
+
+    await testLocallyWithWeb3Node(RpcUrls, ['--csv'], web3)
+
+    expect(writeMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes)))
+      .toMatchInlineSnapshot(`
+      [
+        [
+          "Validator Group Name,RPC URL,Validator Address
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
+      ",
+        ],
+      ]
+    `)
+    expect(
+      logMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes))
+    ).toMatchInlineSnapshot(`[]`)
+  })
+
+  it('shows all the RPC URLs', async () => {
+    const logMock = jest.spyOn(console, 'log')
+    const writeMock = jest.spyOn(ux.write, 'stdout')
+
+    await testLocallyWithWeb3Node(RpcUrls, ['--all', '--csv'], web3)
+
+    expect(writeMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes)))
+      .toMatchInlineSnapshot(`
+      [
+        [
+          "Validator Group Name,RPC URL,Validator Address
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
+      ",
+        ],
+        [
+          "Test group,https://example.com:8545/0x6Ecbe1DB9EF729CBe972C83Fb886247691Fb6beb,0x6Ecbe1DB9EF729CBe972C83Fb886247691Fb6beb
+      ",
+        ],
+      ]
+    `)
+    expect(
+      logMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes))
+    ).toMatchInlineSnapshot(`[]`)
+  })
+})
diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.test.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.test.ts
new file mode 100644
index 000000000..611d4f282
--- /dev/null
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.test.ts
@@ -0,0 +1,132 @@
+import { newKitFromWeb3 } from '@celo/contractkit'
+import { AccountsWrapper } from '@celo/contractkit/lib/wrappers/Accounts'
+import { testWithAnvilL1, withImpersonatedAccount } from '@celo/dev-utils/lib/anvil-test'
+import { ClaimTypes, IdentityMetadataWrapper } from '@celo/metadata-claims'
+import { ux } from '@oclif/core'
+import { setupGroupAndAffiliateValidator } from '../../test-utils/chain-setup'
+import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
+import RpcUrls from './rpc-urls'
+
+testWithAnvilL1('validatorgroup:rpc-urls cmd', async (web3) => {
+  jest.spyOn(IdentityMetadataWrapper, 'fetchFromURL').mockImplementation(async (_, url) => {
+    const validatorAddress = url.split('/').pop()
+
+    return new IdentityMetadataWrapper({
+      claims: [
+        {
+          type: ClaimTypes.RPC_URL,
+          timestamp: Date.now(),
+          rpcUrl: `https://example.com:8545/${validatorAddress}`,
+        },
+      ],
+    } as any) // that data is enough
+  })
+
+  const setMetadataUrlForValidator = async (
+    accountsWrapper: AccountsWrapper,
+    validator: string
+  ) => {
+    await withImpersonatedAccount(
+      web3,
+      validator,
+      async () => {
+        await accountsWrapper
+          .setMetadataURL(`https://example.com/metadata/${validator}`)
+          .sendAndWaitForReceipt({
+            from: validator,
+          })
+      },
+      1_000_000_000_000_000n
+    )
+  }
+
+  const EXISTING_VALIDATORS = [
+    '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65',
+    '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
+    '0x976EA74026E726554dB657fA54763abd0C3a0aa9',
+  ]
+
+  beforeEach(async () => {
+    const kit = newKitFromWeb3(web3)
+    const accountsWrapper = await kit.contracts.getAccounts()
+
+    const [nonElectedGroupAddress, validatorAddress] = await web3.eth.getAccounts()
+
+    await setupGroupAndAffiliateValidator(kit, nonElectedGroupAddress, validatorAddress)
+    await accountsWrapper
+      .setName('Test group')
+      .sendAndWaitForReceipt({ from: nonElectedGroupAddress })
+
+    for (const validator of [...EXISTING_VALIDATORS, validatorAddress]) {
+      await setMetadataUrlForValidator(accountsWrapper, validator)
+    }
+  })
+
+  it('shows the RPC URLs of the elected validator groups', async () => {
+    const logMock = jest.spyOn(console, 'log')
+    const writeMock = jest.spyOn(ux.write, 'stdout')
+
+    await testLocallyWithWeb3Node(RpcUrls, ['--csv'], web3)
+
+    expect(writeMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes)))
+      .toMatchInlineSnapshot(`
+      [
+        [
+          "Validator Group Name,RPC URL,Validator Address
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
+      ",
+        ],
+      ]
+    `)
+    expect(
+      logMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes))
+    ).toMatchInlineSnapshot(`[]`)
+  })
+
+  it('shows all the RPC URLs', async () => {
+    const logMock = jest.spyOn(console, 'log')
+    const writeMock = jest.spyOn(ux.write, 'stdout')
+
+    await testLocallyWithWeb3Node(RpcUrls, ['--all', '--csv'], web3)
+
+    expect(writeMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes)))
+      .toMatchInlineSnapshot(`
+      [
+        [
+          "Validator Group Name,RPC URL,Validator Address
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+      ",
+        ],
+        [
+          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
+      ",
+        ],
+        [
+          "Test group,https://example.com:8545/0x6Ecbe1DB9EF729CBe972C83Fb886247691Fb6beb,0x6Ecbe1DB9EF729CBe972C83Fb886247691Fb6beb
+      ",
+        ],
+      ]
+    `)
+    expect(
+      logMock.mock.calls.map((args) => args.map(stripAnsiCodesAndTxHashes))
+    ).toMatchInlineSnapshot(`[]`)
+  })
+})
diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
new file mode 100644
index 000000000..0cb28ab98
--- /dev/null
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
@@ -0,0 +1,90 @@
+import { concurrentMap, StrongAddress } from '@celo/base'
+import { ClaimTypes, IdentityMetadataWrapper } from '@celo/metadata-claims'
+import { Flags, ux } from '@oclif/core'
+import { BaseCommand } from '../../base'
+
+export default class RpcUrls extends BaseCommand {
+  static description =
+    'Displays a list of community RPC nodes for the currently elected validator groups'
+
+  static aliases: string[] = [
+    'validator:rpc-urls',
+    'validatorgroup:rpc-urls',
+    'network:community-rpc-nodes',
+    'validator:community-rpc-nodes',
+    'validatorgroup:community-rpc-nodes',
+  ]
+
+  static flags = {
+    ...BaseCommand.flags,
+    ...(ux.table.flags() as object),
+    all: Flags.boolean({
+      description:
+        'Display all community RC nodes, not just the ones from currently elected validator groups',
+      required: false,
+      default: false,
+    }),
+  }
+
+  async run() {
+    const res = await this.parse(RpcUrls)
+    const kit = await this.getKit()
+    const isL2 = await this.isCel2()
+    const epochManagerWrapper = await kit.contracts.getEpochManager()
+    const validatorsWrapper = await kit.contracts.getValidators()
+    const accountsWrapper = await kit.contracts.getAccounts()
+
+    let validatorAddresses: StrongAddress[] = []
+
+    if (res.flags.all) {
+      validatorAddresses = (await validatorsWrapper.getRegisteredValidators()).map(
+        (v) => v.address as StrongAddress
+      )
+    } else {
+      if (isL2) {
+        validatorAddresses = (await epochManagerWrapper.getElectedAccounts()) as StrongAddress[]
+      } else {
+        validatorAddresses = (await validatorsWrapper.currentValidatorAccountsSet()).map(
+          (v) => v.account as StrongAddress
+        )
+      }
+    }
+
+    const metadataURLs = await concurrentMap(5, validatorAddresses, async (address) => {
+      const metadataURL = await accountsWrapper.getMetadataURL(address)
+
+      if (!metadataURL) {
+        return undefined
+      }
+
+      const metadata = await IdentityMetadataWrapper.fetchFromURL(accountsWrapper, metadataURL)
+
+      return metadata.findClaim(ClaimTypes.RPC_URL)?.rpcUrl
+    })
+
+    // TODO cache so we don't have to fetch the same validator group name multiple times
+    const validatorGroupNames = await concurrentMap(5, validatorAddresses, async (address) => {
+      return (
+        await validatorsWrapper.getValidatorGroup(
+          await validatorsWrapper.getValidatorsGroup(address)
+        )
+      ).name
+    })
+
+    ux.table(
+      validatorAddresses
+        .map((address, idx) => ({
+          validatorGroupName: validatorGroupNames[idx],
+          rpcUrl: metadataURLs[idx],
+          validatorAddress: address,
+        }))
+        .filter((row) => row.rpcUrl),
+      {
+        validatorGroupName: { header: 'Validator Group Name' },
+        rpcUrl: { header: 'RPC URL' },
+        validatorAddress: { header: 'Validator Address' },
+      },
+      res.flags
+    )
+  }
+}

From fc275e234f1f6d113a8496d05116d766b0b18d53 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Tue, 3 Dec 2024 14:15:18 +0100
Subject: [PATCH 2/9] typo + optimisations + update PR template

---
 .github/pull_request_template.md              |  5 ++++
 .../src/commands/validatorgroup/rpc-urls.ts   | 27 ++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ceb6e1150..0086404a2 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,6 +10,11 @@ _Describe any minor or "drive-by" changes here. If none delete this section_
 
 _An explanation of how the changes were tested or an explanation as to why they don't need to be._
 
+
+### How to QA
+
+_List of steps required to QA the change if applicable_
+
 ### Related issues
 
 - Fixes #[issue number here]
diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
index 0cb28ab98..c1958a885 100644
--- a/packages/cli/src/commands/validatorgroup/rpc-urls.ts
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
@@ -8,8 +8,8 @@ export default class RpcUrls extends BaseCommand {
     'Displays a list of community RPC nodes for the currently elected validator groups'
 
   static aliases: string[] = [
+    'network:rpc-urls',
     'validator:rpc-urls',
-    'validatorgroup:rpc-urls',
     'network:community-rpc-nodes',
     'validator:community-rpc-nodes',
     'validatorgroup:community-rpc-nodes',
@@ -20,7 +20,7 @@ export default class RpcUrls extends BaseCommand {
     ...(ux.table.flags() as object),
     all: Flags.boolean({
       description:
-        'Display all community RC nodes, not just the ones from currently elected validator groups',
+        'Display all community RPC nodes, not just the ones from currently elected validator groups',
       required: false,
       default: false,
     }),
@@ -50,6 +50,18 @@ export default class RpcUrls extends BaseCommand {
       }
     }
 
+    const validatorToGroup: { [key: StrongAddress]: string } = Object.fromEntries(
+      await concurrentMap(5, validatorAddresses, async (address) => {
+        return [address, await validatorsWrapper.getValidatorsGroup(address)]
+      })
+    )
+
+    const validatorGroupNames = Object.fromEntries(
+      await concurrentMap(5, [...new Set(Object.values(validatorToGroup))], async (address) => {
+        return [address, (await validatorsWrapper.getValidatorGroup(address)).name]
+      })
+    )
+
     const metadataURLs = await concurrentMap(5, validatorAddresses, async (address) => {
       const metadataURL = await accountsWrapper.getMetadataURL(address)
 
@@ -62,19 +74,10 @@ export default class RpcUrls extends BaseCommand {
       return metadata.findClaim(ClaimTypes.RPC_URL)?.rpcUrl
     })
 
-    // TODO cache so we don't have to fetch the same validator group name multiple times
-    const validatorGroupNames = await concurrentMap(5, validatorAddresses, async (address) => {
-      return (
-        await validatorsWrapper.getValidatorGroup(
-          await validatorsWrapper.getValidatorsGroup(address)
-        )
-      ).name
-    })
-
     ux.table(
       validatorAddresses
         .map((address, idx) => ({
-          validatorGroupName: validatorGroupNames[idx],
+          validatorGroupName: validatorGroupNames[validatorToGroup[address]],
           rpcUrl: metadataURLs[idx],
           validatorAddress: address,
         }))

From 192f5467431b6e3522eae493457d2d31e8186215 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Tue, 3 Dec 2024 14:24:02 +0100
Subject: [PATCH 3/9] docs

---
 docs/command-line-interface/network.md        | 166 +++++++++++++++++
 docs/command-line-interface/validator.md      | 166 +++++++++++++++++
 docs/command-line-interface/validatorgroup.md | 168 ++++++++++++++++++
 3 files changed, 500 insertions(+)

diff --git a/docs/command-line-interface/network.md b/docs/command-line-interface/network.md
index 7eb63285e..f6bf05e66 100644
--- a/docs/command-line-interface/network.md
+++ b/docs/command-line-interface/network.md
@@ -3,11 +3,95 @@
 
 View details about the network, like contracts and parameters
 
+* [`celocli network:community-rpc-nodes`](#celocli-networkcommunity-rpc-nodes)
 * [`celocli network:contracts`](#celocli-networkcontracts)
 * [`celocli network:info`](#celocli-networkinfo)
 * [`celocli network:parameters`](#celocli-networkparameters)
+* [`celocli network:rpc-urls`](#celocli-networkrpc-urls)
 * [`celocli network:whitelist`](#celocli-networkwhitelist)
 
+## `celocli network:community-rpc-nodes`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli network:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli network:contracts`
 
 Lists Celo core contracts and their addresses.
@@ -182,6 +266,88 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/network/parameters.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/network/parameters.ts)_
 
+## `celocli network:rpc-urls`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli network:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli network:whitelist`
 
 List the whitelisted fee currencies
diff --git a/docs/command-line-interface/validator.md b/docs/command-line-interface/validator.md
index 2518c2152..53759918d 100644
--- a/docs/command-line-interface/validator.md
+++ b/docs/command-line-interface/validator.md
@@ -4,12 +4,14 @@
 View and manage Validators
 
 * [`celocli validator:affiliate ARG1`](#celocli-validatoraffiliate-arg1)
+* [`celocli validator:community-rpc-nodes`](#celocli-validatorcommunity-rpc-nodes)
 * [`celocli validator:deaffiliate`](#celocli-validatordeaffiliate)
 * [`celocli validator:deregister`](#celocli-validatorderegister)
 * [`celocli validator:downtime-slash`](#celocli-validatordowntime-slash)
 * [`celocli validator:list`](#celocli-validatorlist)
 * [`celocli validator:register`](#celocli-validatorregister)
 * [`celocli validator:requirements`](#celocli-validatorrequirements)
+* [`celocli validator:rpc-urls`](#celocli-validatorrpc-urls)
 * [`celocli validator:set-bitmaps`](#celocli-validatorset-bitmaps)
 * [`celocli validator:show ARG1`](#celocli-validatorshow-arg1)
 * [`celocli validator:signed-blocks`](#celocli-validatorsigned-blocks)
@@ -79,6 +81,88 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/validator/affiliate.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validator/affiliate.ts)_
 
+## `celocli validator:community-rpc-nodes`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli validator:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli validator:deaffiliate`
 
 Deaffiliate a Validator from a Validator Group, and remove it from the Group if it is also a member.
@@ -460,6 +544,88 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/validator/requirements.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validator/requirements.ts)_
 
+## `celocli validator:rpc-urls`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli validator:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli validator:set-bitmaps`
 
 Set validator signature bitmaps for provided intervals
diff --git a/docs/command-line-interface/validatorgroup.md b/docs/command-line-interface/validatorgroup.md
index aff4b8875..9c71cc256 100644
--- a/docs/command-line-interface/validatorgroup.md
+++ b/docs/command-line-interface/validatorgroup.md
@@ -4,11 +4,13 @@
 View and manage Validator Groups
 
 * [`celocli validatorgroup:commission`](#celocli-validatorgroupcommission)
+* [`celocli validatorgroup:community-rpc-nodes`](#celocli-validatorgroupcommunity-rpc-nodes)
 * [`celocli validatorgroup:deregister`](#celocli-validatorgroupderegister)
 * [`celocli validatorgroup:list`](#celocli-validatorgrouplist)
 * [`celocli validatorgroup:member ARG1`](#celocli-validatorgroupmember-arg1)
 * [`celocli validatorgroup:register`](#celocli-validatorgroupregister)
 * [`celocli validatorgroup:reset-slashing-multiplier ARG1`](#celocli-validatorgroupreset-slashing-multiplier-arg1)
+* [`celocli validatorgroup:rpc-urls`](#celocli-validatorgrouprpc-urls)
 * [`celocli validatorgroup:show ARG1`](#celocli-validatorgroupshow-arg1)
 
 ## `celocli validatorgroup:commission`
@@ -78,6 +80,88 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/validatorgroup/commission.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validatorgroup/commission.ts)_
 
+## `celocli validatorgroup:community-rpc-nodes`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli validatorgroup:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli validatorgroup:deregister`
 
 Deregister a Validator Group. After the group lock perioid has passed it will be possible to deregister it start unlocking the CELO. If you wish to deregister your validator group, you must first remove all members, then wait the required time before running this command.
@@ -398,6 +482,90 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/validatorgroup/reset-slashing-multiplier.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validatorgroup/reset-slashing-multiplier.ts)_
 
+## `celocli validatorgroup:rpc-urls`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli validatorgroup:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
+    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
+    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
+    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+
+FLAGS
+  -k, --privateKey=<value>
+      Use a private key to sign local transactions with
+
+  -n, --node=<value>
+      URL of the node to run commands against or an alias
+
+  -x, --extended
+      show extra columns
+
+  --all
+      Display all community RPC nodes, not just the ones from currently elected validator
+      groups
+
+  --columns=<value>
+      only show provided columns (comma-separated)
+
+  --csv
+      output is csv format [alias: --output=csv]
+
+  --filter=<value>
+      filter property by partial string matching, ex: name=foo
+
+  --gasCurrency=0x1234567890123456789012345678901234567890
+      Use a specific gas currency for transaction fees (defaults to CELO if no gas
+      currency is supplied). It must be a whitelisted token.
+
+  --globalHelp
+      View all available global flags
+
+  --ledgerAddresses=<value>
+      [default: 1] If --useLedger is set, this will get the first N addresses for local
+      signing
+
+  --no-header
+      hide table header from output
+
+  --no-truncate
+      do not truncate output to fit screen
+
+  --output=<option>
+      output in a more machine friendly format
+      <options: csv|json|yaml>
+
+  --sort=<value>
+      property to sort by (prepend '-' for descending)
+
+  --useLedger
+      Set it to use a ledger wallet
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:rpc-urls
+  $ celocli validator:rpc-urls
+  $ celocli network:community-rpc-nodes
+  $ celocli validator:community-rpc-nodes
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
+_See code: [src/commands/validatorgroup/rpc-urls.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/validatorgroup/rpc-urls.ts)_
+
 ## `celocli validatorgroup:show ARG1`
 
 Show information about an existing Validator Group

From 0251c92084e6f9da9701d7ca10d2da9c67ead46c Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Thu, 5 Dec 2024 18:38:55 +0100
Subject: [PATCH 4/9] CR fixes, ATTESTATION_SERVICE_URL backwards compatible
 support, more test coverage, changesets

---
 .changeset/afraid-wombats-agree.md            |  5 +++
 .changeset/curly-dolls-heal.md                |  5 +++
 .../validatorgroup/rpc-urls-l2.test.ts        | 36 +++++++++++-----
 .../src/commands/validatorgroup/rpc-urls.ts   | 42 +++++++++++++------
 packages/cli/src/utils/identity.ts            |  3 ++
 packages/sdk/metadata-claims/src/claim.ts     | 20 +++++++++
 .../sdk/metadata-claims/src/metadata.test.ts  | 17 +++++++-
 packages/sdk/metadata-claims/src/metadata.ts  |  3 ++
 packages/sdk/metadata-claims/src/types.ts     |  6 ++-
 9 files changed, 111 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/afraid-wombats-agree.md
 create mode 100644 .changeset/curly-dolls-heal.md

diff --git a/.changeset/afraid-wombats-agree.md b/.changeset/afraid-wombats-agree.md
new file mode 100644
index 000000000..853e4c2be
--- /dev/null
+++ b/.changeset/afraid-wombats-agree.md
@@ -0,0 +1,5 @@
+---
+'@celo/metadata-claims': patch
+---
+
+Backwards compatibility for existing ATTESTATIONS_SERVICE_URL claims
diff --git a/.changeset/curly-dolls-heal.md b/.changeset/curly-dolls-heal.md
new file mode 100644
index 000000000..13bf96135
--- /dev/null
+++ b/.changeset/curly-dolls-heal.md
@@ -0,0 +1,5 @@
+---
+'@celo/celocli': minor
+---
+
+Introduce `validatorgroup:rpc-urls` command to list community RPC nodes
diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts b/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
index 88f3fd27f..b810691c2 100644
--- a/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls-l2.test.ts
@@ -3,7 +3,7 @@ import { AccountsWrapper } from '@celo/contractkit/lib/wrappers/Accounts'
 import { testWithAnvilL2, withImpersonatedAccount } from '@celo/dev-utils/lib/anvil-test'
 import { ClaimTypes, IdentityMetadataWrapper } from '@celo/metadata-claims'
 import { ux } from '@oclif/core'
-import { setupGroupAndAffiliateValidator } from '../../test-utils/chain-setup'
+import { setupGroupAndAffiliateValidator, setupValidator } from '../../test-utils/chain-setup'
 import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
 import RpcUrls from './rpc-urls'
 
@@ -11,6 +11,10 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
   jest.spyOn(IdentityMetadataWrapper, 'fetchFromURL').mockImplementation(async (_, url) => {
     const validatorAddress = url.split('/').pop()
 
+    if (validatorAddress === VALIDATOR_WITH_FETCH_ERROR) {
+      throw new Error('Mock fetch error')
+    }
+
     return new IdentityMetadataWrapper({
       claims: [
         {
@@ -18,6 +22,11 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
           timestamp: Date.now(),
           rpcUrl: `https://example.com:8545/${validatorAddress}`,
         },
+        {
+          type: ClaimTypes.ATTESTATION_SERVICE_URL,
+          timestamp: Date.now(),
+          url: `https://attestations.example.com:8545/${validatorAddress}`,
+        },
       ],
     } as any) // that data is enough
   })
@@ -40,9 +49,11 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
     )
   }
 
+  // For that validator fetch() mock call will fail
+  const VALIDATOR_WITH_FETCH_ERROR = '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc'
   const EXISTING_VALIDATORS = [
     '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65',
-    '0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc',
+    VALIDATOR_WITH_FETCH_ERROR,
     '0x976EA74026E726554dB657fA54763abd0C3a0aa9',
   ]
 
@@ -50,14 +61,21 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
     const kit = newKitFromWeb3(web3)
     const accountsWrapper = await kit.contracts.getAccounts()
 
-    const [nonElectedGroupAddress, validatorAddress] = await web3.eth.getAccounts()
+    const [nonElectedGroupAddress, validatorAddress, nonAffilatedValidatorAddress] =
+      await web3.eth.getAccounts()
+
+    await setupValidator(kit, nonAffilatedValidatorAddress)
 
     await setupGroupAndAffiliateValidator(kit, nonElectedGroupAddress, validatorAddress)
     await accountsWrapper
       .setName('Test group')
       .sendAndWaitForReceipt({ from: nonElectedGroupAddress })
 
-    for (const validator of [...EXISTING_VALIDATORS, validatorAddress]) {
+    for (const validator of [
+      ...EXISTING_VALIDATORS,
+      validatorAddress,
+      nonAffilatedValidatorAddress,
+    ]) {
       await setMetadataUrlForValidator(accountsWrapper, validator)
     }
   })
@@ -77,10 +95,6 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
         ],
         [
           "cLabs,https://example.com:8545/0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65,0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
-      ",
-        ],
-        [
-          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
       ",
         ],
         [
@@ -94,7 +108,7 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
     ).toMatchInlineSnapshot(`[]`)
   })
 
-  it('shows all the RPC URLs', async () => {
+  it('shows all the RPC URLs (including non-affilated validator)', async () => {
     const logMock = jest.spyOn(console, 'log')
     const writeMock = jest.spyOn(ux.write, 'stdout')
 
@@ -112,11 +126,11 @@ testWithAnvilL2('validatorgroup:rpc-urls cmd', async (web3) => {
       ",
         ],
         [
-          "cLabs,https://example.com:8545/0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc,0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
       ",
         ],
         [
-          "cLabs,https://example.com:8545/0x976EA74026E726554dB657fA54763abd0C3a0aa9,0x976EA74026E726554dB657fA54763abd0C3a0aa9
+          ",https://example.com:8545/0xE36Ea790bc9d7AB70C55260C66D52b1eca985f84,0xE36Ea790bc9d7AB70C55260C66D52b1eca985f84
       ",
         ],
         [
diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
index c1958a885..6b2cc9fb3 100644
--- a/packages/cli/src/commands/validatorgroup/rpc-urls.ts
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
@@ -2,21 +2,23 @@ import { concurrentMap, StrongAddress } from '@celo/base'
 import { ClaimTypes, IdentityMetadataWrapper } from '@celo/metadata-claims'
 import { Flags, ux } from '@oclif/core'
 import { BaseCommand } from '../../base'
+import { ViewCommmandFlags } from '../../utils/flags'
 
 export default class RpcUrls extends BaseCommand {
   static description =
     'Displays a list of community RPC nodes for the currently elected validator groups'
 
   static aliases: string[] = [
-    'network:rpc-urls',
-    'validator:rpc-urls',
     'network:community-rpc-nodes',
+    'network:rpc-urls',
+    'node:list',
     'validator:community-rpc-nodes',
+    'validator:rpc-urls',
     'validatorgroup:community-rpc-nodes',
   ]
 
   static flags = {
-    ...BaseCommand.flags,
+    ...ViewCommmandFlags,
     ...(ux.table.flags() as object),
     all: Flags.boolean({
       description:
@@ -27,10 +29,11 @@ export default class RpcUrls extends BaseCommand {
   }
 
   async run() {
+    const CONCURRENCY_LEVEL = 5
+
     const res = await this.parse(RpcUrls)
     const kit = await this.getKit()
     const isL2 = await this.isCel2()
-    const epochManagerWrapper = await kit.contracts.getEpochManager()
     const validatorsWrapper = await kit.contracts.getValidators()
     const accountsWrapper = await kit.contracts.getAccounts()
 
@@ -42,6 +45,8 @@ export default class RpcUrls extends BaseCommand {
       )
     } else {
       if (isL2) {
+        const epochManagerWrapper = await kit.contracts.getEpochManager()
+
         validatorAddresses = (await epochManagerWrapper.getElectedAccounts()) as StrongAddress[]
       } else {
         validatorAddresses = (await validatorsWrapper.currentValidatorAccountsSet()).map(
@@ -50,35 +55,46 @@ export default class RpcUrls extends BaseCommand {
       }
     }
 
+    // Fetch the validator group address for each validator
     const validatorToGroup: { [key: StrongAddress]: string } = Object.fromEntries(
-      await concurrentMap(5, validatorAddresses, async (address) => {
-        return [address, await validatorsWrapper.getValidatorsGroup(address)]
+      await concurrentMap(CONCURRENCY_LEVEL, validatorAddresses, async (address) => {
+        return [address, (await validatorsWrapper.getValidator(address)).affiliation || '']
       })
     )
 
+    // Fetch the validator group name for each group
     const validatorGroupNames = Object.fromEntries(
-      await concurrentMap(5, [...new Set(Object.values(validatorToGroup))], async (address) => {
-        return [address, (await validatorsWrapper.getValidatorGroup(address)).name]
-      })
+      await concurrentMap(
+        CONCURRENCY_LEVEL,
+        [...new Set(Object.values(validatorToGroup))],
+        async (address) => {
+          return [address, await accountsWrapper.getName(address)]
+        }
+      )
     )
 
-    const metadataURLs = await concurrentMap(5, validatorAddresses, async (address) => {
+    // Fetch the RPC URL for each validator
+    const rpcUrls = await concurrentMap(CONCURRENCY_LEVEL, validatorAddresses, async (address) => {
       const metadataURL = await accountsWrapper.getMetadataURL(address)
 
       if (!metadataURL) {
         return undefined
       }
 
-      const metadata = await IdentityMetadataWrapper.fetchFromURL(accountsWrapper, metadataURL)
+      try {
+        const metadata = await IdentityMetadataWrapper.fetchFromURL(accountsWrapper, metadataURL)
 
-      return metadata.findClaim(ClaimTypes.RPC_URL)?.rpcUrl
+        return metadata.findClaim(ClaimTypes.RPC_URL)?.rpcUrl
+      } catch (_) {
+        return undefined
+      }
     })
 
     ux.table(
       validatorAddresses
         .map((address, idx) => ({
           validatorGroupName: validatorGroupNames[validatorToGroup[address]],
-          rpcUrl: metadataURLs[idx],
+          rpcUrl: rpcUrls[idx],
           validatorAddress: address,
         }))
         .filter((row) => row.rpcUrl),
diff --git a/packages/cli/src/utils/identity.ts b/packages/cli/src/utils/identity.ts
index 079f8943b..fd45ed694 100644
--- a/packages/cli/src/utils/identity.ts
+++ b/packages/cli/src/utils/identity.ts
@@ -150,6 +150,9 @@ export const displayMetadata = async (
       case ClaimTypes.STORAGE:
         extra = `URL: "${claim.address}"`
         break
+      case ClaimTypes.ATTESTATION_SERVICE_URL:
+        extra = `Attestation Service URL: ${claim.url}`
+        break
       default:
         extra = JSON.stringify(claim)
         break
diff --git a/packages/sdk/metadata-claims/src/claim.ts b/packages/sdk/metadata-claims/src/claim.ts
index 7950dc5c4..85313a582 100644
--- a/packages/sdk/metadata-claims/src/claim.ts
+++ b/packages/sdk/metadata-claims/src/claim.ts
@@ -1,3 +1,4 @@
+import { UrlType } from '@celo/utils/lib/io'
 import { hashMessage } from '@celo/utils/lib/signatureUtils'
 import * as t from 'io-ts'
 import { AccountClaim, AccountClaimType } from './account'
@@ -36,6 +37,15 @@ const StorageClaimType = t.type({
   filteredDataPaths: t.string,
 })
 
+/**
+ * @deprecated Not used anymore, here only for backwards compatibility with old metadata files
+ */
+const AttestationServiceUrlClaimType = t.type({
+  type: t.literal(ClaimTypes.ATTESTATION_SERVICE_URL),
+  timestamp: TimestampType,
+  url: UrlType,
+})
+
 export const ClaimType = t.union([
   AccountClaimType,
   DomainClaimType,
@@ -43,6 +53,7 @@ export const ClaimType = t.union([
   KeybaseClaimType,
   NameClaimType,
   StorageClaimType,
+  AttestationServiceUrlClaimType,
 ])
 
 export const SignedClaimType = t.type({
@@ -55,6 +66,12 @@ export type DomainClaim = t.TypeOf<typeof DomainClaimType>
 export type RpcUrlClaim = t.TypeOf<typeof RpcUrlClaimType>
 export type NameClaim = t.TypeOf<typeof NameClaimType>
 export type StorageClaim = t.TypeOf<typeof StorageClaimType>
+
+/**
+ * @deprecated Not used anymore, here only for backwards compatibility with old metadata files
+ */
+type AttestationServiceUrlClaim = t.TypeOf<typeof AttestationServiceUrlClaimType>
+
 export type Claim =
   | DomainClaim
   | RpcUrlClaim
@@ -62,9 +79,12 @@ export type Claim =
   | NameClaim
   | AccountClaim
   | StorageClaim
+  | AttestationServiceUrlClaim
 
 export type ClaimPayload<K extends ClaimTypes> = K extends typeof ClaimTypes.DOMAIN
   ? DomainClaim
+  : K extends typeof ClaimTypes.ATTESTATION_SERVICE_URL
+  ? AttestationServiceUrlClaim
   : K extends typeof ClaimTypes.RPC_URL
   ? RpcUrlClaim
   : K extends typeof ClaimTypes.NAME
diff --git a/packages/sdk/metadata-claims/src/metadata.test.ts b/packages/sdk/metadata-claims/src/metadata.test.ts
index 0e2c44d16..59c2bfa07 100644
--- a/packages/sdk/metadata-claims/src/metadata.test.ts
+++ b/packages/sdk/metadata-claims/src/metadata.test.ts
@@ -3,8 +3,9 @@ import { testWithAnvilL1 } from '@celo/dev-utils/lib/anvil-test'
 import { ACCOUNT_ADDRESSES } from '@celo/dev-utils/lib/ganache-setup'
 import { Address } from '@celo/utils/lib/address'
 import { NativeSigner } from '@celo/utils/lib/signatureUtils'
-import { createNameClaim } from './claim'
+import { Claim, createNameClaim } from './claim'
 import { ClaimTypes, IdentityMetadataWrapper } from './metadata'
+import { now } from './types'
 
 testWithAnvilL1('Metadata', (web3) => {
   const kit = newKitFromWeb3(web3)
@@ -89,4 +90,18 @@ testWithAnvilL1('Metadata', (web3) => {
       expect(e.toString()).toContain('Signature could not be validated')
     }
   })
+
+  it('throws an error while trying to add a ATTESTAION_SERVICE_URL claim ', async () => {
+    const metadata = IdentityMetadataWrapper.fromEmpty(address)
+
+    const claim = {
+      url: 'https://example.com/',
+      timestamp: now(),
+      type: ClaimTypes.ATTESTATION_SERVICE_URL,
+    }
+
+    await expect(
+      metadata.addClaim(claim as Claim, NativeSigner(kit.connection.sign, address))
+    ).rejects.toThrow('ATTESTATION_SERVICE_URL claims are not supported')
+  })
 })
diff --git a/packages/sdk/metadata-claims/src/metadata.ts b/packages/sdk/metadata-claims/src/metadata.ts
index 1d4b2bea3..df8ea94a2 100644
--- a/packages/sdk/metadata-claims/src/metadata.ts
+++ b/packages/sdk/metadata-claims/src/metadata.ts
@@ -200,6 +200,9 @@ export class IdentityMetadataWrapper {
           return existingClaims[0]
         }
       }
+      case ClaimTypes.ATTESTATION_SERVICE_URL: {
+        throw new Error('ATTESTATION_SERVICE_URL claims are not supported')
+      }
       default:
         break
     }
diff --git a/packages/sdk/metadata-claims/src/types.ts b/packages/sdk/metadata-claims/src/types.ts
index c26553cb3..48560d664 100644
--- a/packages/sdk/metadata-claims/src/types.ts
+++ b/packages/sdk/metadata-claims/src/types.ts
@@ -17,10 +17,14 @@ export enum ClaimTypes {
   PROFILE_PICTURE = 'PROFILE_PICTURE',
   STORAGE = 'STORAGE',
   TWITTER = 'TWITTER',
+  /**
+   * @deprecated Not used anymore, here only for backwards compatibility with old metadata files
+   */
+  ATTESTATION_SERVICE_URL = 'ATTESTATION_SERVICE_URL',
 }
 
 export const VERIFIABLE_CLAIM_TYPES = [ClaimTypes.KEYBASE, ClaimTypes.ACCOUNT, ClaimTypes.DOMAIN]
-export const SINGULAR_CLAIM_TYPES = [ClaimTypes.NAME]
+export const SINGULAR_CLAIM_TYPES = [ClaimTypes.NAME, ClaimTypes.ATTESTATION_SERVICE_URL]
 
 export type AccountSignerGetters = {
   isAccount: (address: Address) => Promise<boolean>

From a98d3e100c28d2739815824c6028f35ee70a080b Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Thu, 5 Dec 2024 18:43:22 +0100
Subject: [PATCH 5/9] more verbose UI

---
 packages/cli/src/commands/validatorgroup/rpc-urls.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
index 6b2cc9fb3..d064c5eb5 100644
--- a/packages/cli/src/commands/validatorgroup/rpc-urls.ts
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
@@ -55,6 +55,8 @@ export default class RpcUrls extends BaseCommand {
       }
     }
 
+    ux.action.start(`Fetching RPC URLs`)
+
     // Fetch the validator group address for each validator
     const validatorToGroup: { [key: StrongAddress]: string } = Object.fromEntries(
       await concurrentMap(CONCURRENCY_LEVEL, validatorAddresses, async (address) => {
@@ -90,6 +92,8 @@ export default class RpcUrls extends BaseCommand {
       }
     })
 
+    ux.action.stop()
+
     ux.table(
       validatorAddresses
         .map((address, idx) => ({

From c00e72a7854a48e2c062f9222399fb192e65af5a Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Thu, 5 Dec 2024 18:49:34 +0100
Subject: [PATCH 6/9] docs

---
 docs/command-line-interface/network.md        | 146 +++++-------------
 docs/command-line-interface/node.md           |  48 ++++++
 docs/command-line-interface/validator.md      | 146 +++++-------------
 docs/command-line-interface/validatorgroup.md | 146 +++++-------------
 .../metadata.IdentityMetadataWrapper.md       |  16 +-
 .../metadata-claims/enums/types.ClaimTypes.md |  15 ++
 docs/sdk/metadata-claims/modules/claim.md     |  46 +++---
 docs/sdk/metadata-claims/modules/metadata.md  |   2 +-
 docs/sdk/metadata-claims/modules/types.md     |   8 +-
 9 files changed, 213 insertions(+), 360 deletions(-)

diff --git a/docs/command-line-interface/network.md b/docs/command-line-interface/network.md
index 0b8beea28..8951bdd7b 100644
--- a/docs/command-line-interface/network.md
+++ b/docs/command-line-interface/network.md
@@ -16,69 +16,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli network:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli network:community-rpc-nodes [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
@@ -196,69 +161,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli network:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli network:rpc-urls [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
diff --git a/docs/command-line-interface/node.md b/docs/command-line-interface/node.md
index 8ba2c3032..7f68266b8 100644
--- a/docs/command-line-interface/node.md
+++ b/docs/command-line-interface/node.md
@@ -4,6 +4,7 @@
 Manage your Celo node
 
 * [`celocli node:accounts`](#celocli-nodeaccounts)
+* [`celocli node:list`](#celocli-nodelist)
 * [`celocli node:synced`](#celocli-nodesynced)
 
 ## `celocli node:accounts`
@@ -53,6 +54,53 @@ FLAG DESCRIPTIONS
 
 _See code: [src/commands/node/accounts.ts](https://github.com/celo-org/developer-tooling/tree/master/packages/cli/src/commands/node/accounts.ts)_
 
+## `celocli node:list`
+
+Displays a list of community RPC nodes for the currently elected validator groups
+
+```
+USAGE
+  $ celocli node:list [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
+
+FLAGS
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  Displays a list of community RPC nodes for the currently elected validator groups
+
+ALIASES
+  $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
+  $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
+  $ celocli validatorgroup:community-rpc-nodes
+
+FLAG DESCRIPTIONS
+  -n, --node=<value>  URL of the node to run commands against or an alias
+
+    Can be a full url like https://forno.celo.org or an alias. default:
+    http://localhost:8545
+    Alias options:
+    local, localhost => 'http://localhost:8545'
+    alfajores => Celo Alfajores Testnet,
+    mainnet, celo, forno => Celo Mainnet chain',
+```
+
 ## `celocli node:synced`
 
 Check if the node is synced
diff --git a/docs/command-line-interface/validator.md b/docs/command-line-interface/validator.md
index 370fec04a..1ec3bbfd0 100644
--- a/docs/command-line-interface/validator.md
+++ b/docs/command-line-interface/validator.md
@@ -87,69 +87,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli validator:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli validator:community-rpc-nodes [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
@@ -516,69 +481,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli validator:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli validator:rpc-urls [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
diff --git a/docs/command-line-interface/validatorgroup.md b/docs/command-line-interface/validatorgroup.md
index d59f19acb..d87789942 100644
--- a/docs/command-line-interface/validatorgroup.md
+++ b/docs/command-line-interface/validatorgroup.md
@@ -86,69 +86,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli validatorgroup:community-rpc-nodes [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli validatorgroup:community-rpc-nodes [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
@@ -454,69 +419,34 @@ Displays a list of community RPC nodes for the currently elected validator group
 
 ```
 USAGE
-  $ celocli validatorgroup:rpc-urls [-k <value> | --useLedger | ] [-n <value>] [--gasCurrency
-    0x1234567890123456789012345678901234567890] [--ledgerAddresses <value> ]
-    [--globalHelp] [--columns <value> | -x] [--filter <value>] [--no-header | [--csv |
-    --no-truncate]] [--output csv|json|yaml |  | ] [--sort <value>] [--all]
+  $ celocli validatorgroup:rpc-urls [-n <value>] [--globalHelp] [--columns <value> | -x]
+    [--filter <value>] [--no-header | [--csv | --no-truncate]] [--output csv|json|yaml |
+    | ] [--sort <value>] [--all]
 
 FLAGS
-  -k, --privateKey=<value>
-      Use a private key to sign local transactions with
-
-  -n, --node=<value>
-      URL of the node to run commands against or an alias
-
-  -x, --extended
-      show extra columns
-
-  --all
-      Display all community RPC nodes, not just the ones from currently elected validator
-      groups
-
-  --columns=<value>
-      only show provided columns (comma-separated)
-
-  --csv
-      output is csv format [alias: --output=csv]
-
-  --filter=<value>
-      filter property by partial string matching, ex: name=foo
-
-  --gasCurrency=0x1234567890123456789012345678901234567890
-      Use a specific gas currency for transaction fees (defaults to CELO if no gas
-      currency is supplied). It must be a whitelisted token.
-
-  --globalHelp
-      View all available global flags
-
-  --ledgerAddresses=<value>
-      [default: 1] If --useLedger is set, this will get the first N addresses for local
-      signing
-
-  --no-header
-      hide table header from output
-
-  --no-truncate
-      do not truncate output to fit screen
-
-  --output=<option>
-      output in a more machine friendly format
-      <options: csv|json|yaml>
-
-  --sort=<value>
-      property to sort by (prepend '-' for descending)
-
-  --useLedger
-      Set it to use a ledger wallet
+  -n, --node=<value>     URL of the node to run commands against or an alias
+  -x, --extended         show extra columns
+      --all              Display all community RPC nodes, not just the ones from
+                         currently elected validator groups
+      --columns=<value>  only show provided columns (comma-separated)
+      --csv              output is csv format [alias: --output=csv]
+      --filter=<value>   filter property by partial string matching, ex: name=foo
+      --globalHelp       View all available global flags
+      --no-header        hide table header from output
+      --no-truncate      do not truncate output to fit screen
+      --output=<option>  output in a more machine friendly format
+                         <options: csv|json|yaml>
+      --sort=<value>     property to sort by (prepend '-' for descending)
 
 DESCRIPTION
   Displays a list of community RPC nodes for the currently elected validator groups
 
 ALIASES
-  $ celocli network:rpc-urls
-  $ celocli validator:rpc-urls
   $ celocli network:community-rpc-nodes
+  $ celocli network:rpc-urls
+  $ celocli node:list
   $ celocli validator:community-rpc-nodes
+  $ celocli validator:rpc-urls
   $ celocli validatorgroup:community-rpc-nodes
 
 FLAG DESCRIPTIONS
diff --git a/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md b/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
index 5538f07b7..f8e934499 100644
--- a/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
+++ b/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
@@ -43,7 +43,7 @@
 | Name | Type | Default value |
 | :------ | :------ | :------ |
 | `data` | `Object` | `undefined` |
-| `data.claims` | (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  })[] | `undefined` |
+| `data.claims` | (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType })[] | `undefined` |
 | `data.meta` | `Object` | `MetaType` |
 | `data.meta.address` | `string` | `AddressType` |
 | `data.meta.signature` | `string` | `SignatureType` |
@@ -66,7 +66,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `claims` | (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  })[] |
+| `claims` | (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType })[] |
 | `meta` | \{ `address`: `string` = AddressType; `signature`: `string` = SignatureType } |
 | `meta.address` | `string` |
 | `meta.signature` | `string` |
@@ -79,11 +79,11 @@
 
 ### claims
 
-• `get` **claims**(): (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  })[]
+• `get` **claims**(): (\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType })[]
 
 #### Returns
 
-(\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  })[]
+(\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType })[]
 
 #### Defined in
 
@@ -93,7 +93,7 @@
 
 ### addClaim
 
-▸ **addClaim**(`claim`, `signer`): `Promise`\<[`Claim`](../modules/claim.md#claim)\>
+▸ **addClaim**(`claim`, `signer`): `Promise`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType }\>
 
 #### Parameters
 
@@ -104,7 +104,7 @@
 
 #### Returns
 
-`Promise`\<[`Claim`](../modules/claim.md#claim)\>
+`Promise`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ; `username`: `string` = t.string } \| \{ `domain`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`DOMAIN`](../enums/types.ClaimTypes.md#domain)  } \| \{ `rpcUrl`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)  } \| \{ `name`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`NAME`](../enums/types.ClaimTypes.md#name)  } \| \{ `address`: `string` = t.string; `filteredDataPaths`: `string` = t.string; `timestamp`: `number` = TimestampType; `type`: [`STORAGE`](../enums/types.ClaimTypes.md#storage)  } \| \{ `timestamp`: `number` = TimestampType; `type`: [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ; `url`: `string` = UrlType }\>
 
 #### Defined in
 
@@ -134,7 +134,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/metadata.ts:223](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L223)
+[packages/sdk/metadata-claims/src/metadata.ts:226](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L226)
 
 ___
 
@@ -160,7 +160,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/metadata.ts:219](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L219)
+[packages/sdk/metadata-claims/src/metadata.ts:222](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L222)
 
 ___
 
diff --git a/docs/sdk/metadata-claims/enums/types.ClaimTypes.md b/docs/sdk/metadata-claims/enums/types.ClaimTypes.md
index 9d061e8fa..8bdde1766 100644
--- a/docs/sdk/metadata-claims/enums/types.ClaimTypes.md
+++ b/docs/sdk/metadata-claims/enums/types.ClaimTypes.md
@@ -9,6 +9,7 @@
 ### Enumeration Members
 
 - [ACCOUNT](types.ClaimTypes.md#account)
+- [ATTESTATION\_SERVICE\_URL](types.ClaimTypes.md#attestation_service_url)
 - [DOMAIN](types.ClaimTypes.md#domain)
 - [KEYBASE](types.ClaimTypes.md#keybase)
 - [NAME](types.ClaimTypes.md#name)
@@ -29,6 +30,20 @@
 
 ___
 
+### ATTESTATION\_SERVICE\_URL
+
+• **ATTESTATION\_SERVICE\_URL** = ``"ATTESTATION_SERVICE_URL"``
+
+**`Deprecated`**
+
+Not used anymore, here only for backwards compatibility with old metadata files
+
+#### Defined in
+
+[packages/sdk/metadata-claims/src/types.ts:23](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L23)
+
+___
+
 ### DOMAIN
 
 • **DOMAIN** = ``"DOMAIN"``
diff --git a/docs/sdk/metadata-claims/modules/claim.md b/docs/sdk/metadata-claims/modules/claim.md
index 74a505ca7..a26df16c4 100644
--- a/docs/sdk/metadata-claims/modules/claim.md
+++ b/docs/sdk/metadata-claims/modules/claim.md
@@ -36,17 +36,17 @@
 
 ### Claim
 
-Ƭ **Claim**: [`DomainClaim`](claim.md#domainclaim) \| [`RpcUrlClaim`](claim.md#rpcurlclaim) \| [`KeybaseClaim`](claim.md#keybaseclaim) \| [`NameClaim`](claim.md#nameclaim) \| [`AccountClaim`](account.md#accountclaim) \| [`StorageClaim`](claim.md#storageclaim)
+Ƭ **Claim**: [`DomainClaim`](claim.md#domainclaim) \| [`RpcUrlClaim`](claim.md#rpcurlclaim) \| [`KeybaseClaim`](claim.md#keybaseclaim) \| [`NameClaim`](claim.md#nameclaim) \| [`AccountClaim`](account.md#accountclaim) \| [`StorageClaim`](claim.md#storageclaim) \| `AttestationServiceUrlClaim`
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:58](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L58)
+[packages/sdk/metadata-claims/src/claim.ts:75](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L75)
 
 ___
 
 ### ClaimPayload
 
-Ƭ **ClaimPayload**\<`K`\>: `K` extends typeof [`DOMAIN`](../enums/types.ClaimTypes.md#domain) ? [`DomainClaim`](claim.md#domainclaim) : `K` extends typeof [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url) ? [`RpcUrlClaim`](claim.md#rpcurlclaim) : `K` extends typeof [`NAME`](../enums/types.ClaimTypes.md#name) ? [`NameClaim`](claim.md#nameclaim) : `K` extends typeof [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ? [`KeybaseClaim`](claim.md#keybaseclaim) : `K` extends typeof [`ACCOUNT`](../enums/types.ClaimTypes.md#account) ? [`AccountClaim`](account.md#accountclaim) : [`StorageClaim`](claim.md#storageclaim)
+Ƭ **ClaimPayload**\<`K`\>: `K` extends typeof [`DOMAIN`](../enums/types.ClaimTypes.md#domain) ? [`DomainClaim`](claim.md#domainclaim) : `K` extends typeof [`ATTESTATION_SERVICE_URL`](../enums/types.ClaimTypes.md#attestation_service_url) ? `AttestationServiceUrlClaim` : `K` extends typeof [`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url) ? [`RpcUrlClaim`](claim.md#rpcurlclaim) : `K` extends typeof [`NAME`](../enums/types.ClaimTypes.md#name) ? [`NameClaim`](claim.md#nameclaim) : `K` extends typeof [`KEYBASE`](../enums/types.ClaimTypes.md#keybase) ? [`KeybaseClaim`](claim.md#keybaseclaim) : `K` extends typeof [`ACCOUNT`](../enums/types.ClaimTypes.md#account) ? [`AccountClaim`](account.md#accountclaim) : [`StorageClaim`](claim.md#storageclaim)
 
 #### Type parameters
 
@@ -56,7 +56,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:66](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L66)
+[packages/sdk/metadata-claims/src/claim.ts:84](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L84)
 
 ___
 
@@ -66,7 +66,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:54](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L54)
+[packages/sdk/metadata-claims/src/claim.ts:65](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L65)
 
 ___
 
@@ -76,7 +76,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:12](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L12)
+[packages/sdk/metadata-claims/src/claim.ts:13](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L13)
 
 ___
 
@@ -86,7 +86,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:56](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L56)
+[packages/sdk/metadata-claims/src/claim.ts:67](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L67)
 
 ___
 
@@ -96,7 +96,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:55](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L55)
+[packages/sdk/metadata-claims/src/claim.ts:66](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L66)
 
 ___
 
@@ -106,17 +106,17 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:57](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L57)
+[packages/sdk/metadata-claims/src/claim.ts:68](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L68)
 
 ## Variables
 
 ### ClaimType
 
-• `Const` **ClaimType**: `UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>, `TypeC`\<\{ `name`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`NAME`](../enums/types.ClaimTypes.md#name)\>  }\>, `TypeC`\<\{ `address`: `StringC` = t.string; `filteredDataPaths`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`STORAGE`](../enums/types.ClaimTypes.md#storage)\>  }\>]\>
+• `Const` **ClaimType**: `UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>]\>
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:39](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L39)
+[packages/sdk/metadata-claims/src/claim.ts:49](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L49)
 
 ___
 
@@ -126,7 +126,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:53](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L53)
+[packages/sdk/metadata-claims/src/claim.ts:64](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L64)
 
 ___
 
@@ -136,17 +136,17 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:6](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L6)
+[packages/sdk/metadata-claims/src/claim.ts:7](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L7)
 
 ___
 
 ### SignedClaimType
 
-• `Const` **SignedClaimType**: `TypeC`\<\{ `claim`: `UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>, `TypeC`\<\{ `name`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`NAME`](../enums/types.ClaimTypes.md#name)\>  }\>, `TypeC`\<\{ `address`: `StringC` = t.string; `filteredDataPaths`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`STORAGE`](../enums/types.ClaimTypes.md#storage)\>  }\>]\> = ClaimType; `signature`: `StringC` = SignatureType }\>
+• `Const` **SignedClaimType**: `TypeC`\<\{ `claim`: `UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>]\> = ClaimType; `signature`: `StringC` = SignatureType }\>
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:48](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L48)
+[packages/sdk/metadata-claims/src/claim.ts:59](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L59)
 
 ## Functions
 
@@ -172,7 +172,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:103](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L103)
+[packages/sdk/metadata-claims/src/claim.ts:123](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L123)
 
 ___
 
@@ -198,7 +198,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:97](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L97)
+[packages/sdk/metadata-claims/src/claim.ts:117](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L117)
 
 ___
 
@@ -224,7 +224,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:109](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L109)
+[packages/sdk/metadata-claims/src/claim.ts:129](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L129)
 
 ___
 
@@ -251,7 +251,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:115](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L115)
+[packages/sdk/metadata-claims/src/claim.ts:135](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L135)
 
 ___
 
@@ -271,7 +271,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:84](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L84)
+[packages/sdk/metadata-claims/src/claim.ts:104](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L104)
 
 ___
 
@@ -291,7 +291,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:88](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L88)
+[packages/sdk/metadata-claims/src/claim.ts:108](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L108)
 
 ___
 
@@ -329,7 +329,7 @@ data is ClaimPayload\<K\>
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:80](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L80)
+[packages/sdk/metadata-claims/src/claim.ts:100](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L100)
 
 ___
 
@@ -349,4 +349,4 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/claim.ts:93](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L93)
+[packages/sdk/metadata-claims/src/claim.ts:113](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/claim.ts#L113)
diff --git a/docs/sdk/metadata-claims/modules/metadata.md b/docs/sdk/metadata-claims/modules/metadata.md
index dec2d5ea4..be386f937 100644
--- a/docs/sdk/metadata-claims/modules/metadata.md
+++ b/docs/sdk/metadata-claims/modules/metadata.md
@@ -40,7 +40,7 @@ Re-exports [ClaimTypes](../enums/types.ClaimTypes.md)
 
 ### IdentityMetadataType
 
-• `Const` **IdentityMetadataType**: `TypeC`\<\{ `claims`: `ArrayC`\<`UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>, `TypeC`\<\{ `name`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`NAME`](../enums/types.ClaimTypes.md#name)\>  }\>, `TypeC`\<\{ `address`: `StringC` = t.string; `filteredDataPaths`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`STORAGE`](../enums/types.ClaimTypes.md#storage)\>  }\>]\>\> ; `meta`: `TypeC`\<\{ `address`: `Type`\<`string`, `string`, `unknown`\> = AddressType; `signature`: `StringC` = SignatureType }\> = MetaType }\>
+• `Const` **IdentityMetadataType**: `TypeC`\<\{ `claims`: `ArrayC`\<`UnionC`\<[`Type`\<\{ `address`: `string` = AddressType; `publicKey`: `undefined` \| `string` ; `timestamp`: `number` = TimestampType; `type`: [`ACCOUNT`](../enums/types.ClaimTypes.md#account)  }, `any`, `unknown`\>, `TypeC`\<\{ `domain`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`DOMAIN`](../enums/types.ClaimTypes.md#domain)\>  }\>, `TypeC`\<\{ `rpcUrl`: `StringC` = t.string; `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`RPC_URL`](../enums/types.ClaimTypes.md#rpc_url)\>  }\>, `TypeC`\<\{ `timestamp`: `NumberC` = TimestampType; `type`: `LiteralC`\<[`KEYBASE`](../enums/types.ClaimTypes.md#keybase)\> ; `username`: `StringC` = t.string }\>]\>\> ; `meta`: `TypeC`\<\{ `address`: `Type`\<`string`, `string`, `unknown`\> = AddressType; `signature`: `StringC` = SignatureType }\> = MetaType }\>
 
 #### Defined in
 
diff --git a/docs/sdk/metadata-claims/modules/types.md b/docs/sdk/metadata-claims/modules/types.md
index 3252ded5b..936d520bc 100644
--- a/docs/sdk/metadata-claims/modules/types.md
+++ b/docs/sdk/metadata-claims/modules/types.md
@@ -32,7 +32,7 @@
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/types.ts:32](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L32)
+[packages/sdk/metadata-claims/src/types.ts:36](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L36)
 
 ___
 
@@ -51,7 +51,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/types.ts:25](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L25)
+[packages/sdk/metadata-claims/src/types.ts:29](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L29)
 
 ## Variables
 
@@ -61,7 +61,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/types.ts:23](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L23)
+[packages/sdk/metadata-claims/src/types.ts:27](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L27)
 
 ___
 
@@ -91,7 +91,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/types.ts:22](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L22)
+[packages/sdk/metadata-claims/src/types.ts:26](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/types.ts#L26)
 
 ## Functions
 

From f9b142278e8418d70f85d317bb7cd0c16be0f5bf Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Fri, 6 Dec 2024 10:27:39 +0100
Subject: [PATCH 7/9] even more verbose output

---
 packages/cli/src/commands/validatorgroup/rpc-urls.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/validatorgroup/rpc-urls.ts b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
index d064c5eb5..8836425e1 100644
--- a/packages/cli/src/commands/validatorgroup/rpc-urls.ts
+++ b/packages/cli/src/commands/validatorgroup/rpc-urls.ts
@@ -55,7 +55,7 @@ export default class RpcUrls extends BaseCommand {
       }
     }
 
-    ux.action.start(`Fetching RPC URLs`)
+    ux.action.start(`Fetching validator groups`)
 
     // Fetch the validator group address for each validator
     const validatorToGroup: { [key: StrongAddress]: string } = Object.fromEntries(
@@ -75,6 +75,9 @@ export default class RpcUrls extends BaseCommand {
       )
     )
 
+    ux.action.stop()
+    ux.action.start(`Fetching validators RPC URLs`)
+
     // Fetch the RPC URL for each validator
     const rpcUrls = await concurrentMap(CONCURRENCY_LEVEL, validatorAddresses, async (address) => {
       const metadataURL = await accountsWrapper.getMetadataURL(address)

From 076c2802559d5d50160615a3e3725c9413d8e92b Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Fri, 6 Dec 2024 13:54:35 +0100
Subject: [PATCH 8/9] one more test case

---
 .../sdk/metadata-claims/src/metadata.test.ts  | 29 ++++++++++++++++++-
 packages/sdk/metadata-claims/src/metadata.ts  |  1 +
 packages/sdk/metadata-claims/src/types.ts     |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/sdk/metadata-claims/src/metadata.test.ts b/packages/sdk/metadata-claims/src/metadata.test.ts
index 59c2bfa07..2269ba4c1 100644
--- a/packages/sdk/metadata-claims/src/metadata.test.ts
+++ b/packages/sdk/metadata-claims/src/metadata.test.ts
@@ -91,7 +91,7 @@ testWithAnvilL1('Metadata', (web3) => {
     }
   })
 
-  it('throws an error while trying to add a ATTESTAION_SERVICE_URL claim ', async () => {
+  it('throws an error while trying to add a ATTESTATION_SERVICE_URL claim ', async () => {
     const metadata = IdentityMetadataWrapper.fromEmpty(address)
 
     const claim = {
@@ -104,4 +104,31 @@ testWithAnvilL1('Metadata', (web3) => {
       metadata.addClaim(claim as Claim, NativeSigner(kit.connection.sign, address))
     ).rejects.toThrow('ATTESTATION_SERVICE_URL claims are not supported')
   })
+
+  it('allows to add a new valid claim and hashes it even if the existing claims contains deprecated ATTESTATION_SERVICE_URL', async () => {
+    const metadata = await IdentityMetadataWrapper.fromRawString(
+      await kit.contracts.getAccounts(),
+      `{
+        "claims": [
+          {
+            "url": "https://example.com/attestations",
+            "timestamp": 1733488714,
+            "type": "ATTESTATION_SERVICE_URL"
+          }
+        ],
+        "meta": {
+          "address": "0x5409ED021D9299bf6814279A6A1411A7e866A631",
+          "signature": "0x48b156db90446fcc0587575ad4913c40184cae119ef40e17652c66641f6fef4611d4be7b7940d36b46ac8803ba26ea608e6009c12bf9361e2e149fee33ecbbf11c"
+        }
+      }`
+    )
+
+    await expect(
+      metadata.addClaim(createNameClaim('Test name'), NativeSigner(kit.connection.sign, address))
+    ).resolves.toMatchObject({
+      // Not checking timestamp here on purpose
+      name: 'Test name',
+      type: 'NAME',
+    })
+  })
 })
diff --git a/packages/sdk/metadata-claims/src/metadata.ts b/packages/sdk/metadata-claims/src/metadata.ts
index df8ea94a2..0ba412cea 100644
--- a/packages/sdk/metadata-claims/src/metadata.ts
+++ b/packages/sdk/metadata-claims/src/metadata.ts
@@ -199,6 +199,7 @@ export class IdentityMetadataWrapper {
         if (existingClaims.length > 0) {
           return existingClaims[0]
         }
+        break
       }
       case ClaimTypes.ATTESTATION_SERVICE_URL: {
         throw new Error('ATTESTATION_SERVICE_URL claims are not supported')
diff --git a/packages/sdk/metadata-claims/src/types.ts b/packages/sdk/metadata-claims/src/types.ts
index 48560d664..1bb2d6da7 100644
--- a/packages/sdk/metadata-claims/src/types.ts
+++ b/packages/sdk/metadata-claims/src/types.ts
@@ -24,7 +24,7 @@ export enum ClaimTypes {
 }
 
 export const VERIFIABLE_CLAIM_TYPES = [ClaimTypes.KEYBASE, ClaimTypes.ACCOUNT, ClaimTypes.DOMAIN]
-export const SINGULAR_CLAIM_TYPES = [ClaimTypes.NAME, ClaimTypes.ATTESTATION_SERVICE_URL]
+export const SINGULAR_CLAIM_TYPES = [ClaimTypes.NAME]
 
 export type AccountSignerGetters = {
   isAccount: (address: Address) => Promise<boolean>

From c3712915f85c27d5370d282b781679f8fbaaa150 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Mon, 9 Dec 2024 13:43:26 +0100
Subject: [PATCH 9/9] docs

---
 .../classes/metadata.IdentityMetadataWrapper.md               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md b/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
index f8e934499..1b5b24252 100644
--- a/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
+++ b/docs/sdk/metadata-claims/classes/metadata.IdentityMetadataWrapper.md
@@ -134,7 +134,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/metadata.ts:226](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L226)
+[packages/sdk/metadata-claims/src/metadata.ts:227](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L227)
 
 ___
 
@@ -160,7 +160,7 @@ ___
 
 #### Defined in
 
-[packages/sdk/metadata-claims/src/metadata.ts:222](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L222)
+[packages/sdk/metadata-claims/src/metadata.ts:223](https://github.com/celo-org/developer-tooling/blob/master/packages/sdk/metadata-claims/src/metadata.ts#L223)
 
 ___