@sparkdotfi/abi-cli 0.2.0-20250808.efecd1d6 → 0.2.0-20250811.13be5bb5

package/dist/cli.js

@@ -1,11 +1,13 @@
 import { NodeContext, NodeRuntime } from '@effect/platform-node';
-import { Effect, Layer } from 'effect';
+import { Effect, Layer, Logger } from 'effect';
 import { configLayer } from './config/Config';
 import { abiFetcherLayer } from './fetch/AbiFetcher';
 import { blockchainClientRepositoryLayer } from './fetch/BlockchainClientRepository';
 import { main } from './main';
+import { AbiCliLogger } from './services/AbiCliLogger';
 import { progressBarLayer } from './services/ProgressBar';
 const blockchainClientRepository = Layer.provide(blockchainClientRepositoryLayer, configLayer);
 const abiFetcher = Layer.provide(abiFetcherLayer, [blockchainClientRepository, configLayer]);
+const logger = Logger.replace(Logger.defaultLogger, AbiCliLogger);
 const mainDeps = Layer.mergeAll(configLayer, blockchainClientRepository, abiFetcher, NodeContext.layer, progressBarLayer);
-main.pipe(Effect.provide(mainDeps), Effect.withSpan('cli'), NodeRuntime.runMain);
+main.pipe(Effect.provide(mainDeps), Effect.provide(logger), Effect.withSpan('cli'), NodeRuntime.runMain({ disablePrettyLogger: true }));

package/dist/config/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/config/Config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,YAAY,EAAgB,MAAM,UAAU,CAAA;;;;AAErD,qBAAa,gBAAiB,SAAQ,sBAAqC,YAAY,CAAC;CAAG;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;CACtD;;AASD,qBAAa,SAAU,SAAQ,cAAuD;CAAG;AAEzF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAE3F;AAED,eAAO,MAAM,WAAW,8DASmB,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/config/Config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,YAAY,EAAgB,MAAM,UAAU,CAAA;;;;AAErD,qBAAa,gBAAiB,SAAQ,sBAAqC,YAAY,CAAC;CAAG;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;CACtD;;AASD,qBAAa,SAAU,SAAQ,cAAuD;CAAG;AAEzF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAE3F;AAED,eAAO,MAAM,WAAW,8DAamB,CAAA"}

package/dist/config/Config.js

@@ -15,7 +15,7 @@ export function configLayerFromConfig(cfg) {
 }
 export const configLayer = Layer.effect(CliConfig, Effect.gen(function* () {
     const config = yield* loadRawConfigFromFile;
-    const decodedConfig = yield* Schema.decodeUnknownEither(configSchema)(config);
+    const decodedConfig = yield* Schema.decodeUnknownEither(configSchema, { onExcessProperty: 'error' })(config);
     yield* Effect.logInfo('Config loaded');
     return yield* make(decodedConfig);
 }).pipe(Effect.withSpan('configLayer')));

package/dist/config/schema.d.ts

@@ -1,29 +1,9 @@
 import { Schema } from 'effect';
