ox 0.14.23 → 0.14.25

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ox
 
+## 0.14.25
+
+### Patch Changes
+
+- [#256](https://github.com/wevm/ox/pull/256) [`ad7610b`](https://github.com/wevm/ox/commit/ad7610b115c1ebc20739289bfacead52652160be) Thanks [@jxom](https://github.com/jxom)! - Renamed `ChannelDescriptor.from` to `Channel.from`, made `Channel.Channel` the descriptor type, and changed `Channel.computeId` to receive channel and options separately.
+
+## 0.14.24
+
+### Patch Changes
+
+- [#254](https://github.com/wevm/ox/pull/254) [`d837628`](https://github.com/wevm/ox/commit/d8376284988f6c2b56d9cb18ac2b677465f3b835) Thanks [@jxom](https://github.com/jxom)! - Added `ChannelDescriptor.from` for normalizing TIP-20 channel reserve descriptors.
+
 ## 0.14.23
 
 ### Patch Changes

package/_cjs/tempo/Channel.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voucherTypehash = exports.closeGracePeriod = exports.address = void 0;
+exports.from = from;
 exports.computeId = computeId;
 exports.domainSeparator = domainSeparator;
 exports.getVoucherSignPayload = getVoucherSignPayload;
 const AbiParameters = require("../core/AbiParameters.js");
+const Address = require("../core/Address.js");
 const Hash = require("../core/Hash.js");
 const Hex = require("../core/Hex.js");
-const TempoAddress = require("./TempoAddress.js");
 const TokenId = require("./TokenId.js");
 const channelIdParameters = AbiParameters.from('address, address, address, address, bytes32, address, bytes32, address, uint256');
 const domainSeparatorParameters = AbiParameters.from('bytes32, bytes32, bytes32, uint256, address');
@@ -15,20 +16,36 @@ const voucherHashParameters = AbiParameters.from('bytes32, bytes32, uint96');
 const eip712DomainTypehash = Hash.keccak256(Hex.fromString('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'));
 const nameHash = Hash.keccak256(Hex.fromString('TIP20 Channel Reserve'));
 const versionHash = Hash.keccak256(Hex.fromString('1'));
+const zeroAddress = '0x0000000000000000000000000000000000000000';
 exports.address = '0x4d50500000000000000000000000000000000000';
 exports.closeGracePeriod = 900n;
 exports.voucherTypehash = Hash.keccak256(Hex.fromString('Voucher(bytes32 channelId,uint96 cumulativeAmount)'));
-function computeId(value) {
+function from(value) {
+    const { authorizedSigner = zeroAddress, expiringNonceHash, operator = zeroAddress, payee, payer, salt, token, } = value;
+    return {
+        authorizedSigner: resolveAddress(authorizedSigner),
+        expiringNonceHash,
+        operator: resolveAddress(operator),
+        payee: resolveAddress(payee),
+        payer: resolveAddress(payer),
+        salt,
+        token: typeof token === 'string'
+            ? resolveAddress(token)
+            : TokenId.toAddress(token),
+    };
+}
+function computeId(channel, options) {
+    const channel_ = from(channel);
     return Hash.keccak256(AbiParameters.encode(channelIdParameters, [
-        TempoAddress.resolve(value.payer),
-        TempoAddress.resolve(value.payee),
-        TempoAddress.resolve(value.operator),
-        TokenId.toAddress(value.token),
-        value.salt,
-        TempoAddress.resolve(value.authorizedSigner),
-        value.expiringNonceHash,
+        channel_.payer,
+        channel_.payee,
+        channel_.operator,
+        channel_.token,
+        channel_.salt,
+        channel_.authorizedSigner,
+        channel_.expiringNonceHash,
         exports.address,
-        BigInt(value.chainId),
+        BigInt(options.chainId),
     ]));
 }
 function domainSeparator(value) {
@@ -48,4 +65,7 @@ function getVoucherSignPayload(value) {
     ]));
     return Hash.keccak256(Hex.concat('0x1901', domainSeparator({ chainId: value.chainId }), voucherHash));
 }
+function resolveAddress(address) {
+    return Address.from(address);
+}
 //# sourceMappingURL=Channel.js.map

package/_cjs/tempo/Channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":";;;AAsFA,8BAcC;AA8BD,0CAUC;AA+BD,sDAiBC;AA5LD,0DAAyD;AAEzD,wCAAuC;AACvC,sCAAqC;AACrC,kDAAiD;AACjD,wCAAuC;AAEvC,MAAM,mBAAmB,GAAG,aAAa,CAAC,IAAI,CAC5C,iFAAiF,CAClF,CAAA;AACD,MAAM,yBAAyB,GAAG,aAAa,CAAC,IAAI,CAClD,6CAA6C,CAC9C,CAAA;AACD,MAAM,qBAAqB,GAAG,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;AAE5E,MAAM,oBAAoB,GAAG,IAAI,CAAC,SAAS,CACzC,GAAG,CAAC,UAAU,CACZ,oFAAoF,CACrF,CACF,CAAA;AACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAA;AACxE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;AAK1C,QAAA,OAAO,GAClB,4CAA+E,CAAA;AAKpE,QAAA,gBAAgB,GAAG,IAAI,CAAA;AAKvB,QAAA,eAAe,GAAG,IAAI,CAAC,SAAS,CAC3C,GAAG,CAAC,UAAU,CAAC,oDAAoD,CAAC,CACrE,CAAA;AA+CD,SAAgB,SAAS,CAAC,KAAsB;IAC9C,OAAO,IAAI,CAAC,SAAS,CACnB,aAAa,CAAC,MAAM,CAAC,mBAAmB,EAAE;QACxC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9B,KAAK,CAAC,IAAI;QACV,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAC5C,KAAK,CAAC,iBAAiB;QACvB,eAAO;QACP,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;KACtB,CAAC,CACH,CAAA;AACH,CAAC;AA8BD,SAAgB,eAAe,CAAC,KAA4B;IAC1D,OAAO,IAAI,CAAC,SAAS,CACnB,aAAa,CAAC,MAAM,CAAC,yBAAyB,EAAE;QAC9C,oBAAoB;QACpB,QAAQ;QACR,WAAW;QACX,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QACrB,eAAO;KACR,CAAC,CACH,CAAA;AACH,CAAC;AA+BD,SAAgB,qBAAqB,CACnC,KAAkC;IAElC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAChC,aAAa,CAAC,MAAM,CAAC,qBAAqB,EAAE;QAC1C,uBAAe;QACf,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,gBAAgB;KACvB,CAAC,CACH,CAAA;IACD,OAAO,IAAI,CAAC,SAAS,CACnB,GAAG,CAAC,MAAM,CACR,QAAQ,EACR,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,EAC3C,WAAW,CACZ,CACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":"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"}

package/_cjs/tempo/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":";;;AAoCA,gEAA6D;AA0B7D,0CAAuC;AAwCvC,4DAAyD;AA6BzD,wCAAqC;AAsBrC,wCAAqC;AAoBrC,wDAAqD;AAuBrD,8DAA2D;AAmB3D,oDAAiD;AAoBjD,oCAAiC;AAqBjC,0CAAuC;AAkBvC,8CAA2C;AAkD3C,kDAA+C;AAuB/C,gEAA6D;AAqB7D,gEAA6D;AA6B7D,0DAAuD;AA4BvD,wDAAqD;AAyBrD,sDAAmD;AAqBnD,wCAAqC;AAmCrC,sEAAmE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":";;;AAoCA,gEAA6D;AA2B7D,0CAAuC;AAwCvC,4DAAyD;AA6BzD,wCAAqC;AAsBrC,wCAAqC;AAoBrC,wDAAqD;AAuBrD,8DAA2D;AAmB3D,oDAAiD;AAoBjD,oCAAiC;AAqBjC,0CAAuC;AAkBvC,8CAA2C;AAkD3C,kDAA+C;AAuB/C,gEAA6D;AAqB7D,gEAA6D;AA6B7D,0DAAuD;AA4BvD,wDAAqD;AAyBrD,sDAAmD;AAqBnD,wCAAqC;AAmCrC,sEAAmE"}

package/_cjs/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '0.14.23';
+exports.version = '0.14.25';
 //# sourceMappingURL=version.js.map

package/_esm/tempo/Channel.js

@@ -1,7 +1,7 @@
 import * as AbiParameters from '../core/AbiParameters.js';
+import * as Address from '../core/Address.js';
 import * as Hash from '../core/Hash.js';
 import * as Hex from '../core/Hex.js';
-import * as TempoAddress from './TempoAddress.js';
 import * as TokenId from './TokenId.js';
 const channelIdParameters = AbiParameters.from('address, address, address, address, bytes32, address, bytes32, address, uint256');
 const domainSeparatorParameters = AbiParameters.from('bytes32, bytes32, bytes32, uint256, address');
@@ -9,6 +9,7 @@ const voucherHashParameters = AbiParameters.from('bytes32, bytes32, uint96');
 const eip712DomainTypehash = Hash.keccak256(Hex.fromString('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'));
 const nameHash = Hash.keccak256(Hex.fromString('TIP20 Channel Reserve'));
 const versionHash = Hash.keccak256(Hex.fromString('1'));
+const zeroAddress = '0x0000000000000000000000000000000000000000';
 /**
  * TIP-20 channel reserve precompile address.
  */
@@ -21,6 +22,42 @@ export const closeGracePeriod = 900n;
  * EIP-712 type hash for `Voucher(bytes32 channelId,uint96 cumulativeAmount)`.
  */
 export const voucherTypehash = Hash.keccak256(Hex.fromString('Voucher(bytes32 channelId,uint96 cumulativeAmount)'));
+/**
+ * Instantiates a TIP-20 channel reserve descriptor.
+ *
+ * Accepts a TIP-20 token ID or address, and defaults `operator` and
+ * `authorizedSigner` to the zero address.
+ *
+ * @example
+ * ```ts twoslash
+ * import { Channel } from 'ox/tempo'
+ *
+ * const channel = Channel.from({
+ *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000002',
+ *   payee: '0x2222222222222222222222222222222222222222',
+ *   payer: '0x1111111111111111111111111111111111111111',
+ *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
+ *   token: 1n,
+ * })
+ * ```
+ *
+ * @param value - The channel descriptor input.
+ * @returns The normalized channel descriptor.
+ */
+export function from(value) {
+    const { authorizedSigner = zeroAddress, expiringNonceHash, operator = zeroAddress, payee, payer, salt, token, } = value;
+    return {
+        authorizedSigner: resolveAddress(authorizedSigner),
+        expiringNonceHash,
+        operator: resolveAddress(operator),
+        payee: resolveAddress(payee),
+        payer: resolveAddress(payer),
+        salt,
+        token: typeof token === 'string'
+            ? resolveAddress(token)
+            : TokenId.toAddress(token),
+    };
+}
 /**
  * Computes the canonical TIP-20 channel id for a descriptor.
  *
@@ -33,30 +70,33 @@ export const voucherTypehash = Hash.keccak256(Hex.fromString('Voucher(bytes32 ch
  *
  * const channelId = Channel.computeId({
  *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
  *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
+ * }, {
+ *   chainId: 4217,
  * })
  * ```
  *
- * @param value - Channel descriptor and chain id.
+ * @param channel - Channel descriptor.
+ * @param options - Options.
  * @returns The channel id.
  */
-export function computeId(value) {
+export function computeId(channel, options) {
+    const channel_ = from(channel);
     return Hash.keccak256(AbiParameters.encode(channelIdParameters, [
-        TempoAddress.resolve(value.payer),
-        TempoAddress.resolve(value.payee),
-        TempoAddress.resolve(value.operator),
-        TokenId.toAddress(value.token),
-        value.salt,
-        TempoAddress.resolve(value.authorizedSigner),
-        value.expiringNonceHash,
+        channel_.payer,
+        channel_.payee,
+        channel_.operator,
+        channel_.token,
+        channel_.salt,
+        channel_.authorizedSigner,
+        channel_.expiringNonceHash,
         address,
-        BigInt(value.chainId),
+        BigInt(options.chainId),
     ]));
 }
 /**
@@ -112,4 +152,7 @@ export function getVoucherSignPayload(value) {
     ]));
     return Hash.keccak256(Hex.concat('0x1901', domainSeparator({ chainId: value.chainId }), voucherHash));
 }
+function resolveAddress(address) {
+    return Address.from(address);
+}
 //# sourceMappingURL=Channel.js.map

package/_esm/tempo/Channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAA;AAEzD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC,MAAM,mBAAmB,GAAG,aAAa,CAAC,IAAI,CAC5C,iFAAiF,CAClF,CAAA;AACD,MAAM,yBAAyB,GAAG,aAAa,CAAC,IAAI,CAClD,6CAA6C,CAC9C,CAAA;AACD,MAAM,qBAAqB,GAAG,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;AAE5E,MAAM,oBAAoB,GAAG,IAAI,CAAC,SAAS,CACzC,GAAG,CAAC,UAAU,CACZ,oFAAoF,CACrF,CACF,CAAA;AACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAA;AACxE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;AAEvD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAClB,4CAA+E,CAAA;AAEjF;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAEpC;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAC3C,GAAG,CAAC,UAAU,CAAC,oDAAoD,CAAC,CACrE,CAAA;AAsBD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,SAAS,CAAC,KAAsB;IAC9C,OAAO,IAAI,CAAC,SAAS,CACnB,aAAa,CAAC,MAAM,CAAC,mBAAmB,EAAE;QACxC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;QACpC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9B,KAAK,CAAC,IAAI;QACV,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAC5C,KAAK,CAAC,iBAAiB;QACvB,OAAO;QACP,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;KACtB,CAAC,CACH,CAAA;AACH,CAAC;AAcD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,eAAe,CAAC,KAA4B;IAC1D,OAAO,IAAI,CAAC,SAAS,CACnB,aAAa,CAAC,MAAM,CAAC,yBAAyB,EAAE;QAC9C,oBAAoB;QACpB,QAAQ;QACR,WAAW;QACX,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QACrB,OAAO;KACR,CAAC,CACH,CAAA;AACH,CAAC;AAWD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,qBAAqB,CACnC,KAAkC;IAElC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAChC,aAAa,CAAC,MAAM,CAAC,qBAAqB,EAAE;QAC1C,eAAe;QACf,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,gBAAgB;KACvB,CAAC,CACH,CAAA;IACD,OAAO,IAAI,CAAC,SAAS,CACnB,GAAG,CAAC,MAAM,CACR,QAAQ,EACR,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,EAC3C,WAAW,CACZ,CACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":"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"}

package/_esm/tempo/index.js

@@ -32,26 +32,27 @@
  */
 export * as AuthorizationTempo from './AuthorizationTempo.js';
 /**
- * TIP-20 channel reserve constants and deterministic hashing utilities.
+ * TIP-20 channel reserve descriptor, constants, and deterministic hashing utilities.
  *
- * The channel reserve precompile exposes helper methods for channel identifiers,
- * voucher sign payloads, and its EIP-712 domain separator. These utilities compute the
- * same values locally when the chain id and channel fields are known.
+ * Channel descriptors are emitted by `Channel.open` and then reused to settle,
+ * top up, close, request close, withdraw, or compute the channel ID. The channel
+ * reserve precompile exposes helper methods for channel identifiers, voucher sign
+ * payloads, and its EIP-712 domain separator. These utilities compute the same
+ * values locally when the chain id and channel fields are known.
  *
  * @example
  * ```ts twoslash
  * import { Channel } from 'ox/tempo'
  *
- * const channelId = Channel.computeId({
- *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
+ * const channel = Channel.from({
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
- *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
  * })
+ *
+ * const channelId = Channel.computeId(channel, { chainId: 4217 })
  * ```
  *
  * @category Reference

package/_esm/tempo/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/_esm/version.js

@@ -1,3 +1,3 @@
 /** @internal */
-export const version = '0.14.23';
+export const version = '0.14.25';
 //# sourceMappingURL=version.js.map

package/_types/tempo/Channel.d.ts

@@ -1,7 +1,8 @@
 import * as AbiParameters from '../core/AbiParameters.js';
+import * as Address from '../core/Address.js';
+import type * as Errors from '../core/Errors.js';
 import * as Hash from '../core/Hash.js';
 import * as Hex from '../core/Hex.js';
-import * as TempoAddress from './TempoAddress.js';
 import * as TokenId from './TokenId.js';
 /**
  * TIP-20 channel reserve precompile address.
@@ -18,22 +19,67 @@ export declare const voucherTypehash: `0x${string}`;
 /**
  * TIP-20 channel descriptor.
  */
-export type Descriptor = {
-    /** Account that funded the channel and receives refunds. */
-    payer: TempoAddress.Address;
-    /** Account that receives settled voucher payments. */
-    payee: TempoAddress.Address;
-    /** Optional relayer allowed to submit `settle` for the payee. */
-    operator: TempoAddress.Address;
-    /** TIP-20 token address held by the channel. */
-    token: TokenId.TokenIdOrAddress<TempoAddress.Address>;
-    /** User-supplied salt to distinguish otherwise identical channels. */
-    salt: Hex.Hex;
+export type Channel<addressType = Address.Address, tokenType = TokenId.TokenIdOrAddress<addressType>> = {
     /** Optional signer for vouchers. Zero means `payer` signs. */
-    authorizedSigner: TempoAddress.Address;
+    authorizedSigner: addressType;
     /** Transaction-derived hash assigned when the channel was opened. */
     expiringNonceHash: Hex.Hex;
+    /** Optional relayer allowed to submit `settle` for the payee. */
+    operator: addressType;
+    /** Account that receives settled voucher payments. */
+    payee: addressType;
+    /** Account that funded the channel and receives refunds. */
+    payer: addressType;
+    /** User-supplied salt to distinguish otherwise identical channels. */
+    salt: Hex.Hex;
+    /** TIP-20 token address held by the channel. */
+    token: tokenType;
 };
+/** Hex-address-normalized {@link ox#Channel.Channel}. */
+export type Resolved = Channel<Address.Address, Address.Address>;
+/**
+ * Instantiates a TIP-20 channel reserve descriptor.
+ *
+ * Accepts a TIP-20 token ID or address, and defaults `operator` and
+ * `authorizedSigner` to the zero address.
+ *
+ * @example
+ * ```ts twoslash
+ * import { Channel } from 'ox/tempo'
+ *
+ * const channel = Channel.from({
+ *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000002',
+ *   payee: '0x2222222222222222222222222222222222222222',
+ *   payer: '0x1111111111111111111111111111111111111111',
+ *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
+ *   token: 1n,
+ * })
+ * ```
+ *
+ * @param value - The channel descriptor input.
+ * @returns The normalized channel descriptor.
+ */
+export declare function from(value: from.Value): from.ReturnType;
+export declare namespace from {
+    type Value = {
+        /** Optional signer for vouchers. Zero means `payer` signs. */
+        authorizedSigner?: Address.Address | undefined;
+        /** Transaction-derived hash assigned when the channel was opened. */
+        expiringNonceHash: Hex.Hex;
+        /** Optional relayer allowed to submit `settle` for the payee. */
+        operator?: Address.Address | undefined;
+        /** Account that receives settled voucher payments. */
+        payee: Address.Address;
+        /** Account that funded the channel and receives refunds. */
+        payer: Address.Address;
+        /** User-supplied salt to distinguish otherwise identical channels. */
+        salt: Hex.Hex;
+        /** TIP-20 token address or ID held by the channel. */
+        token: TokenId.TokenIdOrAddress<Address.Address>;
+    };
+    type ReturnType = Resolved;
+    type ErrorType = Address.from.ErrorType | Hex.concat.ErrorType | Hex.fromNumber.ErrorType | Errors.GlobalErrorType;
+}
 /**
  * Computes the canonical TIP-20 channel id for a descriptor.
  *
@@ -46,26 +92,29 @@ export type Descriptor = {
  *
  * const channelId = Channel.computeId({
  *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
  *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
+ * }, {
+ *   chainId: 4217,
  * })
  * ```
  *
- * @param value - Channel descriptor and chain id.
+ * @param channel - Channel descriptor.
+ * @param options - Options.
  * @returns The channel id.
  */
-export declare function computeId(value: computeId.Value): Hex.Hex;
+export declare function computeId(channel: computeId.Channel, options: computeId.Options): Hex.Hex;
 export declare namespace computeId {
-    type Value = Descriptor & {
-        /** Chain id used by the channel reserve precompile. */
+    type Channel = from.Value;
+    type Options = {
+        /** Chain ID used by the channel reserve precompile. */
         chainId: number | bigint;
     };
-    type ErrorType = AbiParameters.encode.ErrorType | Hash.keccak256.ErrorType | TempoAddress.parse.ErrorType;
+    type ErrorType = AbiParameters.encode.ErrorType | from.ErrorType | Hash.keccak256.ErrorType;
 }
 /**
  * Computes the EIP-712 domain separator for the TIP-20 channel reserve.

package/_types/tempo/Channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Channel.d.ts","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAA;AAEzD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAkBvC;;GAEG;AACH,eAAO,MAAM,OAAO,8CAC6D,CAAA;AAEjF;;GAEG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAA;AAEpC;;GAEG;AACH,eAAO,MAAM,eAAe,eAE3B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,4DAA4D;IAC5D,KAAK,EAAE,YAAY,CAAC,OAAO,CAAA;IAC3B,sDAAsD;IACtD,KAAK,EAAE,YAAY,CAAC,OAAO,CAAA;IAC3B,iEAAiE;IACjE,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAA;IAC9B,gDAAgD;IAChD,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IACrD,sEAAsE;IACtE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAA;IACb,8DAA8D;IAC9D,gBAAgB,EAAE,YAAY,CAAC,OAAO,CAAA;IACtC,qEAAqE;IACrE,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAA;CAC3B,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAczD;AAED,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAK,KAAK,GAAG,UAAU,GAAG;QACxB,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GACV,aAAa,CAAC,MAAM,CAAC,SAAS,GAC9B,IAAI,CAAC,SAAS,CAAC,SAAS,GACxB,YAAY,CAAC,KAAK,CAAC,SAAS,CAAA;CACjC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAUrE;AAED,MAAM,CAAC,OAAO,WAAW,eAAe,CAAC;IACvC,KAAK,KAAK,GAAG;QACX,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAA;CAC3E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,qBAAqB,CAAC,KAAK,GACjC,GAAG,CAAC,GAAG,CAeT;AAED,MAAM,CAAC,OAAO,WAAW,qBAAqB,CAAC;IAC7C,KAAK,KAAK,GAAG;QACX,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;QACxB,kBAAkB;QAClB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;QAClB,mDAAmD;QACnD,gBAAgB,EAAE,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GACV,aAAa,CAAC,MAAM,CAAC,SAAS,GAC9B,eAAe,CAAC,SAAS,GACzB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAA;CAC7B"}
+{"version":3,"file":"Channel.d.ts","sourceRoot":"","sources":["../../tempo/Channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAoBvC;;GAEG;AACH,eAAO,MAAM,OAAO,8CAC6D,CAAA;AAEjF;;GAEG;AACH,eAAO,MAAM,gBAAgB,OAAO,CAAA;AAEpC;;GAEG;AACH,eAAO,MAAM,eAAe,eAE3B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,CACjB,WAAW,GAAG,OAAO,CAAC,OAAO,EAC7B,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAC/C;IACF,8DAA8D;IAC9D,gBAAgB,EAAE,WAAW,CAAA;IAC7B,qEAAqE;IACrE,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAA;IAC1B,iEAAiE;IACjE,QAAQ,EAAE,WAAW,CAAA;IACrB,sDAAsD;IACtD,KAAK,EAAE,WAAW,CAAA;IAClB,4DAA4D;IAC5D,KAAK,EAAE,WAAW,CAAA;IAClB,sEAAsE;IACtE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAA;IACb,gDAAgD;IAChD,KAAK,EAAE,SAAS,CAAA;CACjB,CAAA;AAED,yDAAyD;AACzD,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;AAEhE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAuBvD;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,KAAK,GAAG;QACX,8DAA8D;QAC9D,gBAAgB,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;QAC9C,qEAAqE;QACrE,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAA;QAC1B,iEAAiE;QACjE,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;QACtC,sDAAsD;QACtD,KAAK,EAAE,OAAO,CAAC,OAAO,CAAA;QACtB,4DAA4D;QAC5D,KAAK,EAAE,OAAO,CAAC,OAAO,CAAA;QACtB,sEAAsE;QACtE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAA;QACb,sDAAsD;QACtD,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;KACjD,CAAA;IAED,KAAK,UAAU,GAAG,QAAQ,CAAA;IAE1B,KAAK,SAAS,GACV,OAAO,CAAC,IAAI,CAAC,SAAS,GACtB,GAAG,CAAC,MAAM,CAAC,SAAS,GACpB,GAAG,CAAC,UAAU,CAAC,SAAS,GACxB,MAAM,CAAC,eAAe,CAAA;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,SAAS,CAAC,OAAO,EAC1B,OAAO,EAAE,SAAS,CAAC,OAAO,GACzB,GAAG,CAAC,GAAG,CAeT;AAED,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAK,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;IAEzB,KAAK,OAAO,GAAG;QACb,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GACV,aAAa,CAAC,MAAM,CAAC,SAAS,GAC9B,IAAI,CAAC,SAAS,GACd,IAAI,CAAC,SAAS,CAAC,SAAS,CAAA;CAC7B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAUrE;AAED,MAAM,CAAC,OAAO,WAAW,eAAe,CAAC;IACvC,KAAK,KAAK,GAAG;QACX,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAA;CAC3E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,qBAAqB,CAAC,KAAK,GACjC,GAAG,CAAC,GAAG,CAeT;AAED,MAAM,CAAC,OAAO,WAAW,qBAAqB,CAAC;IAC7C,KAAK,KAAK,GAAG;QACX,uDAAuD;QACvD,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;QACxB,kBAAkB;QAClB,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;QAClB,mDAAmD;QACnD,gBAAgB,EAAE,MAAM,CAAA;KACzB,CAAA;IAED,KAAK,SAAS,GACV,aAAa,CAAC,MAAM,CAAC,SAAS,GAC9B,eAAe,CAAC,SAAS,GACzB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAA;CAC7B"}

package/_types/tempo/index.d.ts

@@ -34,26 +34,27 @@ export type {};
  */
 export * as AuthorizationTempo from './AuthorizationTempo.js';
 /**
- * TIP-20 channel reserve constants and deterministic hashing utilities.
+ * TIP-20 channel reserve descriptor, constants, and deterministic hashing utilities.
  *
- * The channel reserve precompile exposes helper methods for channel identifiers,
- * voucher sign payloads, and its EIP-712 domain separator. These utilities compute the
- * same values locally when the chain id and channel fields are known.
+ * Channel descriptors are emitted by `Channel.open` and then reused to settle,
+ * top up, close, request close, withdraw, or compute the channel ID. The channel
+ * reserve precompile exposes helper methods for channel identifiers, voucher sign
+ * payloads, and its EIP-712 domain separator. These utilities compute the same
+ * values locally when the chain id and channel fields are known.
  *
  * @example
  * ```ts twoslash
  * import { Channel } from 'ox/tempo'
  *
- * const channelId = Channel.computeId({
- *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
+ * const channel = Channel.from({
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
- *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
  * })
+ *
+ * const channelId = Channel.computeId(channel, { chainId: 4217 })
  * ```
  *
  * @category Reference

package/_types/tempo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,YAAY,EAAE,CAAA;AAEd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../tempo/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,YAAY,EAAE,CAAA;AAEd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}

package/_types/version.d.ts

@@ -1,3 +1,3 @@
 /** @internal */
-export declare const version = "0.14.23";
+export declare const version = "0.14.25";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ox",
   "description": "Ethereum Standard Library",
-  "version": "0.14.23",
+  "version": "0.14.25",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/tempo/Channel.test.ts

@@ -1,10 +1,9 @@
-import { Hash, Hex, TypedData } from 'ox'
+import { type Address, Hash, Hex, TypedData } from 'ox'
 import { Channel } from 'ox/tempo'
 import { describe, expect, test } from 'vitest'
 
-const descriptor = {
+const channel = {
   authorizedSigner: '0x3333333333333333333333333333333333333333',
-  chainId: 4217,
   expiringNonceHash:
     '0x0000000000000000000000000000000000000000000000000000000000000002',
   operator: '0x0000000000000000000000000000000000000000',
@@ -14,6 +13,8 @@ const descriptor = {
   token: 1n,
 } as const
 
+const chainId = 4217
+
 describe('address', () => {
   test('default', () => {
     expect(Channel.address).toMatchInlineSnapshot(
@@ -41,39 +42,120 @@ describe('voucherTypehash', () => {
   })
 })
 
+describe('from', () => {
+  test('default', () => {
+    expect(
+      Channel.from({
+        ...channel,
+        operator: '0x4444444444444444444444444444444444444444',
+      }),
+    ).toMatchInlineSnapshot(`
+      {
+        "authorizedSigner": "0x3333333333333333333333333333333333333333",
+        "expiringNonceHash": "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "operator": "0x4444444444444444444444444444444444444444",
+        "payee": "0x2222222222222222222222222222222222222222",
+        "payer": "0x1111111111111111111111111111111111111111",
+        "salt": "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "token": "0x20c0000000000000000000000000000000000001",
+      }
+    `)
+  })
+
+  test('default values', () => {
+    expect(
+      Channel.from({
+        expiringNonceHash: channel.expiringNonceHash,
+        payee: channel.payee,
+        payer: channel.payer,
+        salt: channel.salt,
+        token: channel.token,
+      }),
+    ).toMatchInlineSnapshot(`
+      {
+        "authorizedSigner": "0x0000000000000000000000000000000000000000",
+        "expiringNonceHash": "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "operator": "0x0000000000000000000000000000000000000000",
+        "payee": "0x2222222222222222222222222222222222222222",
+        "payer": "0x1111111111111111111111111111111111111111",
+        "salt": "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "token": "0x20c0000000000000000000000000000000000001",
+      }
+    `)
+  })
+
+  test('token address input', () => {
+    expect(
+      Channel.from({
+        ...channel,
+        operator: '0x4444444444444444444444444444444444444444',
+        token: '0x20c0000000000000000000000000000000000001',
+      }),
+    ).toMatchInlineSnapshot(`
+      {
+        "authorizedSigner": "0x3333333333333333333333333333333333333333",
+        "expiringNonceHash": "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "operator": "0x4444444444444444444444444444444444444444",
+        "payee": "0x2222222222222222222222222222222222222222",
+        "payer": "0x1111111111111111111111111111111111111111",
+        "salt": "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "token": "0x20c0000000000000000000000000000000000001",
+      }
+    `)
+  })
+
+  test('return type', () => {
+    const resolved = Channel.from({
+      expiringNonceHash:
+        '0x0000000000000000000000000000000000000000000000000000000000000002',
+      payee: '0x2222222222222222222222222222222222222222',
+      payer: '0x1111111111111111111111111111111111111111',
+      salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
+      token: 1n,
+    })
+
+    resolved satisfies Channel.Resolved
+    resolved satisfies Channel.Channel
+    resolved.payer satisfies Address.Address
+    resolved.token satisfies Address.Address
+  })
+})
+
 describe('computeId', () => {
   test('default', () => {
-    expect(Channel.computeId(descriptor)).toMatchInlineSnapshot(
+    expect(Channel.computeId(channel, { chainId })).toMatchInlineSnapshot(
       `"0xa392474fdbb5c6753e8789236893343f11200f43ba53cca09c0cda3651946ef2"`,
     )
   })
 
-  test('address inputs', () => {
+  test('token address input', () => {
     expect(
-      Channel.computeId({
-        ...descriptor,
-        payee: 'tempox0x2222222222222222222222222222222222222222',
-        token: 'tempox0x20c0000000000000000000000000000000000001',
-      }),
-    ).toBe(Channel.computeId(descriptor))
+      Channel.computeId(
+        {
+          ...channel,
+          token: '0x20c0000000000000000000000000000000000001',
+        },
+        { chainId },
+      ),
+    ).toBe(Channel.computeId(channel, { chainId }))
   })
 
   test('chain id bigint', () => {
-    expect(Channel.computeId({ ...descriptor, chainId: 4217n })).toBe(
-      Channel.computeId(descriptor),
+    expect(Channel.computeId(channel, { chainId: 4217n })).toBe(
+      Channel.computeId(channel, { chainId }),
     )
   })
 })
 
 describe('domainSeparator', () => {
   test('default', () => {
-    const separator = Channel.domainSeparator({ chainId: descriptor.chainId })
+    const separator = Channel.domainSeparator({ chainId })
 
     expect(separator).toBe(
       TypedData.domainSeparator({
         name: 'TIP20 Channel Reserve',
         version: '1',
-        chainId: descriptor.chainId,
+        chainId,
         verifyingContract: Channel.address,
       }),
     )
@@ -85,10 +167,10 @@ describe('domainSeparator', () => {
 
 describe('getVoucherSignPayload', () => {
   test('default', () => {
-    const channelId = Channel.computeId(descriptor)
+    const channelId = Channel.computeId(channel, { chainId })
     const cumulativeAmount = 100n
     const payload = Channel.getVoucherSignPayload({
-      chainId: descriptor.chainId,
+      chainId,
       channelId,
       cumulativeAmount,
     })
@@ -98,7 +180,7 @@ describe('getVoucherSignPayload', () => {
         domain: {
           name: 'TIP20 Channel Reserve',
           version: '1',
-          chainId: descriptor.chainId,
+          chainId,
           verifyingContract: Channel.address,
         },
         message: {

package/tempo/Channel.ts

@@ -1,8 +1,8 @@
 import * as AbiParameters from '../core/AbiParameters.js'
-import type * as Address from '../core/Address.js'
+import * as Address from '../core/Address.js'
+import type * as Errors from '../core/Errors.js'
 import * as Hash from '../core/Hash.js'
 import * as Hex from '../core/Hex.js'
-import * as TempoAddress from './TempoAddress.js'
 import * as TokenId from './TokenId.js'
 
 const channelIdParameters = AbiParameters.from(
@@ -20,6 +20,8 @@ const eip712DomainTypehash = Hash.keccak256(
 )
 const nameHash = Hash.keccak256(Hex.fromString('TIP20 Channel Reserve'))
 const versionHash = Hash.keccak256(Hex.fromString('1'))
+const zeroAddress =
+  '0x0000000000000000000000000000000000000000' as const satisfies Address.Address
 
 /**
  * TIP-20 channel reserve precompile address.
@@ -42,21 +44,101 @@ export const voucherTypehash = Hash.keccak256(
 /**
  * TIP-20 channel descriptor.
  */
-export type Descriptor = {
-  /** Account that funded the channel and receives refunds. */
-  payer: TempoAddress.Address
-  /** Account that receives settled voucher payments. */
-  payee: TempoAddress.Address
-  /** Optional relayer allowed to submit `settle` for the payee. */
-  operator: TempoAddress.Address
-  /** TIP-20 token address held by the channel. */
-  token: TokenId.TokenIdOrAddress<TempoAddress.Address>
-  /** User-supplied salt to distinguish otherwise identical channels. */
-  salt: Hex.Hex
+export type Channel<
+  addressType = Address.Address,
+  tokenType = TokenId.TokenIdOrAddress<addressType>,
+> = {
   /** Optional signer for vouchers. Zero means `payer` signs. */
-  authorizedSigner: TempoAddress.Address
+  authorizedSigner: addressType
   /** Transaction-derived hash assigned when the channel was opened. */
   expiringNonceHash: Hex.Hex
+  /** Optional relayer allowed to submit `settle` for the payee. */
+  operator: addressType
+  /** Account that receives settled voucher payments. */
+  payee: addressType
+  /** Account that funded the channel and receives refunds. */
+  payer: addressType
+  /** User-supplied salt to distinguish otherwise identical channels. */
+  salt: Hex.Hex
+  /** TIP-20 token address held by the channel. */
+  token: tokenType
+}
+
+/** Hex-address-normalized {@link ox#Channel.Channel}. */
+export type Resolved = Channel<Address.Address, Address.Address>
+
+/**
+ * Instantiates a TIP-20 channel reserve descriptor.
+ *
+ * Accepts a TIP-20 token ID or address, and defaults `operator` and
+ * `authorizedSigner` to the zero address.
+ *
+ * @example
+ * ```ts twoslash
+ * import { Channel } from 'ox/tempo'
+ *
+ * const channel = Channel.from({
+ *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000002',
+ *   payee: '0x2222222222222222222222222222222222222222',
+ *   payer: '0x1111111111111111111111111111111111111111',
+ *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
+ *   token: 1n,
+ * })
+ * ```
+ *
+ * @param value - The channel descriptor input.
+ * @returns The normalized channel descriptor.
+ */
+export function from(value: from.Value): from.ReturnType {
+  const {
+    authorizedSigner = zeroAddress,
+    expiringNonceHash,
+    operator = zeroAddress,
+    payee,
+    payer,
+    salt,
+    token,
+  } = value
+
+  return {
+    authorizedSigner: resolveAddress(authorizedSigner),
+    expiringNonceHash,
+    operator: resolveAddress(operator),
+    payee: resolveAddress(payee),
+    payer: resolveAddress(payer),
+    salt,
+    token:
+      typeof token === 'string'
+        ? resolveAddress(token)
+        : TokenId.toAddress(token),
+  }
+}
+
+export declare namespace from {
+  type Value = {
+    /** Optional signer for vouchers. Zero means `payer` signs. */
+    authorizedSigner?: Address.Address | undefined
+    /** Transaction-derived hash assigned when the channel was opened. */
+    expiringNonceHash: Hex.Hex
+    /** Optional relayer allowed to submit `settle` for the payee. */
+    operator?: Address.Address | undefined
+    /** Account that receives settled voucher payments. */
+    payee: Address.Address
+    /** Account that funded the channel and receives refunds. */
+    payer: Address.Address
+    /** User-supplied salt to distinguish otherwise identical channels. */
+    salt: Hex.Hex
+    /** TIP-20 token address or ID held by the channel. */
+    token: TokenId.TokenIdOrAddress<Address.Address>
+  }
+
+  type ReturnType = Resolved
+
+  type ErrorType =
+    | Address.from.ErrorType
+    | Hex.concat.ErrorType
+    | Hex.fromNumber.ErrorType
+    | Errors.GlobalErrorType
 }
 
 /**
@@ -71,45 +153,53 @@ export type Descriptor = {
  *
  * const channelId = Channel.computeId({
  *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
  *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
+ * }, {
+ *   chainId: 4217,
  * })
  * ```
  *
- * @param value - Channel descriptor and chain id.
+ * @param channel - Channel descriptor.
+ * @param options - Options.
  * @returns The channel id.
  */
-export function computeId(value: computeId.Value): Hex.Hex {
+export function computeId(
+  channel: computeId.Channel,
+  options: computeId.Options,
+): Hex.Hex {
+  const channel_ = from(channel)
   return Hash.keccak256(
     AbiParameters.encode(channelIdParameters, [
-      TempoAddress.resolve(value.payer),
-      TempoAddress.resolve(value.payee),
-      TempoAddress.resolve(value.operator),
-      TokenId.toAddress(value.token),
-      value.salt,
-      TempoAddress.resolve(value.authorizedSigner),
-      value.expiringNonceHash,
+      channel_.payer,
+      channel_.payee,
+      channel_.operator,
+      channel_.token,
+      channel_.salt,
+      channel_.authorizedSigner,
+      channel_.expiringNonceHash,
       address,
-      BigInt(value.chainId),
+      BigInt(options.chainId),
     ]),
   )
 }
 
 export declare namespace computeId {
-  type Value = Descriptor & {
-    /** Chain id used by the channel reserve precompile. */
+  type Channel = from.Value
+
+  type Options = {
+    /** Chain ID used by the channel reserve precompile. */
     chainId: number | bigint
   }
 
   type ErrorType =
     | AbiParameters.encode.ErrorType
+    | from.ErrorType
     | Hash.keccak256.ErrorType
-    | TempoAddress.parse.ErrorType
 }
 
 /**
@@ -203,3 +293,7 @@ export declare namespace getVoucherSignPayload {
     | domainSeparator.ErrorType
     | Hash.keccak256.ErrorType
 }
+
+function resolveAddress(address: Address.Address): Address.Address {
+  return Address.from(address)
+}

package/tempo/index.ts

@@ -36,26 +36,27 @@ export type {}
  */
 export * as AuthorizationTempo from './AuthorizationTempo.js'
 /**
- * TIP-20 channel reserve constants and deterministic hashing utilities.
+ * TIP-20 channel reserve descriptor, constants, and deterministic hashing utilities.
  *
- * The channel reserve precompile exposes helper methods for channel identifiers,
- * voucher sign payloads, and its EIP-712 domain separator. These utilities compute the
- * same values locally when the chain id and channel fields are known.
+ * Channel descriptors are emitted by `Channel.open` and then reused to settle,
+ * top up, close, request close, withdraw, or compute the channel ID. The channel
+ * reserve precompile exposes helper methods for channel identifiers, voucher sign
+ * payloads, and its EIP-712 domain separator. These utilities compute the same
+ * values locally when the chain id and channel fields are known.
  *
  * @example
  * ```ts twoslash
  * import { Channel } from 'ox/tempo'
  *
- * const channelId = Channel.computeId({
- *   authorizedSigner: '0x0000000000000000000000000000000000000000',
- *   chainId: 4217,
+ * const channel = Channel.from({
  *   expiringNonceHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
- *   operator: '0x0000000000000000000000000000000000000000',
  *   payee: '0x2222222222222222222222222222222222222222',
  *   payer: '0x1111111111111111111111111111111111111111',
  *   salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
  *   token: 1n,
  * })
+ *
+ * const channelId = Channel.computeId(channel, { chainId: 4217 })
  * ```
  *
  * @category Reference

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.14.23'
+export const version = '0.14.25'