@haneullabs/haneul 2.5.1 → 2.13.0

package/src/keypairs/ed25519/keypair.ts

@@ -1,11 +1,12 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+import { toHex } from '@haneullabs/bcs';
 import { ed25519 } from '@noble/curves/ed25519.js';
 
 import {
-	decodeSuiPrivateKey,
-	encodeSuiPrivateKey,
+	decodeHaneulPrivateKey,
+	encodeHaneulPrivateKey,
 	Keypair,
 	PRIVATE_KEY_SIZE,
 } from '../../cryptography/keypair.js';
@@ -14,7 +15,7 @@ import type { SignatureScheme } from '../../cryptography/signature-scheme.js';
 import { derivePath } from './ed25519-hd-key.js';
 import { Ed25519PublicKey } from './publickey.js';
 
-export const DEFAULT_ED25519_DERIVATION_PATH = "m/44'/784'/0'/0'/0'";
+export const DEFAULT_ED25519_DERIVATION_PATH = "m/44'/8282'/0'/0'/0'";
 
 /**
  * Ed25519 Keypair data. The publickey is the 32-byte public key and
@@ -87,7 +88,7 @@ export class Ed25519Keypair extends Keypair {
 		options?: { skipValidation?: boolean },
 	): Ed25519Keypair {
 		if (typeof secretKey === 'string') {
-			const decoded = decodeSuiPrivateKey(secretKey);
+			const decoded = decodeHaneulPrivateKey(secretKey);
 
 			if (decoded.scheme !== 'ED25519') {
 				throw new Error(`Expected a ED25519 keypair, got ${decoded.scheme}`);
@@ -129,7 +130,7 @@ export class Ed25519Keypair extends Keypair {
 	 * The Bech32 secret key string for this Ed25519 keypair
 	 */
 	getSecretKey(): string {
-		return encodeSuiPrivateKey(
+		return encodeHaneulPrivateKey(
 			this.keypair.secretKey.slice(0, PRIVATE_KEY_SIZE),
 			this.getKeyScheme(),
 		);
@@ -146,8 +147,8 @@ export class Ed25519Keypair extends Keypair {
 	 * Derive Ed25519 keypair from mnemonics and path. The mnemonics must be normalized
 	 * and validated against the english wordlist.
 	 *
-	 * If path is none, it will default to m/44'/784'/0'/0'/0', otherwise the path must
-	 * be compliant to SLIP-0010 in form m/44'/784'/{account_index}'/{change_index}'/{address_index}'.
+	 * If path is none, it will default to m/44'/8282'/0'/0'/0', otherwise the path must
+	 * be compliant to SLIP-0010 in form m/44'/8282'/{account_index}'/{change_index}'/{address_index}'.
 	 */
 	static deriveKeypair(mnemonics: string, path?: string): Ed25519Keypair {
 		if (path == null) {
@@ -164,16 +165,19 @@ export class Ed25519Keypair extends Keypair {
 	/**
 	 * Derive Ed25519 keypair from mnemonicSeed and path.
 	 *
-	 * If path is none, it will default to m/44'/784'/0'/0'/0', otherwise the path must
-	 * be compliant to SLIP-0010 in form m/44'/784'/{account_index}'/{change_index}'/{address_index}'.
+	 * If path is none, it will default to m/44'/8282'/0'/0'/0', otherwise the path must
+	 * be compliant to SLIP-0010 in form m/44'/8282'/{account_index}'/{change_index}'/{address_index}'.
+	 *
+	 * @param seed - The seed as a hex string or Uint8Array.
 	 */
-	static deriveKeypairFromSeed(seedHex: string, path?: string): Ed25519Keypair {
+	static deriveKeypairFromSeed(seed: string | Uint8Array, path?: string): Ed25519Keypair {
 		if (path == null) {
 			path = DEFAULT_ED25519_DERIVATION_PATH;
 		}
 		if (!isValidHardenedPath(path)) {
 			throw new Error('Invalid derivation path');
 		}
+		const seedHex = typeof seed === 'string' ? seed : toHex(seed);
 		const { key } = derivePath(path, seedHex);
 
 		return Ed25519Keypair.fromSecretKey(key);

package/src/keypairs/passkey/keypair.ts

@@ -39,7 +39,7 @@ export type BrowserPasswordProviderOptions = Pick<
 
 export interface PasskeyProvider {
 	create(): Promise<RegistrationCredential>;
-	get(challenge: Uint8Array): Promise<AuthenticationCredential>;
+	get(challenge: Uint8Array, credentialId?: Uint8Array): Promise<AuthenticationCredential>;
 }
 
 // Default browser implementation
@@ -80,12 +80,15 @@ export class BrowserPasskeyProvider implements PasskeyProvider {
 		})) as RegistrationCredential;
 	}
 
-	async get(challenge: Uint8Array): Promise<AuthenticationCredential> {
+	async get(challenge: Uint8Array, credentialId?: Uint8Array): Promise<AuthenticationCredential> {
 		return (await navigator.credentials.get({
 			publicKey: {
 				challenge: challenge as BufferSource,
 				userVerification: this.#options.authenticatorSelection?.userVerification || 'required',
 				timeout: this.#options.timeout ?? 60000,
+				...(credentialId && {
+					allowCredentials: [{ type: 'public-key' as const, id: credentialId as BufferSource }],
+				}),
 			},
 		})) as AuthenticationCredential;
 	}
@@ -93,11 +96,12 @@ export class BrowserPasskeyProvider implements PasskeyProvider {
 
 /**
  * @experimental
- * A passkey signer used for signing transactions. This is a client side implementation for [SIP-9](https://github.co./haneul-foundation/sips/blob/main/sips/sip-9.md).
+ * A passkey signer used for signing transactions. This is a client side implementation for [SIP-9](https://github.com/haneul-foundation/sips/blob/main/sips/sip-9.md).
  */
 export class PasskeyKeypair extends Signer {
 	private publicKey: Uint8Array;
 	private provider: PasskeyProvider;
+	private credentialId?: Uint8Array;
 
 	/**
 	 * Get the key scheme of passkey,
@@ -120,10 +124,20 @@ export class PasskeyKeypair extends Signer {
 	 * If there are existing passkey wallet, use `signAndRecover` to identify the correct
 	 * public key and then initialize the instance. See usage in `signAndRecover`.
 	 */
-	constructor(publicKey: Uint8Array, provider: PasskeyProvider) {
+	constructor(publicKey: Uint8Array, provider: PasskeyProvider, credentialId?: Uint8Array) {
 		super();
 		this.publicKey = publicKey;
 		this.provider = provider;
+		this.credentialId = credentialId;
+	}
+
+	/**
+	 * Return the credential ID for this passkey, if available.
+	 * The credential ID is captured when creating a new passkey via `getPasskeyInstance`
+	 * and can be used to constrain which credential the browser selects during signing.
+	 */
+	getCredentialId(): Uint8Array | undefined {
+		return this.credentialId;
 	}
 
 	/**
@@ -145,7 +159,7 @@ export class PasskeyKeypair extends Signer {
 			const pubkeyUncompressed = parseDerSPKI(new Uint8Array(derSPKI));
 			const pubkey = secp256r1.Point.fromBytes(pubkeyUncompressed);
 			const pubkeyCompressed = pubkey.toBytes(true);
-			return new PasskeyKeypair(pubkeyCompressed, provider);
+			return new PasskeyKeypair(pubkeyCompressed, provider, new Uint8Array(credential.rawId));
 		}
 	}
 
@@ -162,7 +176,7 @@ export class PasskeyKeypair extends Signer {
 	 */
 	async sign(data: Uint8Array) {
 		// asks the passkey to sign over challenge as the data.
-		const credential = await this.provider.get(data);
+		const credential = await this.provider.get(data, this.credentialId);
 
 		// parse authenticatorData (as bytes), clientDataJSON (decoded as string).
 		const authenticatorData = new Uint8Array(credential.response.authenticatorData);
@@ -190,7 +204,7 @@ export class PasskeyKeypair extends Signer {
 		arr.set(normalized, 1);
 		arr.set(this.publicKey, 1 + normalized.length);
 
-		// serialize all fields into a passkey signature according to https://github.co./haneul-foundation/sips/blob/main/sips/sip-9.md#signature-encoding
+		// serialize all fields into a passkey signature according to https://github.com/haneul-foundation/sips/blob/main/sips/sip-9.md#signature-encoding
 		return PasskeyAuthenticator.serialize({
 			authenticatorData: authenticatorData,
 			clientDataJson: clientDataJSONString,
@@ -245,7 +259,7 @@ export class PasskeyKeypair extends Signer {
 	 * const testMessage2 = new TextEncoder().encode('Hello world 2!');
 	 * const possiblePks2 = await PasskeyKeypair.signAndRecover(provider, testMessage2);
 	 * const commonPk = findCommonPublicKey(possiblePks, possiblePks2);
-	 * const signer = new PasskeyKeypair(provider, commonPk.toRawBytes());
+	 * const signer = new PasskeyKeypair(commonPk.toRawBytes(), provider);
 	 * ```
 	 *
 	 * @param provider - the passkey provider.

package/src/keypairs/secp256k1/keypair.ts

@@ -5,13 +5,13 @@ import { secp256k1 } from '@noble/curves/secp256k1.js';
 import { blake2b } from '@noble/hashes/blake2.js';
 import { HDKey } from '@scure/bip32';
 
-import { decodeSuiPrivateKey, encodeSuiPrivateKey, Keypair } from '../../cryptography/keypair.js';
+import { decodeHaneulPrivateKey, encodeHaneulPrivateKey, Keypair } from '../../cryptography/keypair.js';
 import { isValidBIP32Path, mnemonicToSeed } from '../../cryptography/mnemonics.js';
 import type { PublicKey } from '../../cryptography/publickey.js';
 import type { SignatureScheme } from '../../cryptography/signature-scheme.js';
 import { Secp256k1PublicKey } from './publickey.js';
 
-export const DEFAULT_SECP256K1_DERIVATION_PATH = "m/54'/784'/0'/0/0";
+export const DEFAULT_SECP256K1_DERIVATION_PATH = "m/54'/8282'/0'/0/0";
 
 /**
  * Secp256k1 Keypair data
@@ -77,7 +77,7 @@ export class Secp256k1Keypair extends Keypair {
 		options?: { skipValidation?: boolean },
 	): Secp256k1Keypair {
 		if (typeof secretKey === 'string') {
-			const decoded = decodeSuiPrivateKey(secretKey);
+			const decoded = decodeHaneulPrivateKey(secretKey);
 
 			if (decoded.scheme !== 'Secp256k1') {
 				throw new Error(`Expected a Secp256k1 keypair, got ${decoded.scheme}`);
@@ -120,7 +120,7 @@ export class Secp256k1Keypair extends Keypair {
 	 * The Bech32 secret key string for this Secp256k1 keypair
 	 */
 	getSecretKey(): string {
-		return encodeSuiPrivateKey(this.keypair.secretKey, this.getKeyScheme());
+		return encodeHaneulPrivateKey(this.keypair.secretKey, this.getKeyScheme());
 	}
 
 	/**
@@ -136,8 +136,8 @@ export class Secp256k1Keypair extends Keypair {
 	 * Derive Secp256k1 keypair from mnemonics and path. The mnemonics must be normalized
 	 * and validated against the english wordlist.
 	 *
-	 * If path is none, it will default to m/54'/784'/0'/0/0, otherwise the path must
-	 * be compliant to BIP-32 in form m/54'/784'/{account_index}'/{change_index}/{address_index}.
+	 * If path is none, it will default to m/54'/8282'/0'/0/0, otherwise the path must
+	 * be compliant to BIP-32 in form m/54'/8282'/{account_index}'/{change_index}/{address_index}.
 	 */
 	static deriveKeypair(mnemonics: string, path?: string): Secp256k1Keypair {
 		if (path == null) {

package/src/keypairs/secp256r1/keypair.ts

@@ -5,13 +5,13 @@ import { p256 as secp256r1 } from '@noble/curves/nist.js';
 import { blake2b } from '@noble/hashes/blake2.js';
 import { HDKey } from '@scure/bip32';
 
-import { decodeSuiPrivateKey, encodeSuiPrivateKey, Keypair } from '../../cryptography/keypair.js';
+import { decodeHaneulPrivateKey, encodeHaneulPrivateKey, Keypair } from '../../cryptography/keypair.js';
 import { isValidBIP32Path, mnemonicToSeed } from '../../cryptography/mnemonics.js';
 import type { PublicKey } from '../../cryptography/publickey.js';
 import type { SignatureScheme } from '../../cryptography/signature-scheme.js';
 import { Secp256r1PublicKey } from './publickey.js';
 
-export const DEFAULT_SECP256R1_DERIVATION_PATH = "m/74'/784'/0'/0/0";
+export const DEFAULT_SECP256R1_DERIVATION_PATH = "m/74'/8282'/0'/0/0";
 
 /**
  * Secp256r1 Keypair data
@@ -77,7 +77,7 @@ export class Secp256r1Keypair extends Keypair {
 		options?: { skipValidation?: boolean },
 	): Secp256r1Keypair {
 		if (typeof secretKey === 'string') {
-			const decoded = decodeSuiPrivateKey(secretKey);
+			const decoded = decodeHaneulPrivateKey(secretKey);
 
 			if (decoded.scheme !== 'Secp256r1') {
 				throw new Error(`Expected a Secp256r1 keypair, got ${decoded.scheme}`);
@@ -121,7 +121,7 @@ export class Secp256r1Keypair extends Keypair {
 	 * The Bech32 secret key string for this Secp256r1 keypair
 	 */
 	getSecretKey(): string {
-		return encodeSuiPrivateKey(this.keypair.secretKey, this.getKeyScheme());
+		return encodeHaneulPrivateKey(this.keypair.secretKey, this.getKeyScheme());
 	}
 
 	/**
@@ -137,8 +137,8 @@ export class Secp256r1Keypair extends Keypair {
 	 * Derive Secp256r1 keypair from mnemonics and path. The mnemonics must be normalized
 	 * and validated against the english wordlist.
 	 *
-	 * If path is none, it will default to m/74'/784'/0'/0/0, otherwise the path must
-	 * be compliant to BIP-32 in form m/74'/784'/{account_index}'/{change_index}/{address_index}.
+	 * If path is none, it will default to m/74'/8282'/0'/0/0, otherwise the path must
+	 * be compliant to BIP-32 in form m/74'/8282'/{account_index}'/{change_index}/{address_index}.
 	 */
 	static deriveKeypair(mnemonics: string, path?: string): Secp256r1Keypair {
 		if (path == null) {

package/src/multisig/publickey.ts

@@ -197,7 +197,7 @@ export class MultiSigPublicKey extends PublicKey {
 		// The initial value 3 ensures that following data will be after the flag byte and threshold bytes
 		let i = 3;
 		for (const { publicKey, weight } of this.publicKeys) {
-			const bytes = publicKey.toSuiBytes();
+			const bytes = publicKey.toHaneulBytes();
 			tmp.set(bytes, i);
 			i += bytes.length;
 			tmp.set([weight], i++);

package/src/transactions/Commands.ts

@@ -17,7 +17,7 @@ export type TransactionArgument =
 export type TransactionInput = CallArg;
 
 // Keep in sync with constants in
-// crate./haneul-framework/package./haneul-framework/sources/package.move
+// crates/haneul-framework/packages/haneul-framework/sources/package.move
 export enum UpgradePolicy {
 	COMPATIBLE = 0,
 	ADDITIVE = 128,

package/src/transactions/Transaction.ts

@@ -31,7 +31,12 @@ import { createPure } from './pure.js';
 import { TransactionDataBuilder } from './TransactionData.js';
 import { getIdFromCallArg } from './utils.js';
 import { namedPackagesPlugin } from './plugins/NamedPackagesPlugin.js';
-import { COIN_WITH_BALANCE, resolveCoinBalance } from './intents/CoinWithBalance.js';
+import {
+	COIN_WITH_BALANCE,
+	resolveCoinBalance,
+	coinWithBalance,
+	createBalance,
+} from './intents/CoinWithBalance.js';
 import type { ClientWithCoreApi } from '../client/core.js';
 
 export type TransactionObjectArgument =
@@ -307,6 +312,38 @@ export class Transaction {
 		return { $kind: 'GasCoin' as const, GasCoin: true as const };
 	}
 
+	/**
+	 * Creates a coin of the specified type and balance.
+	 * Sourced from address balance when available, falling back to owned coins.
+	 */
+	coin({
+		type,
+		balance,
+		useGasCoin,
+	}: {
+		balance: bigint | number;
+		type?: string;
+		useGasCoin?: boolean;
+	}): TransactionResult {
+		return this.add(coinWithBalance({ type, balance, useGasCoin }));
+	}
+
+	/**
+	 * Creates a Balance object of the specified type and balance.
+	 * Sourced from address balance when available, falling back to owned coins.
+	 */
+	balance({
+		type,
+		balance,
+		useGasCoin,
+	}: {
+		balance: bigint | number;
+		type?: string;
+		useGasCoin?: boolean;
+	}): TransactionResult {
+		return this.add(createBalance({ type, balance, useGasCoin }));
+	}
+
 	/**
 	 * Add a new object input to the transaction.
 	 */

package/src/transactions/TransactionData.ts

@@ -22,7 +22,7 @@ import type { SerializedTransactionDataV2Schema } from './data/v2.js';
 import { hashTypedData } from './hash.js';
 import { getIdFromCallArg, remapCommandArguments } from './utils.js';
 import type { TransactionResult } from './Transaction.js';
-function prepareSuiAddress(address: string) {
+function prepareHaneulAddress(address: string) {
 	return normalizeHaneulAddress(address).replace('0x', '');
 }
 
@@ -164,11 +164,11 @@ export class TransactionDataBuilder implements TransactionData {
 		}
 
 		const transactionData = {
-			sender: prepareSuiAddress(sender),
+			sender: prepareHaneulAddress(sender),
 			expiration: expiration ? expiration : { None: true },
 			gasData: {
 				payment: gasData.payment,
-				owner: prepareSuiAddress(this.gasData.owner ?? sender),
+				owner: prepareHaneulAddress(this.gasData.owner ?? sender),
 				price: BigInt(gasData.price),
 				budget: BigInt(gasData.budget),
 			},

package/src/transactions/__tests__/bcs.test.ts

@@ -124,7 +124,7 @@ it('can serialize transaction data with a programmable transaction', () => {
 								package: haneul,
 								module: 'display',
 								function: 'new',
-								typeArguments: [`::capy::Capy`],
+								typeArguments: [`${haneul}::capy::Capy`],
 								arguments: [
 									// publisher object
 									{
@@ -140,7 +140,7 @@ it('can serialize transaction data with a programmable transaction', () => {
 								package: haneul,
 								module: 'display',
 								function: 'add_multiple',
-								typeArguments: [`::capy::Capy`],
+								typeArguments: [`${haneul}::capy::Capy`],
 								arguments: [
 									// result of the first transaction
 									{
@@ -166,7 +166,7 @@ it('can serialize transaction data with a programmable transaction', () => {
 								package: haneul,
 								module: 'display',
 								function: 'update_version',
-								typeArguments: [`::capy::Capy`],
+								typeArguments: [`${haneul}::capy::Capy`],
 								arguments: [
 									// result of the first transaction again
 									{

package/src/transactions/data/internal.ts

@@ -101,7 +101,7 @@ export const U32 = pipe(
 	check((val) => val >= 0 && val < 2 ** 32, 'Invalid u32'),
 );
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/base_types.rs#L138
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/base_types.rs#L138
 // Implemented as a tuple in rust
 export const ObjectRefSchema = object({
 	objectId: HaneulAddress,
@@ -110,7 +110,7 @@ export const ObjectRefSchema = object({
 });
 export type ObjectRef = InferOutput<typeof ObjectRefSchema>;
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L690-L702
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L690-L702
 export const ArgumentSchema = union([
 	withKind('GasCoin', object({ GasCoin: literal(true) })),
 	withKind(
@@ -129,7 +129,7 @@ export const ArgumentSchema = union([
 
 export type Argument = InferOutput<typeof ArgumentSchema>;
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L1387-L1392
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L1387-L1392
 export const GasDataSchema = object({
 	budget: nullable(JsonU64),
 	price: nullable(JsonU64),
@@ -174,7 +174,7 @@ export const OpenSignatureSchema = object({
 	body: OpenSignatureBodySchema,
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L707-L718
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L707-L718
 const ProgrammableMoveCallSchema = object({
 	package: ObjectID,
 	module: string(),
@@ -192,7 +192,7 @@ export const $Intent = object({
 	data: record(string(), unknown()),
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L657-L685
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L657-L685
 export const CommandSchema = safeEnum({
 	MoveCall: ProgrammableMoveCallSchema,
 	TransferObjects: object({
@@ -266,7 +266,7 @@ export type Command<Arg = Argument> = EnumOutputShape<{
 	};
 }>;
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L102-L114
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L102-L114
 export const ObjectArgSchema = safeEnum({
 	ImmOrOwnedObject: ObjectRefSchema,
 	SharedObject: object({
@@ -278,26 +278,26 @@ export const ObjectArgSchema = safeEnum({
 	Receiving: ObjectRefSchema,
 });
 
-// Rust: crate./haneul-types/src/transaction.rs
+// Rust: crates/haneul-types/src/transaction.rs
 export const ReservationSchema = safeEnum({
 	MaxAmountU64: JsonU64,
 });
 export type Reservation = InferOutput<typeof ReservationSchema>;
 
-// Rust: crate./haneul-types/src/transaction.rs
+// Rust: crates/haneul-types/src/transaction.rs
 export const WithdrawalTypeArgSchema = safeEnum({
 	Balance: string(),
 });
 export type WithdrawalTypeArg = InferOutput<typeof WithdrawalTypeArgSchema>;
 
-// Rust: crate./haneul-types/src/transaction.rs
+// Rust: crates/haneul-types/src/transaction.rs
 export const WithdrawFromSchema = safeEnum({
 	Sender: literal(true),
 	Sponsor: literal(true),
 });
 export type WithdrawFrom = InferOutput<typeof WithdrawFromSchema>;
 
-// Rust: crate./haneul-types/src/transaction.rs
+// Rust: crates/haneul-types/src/transaction.rs
 export const FundsWithdrawalArgSchema = object({
 	reservation: ReservationSchema,
 	typeArg: WithdrawalTypeArgSchema,
@@ -305,7 +305,7 @@ export const FundsWithdrawalArgSchema = object({
 });
 export type FundsWithdrawalArg = InferOutput<typeof FundsWithdrawalArgSchema>;
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L75-L80
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L75-L80
 const CallArgSchema = safeEnum({
 	Object: ObjectArgSchema,
 	Pure: object({
@@ -332,7 +332,7 @@ export const NormalizedCallArg = safeEnum({
 	}),
 });
 
-// Rust: crate./haneul-types/src/transaction.rs
+// Rust: crates/haneul-types/src/transaction.rs
 export const ValidDuringSchema = object({
 	minEpoch: nullable(JsonU64),
 	maxEpoch: nullable(JsonU64),

package/src/transactions/data/v2.ts

@@ -44,7 +44,7 @@ function enumUnion<T extends Record<string, GenericSchema<any>>>(options: T) {
 	>;
 }
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L690-L702
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L690-L702
 const Argument = enumUnion({
 	GasCoin: literal(true),
 	Input: pipe(number(), integer()),
@@ -52,7 +52,7 @@ const Argument = enumUnion({
 	NestedResult: tuple([pipe(number(), integer()), pipe(number(), integer())]),
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L1387-L1392
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L1387-L1392
 const GasData = object({
 	budget: nullable(JsonU64),
 	price: nullable(JsonU64),
@@ -60,7 +60,7 @@ const GasData = object({
 	payment: nullable(array(ObjectRefSchema)),
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L707-L718
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L707-L718
 const ProgrammableMoveCall = object({
 	package: ObjectID,
 	module: string(),
@@ -76,7 +76,7 @@ const $Intent = object({
 	data: record(string(), unknown()),
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L657-L685
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L657-L685
 const Command = enumUnion({
 	MoveCall: ProgrammableMoveCall,
 	TransferObjects: object({
@@ -108,7 +108,7 @@ const Command = enumUnion({
 	$Intent,
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L102-L114
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L102-L114
 const ObjectArg = enumUnion({
 	ImmOrOwnedObject: ObjectRefSchema,
 	SharedObject: object({
@@ -120,7 +120,7 @@ const ObjectArg = enumUnion({
 	Receiving: ObjectRefSchema,
 });
 
-// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crate./haneul-types/src/transaction.rs#L75-L80
+// https://github.com/GeunhwaJeong/haneul/blob/df41d5fa8127634ff4285671a01ead00e519f806/crates/haneul-types/src/transaction.rs#L75-L80
 const CallArg = enumUnion({
 	Object: ObjectArg,
 	Pure: object({

package/src/transactions/executor/caching.ts

@@ -15,7 +15,7 @@ import { isTransaction } from '../Transaction.js';
 export interface ExecuteTransactionOptions<Include extends HaneulClientTypes.TransactionInclude = {}> {
 	transaction: Transaction | Uint8Array;
 	signatures: string[];
-	include?: Include;
+	include?: Include & HaneulClientTypes.TransactionInclude;
 }
 
 export class CachingTransactionExecutor {
@@ -93,7 +93,7 @@ export class CachingTransactionExecutor {
 	}: {
 		transaction: Transaction;
 		signer: Signer;
-		include?: Include;
+		include?: Include & HaneulClientTypes.TransactionInclude;
 	}): Promise<HaneulClientTypes.TransactionResult<Include & { effects: true }>> {
 		transaction.setSenderIfNotSet(signer.toHaneulAddress());
 		const bytes = await this.buildTransaction({ transaction });

package/src/transactions/executor/parallel.ts

@@ -128,7 +128,7 @@ export class ParallelTransactionExecutor {
 
 	async executeTransaction<Include extends HaneulClientTypes.TransactionInclude = {}>(
 		transaction: Transaction,
-		include?: Include,
+		include?: Include & HaneulClientTypes.TransactionInclude,
 		additionalSignatures: string[] = [],
 	): Promise<HaneulClientTypes.TransactionResult<Include & { effects: true }>> {
 		const { promise, resolve, reject } =
@@ -262,7 +262,6 @@ export class ParallelTransactionExecutor {
 				if (gasOwner === this.#signer.toHaneulAddress()) {
 					const totalUsed =
 						BigInt(gasUsed.computationCost) +
-						BigInt(gasUsed.storageCost) +
 						BigInt(gasUsed.storageCost) -
 						BigInt(gasUsed.storageRebate);
 					const remainingBalance = coin.balance - totalUsed;

package/src/transactions/executor/serial.ts

@@ -164,7 +164,7 @@ export class SerialTransactionExecutor {
 
 	executeTransaction<Include extends HaneulClientTypes.TransactionInclude = {}>(
 		transaction: Transaction | Uint8Array,
-		include?: Include,
+		include?: Include & HaneulClientTypes.TransactionInclude,
 		additionalSignatures: string[] = [],
 	): Promise<HaneulClientTypes.TransactionResult<Include & { effects: true }>> {
 		return this.#queue.runTask(async () => {