Fixing import path extension type errors

Author: corbanbrook

packages/services/api/src/index.ts

@@ -1,6 +1,6 @@
-export * from './api.gen'
+export * from './api.gen.js'
 
-import { API as ApiRpc } from './api.gen'
+import { API as ApiRpc } from './api.gen.js'
 
 export class SequenceAPIClient extends ApiRpc {
   constructor(

packages/services/builder/src/index.ts

@@ -1,6 +1,6 @@
-export * from './builder.gen'
+export * from './builder.gen.js'
 
-import { Builder as BuilderRpc } from './builder.gen'
+import { Builder as BuilderRpc } from './builder.gen.js'
 
 export class SequenceBuilderClient extends BuilderRpc {
   constructor(

packages/services/guard/test/sequence.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { Guard } from '../src/sequence'
-import { PayloadType } from '../src/client/guard.gen'
+import { Guard } from '../src/sequence.js'
+import { PayloadType } from '../src/client/guard.gen.js'
 import { Address, Bytes, Hex } from 'ox'
 
 // Mock fetch globally for guard API calls

packages/services/indexer/src/index.ts

@@ -1,8 +1,8 @@
-export * from './indexer.gen'
-export * as IndexerGateway from './indexergw.gen'
+export * from './indexer.gen.js'
+export * as IndexerGateway from './indexergw.gen.js'
 
-import { Indexer as IndexerRpc } from './indexer.gen'
-import { IndexerGateway as IndexerGatewayRpc } from './indexergw.gen'
+import { Indexer as IndexerRpc } from './indexer.gen.js'
+import { IndexerGateway as IndexerGatewayRpc } from './indexergw.gen.js'
 
 export class SequenceIndexer extends IndexerRpc {
   constructor(

packages/services/marketplace/src/index.ts

@@ -1,6 +1,6 @@
-export * from './marketplace.gen'
+export * from './marketplace.gen.js'
 
-import { Marketplace as MarketplaceRpc } from './marketplace.gen'
+import { Marketplace as MarketplaceRpc } from './marketplace.gen.js'
 
 export class MarketplaceIndexer extends MarketplaceRpc {
   constructor(

packages/services/userdata/src/index.ts

@@ -1,6 +1,6 @@
-export * from './userdata.gen'
+export * from './userdata.gen.js'
 
-import { UserData as UserdataRpc } from './userdata.gen'
+import { UserData as UserdataRpc } from './userdata.gen.js'
 
 export class SequenceUserdataClient extends UserdataRpc {
   constructor(

packages/wallet/primitives/src/attestation.ts

@@ -1,4 +1,4 @@
-import { Address, Bytes, Hash } from 'ox'
+import { Address, Bytes, Hash, Hex } from 'ox'
 
 export type Attestation = {
   approvedSigner: Address.Address
@@ -14,6 +14,18 @@ export type AuthData = {
   issuedAt: bigint // uint64
 }
 
+type EncodedAttestation = {
+  approvedSigner: Address.Address
+  identityType: Hex.Hex
+  issuerHash: Hex.Hex
+  audienceHash: Hex.Hex
+  applicationData: Hex.Hex
+  authData: {
+    redirectUrl: string
+    issuedAt: string
+  }
+}
+
 // Encoding and decoding
 
 export function encode(attestation: Attestation): Bytes.Bytes {
@@ -76,9 +88,9 @@ export function toJson(attestation: Attestation, indent?: number): string {
   return JSON.stringify(encodeForJson(attestation), null, indent)
 }
 
-export function encodeForJson(attestation: Attestation): any {
+export function encodeForJson(attestation: Attestation): EncodedAttestation {
   return {
-    approvedSigner: attestation.approvedSigner.toString(),
+    approvedSigner: attestation.approvedSigner,
     identityType: Bytes.toHex(attestation.identityType),
     issuerHash: Bytes.toHex(attestation.issuerHash),
     audienceHash: Bytes.toHex(attestation.audienceHash),
@@ -94,7 +106,7 @@ export function fromJson(json: string): Attestation {
   return fromParsed(JSON.parse(json))
 }
 
-export function fromParsed(parsed: any): Attestation {
+export function fromParsed(parsed: EncodedAttestation): Attestation {
   return {
     approvedSigner: Address.from(parsed.approvedSigner),
     identityType: Bytes.fromHex(parsed.identityType),

packages/wallet/primitives/src/config.ts

@@ -2,7 +2,6 @@ import { Address, Bytes, Hash, Hex } from 'ox'
 import {
   isRawConfig,
   isRawNestedLeaf,
-  isRawNode,
   isRawSignerLeaf,
   isSignedSapientSignerLeaf,
   isSignedSignerLeaf,
@@ -55,46 +54,89 @@ export type Leaf = SignerLeaf | SapientSignerLeaf | SubdigestLeaf | AnyAddressSu
 
 export type Topology = Node | Leaf
 
+/** Encoded topology types for JSON serialization */
+type EncodedSignerLeaf = {
+  type: 'signer'
+  address: Address.Address
+  weight: string
+}
+
+type EncodedSapientSignerLeaf = {
+  type: 'sapient-signer'
+  address: Address.Address
+  weight: string
+  imageHash: Hex.Hex
+}
+
+type EncodedSubdigestLeaf = {
+  type: 'subdigest'
+  digest: Hex.Hex
+}
+
+type EncodedAnyAddressSubdigestLeaf = {
+  type: 'any-address-subdigest'
+  digest: Hex.Hex
+}
+
+type EncodedNestedLeaf = {
+  type: 'nested'
+  tree: EncodedTopology
+  weight: string
+  threshold: string
+}
+
+type EncodedNodeLeaf = Hex.Hex
+
+export type EncodedLeaf =
+  | EncodedSignerLeaf
+  | EncodedSapientSignerLeaf
+  | EncodedSubdigestLeaf
+  | EncodedAnyAddressSubdigestLeaf
+  | EncodedNestedLeaf
+  | EncodedNodeLeaf
+export type EncodedNode = [EncodedTopology, EncodedTopology]
+export type EncodedTopology = EncodedNode | EncodedLeaf
+
 export type Config = {
   threshold: bigint
   checkpoint: bigint
   topology: Topology
   checkpointer?: Address.Address
 }
 
-export function isSignerLeaf(cand: any): cand is SignerLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'signer'
+export function isSignerLeaf(cand: unknown): cand is SignerLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'signer'
 }
 
-export function isSapientSignerLeaf(cand: any): cand is SapientSignerLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'sapient-signer'
+export function isSapientSignerLeaf(cand: unknown): cand is SapientSignerLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'sapient-signer'
 }
 
-export function isSubdigestLeaf(cand: any): cand is SubdigestLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'subdigest'
+export function isSubdigestLeaf(cand: unknown): cand is SubdigestLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'subdigest'
 }
 
-export function isAnyAddressSubdigestLeaf(cand: any): cand is AnyAddressSubdigestLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'any-address-subdigest'
+export function isAnyAddressSubdigestLeaf(cand: unknown): cand is AnyAddressSubdigestLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'any-address-subdigest'
 }
 
-export function isNodeLeaf(cand: any): cand is NodeLeaf {
-  return Hex.validate(cand) && cand.length === 66
+export function isNodeLeaf(cand: unknown): cand is NodeLeaf {
+  return typeof cand === 'string' && Hex.validate(cand) && cand.length === 66
 }
 
-export function isNestedLeaf(cand: any): cand is NestedLeaf {
-  return typeof cand === 'object' && cand !== null && cand.type === 'nested'
+export function isNestedLeaf(cand: unknown): cand is NestedLeaf {
+  return typeof cand === 'object' && cand !== null && 'type' in cand && cand.type === 'nested'
 }
 
-export function isNode(cand: any): cand is Node {
+export function isNode(cand: unknown): cand is Node {
   return Array.isArray(cand) && cand.length === 2 && isTopology(cand[0]) && isTopology(cand[1])
 }
 
-export function isConfig(cand: any): cand is Config {
-  return typeof cand === 'object' && 'threshold' in cand && 'checkpoint' in cand && 'topology' in cand
+export function isConfig(cand: unknown): cand is Config {
+  return typeof cand === 'object' && cand !== null && 'threshold' in cand && 'checkpoint' in cand && 'topology' in cand
 }
 
-export function isLeaf(cand: Topology): cand is Leaf {
+export function isLeaf(cand: unknown): cand is Leaf {
   return (
     isSignerLeaf(cand) ||
     isSapientSignerLeaf(cand) ||
@@ -105,7 +147,7 @@ export function isLeaf(cand: Topology): cand is Leaf {
   )
 }
 
-export function isTopology(cand: any): cand is Topology {
+export function isTopology(cand: unknown): cand is Topology {
   return isNode(cand) || isLeaf(cand)
 }
 
@@ -310,7 +352,7 @@ export function configFromJson(json: string): Config {
   }
 }
 
-function encodeTopology(top: Topology): any {
+function encodeTopology(top: Topology): EncodedTopology {
   if (isNode(top)) {
     return [encodeTopology(top[0]), encodeTopology(top[1])]
   } else if (isSignerLeaf(top)) {
@@ -350,7 +392,7 @@ function encodeTopology(top: Topology): any {
   throw new Error('Invalid topology')
 }
 
-function decodeTopology(obj: any): Topology {
+function decodeTopology(obj: EncodedTopology): Topology {
   if (Array.isArray(obj)) {
     if (obj.length !== 2) {
       throw new Error('Invalid node structure in JSON')

packages/wallet/primitives/src/signature.ts

@@ -618,7 +618,7 @@ export function fillLeaves(
 export function encodeChainedSignature(signatures: RawSignature[]): Uint8Array {
   let flag = 0x01
 
-  let sigForCheckpointer = signatures[signatures.length - 1]
+  const sigForCheckpointer = signatures[signatures.length - 1]
 
   if (sigForCheckpointer?.configuration.checkpointer) {
     flag |= 0x40
@@ -723,7 +723,7 @@ export function encodeTopology(
     const isBranching = isNode(topology[1]!) || isRawNode(topology[1]!)
 
     if (isBranching) {
-      let encoded1Size = minBytesFor(BigInt(encoded1.length))
+      const encoded1Size = minBytesFor(BigInt(encoded1.length))
       if (encoded1Size > 15) {
         throw new Error('Branch too large')
       }
@@ -799,7 +799,7 @@ export function encodeTopology(
     } else if (topology.signature.type === 'erc1271') {
       let flag = FLAG_SIGNATURE_ERC1271 << 4
 
-      let bytesForSignatureSize = minBytesFor(BigInt(topology.signature.data.length))
+      const bytesForSignatureSize = minBytesFor(BigInt(topology.signature.data.length))
       if (bytesForSignatureSize > 3) {
         throw new Error('Signature too large')
       }
@@ -826,7 +826,7 @@ export function encodeTopology(
       let flag = (topology.signature.type === 'sapient' ? FLAG_SIGNATURE_SAPIENT : FLAG_SIGNATURE_SAPIENT_COMPACT) << 4
 
       const signatureBytes = Bytes.fromHex(topology.signature.data)
-      let bytesForSignatureSize = minBytesFor(BigInt(signatureBytes.length))
+      const bytesForSignatureSize = minBytesFor(BigInt(signatureBytes.length))
       if (bytesForSignatureSize > 3) {
         throw new Error('Signature too large')
       }

packages/wallet/primitives/src/utils.ts

@@ -7,7 +7,7 @@ export function minBytesFor(val: bigint): number {
 // ERC-2098
 export function packRSY({ r, s, yParity }: { r: bigint; s: bigint; yParity: number }): Bytes.Bytes {
   const rBytes = Bytes.padLeft(Bytes.fromNumber(r), 32)
-  let sBytes = Bytes.padLeft(Bytes.fromNumber(s), 32)
+  const sBytes = Bytes.padLeft(Bytes.fromNumber(s), 32)
   if (yParity % 2 === 1) {
     sBytes[0]! |= 0x80
   }