@arcblock/did-util 1.30.3 → 1.30.4

package/esm/cbor.d.mts

@@ -0,0 +1,12 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.mjs";
+import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
+
+//#region src/cbor.d.ts
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>) => string;
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/cbor.mjs

@@ -0,0 +1,36 @@
+import { makeCurriedAddress, toDelegateAddress, toStakeAddress } from "./shared.mjs";
+import { fromHash } from "@arcblock/did";
+import { Hasher, types } from "@ocap/mcrypto";
+import { canonicalBytes } from "@ocap/message/cbor";
+import { transactions } from "@ocap/proto/schema";
+
+//#region src/cbor.ts
+/**
+* `@arcblock/did-util/cbor` — CBOR-only address derivation.
+*
+* Imports only `@ocap/proto/schema` and `@ocap/message/cbor`, so new Client
+* SDK bundles (and any Worker / Kernel build) that stick to CBOR end-to-end
+* never drag the protobuf runtime (`*_pb.js`, `google-protobuf`) in.
+*
+* The curried helpers match the legacy main-entry signatures (`toAssetAddress(itx)`)
+* minus the `encoding` parameter — the subpath IS the encoding selector, and
+* wiring in an encoding argument here would defeat the tree-shake goal by
+* forcing the protobuf path into the bundle.
+*
+* For dual-encoding callers (chain side) keep using the main entry, whose
+* `toItxAddress(itx, type, role, encoding)` dispatches per request.
+*/
+function toItxAddress(itx, type, role) {
+	if (transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
+	const itxBytes = canonicalBytes(type, itx);
+	return fromHash(Hasher.SHA3.hash256(itxBytes), role);
+}
+const curriedAddress = makeCurriedAddress(toItxAddress);
+const toAssetAddress = curriedAddress("CreateAssetTx", types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", types.RoleType.ROLE_ROLLUP);
+
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/index.d.mts

@@ -1,38 +1,23 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.mjs";
 import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
 
 //#region src/index.d.ts
-
-/**
- * Create an itx address
- */
-declare function toItxAddress(itx: Record<string, unknown>, type: string, role?: number): string;
-/**
- * Create an asset address
- */
-declare function toAssetAddress(itx: Partial<TCreateAssetTx>): string;
-/**
- * Create an asset factory address
- */
-declare function toFactoryAddress(itx: Partial<TCreateFactoryTx>): string;
-/**
- * Create an token address
- */
-declare function toTokenAddress(itx: Partial<TCreateTokenTx>): string;
-/**
- * Create a token factory address
- */
-declare function toTokenFactoryAddress(itx: Partial<TCreateTokenFactoryTx>): string;
-/**
- * Create an rollup address
- */
-declare function toRollupAddress(itx: Partial<TCreateRollupTx>): string;
-/**
- * Generate an stake address, eg: the did of the stake
- */
-declare function toStakeAddress(sender: string, receiver: string, nonce?: string): string;
-/**
- * Generate an delegate address, eg: the did of the delegation
- */
-declare function toDelegateAddress(delegator: string, delegatee: string): string;
+type ItxEncoding = 'protobuf' | 'cbor';
+/**
+ * Create an itx address.
+ *
+ * ⚠️ `encoding` is mandatory (no default). Phase 3 servers compute addresses
+ * from `context.txEncoding` — letting this default silently pick `protobuf`
+ * would re-introduce the dual-encoding footgun the tasks.md §4.3 warns about.
+ *
+ * The byte payload differs between `'cbor'` and `'protobuf'` even for the
+ * same `itx`, and therefore so does the resulting address.
+ */
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number, encoding: ItxEncoding): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>, encoding: ItxEncoding) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>, encoding: ItxEncoding) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>, encoding: ItxEncoding) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>, encoding: ItxEncoding) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>, encoding: ItxEncoding) => string;
 //#endregion
