refactor: update remaining bech32 to proper address type

Author: solidsnakedev

docs/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./out/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

packages/evolution/src/sdk/builders/TransactionBuilder.ts

@@ -28,6 +28,7 @@
 import { Context, Data, Effect, Layer, Logger, LogLevel, Ref } from "effect"
 import type { Either } from "effect/Either"
 
+import type * as CoreAddress from "../../core/Address.js"
 import * as CoreAssets from "../../core/Assets/index.js"
 import type * as Coin from "../../core/Coin.js"
 import type * as Network from "../../core/Network.js"
@@ -150,7 +151,7 @@ const resolveProtocolParameters = (
 const resolveChangeAddress = (
   config: TxBuilderConfig,
   options?: BuildOptions
-): Effect.Effect<string, TransactionBuilderError | WalletNew.WalletError> => {
+): Effect.Effect<CoreAddress.Address, TransactionBuilderError | WalletNew.WalletError> => {
   if (options?.changeAddress) {
     return Effect.succeed(options.changeAddress)
   }
@@ -781,13 +782,13 @@ export interface BuildOptions {
    * // Use different account for change
    * builder.build({ changeAddress: wallet.addresses[5] })
    *
-   * // Custom address
-   * builder.build({ changeAddress: "addr_test1..." })
+   * // Custom Core Address
+   * builder.build({ changeAddress: Core.Address.fromBech32("addr_test1...") })
    * ```
    *
    * @since 2.0.0
    */
-  readonly changeAddress?: string
+  readonly changeAddress?: CoreAddress.Address
 
   /**
    * Override the available UTxOs for this specific transaction build.
@@ -1216,7 +1217,7 @@ export class TxContext extends Context.Tag("TxContext")<TxContext, Ref.Ref<TxBui
  * @since 2.0.0
  * @category context
  */
-export class ChangeAddressTag extends Context.Tag("ChangeAddress")<ChangeAddressTag, string>() {}
+export class ChangeAddressTag extends Context.Tag("ChangeAddress")<ChangeAddressTag, CoreAddress.Address>() {}
 
 /**
  * Resolved protocol parameters for the current build.

packages/evolution/src/sdk/builders/TxBuilderImpl.ts

@@ -3,7 +3,7 @@ import { Effect, Ref, Schema } from "effect"
 import type * as Array from "effect/Array"
 
 // Core imports
-import * as CoreAddress from "../../core/Address.js"
+import type * as CoreAddress from "../../core/Address.js"
 import * as CoreAssets from "../../core/Assets/index.js"
 import * as Bytes32 from "../../core/Bytes32.js"
 import * as PlutusData from "../../core/Data.js"
@@ -234,14 +234,14 @@ export const makeDatumOption = (datum: Datum.Datum): Effect.Effect<DatumOption.D
  * @category helpers
  */
 export const makeTxOutput = (params: {
-  address: string
+  address: CoreAddress.Address
   assets: CoreAssets.Assets
   datum?: Datum.Datum
   scriptRef?: any // TODO: Add ScriptRef type
 }): Effect.Effect<TxOut.TransactionOutput, TransactionBuilderError> =>
   Effect.gen(function* () {
-    // Parse address from bech32 string to core Address type
-    const address = yield* Schema.decodeUnknown(CoreAddress.FromBech32)(params.address)
+    // Address is already a Core Address type
+    const address = params.address
 
     // Convert datum if provided
     let datumOption: DatumOption.DatumOption | undefined
@@ -262,7 +262,7 @@ export const makeTxOutput = (params: {
     Effect.mapError(
       (error) =>
         new TransactionBuilderError({
-          message: `Failed to create TxOutput for address: ${params.address}`,
+          message: `Failed to create TxOutput`,
           cause: error
         })
     )
@@ -278,14 +278,14 @@ export const makeTxOutput = (params: {
  * @internal
  */
 export const txOutputToTransactionOutput = (params: {
-  address: string
+  address: CoreAddress.Address
   assets: CoreAssets.Assets
   datum?: Datum.Datum
   scriptRef?: any // TODO: Add ScriptRef type
 }): Effect.Effect<TxOut.TransactionOutput, TransactionBuilderError> =>
   Effect.gen(function* () {
-    // Parse address from bech32 string to core Address type using Schema
-    const address = yield* Schema.decodeUnknown(CoreAddress.FromBech32)(params.address)
+    // Address is already a Core Address type
+    const address = params.address
 
     // Convert datum if provided
     let datumOption: DatumOption.DatumOption | undefined
@@ -306,7 +306,7 @@ export const txOutputToTransactionOutput = (params: {
     Effect.mapError(
       (error) =>
         new TransactionBuilderError({
-          message: `Failed to create transaction output for address: ${params.address}`,
+          message: `Failed to create transaction output`,
           cause: error
         })
     )
@@ -1114,7 +1114,7 @@ export const calculateLeftoverAssets = (params: {
  * @category change
  */
 export const calculateMinimumUtxoLovelace = (params: {
-  address: string
+  address: CoreAddress.Address
   assets: CoreAssets.Assets
   datum?: Datum.Datum
   scriptRef?: any
@@ -1165,7 +1165,7 @@ export const calculateMinimumUtxoLovelace = (params: {
  */
 export const createChangeOutput = (params: {
   leftoverAssets: CoreAssets.Assets
-  changeAddress: string
+  changeAddress: CoreAddress.Address
   coinsPerUtxoByte: bigint
   unfrackOptions?: UnfrackOptions
 }): Effect.Effect<ReadonlyArray<TxOut.TransactionOutput>, TransactionBuilderError> =>

packages/evolution/src/sdk/builders/Unfrack.ts

@@ -12,6 +12,7 @@
 
 import * as Effect from "effect/Effect"
 
+import type * as CoreAddress from "../../core/Address.js"
 import * as CoreAssets from "../../core/Assets/index.js"
 import type * as TxOut from "../../core/TxOut.js"
 import type { UnfrackOptions } from "./TransactionBuilder.js"
@@ -117,7 +118,7 @@ export interface TokenBundle {
  */
 const calculateBundleMinUTxO = (
   bundleTokens: ReadonlyArray<TokenInfo>,
-  changeAddress: string,
+  changeAddress: CoreAddress.Address,
   coinsPerUtxoByte: bigint
 ): Effect.Effect<bigint, Error, never> => Effect.gen(function* () {
   // Build Assets object with the bundle tokens using CoreAssets
@@ -147,7 +148,7 @@ const calculateBundleMinUTxO = (
 export const calculateTokenBundles = (
   tokens: ReadonlyArray<TokenInfo>,
   options: UnfrackOptions,
-  changeAddress: string,
+  changeAddress: CoreAddress.Address,
   coinsPerUtxoByte: bigint
 ): Effect.Effect<ReadonlyArray<TokenBundle>, Error, never> => Effect.gen(function* () {
   const bundleSize = options.tokens?.bundleSize ?? 10
@@ -208,7 +209,7 @@ export const calculateTokenBundles = (
 const bundleTokensWithRules = (
   tokens: ReadonlyArray<TokenInfo>,
   bundleSize: number,
-  changeAddress: string,
+  changeAddress: CoreAddress.Address,
   coinsPerUtxoByte: bigint
 ): Effect.Effect<ReadonlyArray<TokenBundle>, Error, never> => Effect.gen(function* () {
   const bundles: Array<TokenBundle> = []
@@ -349,7 +350,7 @@ export type UnfrackResult = {
  * @category builders
  */
 export const createUnfrackedChangeOutputs = (
-  changeAddress: string,
+  changeAddress: CoreAddress.Address,
   changeAssets: CoreAssets.Assets,
   options: UnfrackOptions = {},
   coinsPerUtxoByte: bigint

packages/evolution/src/sdk/builders/operations/Operations.ts

@@ -1,6 +1,6 @@
+import type * as CoreAddress from "../../../core/Address.js"
 import type * as CoreAssets from "../../../core/Assets/index.js"
 import type * as UTxO from "../../../core/UTxO.js"
-import type * as Address from "../../Address.js"
 import type * as Datum from "../../Datum.js"
 import type * as Script from "../../Script.js"
 
@@ -9,7 +9,7 @@ import type * as Script from "../../Script.js"
 // ============================================================================
 
 export interface PayToAddressParams {
-  readonly address: Address.Address // Mandatory: Recipient address
+  readonly address: CoreAddress.Address // Mandatory: Recipient address (Core Address object)
   readonly assets: CoreAssets.Assets // Mandatory: ADA and/or native tokens to send
   readonly datum?: Datum.Datum // Optional: Datum to attach for script addresses
   readonly scriptRef?: Script.Script // Optional: Reference script to attach

packages/evolution/src/sdk/builders/phases/ChangeCreation.ts

@@ -10,6 +10,7 @@
 
 import { Effect, Ref } from "effect"
 
+import type * as CoreAddress from "../../../core/Address.js"
 import * as CoreAssets from "../../../core/Assets/index.js"
 import type * as TxOut from "../../../core/TxOut.js"
 import * as CoreUTxO from "../../../core/UTxO.js"
@@ -57,7 +58,7 @@ const getAvailableUtxos = (
  */
 const createChangeOutputs = (
   leftoverAfterFee: CoreAssets.Assets,
-  changeAddress: string,
+  changeAddress: CoreAddress.Address,
   coinsPerUtxoByte: bigint
 ): Effect.Effect<ReadonlyArray<TxOut.TransactionOutput>, TransactionBuilderError, BuildOptionsTag> =>
   Effect.gen(function* () {

packages/evolution/src/sdk/builders/phases/Collateral.ts

@@ -11,7 +11,6 @@
 
 import { Effect, Ref } from "effect"
 
-import * as CoreAddress from "../../../core/Address.js"
 import * as CoreAssets from "../../../core/Assets/index.js"
 import * as TxOut from "../../../core/TxOut.js"
 import * as UTxO from "../../../core/UTxO.js"
@@ -302,9 +301,8 @@ export const executeCollateral = (): Effect.Effect<
     // ═══════════════════════════════════════════════════════════
     // STEP 9: Create Return Output
     // ═══════════════════════════════════════════════════════════
-    const coreAddress = CoreAddress.fromBech32(changeAddress)
     const collateralReturn = new TxOut.TransactionOutput({
-      address: coreAddress,
+      address: changeAddress,
       assets: returnAssets,
       datumOption: undefined, // No datum for collateral return
       scriptRef: undefined // No script reference

packages/evolution/src/sdk/client/ClientImpl.ts

@@ -1,5 +1,6 @@
 import { Effect, Equal, ParseResult } from "effect"
 
+import * as CoreAddress from "../../core/Address.js"
 import * as KeyHash from "../../core/KeyHash.js"
 import * as PrivateKey from "../../core/PrivateKey.js"
 import * as Transaction from "../../core/Transaction.js"
@@ -9,7 +10,6 @@ import * as CoreUTxO from "../../core/UTxO.js"
 import * as VKey from "../../core/VKey.js"
 import { runEffectPromise } from "../../utils/effect-runtime.js"
 import { hashTransaction } from "../../utils/Hash.js"
-import type * as Address from "../Address.js"
 import {
   makeTxBuilder,
   type ReadOnlyTransactionBuilder,
@@ -114,13 +114,14 @@ const createReadOnlyWallet = (
   address: string,
   rewardAddress?: string
 ): WalletNew.ReadOnlyWallet => {
+  const coreAddress = CoreAddress.fromBech32(address)
   const walletEffect: WalletNew.ReadOnlyWalletEffect = {
-    address: () => Effect.succeed(address),
+    address: () => Effect.succeed(coreAddress),
     rewardAddress: () => Effect.succeed(rewardAddress ?? null)
   }
 
   return {
-    address: () => Promise.resolve(address),
+    address: () => Promise.resolve(coreAddress),
     rewardAddress: () => Promise.resolve(rewardAddress ?? null),
     Effect: walletEffect,
     type: "read-only"
@@ -167,12 +168,14 @@ const createReadOnlyClient = (
   const provider = createProvider(providerConfig)
   const walletNetwork = toWalletNetwork(network)
   const wallet = createReadOnlyWallet(walletNetwork, walletConfig.address, walletConfig.rewardAddress)
+  // Parse the bech32 address to Core Address for provider calls
+  const coreAddress = CoreAddress.fromBech32(walletConfig.address)
 
   const result = {
     ...provider,
     address: wallet.address,
     rewardAddress: wallet.rewardAddress,
-    getWalletUtxos: () => provider.getUtxos(walletConfig.address),
+    getWalletUtxos: () => provider.getUtxos(coreAddress),
     getWalletDelegation: async () => {
       const rewardAddr = walletConfig.rewardAddress
       if (!rewardAddr) throw new Error("No reward address configured")
@@ -187,7 +190,7 @@ const createReadOnlyClient = (
     Effect: {
       ...provider.Effect,
       ...wallet.Effect,
-      getWalletUtxos: () => provider.Effect.getUtxos(walletConfig.address),
+      getWalletUtxos: () => provider.Effect.getUtxos(coreAddress),
       getWalletDelegation: () => {
         const rewardAddr = walletConfig.rewardAddress
         if (!rewardAddr)
@@ -324,7 +327,7 @@ const createSigningWallet = (network: WalletNew.Network, config: SeedWalletConfi
 
         return witnesses.length > 0 ? TransactionWitnessSet.fromVKeyWitnesses(witnesses) : TransactionWitnessSet.empty()
       }),
-    signMessage: (_address: Address.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
+    signMessage: (_address: CoreAddress.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
       Effect.map(derivationEffect, (derivation) => {
         // For now, always use payment key for message signing
         const paymentSk = PrivateKey.fromBech32(derivation.paymentKey)
@@ -406,7 +409,7 @@ const createPrivateKeyWallet = (
 
         return witnesses.length > 0 ? TransactionWitnessSet.fromVKeyWitnesses(witnesses) : TransactionWitnessSet.empty()
       }),
-    signMessage: (_address: Address.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
+    signMessage: (_address: CoreAddress.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
       Effect.map(derivationEffect, (derivation) => {
         const paymentSk = PrivateKey.fromBech32(derivation.paymentKey)
         const vk = VKey.fromPrivateKey(paymentSk)
@@ -435,7 +438,7 @@ const createPrivateKeyWallet = (
  */
 const createApiWallet = (_network: WalletNew.Network, config: ApiWalletConfig): WalletNew.ApiWallet => {
   const api = config.api
-  let cachedAddress: Address.Address | null = null
+  let cachedAddress: CoreAddress.Address | null = null
   let cachedReward: RewardAddress.RewardAddress | null = null
 
   const getPrimaryAddress = Effect.gen(function* () {
@@ -448,12 +451,13 @@ const createApiWallet = (_network: WalletNew.Network, config: ApiWalletConfig):
       try: () => api.getUnusedAddresses(),
       catch: (cause) => new WalletNew.WalletError({ message: (cause as Error).message, cause: cause as Error })
     })
-    const addr = used[0] ?? unused[0]
-    if (!addr) {
+    const addrStr = used[0] ?? unused[0]
+    if (!addrStr) {
       return yield* Effect.fail(new WalletNew.WalletError({ message: "Wallet API returned no addresses", cause: null }))
     }
-    cachedAddress = addr
-    return addr
+    // Convert bech32 string to Core Address
+    cachedAddress = CoreAddress.fromBech32(addrStr)
+    return cachedAddress
   })
 
   const getPrimaryRewardAddress = Effect.gen(function* () {
@@ -483,10 +487,12 @@ const createApiWallet = (_network: WalletNew.Network, config: ApiWalletConfig):
           )
         )
       }),
-    signMessage: (address: Address.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
+    signMessage: (address: CoreAddress.Address | RewardAddress.RewardAddress, payload: WalletNew.Payload) =>
       Effect.gen(function* () {
+        // Convert Core Address to bech32 string for the CIP-30 API
+        const addressStr = address instanceof CoreAddress.Address ? CoreAddress.toBech32(address) : address
         const result = yield* Effect.tryPromise({
-          try: () => api.signData(address, payload),
+          try: () => api.signData(addressStr, payload),
           catch: (cause) => new WalletNew.WalletError({ message: "User rejected message signing", cause })
         })
         return { payload, signature: result.signature }

packages/evolution/src/sdk/provider/Provider.ts

@@ -1,8 +1,8 @@
 import type { Effect } from "effect"
 import { Context, Data } from "effect"
 
+import type * as CoreAddress from "../../core/Address.js"
 import type * as CoreUTxO from "../../core/UTxO.js"
-import type * as Address from "../Address.js"
 import type * as Credential from "../Credential.js"
 import type * as Delegation from "../Delegation.js"
 import type { EvalRedeemer } from "../EvalRedeemer.js"
@@ -38,12 +38,12 @@ export interface ProviderEffect {
   /**
    * Query UTxOs at a given address or by credential.
    */
-  readonly getUtxos: (addressOrCredential: Address.Address | Credential.Credential) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
+  readonly getUtxos: (addressOrCredential: CoreAddress.Address | Credential.Credential) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**
    * Query UTxOs at a given address or credential filtered by specific unit.
    */
   readonly getUtxosWithUnit: (
-    addressOrCredential: Address.Address | Credential.Credential,
+    addressOrCredential: CoreAddress.Address | Credential.Credential,
     unit: string
   ) => Effect.Effect<Array<CoreUTxO.UTxO>, ProviderError>
   /**