@rootzero/contracts 1.3.0 → 1.5.0

package/blocks/Schema.sol

@@ -59,15 +59,15 @@ library Schemas {
     string constant Unit = "#unit";
     string constant Node = "#node { uint id }";
     string constant Account = "#account { bytes32 account }";
-    string constant Asset = "#asset { bytes32 asset, bytes32 meta }";
-    string constant Amount = "#amount { bytes32 asset, bytes32 meta, uint amount }";
-    string constant Balance = "#balance { bytes32 asset, bytes32 meta, uint amount }";
-    string constant BalanceLimit = "#balanceLimit { bytes32 asset, bytes32 meta, uint min, uint max }";
-    string constant Custody = "#custody { uint host, bytes32 asset, bytes32 meta, uint amount }";
-    string constant CustodyLimit = "#custodyLimit { uint host, bytes32 asset, bytes32 meta, uint min, uint max }";
-    string constant Allocation = "#allocation { uint host, bytes32 asset, bytes32 meta, uint amount }";
-    string constant Allowance = "#allowance { uint host, bytes32 asset, bytes32 meta, uint amount }";
-    string constant Transaction = "#transaction { bytes32 from, bytes32 to, bytes32 asset, bytes32 meta, uint amount }";
+    string constant Asset = "#asset { bytes32 asset }";
+    string constant Amount = "#amount { bytes32 asset, uint amount }";
+    string constant Balance = "#balance { bytes32 asset, uint amount }";
+    string constant BalanceLimit = "#balanceLimit { bytes32 asset, uint min, uint max }";
+    string constant Custody = "#custody { uint host, bytes32 asset, uint amount }";
+    string constant CustodyLimit = "#custodyLimit { uint host, bytes32 asset, uint min, uint max }";
+    string constant Allocation = "#allocation { uint host, bytes32 asset, uint amount }";
+    string constant Allowance = "#allowance { uint host, bytes32 asset, uint amount }";
+    string constant Transaction = "#transaction { bytes32 from, bytes32 to, bytes32 asset, uint amount }";
     string constant Context = "#context { bytes32 account, #bytes as state, #bytes as request }";
     string constant Pipe = "#pipe { uint resources, #context { bytes32 account, #bytes as state, #bytes as steps } }";
     string constant Call = "#call { uint target, uint resources, #bytes as payload }";
@@ -90,13 +90,12 @@ library Schemas {
 /// These describe payload form without assigning command or query semantics.
 library Forms {
     string constant Status = "#status { uint code }";
-    string constant AssetAmount = "#assetAmount { bytes32 asset, bytes32 meta, uint amount }";
-    string constant AccountAsset = "#accountAsset { bytes32 account, bytes32 asset, bytes32 meta }";
-    string constant AccountAmount = "#accountAmount { bytes32 account, bytes32 asset, bytes32 meta, uint amount }";
-    string constant HostAmount = "#hostAmount { uint host, bytes32 asset, bytes32 meta, uint amount }";
-    string constant HostAccountAsset = "#hostAccountAsset { uint host, bytes32 account, bytes32 asset, bytes32 meta }";
-    string constant HostAccountAmount =
-        "#hostAccountAmount { uint host, bytes32 account, bytes32 asset, bytes32 meta, uint amount }";
+    string constant AssetAmount = "#assetAmount { bytes32 asset, uint amount }";
+    string constant AccountAsset = "#accountAsset { bytes32 account, bytes32 asset }";
+    string constant AccountAmount = "#accountAmount { bytes32 account, bytes32 asset, uint amount }";
+    string constant HostAmount = "#hostAmount { uint host, bytes32 asset, uint amount }";
+    string constant HostAccountAsset = "#hostAccountAsset { uint host, bytes32 account, bytes32 asset }";
+    string constant HostAccountAmount = "#hostAccountAmount { uint host, bytes32 account, bytes32 asset, uint amount }";
 }
 
 /// @title Sizes
@@ -122,20 +121,20 @@ library Sizes {
     uint constant Auth = B64 + Header + Proof;
     /// @dev STATUS block: 8 header + 32 status code = 40 bytes
     uint constant Status = B32;
-    /// @dev AMOUNT block: 8 header + 32 asset + 32 meta + 32 amount = 104 bytes
-    uint constant Amount = B96;
-    /// @dev BALANCE block: 8 header + 32 asset + 32 meta + 32 amount = 104 bytes
-    uint constant Balance = B96;
-    /// @dev BALANCE_LIMIT block: 8 header + 32 asset + 32 meta + 32 min + 32 max = 136 bytes
-    uint constant BalanceLimit = B128;
+    /// @dev AMOUNT block: 8 header + 32 asset + 32 amount = 72 bytes
+    uint constant Amount = B64;
+    /// @dev BALANCE block: 8 header + 32 asset + 32 amount = 72 bytes
+    uint constant Balance = B64;
+    /// @dev BALANCE_LIMIT block: 8 header + 32 asset + 32 min + 32 max = 104 bytes
+    uint constant BalanceLimit = B96;
     /// @dev FEE block: 8 header + 32 amount = 40 bytes
     uint constant Fee = B32;
     /// @dev BOUNTY block: 8 header + 32 amount + 32 relayer = 72 bytes
     uint constant Bounty = B64;
-    /// @dev ALLOCATION/CUSTODY block: 8 header + 32 host + 32 asset + 32 meta + 32 amount = 136 bytes
-    uint constant HostAmount = B128;
-    /// @dev CUSTODY_LIMIT block: 8 header + 32 host + 32 asset + 32 meta + 32 min + 32 max = 168 bytes
-    uint constant CustodyLimit = B160;
-    /// @dev TRANSACTION block: 8 header + 32 from + 32 to + 32 asset + 32 meta + 32 amount = 168 bytes
-    uint constant Transaction = B160;
+    /// @dev ALLOCATION/CUSTODY block: 8 header + 32 host + 32 asset + 32 amount = 104 bytes
+    uint constant HostAmount = B96;
+    /// @dev CUSTODY_LIMIT block: 8 header + 32 host + 32 asset + 32 min + 32 max = 136 bytes
+    uint constant CustodyLimit = B128;
+    /// @dev TRANSACTION block: 8 header + 32 from + 32 to + 32 asset + 32 amount = 136 bytes
+    uint constant Transaction = B128;
 }

package/blocks/Writers.sol

@@ -171,42 +171,42 @@ library Writers {
     /// @param count Number of asset blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocAssets(uint count) internal pure returns (Writer memory writer) {
-        return alloc64s(count);
+        return alloc32s(count);
     }
 
     /// @notice Allocate a writer sized for exactly `count` AMOUNT blocks.
     /// @param count Number of amount blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocAmounts(uint count) internal pure returns (Writer memory writer) {
-        return alloc96s(count);
+        return alloc64s(count);
     }
 
     /// @notice Allocate a writer sized for exactly `count` BALANCE blocks.
     /// @param count Number of balance blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocBalances(uint count) internal pure returns (Writer memory writer) {
-        return alloc96s(count);
+        return alloc64s(count);
     }
 
     /// @notice Allocate a writer sized for exactly `count` ACCOUNT_AMOUNT form blocks.
     /// @param count Number of account amount blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocAccountAmounts(uint count) internal pure returns (Writer memory writer) {