-export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };
+export { ItxEncoding, toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/index.mjs

@@ -1,66 +1,40 @@
-import { fromHash } from "@arcblock/did";
-import { Hasher, types } from "@ocap/mcrypto";
-import { createMessage } from "@ocap/message";
-import ocapProto from "@ocap/proto";
+import { toDelegateAddress, toStakeAddress } from "./shared.mjs";
+import { toItxAddress as toItxAddress$1 } from "./cbor.mjs";
+import { toItxAddress as toItxAddress$2 } from "./protobuf.mjs";
+import { types } from "@ocap/mcrypto";
 
 //#region src/index.ts
-const { transactions } = ocapProto;
 /**
-* Create an itx address
-*/
-function toItxAddress(itx, type, role = types.RoleType.ROLE_TX) {
-	if (transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
-	const itxBytes = createMessage(type, itx).serializeBinary();
-	return fromHash(Hasher.SHA3.hash256(itxBytes), role);
-}
-/**
-* Create an asset address
-*/
-function toAssetAddress(itx) {
-	return toItxAddress(itx, "CreateAssetTx", types.RoleType.ROLE_ASSET);
-}
-/**
-* Create an asset factory address
-*/
-function toFactoryAddress(itx) {
-	return toItxAddress(itx, "CreateFactoryTx", types.RoleType.ROLE_FACTORY);
-}
-/**
-* Create an token address
-*/
-function toTokenAddress(itx) {
-	return toItxAddress(itx, "CreateTokenTx", types.RoleType.ROLE_TOKEN);
-}
-/**
-* Create a token factory address
-*/
-function toTokenFactoryAddress(itx) {
-	return toItxAddress(itx, "CreateTokenFactoryTx", types.RoleType.ROLE_TOKEN_FACTORY);
-}
-/**
-* Create an rollup address
-*/
-function toRollupAddress(itx) {
-	return toItxAddress(itx, "CreateRollupTx", types.RoleType.ROLE_ROLLUP);
-}
-/**
-* Generate an stake address, eg: the did of the stake
-*/
-function toStakeAddress(sender, receiver, nonce) {
-	const buffer = Buffer.concat([
-		sender,
-		receiver,
-		nonce
-	].filter((x) => Boolean(x)).map((x) => Uint8Array.from(Buffer.from(x))));
-	return fromHash(Hasher.SHA3.hash256(buffer), types.RoleType.ROLE_STAKE);
-}
-/**
-* Generate an delegate address, eg: the did of the delegation
-*/
-function toDelegateAddress(delegator, delegatee) {
-	const buffer = Buffer.concat([Uint8Array.from(Buffer.from(delegator)), Uint8Array.from(Buffer.from(delegatee))]);
-	return fromHash(Hasher.SHA3.hash256(buffer), types.RoleType.ROLE_DELEGATION);
-}
+* `@arcblock/did-util` aggregate entry — chain-side / dual-encoding caller.
+*
+* The main entry pulls in BOTH the CBOR and protobuf paths so the chain side
+* can pick the right one off `context.txEncoding`. Client SDK callers
+* (tree-shake-sensitive) must import the `/cbor` or `/protobuf` subpath.
+*
+* Curried helpers (`toAssetAddress`, `toFactoryAddress`, …) keep their
+* `(itx, encoding)` signature on the main entry for backwards compatibility.
+*/
+/**
+* Create an itx address.
+*
+* ⚠️ `encoding` is mandatory (no default). Phase 3 servers compute addresses
+* from `context.txEncoding` — letting this default silently pick `protobuf`
+* would re-introduce the dual-encoding footgun the tasks.md §4.3 warns about.
+*
+* The byte payload differs between `'cbor'` and `'protobuf'` even for the
+* same `itx`, and therefore so does the resulting address.
+*/
+function toItxAddress(itx, type, role, encoding) {
+	if (encoding === "cbor") return toItxAddress$1(itx, type, role);
+	if (encoding === "protobuf") return toItxAddress$2(itx, type, role);
+	throw new Error(`Unsupported itx encoding: ${encoding}`);
+}
+const curriedAddress = (type, role) => (itx, encoding) => toItxAddress(itx, type, role, encoding);
+const toAssetAddress = curriedAddress("CreateAssetTx", types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", types.RoleType.ROLE_ROLLUP);
 
 //#endregion
 export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/protobuf.d.mts

@@ -0,0 +1,12 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.mjs";
+import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
+
+//#region src/protobuf.d.ts
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>) => string;
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/protobuf.mjs

@@ -0,0 +1,28 @@
+import { makeCurriedAddress, toDelegateAddress, toStakeAddress } from "./shared.mjs";
+import { fromHash } from "@arcblock/did";
+import { Hasher, types } from "@ocap/mcrypto";
+import { createMessage } from "@ocap/message";
+import { transactions } from "@ocap/proto/runtime";
+
+//#region src/protobuf.ts
+/**
+* `@arcblock/did-util/protobuf` — protobuf-only address derivation.
+*
+* Imports `@ocap/proto/runtime` + `@ocap/message/protobuf`; use this subpath
+* only from code paths that already carry the protobuf runtime. CBOR-capable
+* callers should use `/cbor` instead.
+*/
+function toItxAddress(itx, type, role) {
+	if (transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
+	const itxBytes = createMessage(type, itx).serializeBinary();
+	return fromHash(Hasher.SHA3.hash256(itxBytes), role);
+}
+const curriedAddress = makeCurriedAddress(toItxAddress);
+const toAssetAddress = curriedAddress("CreateAssetTx", types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", types.RoleType.ROLE_ROLLUP);
+
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/esm/shared.d.mts

@@ -0,0 +1,7 @@
+//#region src/shared.d.ts
+type ToItxAddressFn = (itx: Record<string, unknown>, type: string, role: number) => string;
+declare function makeCurriedAddress(toItxAddress: ToItxAddressFn): (type: string, role: number) => (itx: Record<string, unknown>) => string;
+declare function toStakeAddress(sender: string, receiver: string, nonce?: string): string;
+declare function toDelegateAddress(delegator: string, delegatee: string): string;
+//#endregion
+export { ToItxAddressFn, makeCurriedAddress, toDelegateAddress, toStakeAddress };

package/esm/shared.mjs

@@ -0,0 +1,33 @@
+import { fromHash } from "@arcblock/did";
+import { Hasher, types } from "@ocap/mcrypto";
+
+//#region src/shared.ts
+/**
+* Encoding-agnostic address helpers + curry factory shared by the three
+* `@arcblock/did-util` entries (`./cbor`, `./protobuf`, `./index`).
+*
+* `toStakeAddress` / `toDelegateAddress` hash raw UTF-8 strings — no CBOR or
+* protobuf involved — so all three entries exposed identical copies before.
+* They live here once.
+*
+* `makeCurriedAddress` takes a `toItxAddress` implementation and produces a
+* curry. Each entry injects its own encoding-specific `toItxAddress`.
+*/
+function makeCurriedAddress(toItxAddress) {
+	return (type, role) => (itx) => toItxAddress(itx, type, role);
+}
+function toStakeAddress(sender, receiver, nonce) {
+	const buffer = Buffer.concat([
+		sender,
+		receiver,
+		nonce
+	].filter((x) => Boolean(x)).map((x) => Uint8Array.from(Buffer.from(x))));
+	return fromHash(Hasher.SHA3.hash256(buffer), types.RoleType.ROLE_STAKE);
+}
+function toDelegateAddress(delegator, delegatee) {
+	const buffer = Buffer.concat([Uint8Array.from(Buffer.from(delegator)), Uint8Array.from(Buffer.from(delegatee))]);
+	return fromHash(Hasher.SHA3.hash256(buffer), types.RoleType.ROLE_DELEGATION);
+}
+
+//#endregion
+export { makeCurriedAddress, toDelegateAddress, toStakeAddress };

package/lib/cbor.cjs

@@ -0,0 +1,43 @@
+const require_shared = require('./shared.cjs');
+let _arcblock_did = require("@arcblock/did");
+let _ocap_mcrypto = require("@ocap/mcrypto");
+let _ocap_message_cbor = require("@ocap/message/cbor");
+let _ocap_proto_schema = require("@ocap/proto/schema");
+
+//#region src/cbor.ts
+/**
+* `@arcblock/did-util/cbor` — CBOR-only address derivation.
+*
+* Imports only `@ocap/proto/schema` and `@ocap/message/cbor`, so new Client
+* SDK bundles (and any Worker / Kernel build) that stick to CBOR end-to-end
+* never drag the protobuf runtime (`*_pb.js`, `google-protobuf`) in.
+*
+* The curried helpers match the legacy main-entry signatures (`toAssetAddress(itx)`)
+* minus the `encoding` parameter — the subpath IS the encoding selector, and
+* wiring in an encoding argument here would defeat the tree-shake goal by
+* forcing the protobuf path into the bundle.
+*
+* For dual-encoding callers (chain side) keep using the main entry, whose
+* `toItxAddress(itx, type, role, encoding)` dispatches per request.
+*/
+function toItxAddress(itx, type, role) {
+	if (_ocap_proto_schema.transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
+	const itxBytes = (0, _ocap_message_cbor.canonicalBytes)(type, itx);
+	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(itxBytes), role);
+}
+const curriedAddress = require_shared.makeCurriedAddress(toItxAddress);
+const toAssetAddress = curriedAddress("CreateAssetTx", _ocap_mcrypto.types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", _ocap_mcrypto.types.RoleType.ROLE_ROLLUP);
+
+//#endregion
+exports.toAssetAddress = toAssetAddress;
+exports.toDelegateAddress = require_shared.toDelegateAddress;
+exports.toFactoryAddress = toFactoryAddress;
+exports.toItxAddress = toItxAddress;
+exports.toRollupAddress = toRollupAddress;
+exports.toStakeAddress = require_shared.toStakeAddress;
+exports.toTokenAddress = toTokenAddress;
+exports.toTokenFactoryAddress = toTokenFactoryAddress;

package/lib/cbor.d.cts

@@ -0,0 +1,12 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.cjs";
+import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
+
+//#region src/cbor.d.ts
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>) => string;
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/lib/index.cjs

@@ -1,75 +1,47 @@
-const require_rolldown_runtime = require('./_virtual/rolldown_runtime.cjs');
-let _arcblock_did = require("@arcblock/did");
+const require_shared = require('./shared.cjs');
+const require_cbor = require('./cbor.cjs');
+const require_protobuf = require('./protobuf.cjs');
 let _ocap_mcrypto = require("@ocap/mcrypto");
-let _ocap_message = require("@ocap/message");
-let _ocap_proto = require("@ocap/proto");
-_ocap_proto = require_rolldown_runtime.__toESM(_ocap_proto);
 
 //#region src/index.ts
-const { transactions } = _ocap_proto.default;
 /**
-* Create an itx address
-*/
-function toItxAddress(itx, type, role = _ocap_mcrypto.types.RoleType.ROLE_TX) {
-	if (transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
-	const itxBytes = (0, _ocap_message.createMessage)(type, itx).serializeBinary();
-	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(itxBytes), role);
-}
-/**
-* Create an asset address
-*/
-function toAssetAddress(itx) {
-	return toItxAddress(itx, "CreateAssetTx", _ocap_mcrypto.types.RoleType.ROLE_ASSET);
-}
-/**
-* Create an asset factory address
-*/
-function toFactoryAddress(itx) {
-	return toItxAddress(itx, "CreateFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_FACTORY);
-}
-/**
-* Create an token address
-*/
-function toTokenAddress(itx) {
-	return toItxAddress(itx, "CreateTokenTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN);
-}
-/**
-* Create a token factory address
-*/
-function toTokenFactoryAddress(itx) {
-	return toItxAddress(itx, "CreateTokenFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN_FACTORY);
-}
-/**
-* Create an rollup address
-*/
-function toRollupAddress(itx) {
-	return toItxAddress(itx, "CreateRollupTx", _ocap_mcrypto.types.RoleType.ROLE_ROLLUP);
-}
-/**
-* Generate an stake address, eg: the did of the stake
-*/
-function toStakeAddress(sender, receiver, nonce) {
-	const buffer = Buffer.concat([
-		sender,
-		receiver,
-		nonce
-	].filter((x) => Boolean(x)).map((x) => Uint8Array.from(Buffer.from(x))));
-	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(buffer), _ocap_mcrypto.types.RoleType.ROLE_STAKE);
-}
-/**
-* Generate an delegate address, eg: the did of the delegation
-*/
-function toDelegateAddress(delegator, delegatee) {
-	const buffer = Buffer.concat([Uint8Array.from(Buffer.from(delegator)), Uint8Array.from(Buffer.from(delegatee))]);
-	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(buffer), _ocap_mcrypto.types.RoleType.ROLE_DELEGATION);
-}
+* `@arcblock/did-util` aggregate entry — chain-side / dual-encoding caller.
+*
+* The main entry pulls in BOTH the CBOR and protobuf paths so the chain side
+* can pick the right one off `context.txEncoding`. Client SDK callers
+* (tree-shake-sensitive) must import the `/cbor` or `/protobuf` subpath.
+*
+* Curried helpers (`toAssetAddress`, `toFactoryAddress`, …) keep their
+* `(itx, encoding)` signature on the main entry for backwards compatibility.
+*/
+/**
+* Create an itx address.
+*
+* ⚠️ `encoding` is mandatory (no default). Phase 3 servers compute addresses
+* from `context.txEncoding` — letting this default silently pick `protobuf`
+* would re-introduce the dual-encoding footgun the tasks.md §4.3 warns about.
+*
+* The byte payload differs between `'cbor'` and `'protobuf'` even for the
+* same `itx`, and therefore so does the resulting address.
+*/
+function toItxAddress(itx, type, role, encoding) {
+	if (encoding === "cbor") return require_cbor.toItxAddress(itx, type, role);
+	if (encoding === "protobuf") return require_protobuf.toItxAddress(itx, type, role);
+	throw new Error(`Unsupported itx encoding: ${encoding}`);
+}
+const curriedAddress = (type, role) => (itx, encoding) => toItxAddress(itx, type, role, encoding);
+const toAssetAddress = curriedAddress("CreateAssetTx", _ocap_mcrypto.types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", _ocap_mcrypto.types.RoleType.ROLE_ROLLUP);
 
 //#endregion
 exports.toAssetAddress = toAssetAddress;
-exports.toDelegateAddress = toDelegateAddress;
+exports.toDelegateAddress = require_shared.toDelegateAddress;
 exports.toFactoryAddress = toFactoryAddress;
 exports.toItxAddress = toItxAddress;
 exports.toRollupAddress = toRollupAddress;
-exports.toStakeAddress = toStakeAddress;
+exports.toStakeAddress = require_shared.toStakeAddress;
 exports.toTokenAddress = toTokenAddress;
 exports.toTokenFactoryAddress = toTokenFactoryAddress;

package/lib/index.d.cts

@@ -1,38 +1,23 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.cjs";
 import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
 
 //#region src/index.d.ts
-
-/**
- * Create an itx address
- */
-declare function toItxAddress(itx: Record<string, unknown>, type: string, role?: number): string;
-/**
- * Create an asset address
- */
-declare function toAssetAddress(itx: Partial<TCreateAssetTx>): string;
-/**
- * Create an asset factory address
- */
-declare function toFactoryAddress(itx: Partial<TCreateFactoryTx>): string;
-/**
- * Create an token address
- */
-declare function toTokenAddress(itx: Partial<TCreateTokenTx>): string;
-/**
- * Create a token factory address
- */
-declare function toTokenFactoryAddress(itx: Partial<TCreateTokenFactoryTx>): string;
-/**
- * Create an rollup address
- */
-declare function toRollupAddress(itx: Partial<TCreateRollupTx>): string;
-/**
- * Generate an stake address, eg: the did of the stake
- */
-declare function toStakeAddress(sender: string, receiver: string, nonce?: string): string;
-/**
- * Generate an delegate address, eg: the did of the delegation
- */
-declare function toDelegateAddress(delegator: string, delegatee: string): string;
+type ItxEncoding = 'protobuf' | 'cbor';
+/**
+ * Create an itx address.
+ *
+ * ⚠️ `encoding` is mandatory (no default). Phase 3 servers compute addresses
+ * from `context.txEncoding` — letting this default silently pick `protobuf`
+ * would re-introduce the dual-encoding footgun the tasks.md §4.3 warns about.
+ *
+ * The byte payload differs between `'cbor'` and `'protobuf'` even for the
+ * same `itx`, and therefore so does the resulting address.
+ */
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number, encoding: ItxEncoding): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>, encoding: ItxEncoding) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>, encoding: ItxEncoding) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>, encoding: ItxEncoding) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>, encoding: ItxEncoding) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>, encoding: ItxEncoding) => string;
 //#endregion