-declare const addressesSchema: Schema.SchemaClass<{
-    readonly mainnet?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly base?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly gnosis?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly arbitrum?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly optimism?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly worldchain?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-    readonly unichain?: (`0x${string}` & {
-        readonly __TAG__: "CheckedAddress";
-    }) | undefined;
-}, {
-    readonly [x: string]: string | undefined;
-}, never>;
+declare const addressesSchema: Schema.Record$<typeof Schema.String, Schema.transform<typeof Schema.String, Schema.declare<`0x${string}` & {
+    readonly __TAG__: "CheckedAddress";
+}, `0x${string}` & {
+    readonly __TAG__: "CheckedAddress";
+}, readonly [], never>>>;
 export declare const configSchema: Schema.Struct<{
     out: typeof Schema.String;
     secrets: Schema.Struct<{
@@ -33,60 +13,24 @@ export declare const configSchema: Schema.Struct<{
     }>;
     eoa: Schema.PropertySignature<":", {
         readonly [x: string]: {
-            readonly mainnet?: (`0x${string}` & {
+            readonly [x: string]: `0x${string}` & {
                 readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly base?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly gnosis?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly arbitrum?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly optimism?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly worldchain?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly unichain?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
+            };
         };
     }, never, "?:", {
         readonly [x: string]: {
-            readonly [x: string]: string | undefined;
+            readonly [x: string]: string;
         };
     }, false, never>;
     contracts: Schema.PropertySignature<":", {
         readonly [x: string]: {
-            readonly mainnet?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly base?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly gnosis?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly arbitrum?: (`0x${string}` & {
+            readonly [x: string]: `0x${string}` & {
                 readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly optimism?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly worldchain?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
-            readonly unichain?: (`0x${string}` & {
-                readonly __TAG__: "CheckedAddress";
-            }) | undefined;
+            };
         };
     }, never, "?:", {
         readonly [x: string]: {
-            readonly [x: string]: string | undefined;
+            readonly [x: string]: string;
         };
     }, false, never>;
     interfaces: Schema.PropertySignature<":", {
@@ -94,33 +38,15 @@ export declare const configSchema: Schema.Struct<{
             readonly methods?: readonly string[] | undefined;
             readonly events?: readonly string[] | undefined;
             readonly addresses: {
-                readonly mainnet?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly base?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly gnosis?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly arbitrum?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly optimism?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly worldchain?: (`0x${string}` & {
-                    readonly __TAG__: "CheckedAddress";
-                }) | undefined;
-                readonly unichain?: (`0x${string}` & {
+                readonly [x: string]: `0x${string}` & {
                     readonly __TAG__: "CheckedAddress";
-                }) | undefined;
+                };
             };
         };
     }, never, "?:", {
         readonly [x: string]: {
             readonly addresses: {
-                readonly [x: string]: string | undefined;
+                readonly [x: string]: string;
             };
             readonly methods?: readonly string[] | undefined;
             readonly events?: readonly string[] | undefined;

package/dist/config/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAA;AAWvC,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;SAOpB,CAAA;AAgBD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmBvB,CAAA;AAGF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,YAAY,CAAC,CAAA;AACrE,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,CAAA;AAElE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC,CAAA;AAExE,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAA;AAWvC,QAAA,MAAM,eAAe;;;;wBAKnB,CAAA;AAgBF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmBvB,CAAA;AAGF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,YAAY,CAAC,CAAA;AACrE,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,CAAA;AAElE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC,CAAA;AAExE,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA"}

package/dist/config/schema.js

@@ -1,16 +1,16 @@
-import { CheckedAddress, allSparkDomains } from '@sparkdotfi/common-universal';
+import { CheckedAddress } from '@sparkdotfi/common-universal';
 import { Option, Schema } from 'effect';
 const CheckedAddressSchema = Schema.declare((input) => input === CheckedAddress(input));
 const StringToCheckedAddress = Schema.transform(Schema.String, CheckedAddressSchema, {
     decode: (fromA) => CheckedAddress(fromA),
     encode: (address) => address.toString(),
 });
-const addressesSchema = Schema.partial(Schema.Record({
-    key: Schema.String.pipe(Schema.filter(isSparkDomain)).annotations({ message: () => 'Must be valid spark domain' }),
+const addressesSchema = Schema.Record({
+    key: Schema.String,
     value: StringToCheckedAddress.annotations({
         message: () => 'Must be valid address',
     }),
-}));
+});
 const interfaceSchema = Schema.Record({
     key: Schema.String,
     value: Schema.Struct({
@@ -32,17 +32,14 @@ export const configSchema = Schema.Struct({
     }),
     eoa: Schema.optionalToRequired(contractsMapSchema, contractsMapSchema, {
         decode: (o) => (Option.isNone(o) ? {} : o.value),
-        encode: (ti) => Option.some(ti),
+        encode: (_) => Option.none(),
     }),
     contracts: Schema.optionalToRequired(contractsMapSchema, contractsMapSchema, {
         decode: (o) => (Option.isNone(o) ? {} : o.value),
-        encode: (ti) => Option.some(ti),
+        encode: (_) => Option.none(),
     }),
     interfaces: Schema.optionalToRequired(interfaceSchema, interfaceSchema, {
         decode: (o) => (Option.isNone(o) ? {} : o.value),
-        encode: (ti) => Option.some(ti),
+        encode: (_) => Option.none(),
     }),
 });
-function isSparkDomain(data) {
-    return allSparkDomains.includes(data);
-}

package/dist/fetch/AbiFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbiFetcher.d.ts","sourceRoot":"","sources":["../../src/fetch/AbiFetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmB,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,OAAO,EAAkB,MAAM,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;;AAExG,qBAAa,UAAW,SAAQ,eAA0D;CAAG;AAE7F,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,CACjB,QAAQ,EAAE,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,6BAA6B,CAAC,CAAA;CAC/G;;;;AAED,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,OAAO,EAAE,cAAc,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC;CAAG;;;;AACL,qBAAa,eAAgB,SAAQ,qBAAoC,YAAY,CAAC;CAAG;AAyBzF,eAAO,MAAM,eAAe,wEAAiC,CAAA"}
+{"version":3,"file":"AbiFetcher.d.ts","sourceRoot":"","sources":["../../src/fetch/AbiFetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAiC,MAAM,8BAA8B,CAAA;AAC5F,OAAO,EAAE,OAAO,EAAkB,MAAM,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAA;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,6BAA6B,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAA;;AAExG,qBAAa,UAAW,SAAQ,eAA0D;CAAG;AAE7F,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,CACjB,QAAQ,EAAE,aAAa,KACpB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,6BAA6B,CAAC,CAAA;CAC/G;;;;AAED,qBAAa,gBAAiB,SAAQ,sBAAqC;IACzE,OAAO,EAAE,cAAc,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC;CAAG;;;;AACL,qBAAa,eAAgB,SAAQ,qBAAoC,YAAY,CAAC;CAAG;AAkCzF,eAAO,MAAM,eAAe,wEAAiC,CAAA"}

package/dist/fetch/AbiFetcher.js

@@ -1,5 +1,5 @@
 import { whatsabi } from '@shazow/whatsabi';
-import { domainToChainId } from '@sparkdotfi/common-universal';
+import { chainIdToDomain } from '@sparkdotfi/common-universal';
 import { Context, Data, Duration, Effect, Layer, Schedule } from 'effect';
 import { CliConfig } from '../config/Config';
 import { BlockchainClientRepository } from './BlockchainClientRepository';
@@ -13,15 +13,21 @@ const make = Effect.gen(function* () {
     const blockchainClientRepository = yield* BlockchainClientRepository;
     const config = yield* (yield* CliConfig).getConfig();
     const fetchAbi = (contract) => Effect.gen(function* () {
-        const { address, domain } = contract;
+        const { address, chainId } = contract;
+        const domain = chainIdToDomain[chainId];
+        if (!domain) {
+            return yield* Effect.fail(new AbiFetcherError({
+                message: `ChainId ${chainId} not supported`,
+            }));
+        }
         const client = yield* blockchainClientRepository.getClientForDomain(domain);
         return yield* whatsAbiFetchEffect({
             address,
-            chainId: domainToChainId[domain],
+            chainId: Number(chainId),
             etherscanApiKey: config.secrets.etherscanApiKey,
             client,
         });
-    });
+    }).pipe(Effect.withSpan('fetchAbi'));
     return {
         fetchAbi,
     };
@@ -51,7 +57,7 @@ const whatsAbiFetchEffect = (args) => {
                 message: 'WhatsABI failure',
             });
         },
-    }).pipe(Effect.timeout('10 seconds'), Effect.retry(Schedule.intersect(Schedule.exponential(Duration.millis(250), 1.5), Schedule.recurs(3))), Effect.andThen((data) => {
+    }).pipe(Effect.timeout('10 seconds'), Effect.retry(Schedule.intersect(Schedule.exponential(Duration.millis(250), 1.5), Schedule.recurs(5))), Effect.andThen((data) => {
         if (data.abi.length === 0) {
             return Effect.fail(new AbiNotFoundError({ address, chainId }));
         }
@@ -59,5 +65,5 @@ const whatsAbiFetchEffect = (args) => {
             return Effect.fail(new AbiNotFoundError({ address, chainId }));
         }
         return Effect.succeed(data.abi);
-    }));
+    }), Effect.withSpan('whatsAbiFetchEffect'));
 };

package/dist/fetch/fetchAbis.d.ts

@@ -2,7 +2,7 @@ import { Effect } from 'effect';
 import { CliConfig } from '../config/Config';
 import { ProgressBar } from '../services/ProgressBar';
 import { AbiFetcher } from './AbiFetcher';
-export declare const fetchAbis: Effect.Effect<Partial<Record<"mainnet" | "base" | "gnosis" | "arbitrum" | "optimism" | "worldchain" | "unichain", Record<`0x${string}` & {
+export declare const fetchAbis: Effect.Effect<Partial<Record<string, Record<`0x${string}` & {
     readonly __TAG__: "CheckedAddress";
 }, import("../types").ContractMetadata>>>, import("./BlockchainClientRepository").BlockchainClientNotFoundError | import("./AbiFetcher").AbiFetcherError | import("./AbiFetcher").AbiNotFoundError | import("effect/Cause").TimeoutException | import("../services/ProgressBar").ProgressBarError, CliConfig | AbiFetcher | ProgressBar>;
 //# sourceMappingURL=fetchAbis.d.ts.map

package/dist/fetch/fetchAbis.js

@@ -17,22 +17,30 @@ export const fetchAbis = Effect.gen(function* () {
 }).pipe(Effect.withSpan('fetchAbis'));
 function getContractsToFetch(config) {
     const contractsPart = entries(config.contracts).flatMap(([name, chainAddresses]) => {
-        return entries(chainAddresses).map(([domain, address]) => ({ domain, address, name }));
+        return entries(chainAddresses).map(([chainId, address]) => ({
+            chainId,
+            address,
+            name,
+        }));
     });
     const interfacesPart = entries(config.interfaces || {}).flatMap(([name, interfaceConfig]) => {
-        return entries(interfaceConfig.addresses).map(([domain, address]) => ({ domain, address, name }));
+        return entries(interfaceConfig.addresses).map(([chainId, address]) => ({
+            chainId,
+            address,
+            name,
+        }));
     });
-    return uniqueBy(contractsPart.concat(interfacesPart), (c) => `${c.domain}-${c.address}`);
+    return uniqueBy(contractsPart.concat(interfacesPart), (c) => `${c.chainId}-${c.address}`);
 }
 // @todo this should be possible to replace with nested usage of remeda's groupBy
 function getMetadataStore(downloadedAbis) {
     return downloadedAbis.reduce((acc, data) => {
-        const domain = data.contract.domain;
+        const chainId = data.contract.chainId;
         const address = data.contract.address;
-        if (!acc[domain]) {
-            acc[domain] = {};
+        if (!acc[chainId]) {
+            acc[chainId] = {};
         }
-        acc[domain][address] = { abi: data.abi };
+        acc[chainId][address] = { abi: data.abi };
         return acc;
     }, {});
 }

package/dist/generate/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAO,qBAAqB,EAAa,yBAAyB,EAAsB,MAAM,UAAU,CAAA;AAI/G,eAAO,MAAM,QAAQ,kBAAmB,qBAAqB,UAAU,YAAY,yIAWL,CAAA;AAE9E;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAM/E;AAiBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,CAE1E"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAO,qBAAqB,EAAa,yBAAyB,EAAsB,MAAM,UAAU,CAAA;AAI/G,eAAO,MAAM,QAAQ,kBAAmB,qBAAqB,UAAU,YAAY,yIAUL,CAAA;AAE9E;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAM/E;AAiBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,CAE1E"}

package/dist/generate/generate.js

@@ -4,10 +4,9 @@ import { entries, fromEntries } from 'remeda';
 import { preprocess } from './dataProcessing';
 import { format } from './formatOutput';
 export const generate = (metadataStore, config) => Effect.gen(function* () {
-    yield* Effect.logInfo('Validating ...');
     const fs = yield* FileSystem.FileSystem;
     const data = preprocess(metadataStore, config);
-    yield* Effect.logInfo('Writing ...');
+    yield* Effect.logInfo(`Writing to "${config.out}"`);
     const module = yield* Effect.tryPromise(() => generateModule(data));
     yield* fs.writeFileString(config.out, module);
 }).pipe(Effect.withSpan('generate'));
@@ -33,7 +32,7 @@ function contractSection(data) {
   `;
 }
 export function getOrderedAddresses(data) {
-    return fromEntries(entries(data).sort(([a], [b]) => a.localeCompare(b)));
+    return fromEntries(entries(data).sort(([a], [b]) => Number(a) - Number(b)));
 }
 function header(name, type) {
     return `

package/dist/services/AbiCliLogger.d.ts

@@ -0,0 +1,3 @@
+import { Logger } from 'effect';
+export declare const AbiCliLogger: Logger.Logger<unknown, void>;
+//# sourceMappingURL=AbiCliLogger.d.ts.map

package/dist/services/AbiCliLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbiCliLogger.d.ts","sourceRoot":"","sources":["../../src/services/AbiCliLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,eAAO,MAAM,YAAY,8BAiBvB,CAAA"}

package/dist/services/AbiCliLogger.js

@@ -0,0 +1,18 @@
+import { Logger } from 'effect';
+export const AbiCliLogger = Logger.make(({ message, logLevel }) => {
+    const logLevelLabel = logLevel.label;
+    switch (logLevelLabel) {
+        case 'FATAL':
+        case 'ERROR':
+            return globalThis.console.error(`${message}`);
+        case 'WARN':
+            return globalThis.console.warn(`${message}`);
+        case 'INFO':
+            return globalThis.console.info(`${message}`);
+        case 'DEBUG':
+        case 'TRACE':
+            return globalThis.console.debug(`${message}`);
+        default:
+            globalThis.console.info(`${message}`);
+    }
+});

package/dist/services/ProgressBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProgressBar.d.ts","sourceRoot":"","sources":["../../src/services/ProgressBar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;;;;AAExC,qBAAa,gBAAiB,SAAQ,sBAAqC,YAAY,CAAC;CAAG;AAE3F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAChF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAChE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;CAC9D;;AA4BD,qBAAa,WAAY,SAAQ,gBAA6D;CAAG;AAEjG,eAAO,MAAM,gBAAgB,wCAAoC,CAAA;AASjE,eAAO,MAAM,oBAAoB,wCAAwC,CAAA"}
+{"version":3,"file":"ProgressBar.d.ts","sourceRoot":"","sources":["../../src/services/ProgressBar.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAQ,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;;;;AAExC,qBAAa,gBAAiB,SAAQ,sBAAqC,YAAY,CAAC;CAAG;AAE3F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAChF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;IAChE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAA;CAC9D;;AAiCD,qBAAa,WAAY,SAAQ,gBAA6D;CAAG;AAEjG,eAAO,MAAM,gBAAgB,wCAAoC,CAAA;AASjE,eAAO,MAAM,oBAAoB,wCAAwC,CAAA"}

package/dist/services/ProgressBar.js

@@ -3,7 +3,9 @@ import { Context, Data, Effect, Layer } from 'effect';
 export class ProgressBarError extends Data.TaggedError('ProgressBarError') {
 }
 const effect = Effect.gen(function* () {
-    const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
+    const bar = new cliProgress.SingleBar({
+        clearOnComplete: true,
+    }, cliProgress.Presets.shades_classic);
     const create = (total) => Effect.try({
         try: () => bar.start(total, 0),
         catch: (error) => new ProgressBarError({ message: 'Failed to create progress bar', cause: error }),

package/dist/types.d.ts

@@ -1,15 +1,15 @@
 import { whatsabi } from '@shazow/whatsabi';
-import { CheckedAddress, SparkDomain } from '@sparkdotfi/common-universal';
+import { CheckedAddress } from '@sparkdotfi/common-universal';
 import { AddressesConfig } from './config/schema';
 export type Abi = whatsabi.abi.ABI;
 export interface ContractIndex {
     address: CheckedAddress;
-    domain: SparkDomain;
+    chainId: string;
 }
 export interface ContractMetadata {
     abi: Abi;
 }
-export type ContractMetadataStore = Partial<Record<SparkDomain, Record<CheckedAddress, ContractMetadata>>>;
+export type ContractMetadataStore = Partial<Record<string, Record<CheckedAddress, ContractMetadata>>>;
 export interface PreprocessedEntity {
     name: string;
     abi: Abi;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAA;AAElC,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,WAAW,CAAA;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,GAAG,CAAA;CACT;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;AAE1G,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,eAAe,CAAA;CAC3B;AACD,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,UAAU,EAAE,kBAAkB,EAAE,CAAA;IAChC,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAA;AAElC,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,cAAc,CAAA;IACvB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,GAAG,CAAA;CACT;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;AAErG,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,eAAe,CAAA;CAC3B;AACD,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,kBAAkB,EAAE,CAAA;IAC/B,UAAU,EAAE,kBAAkB,EAAE,CAAA;IAChC,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB"}

package/dist/verify/verify.d.ts

@@ -2,6 +2,14 @@ import { Effect } from 'effect';
 import { GlobalConfig } from '../config/schema';
 import { ContractMetadataStore } from '../types';
 export declare const verify: (store: ContractMetadataStore, config: GlobalConfig) => Effect.Effect<void, ValidationError, never>;
+/**
+ * @internal
+ */
+export declare const hasAddresses: (config: GlobalConfig) => Effect.Effect<undefined, ValidationError, never>;
+/**
+ * @internal
+ */
+export declare const hasMatchingAbis: (config: GlobalConfig, store: ContractMetadataStore) => Effect.Effect<undefined, ValidationError, never>;
 declare const ValidationError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
     readonly _tag: "ValidationError";
 } & Readonly<A>;

package/dist/verify/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/verify/verify.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAA;AAErC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,eAAO,MAAM,MAAM,UAAW,qBAAqB,UAAU,YAAY,gDAIrE,CAAA;;;;AAwCJ,qBAAa,eAAgB,SAAQ,qBAAoC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;CAAG"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/verify/verify.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAA;AAErC,OAAO,EAAmB,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,eAAO,MAAM,MAAM,UAAW,qBAAqB,UAAU,YAAY,gDAMrE,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,YAAY,WAAY,YAAY,qDAcP,CAAA;AAE1C;;GAEG;AACH,eAAO,MAAM,eAAe,WAAY,YAAY,SAAS,qBAAqB,qDAarC,CAAA;;;;AAa7C,qBAAa,eAAgB,SAAQ,qBAAoC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;CAAG"}

package/dist/verify/verify.js

@@ -2,25 +2,34 @@ import { assert } from '@sparkdotfi/common-universal';
 import { Data, Effect } from 'effect';
 import { entries } from 'remeda';
 export const verify = (store, config) => Effect.gen(function* () {
+    yield* Effect.logInfo('Validating');
     yield* hasAddresses(config);
     yield* hasMatchingAbis(config, store);
 });
-const hasAddresses = (config) => Effect.gen(function* () {
+/**
+ * @internal
+ */
+export const hasAddresses = (config) => Effect.gen(function* () {
     const contracts = Object.entries(config.contracts);
     const emptyAddresses = contracts.filter(([_name, addresses]) => {
         return Object.keys(addresses).length === 0;
     });
     if (emptyAddresses.length > 0) {
-        return yield* Effect.fail(new ValidationError({ message: `Found empty addresses definitions: ${emptyAddresses.map((e) => e[0])}` }));
+        return yield* Effect.fail(new ValidationError({
+            message: `Found empty addresses definitions: ${emptyAddresses.map((e) => e[0]).join(', ')}`,
+        }));
     }
 }).pipe(Effect.withSpan('hasAddresses'));
-const hasMatchingAbis = (config, store) => Effect.gen(function* () {
+/**
+ * @internal
+ */
+export const hasMatchingAbis = (config, store) => Effect.gen(function* () {
     const contracts = Object.entries(config.contracts);
     const result = contracts.filter(([_name, addresses]) => {
         return !validateAbisAreTheSame(addresses, store);
     });
     if (result.length > 0) {
-        return yield* Effect.fail(new ValidationError({ message: `Found not matching abis: ${result.map((e) => e[0])}` }));
+        return yield* Effect.fail(new ValidationError({ message: `Found not matching abis: ${result.map((e) => e[0]).join(', ')}` }));
     }
 }).pipe(Effect.withSpan('hasMatchingAbis'));
 const validateAbisAreTheSame = (addresses, store) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sparkdotfi/abi-cli",
-  "version": "0.2.0-20250808.efecd1d6",
+  "version": "0.2.0-20250811.13be5bb5",
   "engines": {
     "node": ">=22.0.0"
   },