-        return alloc128s(count);
+        return alloc96s(count);
     }
 
     /// @notice Allocate a writer sized for exactly `count` CUSTODY blocks.
     /// @param count Number of custody blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocCustodies(uint count) internal pure returns (Writer memory writer) {
-        return alloc128s(count);
+        return alloc96s(count);
     }
 
     /// @notice Allocate a writer sized for exactly `count` TRANSACTION blocks.
     /// @param count Number of transaction blocks to allocate space for.
     /// @return writer Allocated writer.
     function allocTransactions(uint count) internal pure returns (Writer memory writer) {
-        return alloc160s(count);
+        return alloc128s(count);
     }
 
     /// @notice Allocate a writer for `count` STEP blocks using a per-block capacity hint.
@@ -939,66 +939,61 @@ library Writers {
     }
 
     /// @notice Append a BALANCE block using separate field values.
-    /// @param writer Destination writer; `i` is advanced by `Sizes.Amount`.
+    /// @param writer Destination writer; `i` is advanced by `Sizes.Balance`.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Token amount.
-    function appendBalance(Writer memory writer, bytes32 asset, bytes32 meta, uint amount) internal pure {
-        appendBlock96(writer, Keys.Balance, asset, meta, bytes32(amount), 32);
+    function appendBalance(Writer memory writer, bytes32 asset, uint amount) internal pure {
+        appendBlock64(writer, Keys.Balance, asset, bytes32(amount), 32);
     }
 
     /// @notice Append a BALANCE block from a struct.
     /// @param writer Destination writer; `i` is advanced by `Sizes.Balance`.
     /// @param value Balance fields to encode.
     function appendBalance(Writer memory writer, AssetAmount memory value) internal pure {
-        appendBalance(writer, value.asset, value.meta, value.amount);
+        appendBalance(writer, value.asset, value.amount);
     }
 
     /// @notice Append an AMOUNT block using separate field values.
     /// @param writer Destination writer; `i` is advanced by `Sizes.Amount`.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Token amount.
-    function appendAmount(Writer memory writer, bytes32 asset, bytes32 meta, uint amount) internal pure {
-        appendBlock96(writer, Keys.Amount, asset, meta, bytes32(amount), 32);
+    function appendAmount(Writer memory writer, bytes32 asset, uint amount) internal pure {
+        appendBlock64(writer, Keys.Amount, asset, bytes32(amount), 32);
     }
 
     /// @notice Append an AMOUNT block from a struct.
-    /// @param writer Destination writer; `i` is advanced by `Sizes.Balance`.
+    /// @param writer Destination writer; `i` is advanced by `Sizes.Amount`.
     /// @param value Amount fields to encode.
     function appendAmount(Writer memory writer, AssetAmount memory value) internal pure {
-        appendAmount(writer, value.asset, value.meta, value.amount);
+        appendAmount(writer, value.asset, value.amount);
     }
 
     /// @notice Append an ACCOUNT_AMOUNT form block using separate field values.
-    /// @param writer Destination writer; `i` is advanced by `Sizes.B128`.
+    /// @param writer Destination writer; `i` is advanced by `Sizes.B96`.
     /// @param account Account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Token amount.
     function appendAccountAmount(
         Writer memory writer,
         bytes32 account,
         bytes32 asset,
-        bytes32 meta,
         uint amount
     ) internal pure {
-        appendBlock128(writer, Keys.AccountAmount, account, asset, meta, bytes32(amount), 32);
+        appendBlock96(writer, Keys.AccountAmount, account, asset, bytes32(amount), 32);
     }
 
     /// @notice Append an ACCOUNT_AMOUNT form block from a struct.
-    /// @param writer Destination writer; `i` is advanced by `Sizes.B128`.
+    /// @param writer Destination writer; `i` is advanced by `Sizes.B96`.
     /// @param value Account amount fields to encode.
     function appendAccountAmount(Writer memory writer, AccountAmount memory value) internal pure {
-        appendAccountAmount(writer, value.account, value.asset, value.meta, value.amount);
+        appendAccountAmount(writer, value.account, value.asset, value.amount);
     }
 
     /// @notice Append an ASSET block.
-    /// @param writer Destination writer; `i` is advanced by `Sizes.B64`.
+    /// @param writer Destination writer; `i` is advanced by `Sizes.B32`.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    function appendAsset(Writer memory writer, bytes32 asset, bytes32 meta) internal pure {
-        appendBlock64(writer, Keys.Asset, asset, meta, 32);
+    function appendAsset(Writer memory writer, bytes32 asset) internal pure {
+        appendBlock32(writer, Keys.Asset, asset, 32);
     }
 
     /// @notice Append a BOUNTY block to the writer.
@@ -1013,10 +1008,9 @@ library Writers {
     /// @param writer Destination writer; `i` is advanced by `Sizes.HostAmount`.
     /// @param host Host node ID.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Token amount.
-    function appendCustody(Writer memory writer, uint host, bytes32 asset, bytes32 meta, uint amount) internal pure {
-        appendBlock128(writer, Keys.Custody, bytes32(host), asset, meta, bytes32(amount), 32);
+    function appendCustody(Writer memory writer, uint host, bytes32 asset, uint amount) internal pure {
+        appendBlock96(writer, Keys.Custody, bytes32(host), asset, bytes32(amount), 32);
     }
 
     /// @notice Append a CUSTODY block from a host and asset amount.
@@ -1024,27 +1018,26 @@ library Writers {
     /// @param host Host node ID.
     /// @param value Custody fields to encode.
     function appendCustody(Writer memory writer, uint host, AssetAmount memory value) internal pure {
-        appendCustody(writer, host, value.asset, value.meta, value.amount);
+        appendCustody(writer, host, value.asset, value.amount);
     }
 
     /// @notice Append a CUSTODY block from a host amount struct.
     /// @param writer Destination writer; `i` is advanced by `Sizes.HostAmount`.
     /// @param value Custody fields to encode.
     function appendCustody(Writer memory writer, HostAmount memory value) internal pure {
-        appendCustody(writer, value.host, value.asset, value.meta, value.amount);
+        appendCustody(writer, value.host, value.asset, value.amount);
     }
 
     /// @notice Append a TRANSACTION block from a struct.
     /// @param writer Destination writer; `i` is advanced by `Sizes.Transaction`.
     /// @param value Transfer record fields to encode.
     function appendTransaction(Writer memory writer, Tx memory value) internal pure {
-        appendBlock160(
+        appendBlock128(
             writer,
             Keys.Transaction,
             bytes32(value.from),
             bytes32(value.to),
             value.asset,
-            value.meta,
             bytes32(value.amount),
             32
         );

package/commands/Base.sol

@@ -5,7 +5,7 @@ import {NodeCalls} from "../core/Calls.sol";
 import {CommandEvent} from "../events/Command.sol";
 import {LabeledEvent} from "../events/Labeled.sol";
 import {Keys} from "../blocks/Keys.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 
 /// @notice Execution context passed to every command invocation.
 struct CommandContext {
@@ -51,6 +51,6 @@ abstract contract CommandBase is NodeCalls, CommandEvent, LabeledEvent {
     /// @param selector Command entrypoint selector.
     /// @return Command node ID.
     function commandId(bytes4 selector) internal view returns (uint) {
-        return Ids.toCommand(selector, address(this));
+        return Nodes.toCommand(selector, address(this));
     }
 }

package/commands/Burn.sol

@@ -10,10 +10,9 @@ abstract contract BurnHook {
     /// Called once per BALANCE block in state.
     /// @param account Caller's account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount to burn.
     /// @return Amount actually burned (may differ from `amount` for partial burns).
-    function burn(bytes32 account, bytes32 asset, bytes32 meta, uint amount) internal virtual returns (uint);
+    function burn(bytes32 account, bytes32 asset, uint amount) internal virtual returns (uint);
 }
 
 /// @title Burn
@@ -34,8 +33,8 @@ abstract contract Burn is CommandBase, BurnHook {
         (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
-            burn(c.account, asset, meta, amount);
+            (bytes32 asset, uint amount) = state.unpackBalance();
+            burn(c.account, asset, amount);
         }
 
         state.complete();

package/commands/Credit.sol

@@ -11,9 +11,8 @@ abstract contract CreditAccountHook {
     /// Called once per BALANCE block in state.
     /// @param account Destination account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount to credit.
-    function creditAccount(bytes32 account, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function creditAccount(bytes32 account, bytes32 asset, uint amount) internal virtual;
 }
 
 /// @title CreditAccount
@@ -36,8 +35,8 @@ abstract contract CreditAccount is CommandBase, CreditAccountHook {
         (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
-            creditAccount(c.account, asset, meta, amount);
+            (bytes32 asset, uint amount) = state.unpackBalance();
+            creditAccount(c.account, asset, amount);
         }
 
         state.complete();

package/commands/Debit.sol

@@ -12,9 +12,8 @@ abstract contract DebitAccountHook {
     /// Called once per AMOUNT block before a matching BALANCE is emitted.
     /// @param account Source account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount to debit.
-    function debitAccount(bytes32 account, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function debitAccount(bytes32 account, bytes32 asset, uint amount) internal virtual;
 }
 
 /// @title DebitAccount
@@ -37,9 +36,9 @@ abstract contract DebitAccount is CommandBase, DebitAccountHook {
         Writer memory writer = Writers.allocBalances(groups);
 
         while (input.i < input.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = input.unpackAmount();
-            debitAccount(account, asset, meta, amount);
-            writer.appendBalance(asset, meta, amount);
+            (bytes32 asset, uint amount) = input.unpackAmount();
+            debitAccount(account, asset, amount);
+            writer.appendBalance(asset, amount);
         }
 
         input.complete();

package/commands/Deposit.sol

@@ -15,9 +15,8 @@ abstract contract DepositHook {
     /// output after each call.
     /// @param account Destination account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount received.
-    function deposit(bytes32 account, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function deposit(bytes32 account, bytes32 asset, uint amount) internal virtual;
 }
 
 abstract contract DepositPayableHook {
@@ -26,10 +25,9 @@ abstract contract DepositPayableHook {
     /// output after each call.
     /// @param account Destination account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount received.
     /// @param budget Mutable native-value budget drawn from `msg.value`.
-    function deposit(bytes32 account, bytes32 asset, bytes32 meta, uint amount, Budget memory budget) internal virtual;
+    function deposit(bytes32 account, bytes32 asset, uint amount, Budget memory budget) internal virtual;
 }
 
 /// @title Deposit
@@ -54,9 +52,9 @@ abstract contract Deposit is CommandBase, DepositHook {
         Writer memory writer = Writers.allocBalances(groups);
 
         while (request.i < request.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
-            deposit(c.account, asset, meta, amount);
-            writer.appendBalance(asset, meta, amount);
+            (bytes32 asset, uint amount) = request.unpackAmount();
+            deposit(c.account, asset, amount);
+            writer.appendBalance(asset, amount);
         }
 
         request.complete();
@@ -86,9 +84,9 @@ abstract contract DepositPayable is CommandBase, Payable, DepositPayableHook {
         Budget memory budget = valueBudget();
 
         while (request.i < request.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = request.unpackAmount();
-            deposit(c.account, asset, meta, amount, budget);
-            writer.appendBalance(asset, meta, amount);
+            (bytes32 asset, uint amount) = request.unpackAmount();
+            deposit(c.account, asset, amount, budget);
+            writer.appendBalance(asset, amount);
         }
 
         settleValue(c.account, budget);

package/commands/Payout.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.33;
 
 import {CommandContext, CommandBase, Keys} from "./Base.sol";
 import {Cursors, Cur, Schemas} from "../Cursors.sol";
-import {Accounts} from "../utils/Accounts.sol";
 
 using Cursors for Cur;
 
@@ -13,9 +12,8 @@ abstract contract PayoutHook {
     /// @param account Source account identifier.
     /// @param to Destination account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount to pay out.
-    function payout(bytes32 account, bytes32 to, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function payout(bytes32 account, bytes32 to, bytes32 asset, uint amount) internal virtual;
 }
 
 /// @title Payout
@@ -37,9 +35,8 @@ abstract contract Payout is CommandBase, PayoutHook {
         (Cur memory request, ) = Cursors.init(c.request, 1, groups);
 
         while (state.i < state.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
-            bytes32 to = Accounts.ensure(request.unpackAccount());
-            payout(c.account, to, asset, meta, amount);
+            (bytes32 asset, uint amount) = state.unpackBalance();
+            payout(c.account, request.unpackAccount(), asset, amount);
         }
 
         state.complete();

package/commands/Withdraw.sol

@@ -10,9 +10,8 @@ abstract contract WithdrawHook {
     /// Called once per BALANCE block in state.
     /// @param account Destination account identifier.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Amount to deliver.
-    function withdraw(bytes32 account, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function withdraw(bytes32 account, bytes32 asset, uint amount) internal virtual;
 }
 
 /// @title Withdraw
@@ -36,8 +35,8 @@ abstract contract Withdraw is CommandBase, WithdrawHook {
         (Cur memory state, , ) = Cursors.init(c.state, 1);
 
         while (state.i < state.len) {
-            (bytes32 asset, bytes32 meta, uint amount) = state.unpackBalance();
-            withdraw(c.account, asset, meta, amount);
+            (bytes32 asset, uint amount) = state.unpackBalance();
+            withdraw(c.account, asset, amount);
         }
 
         state.complete();

package/commands/admin/AllowAssets.sol

@@ -7,15 +7,14 @@ import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 abstract contract AllowAssetsHook {
-    /// @dev Override to allow a single asset/meta pair.
+    /// @dev Override to allow a single asset.
     /// Called once per ASSET block in the request.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    function allowAsset(bytes32 asset, bytes32 meta) internal virtual;
+    function allowAsset(bytes32 asset) internal virtual;
 }
 
 /// @title AllowAssets
-/// @notice Admin command that permits a list of (asset, meta) pairs via a virtual hook.
+/// @notice Admin command that permits a list of assets via a virtual hook.
 /// Each ASSET block in the request calls `allowAsset`. Only callable by the admin account.
 abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
     uint internal immutable allowAssetsId = commandId(this.allowAssets.selector);
@@ -34,8 +33,8 @@ abstract contract AllowAssets is CommandBase, AdminEvent, AllowAssetsHook {
         (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
-            (bytes32 asset, bytes32 meta) = request.unpackAsset();
-            allowAsset(asset, meta);
+            bytes32 asset = request.unpackAsset();
+            allowAsset(asset);
         }
 
         request.complete();

package/commands/admin/Allowance.sol

@@ -13,9 +13,8 @@ abstract contract AllowanceHook {
     /// or another host-specific authorization record.
     /// @param peer Host node receiving the allowed cap.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
     /// @param amount Allowed cap amount.
-    function allowance(uint peer, bytes32 asset, bytes32 meta, uint amount) internal virtual;
+    function allowance(uint peer, bytes32 asset, uint amount) internal virtual;
 }
 
 /// @title Allowance
@@ -36,8 +35,8 @@ abstract contract Allowance is CommandBase, AdminEvent, AllowanceHook {
         (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
-            (uint peer, bytes32 asset, bytes32 meta, uint amount) = request.unpackAllowance();
-            allowance(peer, asset, meta, amount);
+            (uint peer, bytes32 asset, uint amount) = request.unpackAllowance();
+            allowance(peer, asset, amount);
         }
 
         request.complete();

package/commands/admin/DenyAssets.sol

@@ -7,15 +7,14 @@ import { AdminEvent } from "../../events/Admin.sol";
 using Cursors for Cur;
 
 abstract contract DenyAssetsHook {
-    /// @dev Override to deny a single asset/meta pair.
+    /// @dev Override to deny a single asset.
     /// Called once per ASSET block in the request.
     /// @param asset Asset identifier.
-    /// @param meta Asset metadata slot.
-    function denyAsset(bytes32 asset, bytes32 meta) internal virtual;
+    function denyAsset(bytes32 asset) internal virtual;
 }
 
 /// @title DenyAssets
-/// @notice Admin command that blocks a list of (asset, meta) pairs via a virtual hook.
+/// @notice Admin command that blocks a list of assets via a virtual hook.
 /// Each ASSET block in the request calls `denyAsset`. Only callable by the admin account.
 abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
     uint internal immutable denyAssetsId = commandId(this.denyAssets.selector);
@@ -34,8 +33,8 @@ abstract contract DenyAssets is CommandBase, AdminEvent, DenyAssetsHook {
         (Cur memory request, , ) = Cursors.init(c.request, 1);
 
         while (request.i < request.len) {
-            (bytes32 asset, bytes32 meta) = request.unpackAsset();
-            denyAsset(asset, meta);
+            bytes32 asset = request.unpackAsset();
+            denyAsset(asset);
         }
 
         request.complete();

package/commands/admin/Execute.sol

@@ -6,7 +6,7 @@ import {Payable} from "../../core/Payable.sol";
 import {Cursors, Cur, Schemas} from "../../Cursors.sol";
 import {AdminEvent} from "../../events/Admin.sol";
 import {Budget} from "../../utils/Value.sol";
-import {Ids} from "../../utils/Ids.sol";
+import {Nodes} from "../../utils/Nodes.sol";
 
 using Cursors for Cur;
 
@@ -32,7 +32,7 @@ abstract contract ExecutePayable is CommandBase, Payable, AdminEvent {
 
         while (request.i < request.len) {
             (uint target, uint resources, bytes calldata data) = request.unpackCall();
-            address addr = Ids.nodeAddr(target);
+            address addr = Nodes.addr(target);
             callAddr(addr, useValue(budget, resources), data);
         }
 

package/core/Access.sol

@@ -5,7 +5,7 @@ import {NodeEvent} from "../events/Node.sol";
 import {GuardianEvent} from "../events/Guardian.sol";
 import {Runtime} from "./Runtime.sol";
 import {Accounts} from "../utils/Accounts.sol";
-import {Ids} from "../utils/Ids.sol";
+import {Nodes} from "../utils/Nodes.sol";
 import {addrOr} from "../utils/Utils.sol";
 
 /// @title AccessControl
@@ -63,7 +63,7 @@ abstract contract AccessControl is Runtime, NodeEvent, GuardianEvent {
     /// whose host ID has been explicitly authorized.
     /// @param caller Address to check.
     function isTrusted(address caller) internal view returns (bool) {
-        return caller == commander || caller == address(this) || nodes[Ids.toHost(caller)];
+        return caller == commander || caller == address(this) || nodes[Nodes.toHost(caller)];
     }
 
     /// @notice Assert that `node` is in the trusted set and return it.

package/core/Balances.sol

@@ -7,33 +7,32 @@ import {BalanceEvent} from "../events/Balance.sol";
 error InsufficientFunds();
 
 /// @title Balances
-/// @notice On-chain ledger for per-account, per-slot balances.
-/// Higher-level modules decide how slots are derived and validated.
+/// @notice On-chain ledger for per-account, per-asset balances.
 abstract contract Balances is BalanceEvent {
-    /// @dev account -> slot -> balance.
-    mapping(bytes32 account => mapping(bytes32 slot => uint amount)) internal balances;
+    /// @dev account -> asset -> balance.
+    mapping(bytes32 account => mapping(bytes32 asset => uint amount)) internal balances;
 
     /// @notice Add `amount` to an account balance and return the new balance.
     /// @param account Account identifier.
-    /// @param slot Storage slot for the position being credited.
+    /// @param asset Unique asset identifier for the position being credited.
     /// @param amount Amount to credit.
     /// @return balance New balance after the credit.
-    function creditTo(bytes32 account, bytes32 slot, uint amount) internal returns (uint balance) {
-        balance = balances[account][slot] += amount;
+    function creditTo(bytes32 account, bytes32 asset, uint amount) internal returns (uint balance) {
+        balance = balances[account][asset] += amount;
     }
 
     /// @notice Deduct `amount` from an account balance and return the new balance.
     /// Reverts with `InsufficientFunds` if the current balance is less than `amount`.
     /// @param account Account identifier.
-    /// @param slot Storage slot for the position being debited.
+    /// @param asset Unique asset identifier for the position being debited.
     /// @param amount Amount to deduct.
     /// @return balance New balance after the debit.
-    function debitFrom(bytes32 account, bytes32 slot, uint amount) internal returns (uint balance) {
-        balance = balances[account][slot];
+    function debitFrom(bytes32 account, bytes32 asset, uint amount) internal returns (uint balance) {
+        balance = balances[account][asset];
         if (balance < amount) revert InsufficientFunds();
         unchecked {
             balance -= amount;
         }
-        balances[account][slot] = balance;
+        balances[account][asset] = balance;
     }
 }