-export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };
+export { ItxEncoding, toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/lib/protobuf.cjs

@@ -0,0 +1,35 @@
+const require_shared = require('./shared.cjs');
+let _arcblock_did = require("@arcblock/did");
+let _ocap_mcrypto = require("@ocap/mcrypto");
+let _ocap_message = require("@ocap/message");
+let _ocap_proto_runtime = require("@ocap/proto/runtime");
+
+//#region src/protobuf.ts
+/**
+* `@arcblock/did-util/protobuf` — protobuf-only address derivation.
+*
+* Imports `@ocap/proto/runtime` + `@ocap/message/protobuf`; use this subpath
+* only from code paths that already carry the protobuf runtime. CBOR-capable
+* callers should use `/cbor` instead.
+*/
+function toItxAddress(itx, type, role) {
+	if (_ocap_proto_runtime.transactions.indexOf(type) === -1) throw new Error(`Unsupported itx type ${type}`);
+	const itxBytes = (0, _ocap_message.createMessage)(type, itx).serializeBinary();
+	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(itxBytes), role);
+}
+const curriedAddress = require_shared.makeCurriedAddress(toItxAddress);
+const toAssetAddress = curriedAddress("CreateAssetTx", _ocap_mcrypto.types.RoleType.ROLE_ASSET);
+const toFactoryAddress = curriedAddress("CreateFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_FACTORY);
+const toTokenAddress = curriedAddress("CreateTokenTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN);
+const toTokenFactoryAddress = curriedAddress("CreateTokenFactoryTx", _ocap_mcrypto.types.RoleType.ROLE_TOKEN_FACTORY);
+const toRollupAddress = curriedAddress("CreateRollupTx", _ocap_mcrypto.types.RoleType.ROLE_ROLLUP);
+
+//#endregion
+exports.toAssetAddress = toAssetAddress;
+exports.toDelegateAddress = require_shared.toDelegateAddress;
+exports.toFactoryAddress = toFactoryAddress;
+exports.toItxAddress = toItxAddress;
+exports.toRollupAddress = toRollupAddress;
+exports.toStakeAddress = require_shared.toStakeAddress;
+exports.toTokenAddress = toTokenAddress;
+exports.toTokenFactoryAddress = toTokenFactoryAddress;

package/lib/protobuf.d.cts

@@ -0,0 +1,12 @@
+import { toDelegateAddress, toStakeAddress } from "./shared.cjs";
+import { TCreateAssetTx, TCreateFactoryTx, TCreateRollupTx, TCreateTokenFactoryTx, TCreateTokenTx } from "@ocap/types";
+
+//#region src/protobuf.d.ts
+declare function toItxAddress(itx: Record<string, unknown>, type: string, role: number): string;
+declare const toAssetAddress: (itx: Partial<TCreateAssetTx>) => string;
+declare const toFactoryAddress: (itx: Partial<TCreateFactoryTx>) => string;
+declare const toTokenAddress: (itx: Partial<TCreateTokenTx>) => string;
+declare const toTokenFactoryAddress: (itx: Partial<TCreateTokenFactoryTx>) => string;
+declare const toRollupAddress: (itx: Partial<TCreateRollupTx>) => string;
+//#endregion
+export { toAssetAddress, toDelegateAddress, toFactoryAddress, toItxAddress, toRollupAddress, toStakeAddress, toTokenAddress, toTokenFactoryAddress };

package/lib/shared.cjs

@@ -0,0 +1,35 @@
+let _arcblock_did = require("@arcblock/did");
+let _ocap_mcrypto = require("@ocap/mcrypto");
+
+//#region src/shared.ts
+/**
+* Encoding-agnostic address helpers + curry factory shared by the three
+* `@arcblock/did-util` entries (`./cbor`, `./protobuf`, `./index`).
+*
+* `toStakeAddress` / `toDelegateAddress` hash raw UTF-8 strings — no CBOR or
+* protobuf involved — so all three entries exposed identical copies before.
+* They live here once.
+*
+* `makeCurriedAddress` takes a `toItxAddress` implementation and produces a
+* curry. Each entry injects its own encoding-specific `toItxAddress`.
+*/
+function makeCurriedAddress(toItxAddress) {
+	return (type, role) => (itx) => toItxAddress(itx, type, role);
+}
+function toStakeAddress(sender, receiver, nonce) {
+	const buffer = Buffer.concat([
+		sender,
+		receiver,
+		nonce
+	].filter((x) => Boolean(x)).map((x) => Uint8Array.from(Buffer.from(x))));
+	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(buffer), _ocap_mcrypto.types.RoleType.ROLE_STAKE);
+}
+function toDelegateAddress(delegator, delegatee) {
+	const buffer = Buffer.concat([Uint8Array.from(Buffer.from(delegator)), Uint8Array.from(Buffer.from(delegatee))]);
+	return (0, _arcblock_did.fromHash)(_ocap_mcrypto.Hasher.SHA3.hash256(buffer), _ocap_mcrypto.types.RoleType.ROLE_DELEGATION);
+}
+
+//#endregion
+exports.makeCurriedAddress = makeCurriedAddress;
+exports.toDelegateAddress = toDelegateAddress;
+exports.toStakeAddress = toStakeAddress;

package/lib/shared.d.cts

@@ -0,0 +1,7 @@
+//#region src/shared.d.ts
+type ToItxAddressFn = (itx: Record<string, unknown>, type: string, role: number) => string;
+declare function makeCurriedAddress(toItxAddress: ToItxAddressFn): (type: string, role: number) => (itx: Record<string, unknown>) => string;
+declare function toStakeAddress(sender: string, receiver: string, nonce?: string): string;
+declare function toDelegateAddress(delegator: string, delegatee: string): string;
+//#endregion
+export { ToItxAddressFn, makeCurriedAddress, toDelegateAddress, toStakeAddress };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcblock/did-util",
   "description": "Helper function to calculate did",
-  "version": "1.30.3",
+  "version": "1.30.4",
   "type": "module",
   "author": {
     "name": "wangshijun",
@@ -19,19 +19,29 @@
     "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
   ],
   "dependencies": {
-    "@arcblock/did": "1.30.3",
-    "@ocap/mcrypto": "1.30.3",
-    "@ocap/message": "1.30.3",
-    "@ocap/proto": "1.30.3",
-    "@ocap/types": "1.30.3",
-    "@ocap/util": "1.30.3",
-    "@ocap/wallet": "1.30.3"
+    "@arcblock/did": "1.30.4",
+    "@ocap/mcrypto": "1.30.4",
+    "@ocap/message": "1.30.4",
+    "@ocap/proto": "1.30.4",
+    "@ocap/types": "1.30.4",
+    "@ocap/util": "1.30.4",
+    "@ocap/wallet": "1.30.4"
   },
   "sideEffects": false,
   "main": "./lib/index.cjs",
   "module": "./esm/index.mjs",
   "types": "./esm/index.d.mts",
   "exports": {
+    "./cbor": {
+      "types": "./esm/cbor.d.mts",
+      "import": "./esm/cbor.mjs",
+      "default": "./lib/cbor.cjs"
+    },
+    "./protobuf": {
+      "types": "./esm/protobuf.d.mts",
+      "import": "./esm/protobuf.mjs",
+      "default": "./lib/protobuf.cjs"
+    },
     ".": {
       "types": "./esm/index.d.mts",
       "import": "./esm/index.mjs",

package/lib/_virtual/rolldown_runtime.cjs

@@ -1,29 +0,0 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-
-exports.__toESM = __toESM;