evm: splits up governance into subcategories at the root level

evm/src/assets/TbrDispatcher.sol

@@ -52,7 +52,7 @@ abstract contract TbrDispatcher is RawDispatcher, TbrGovernance, TbrUser {
         senderRefund -= gasDropoffSpent;
       }
       else if (command == GOVERNANCE_ID)
-        offset = _batchGovernanceCommands(data, offset);
+        offset = _batchConfigCommands(data, offset);
       else if (command == ACQUIRE_OWNERSHIP_ID)
         _acquireOwnership();
       else

evm/src/assets/TbrGovernance.sol

@@ -69,7 +69,7 @@ abstract contract TbrGovernance is TbrBase, ProxyBase {
 
   // ---- externals ----
 
-  function _batchGovernanceCommands(bytes calldata commands, uint offset) internal returns (uint) {
+  function _batchConfigCommands(bytes calldata commands, uint offset) internal returns (uint) {
     GovernanceState storage state = governanceState();
     bool isOwner;
     if (msg.sender == state.owner) //check highest privilege level first

sdk/evm/tbrv3/contract.ts

@@ -264,7 +264,7 @@ export class Tbrv3 {
     const methods = layout.serializeLayout(execParamsLayout, {
       version: 0,
       commandCategories: commands.map(arg => ({
-        commandCategory: 'GovernanceCommands',
+        commandCategory: 'ConfigCommands',
         commands
       }) satisfies LayoutToType<typeof commandCategoryLayout>),
     })

sdk/evm/tbrv3/layouts.ts

@@ -268,7 +268,10 @@ export const commandCategoryLayout = {
     [[0, "TransferTokenWithRelay"], transferTokenWithRelayLayout],
     [[1, "TransferGasTokenWithRelay" ], transferGasTokenWithRelayLayout],
     [[2, "CompleteTransfer"], [{ name: "vaa", binary: "bytes", lengthSize: 2 }]],
-    [[3, "GovernanceCommands"], subArrayLayout("commands", governanceCommandLayout)],
+    [[3, "ConfigCommands"], subArrayLayout("commands", governanceCommandLayout)],
+    [[0x60, "RoleCommands"], [] /*subArrayLayout("commands", roleCommandLayout)*/],
+    [[0x61, "UpgradeCommands"], [] /*subArrayLayout("commands", upgradeCommandLayout)*/],
+    [[0x62, "SweepTokens"], [] /*sweepTokensLayout*/],
   ],
 } as const;
 export type CommandCategory = LayoutToType<typeof commandCategoryLayout>;
@@ -281,6 +284,8 @@ export const queryCategoryLayout = {
     [[0x80, "RelayFee"], relayingFeesInputLayout],
     [[0x81, "BaseRelayingConfig"], baseRelayingConfigInputLayout],
     [[0x82, "GovernanceQueries"], subArrayLayout("queries", governanceQueryLayout)],
+    [[0xe0, "RoleQueries"], [] /*subArrayLayout("queries", roleQueryLayout)*/],
+    [[0xe1, "UpgradeQueries"], [] /*subArrayLayout("queries", upgradeQueryLayout)*/],
   ],
 } as const;
 export type QueryCategory = LayoutToType<typeof queryCategoryLayout>;