@thalalabs/surf 1.5.0 → 1.6.0

package/.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 20.x
       - run: yarn install --frozen-lockfile
       - run: yarn test
       - name: Create Release Pull Request or Publish

package/.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+echo "Running pre-commit hook"
+. "$(dirname "$0")/_/husky.sh"
+
+yarn run lint-staged

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @thalalabs/surf
 
+## 1.6.0
+
+### Minor Changes
+
+- d7b62ed: Change ABITable to an array type instead of a map
+
+## 1.5.1
+
+### Patch Changes
+
+- 09f70fb: upgrade dependencies
+
 ## 1.5.0
 
 ### Minor Changes

package/README.md

@@ -59,7 +59,7 @@ When you input `client.useABI(COIN_ABI).view.` into your IDE, the auto-completio
 npm i @thalalabs/surf @aptos-labs/ts-sdk
 ```
 
-If you want to use the React Hooks, install the `@aptos-labs/wallet-adapter-react@^2.0.0` additionally. Those React Hooks will be moved to a separate package in near future.
+If you want to use the React Hooks, install the `@aptos-labs/wallet-adapter-react` additionally. Those React Hooks will be moved to a separate package in near future.
 
 ### Start
 
@@ -100,6 +100,8 @@ const payload = createViewPayload(COIN_ABI, {
   function: 'balance',
   functionArguments: ['0x1'],
   typeArguments: ['0x1::aptos_coin::AptosCoin'],
+  // (optional) you can also override the address in ABI
+  // address: "0x123"
 });
 const [balance] = await client.view({
   payload,
@@ -132,6 +134,8 @@ const payload = createEntryPayload(COIN_ABI, {
   function: 'transfer',
   functionArguments: ['0x1', 1],
   typeArguments: ['0x1::aptos_coin::AptosCoin'],
+  // (optional) you can also override the address in ABI
+  // address: "0x123"
 });
 const result = await client.submitTransaction({
   payload,
@@ -193,9 +197,12 @@ import { DefaultABITable } from "@thalalabs/surf";
 import { createSurfClient } from '@thalalabs/surf';
 import { Aptos } from '@aptos-labs/ts-sdk';
 
-type ABITAble = DefaultABITable & {
-    '0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9::fixed_point64': typeof FIXED_POINT64_ABI,
-};
+type ABITAble = [
+  ...DefaultABITable,
+  ...[
+    typeof FIXED_POINT64_ABI
+  ]
+];
 
 const client = createSurfClient<ABITAble>(new Aptos());
 ```

package/build/types/types/common.d.ts

@@ -1,4 +1,4 @@
-export type UnknownStruct<_T extends string> = object;
+export type UnknownStruct<_T extends string> = unknown;
 export type AnyNumber = number | bigint | string;
 export type OmitSigner<T extends readonly string[]> = T extends readonly [
     '&signer' | 'signer',

package/build/types/types/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/common.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,MAAM,IAAI,MAAM,CAAC;AAEtD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAIjD,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,SAAS,MAAM,EAAE,IAAI,CAAC,SAAS,SAAS;IACvE,SAAS,GAAG,QAAQ;IACpB,GAAG,MAAM,IAAI;CACd,GACG,IAAI,GACJ,CAAC,CAAC;AAIN,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,IACpC,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,OAAO,GAAG,GAAG,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/common.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,MAAM,IAAI,OAAO,CAAC;AAEvD,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAIjD,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,SAAS,MAAM,EAAE,IAAI,CAAC,SAAS,SAAS;IACvE,SAAS,GAAG,QAAQ;IACpB,GAAG,MAAM,IAAI;CACd,GACG,IAAI,GACJ,CAAC,CAAC;AAIN,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,IACpC,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,OAAO,GAAG,GAAG,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC"}

package/build/types/types/convertor/structConvertor.d.ts

@@ -14,6 +14,12 @@ type ConvertStructFieldNonStructType<TABITable extends ABITable, TMoveType exten
 type ConvertStructFieldOptionType<TABITable extends ABITable, TMoveType extends string> = {
     vec: [ConvertStructFieldType<TABITable, TMoveType>] | [];
 };
-type ConvertStructFieldStructType<TABITable extends ABITable, TMoveType extends string> = TMoveType extends `${infer TAccountAddress}::${infer TModuleName}::${infer TStructName}${'' | `<${infer _TInnerType}>`}` ? `${TAccountAddress}::${TModuleName}` extends keyof TABITable ? OmitInner<TStructName> extends ResourceStructName<TABITable[`${TAccountAddress}::${TModuleName}`]> ? ExtractStructType<TABITable, TABITable[`${TAccountAddress}::${TModuleName}`], OmitInner<TStructName>> : UnknownStruct<TMoveType> : UnknownStruct<TMoveType> : UnknownStruct<TMoveType>;
+type ConvertStructFieldStructType<TABITable extends ABITable, TMoveType extends string> = TMoveType extends `${infer TAccountAddress}::${infer TModuleName}::${infer TStructName}${'' | `<${infer _TInnerType}>`}` ? OmitInner<TStructName> extends ResourceStructName<Extract<TABITable[number], {
+    address: TAccountAddress;
+    name: TModuleName;
+}>> ? ExtractStructType<TABITable, Extract<TABITable[number], {
+    address: TAccountAddress;
+    name: TModuleName;
+}>, OmitInner<TStructName>> : UnknownStruct<TMoveType> : UnknownStruct<TMoveType>;
 export {};
 //# sourceMappingURL=structConvertor.d.ts.map

package/build/types/types/convertor/structConvertor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structConvertor.d.ts","sourceRoot":"","sources":["../../../../src/types/convertor/structConvertor.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGpE,MAAM,MAAM,sBAAsB,CAChC,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB,SAAS,SAAS,kBAAkB,GAEpC,+BAA+B,CAAC,SAAS,EAAE,SAAS,CAAC,GAErD,4BAA4B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAEvD;;GAEG;AACH,KAAK,2BAA2B,CAAC,CAAC,SAAS,aAAa,IAAI,CAAC,SAAS,MAAM,GACxE,OAAO,GACP,CAAC,SAAS,IAAI,GACd,MAAM,GACN,CAAC,SAAS,KAAK,GACf,MAAM,GACN,CAAC,SAAS,KAAK,GACf,MAAM,GACN,CAAC,SAAS,KAAK,GACf,MAAM,GACN,CAAC,SAAS,MAAM,GAChB,MAAM,GACN,CAAC,SAAS,MAAM,GAChB,MAAM,GACN,CAAC,SAAS,SAAS,GACnB,KAAK,MAAM,EAAE,GACb,CAAC,SAAS,qBAAqB,GAC/B,MAAM,GACN,KAAK,CAAC;AAGV,KAAK,+BAA+B,CAClC,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,kBAAkB,IAClC,SAAS,SAAS,aAAa,GAC/B,2BAA2B,CAAC,SAAS,CAAC,GACtC,SAAS,SAAS,UAAU,MAAM,MAAM,GAAG,GAC3C,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,GAC3C,SAAS,SAAS,uBAAuB,MAAM,MAAM,GAAG,GACxD,4BAA4B,CAAC,SAAS,EAAE,MAAM,CAAC,GAC/C,aAAa,CAAC,SAAS,CAAC,CAAC;AAE7B,KAAK,4BAA4B,CAC/B,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB;IACF,GAAG,EAAE,CAAC,sBAAsB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;CAC1D,CAAC;AAGF,KAAK,4BAA4B,CAC/B,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB,SAAS,SAAS,GAAG,MAAM,eAAe,KAAK,MAAM,WAAW,KAAK,MAAM,WAAW,GACtF,EAAE,GACF,IAAI,MAAM,WAAW,GAAG,EAAE,GAC1B,GAAG,eAAe,KAAK,WAAW,EAAE,SAAS,MAAM,SAAS,GAC1D,SAAS,CAAC,WAAW,CAAC,SAAS,kBAAkB,CAC/C,SAAS,CAAC,GAAG,eAAe,KAAK,WAAW,EAAE,CAAC,CAChD,GACC,iBAAiB,CACf,SAAS,EACT,SAAS,CAAC,GAAG,eAAe,KAAK,WAAW,EAAE,CAAC,EAC/C,SAAS,CAAC,WAAW,CAAC,CACvB,GAED,aAAa,CAAC,SAAS,CAAC,GAC1B,aAAa,CAAC,SAAS,CAAC,GAC1B,aAAa,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"structConvertor.d.ts","sourceRoot":"","sources":["../../../../src/types/convertor/structConvertor.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGpE,MAAM,MAAM,sBAAsB,CAChC,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB,SAAS,SAAS,kBAAkB,GAEpC,+BAA+B,CAAC,SAAS,EAAE,SAAS,CAAC,GAErD,4BAA4B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAEvD;;GAEG;AACH,KAAK,2BAA2B,CAAC,CAAC,SAAS,aAAa,IAAI,CAAC,SAAS,MAAM,GACxE,OAAO,GACP,CAAC,SAAS,IAAI,GACZ,MAAM,GACN,CAAC,SAAS,KAAK,GACb,MAAM,GACN,CAAC,SAAS,KAAK,GACb,MAAM,GACN,CAAC,SAAS,KAAK,GACb,MAAM,GACN,CAAC,SAAS,MAAM,GACd,MAAM,GACN,CAAC,SAAS,MAAM,GACd,MAAM,GACN,CAAC,SAAS,SAAS,GACjB,KAAK,MAAM,EAAE,GACb,CAAC,SAAS,qBAAqB,GAC7B,MAAM,GACN,KAAK,CAAC;AAG1B,KAAK,+BAA+B,CAClC,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,kBAAkB,IAClC,SAAS,SAAS,aAAa,GAC/B,2BAA2B,CAAC,SAAS,CAAC,GACtC,SAAS,SAAS,UAAU,MAAM,MAAM,GAAG,GACzC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,GAC3C,SAAS,SAAS,uBAAuB,MAAM,MAAM,GAAG,GACtD,4BAA4B,CAAC,SAAS,EAAE,MAAM,CAAC,GAC/C,aAAa,CAAC,SAAS,CAAC,CAAC;AAEjC,KAAK,4BAA4B,CAC/B,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB;IACF,GAAG,EAAE,CAAC,sBAAsB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;CAC1D,CAAC;AAGF,KAAK,4BAA4B,CAC/B,SAAS,SAAS,QAAQ,EAC1B,SAAS,SAAS,MAAM,IACtB,SAAS,SAAS,GAAG,MAAM,eAAe,KAAK,MAAM,WAAW,KAAK,MAAM,WAAW,GACtF,EAAE,GACF,IAAI,MAAM,WAAW,GAAG,EAAE,GAC1B,SAAS,CAAC,WAAW,CAAC,SAAS,kBAAkB,CAC/C,OAAO,CACL,SAAS,CAAC,MAAM,CAAC,EACjB;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAChD,CACF,GACC,iBAAiB,CACf,SAAS,EACT,OAAO,CACL,SAAS,CAAC,MAAM,CAAC,EACjB;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAChD,EACD,SAAS,CAAC,WAAW,CAAC,CACvB,GAED,aAAa,CAAC,SAAS,CAAC,GAC1B,aAAa,CAAC,SAAS,CAAC,CAAC"}

package/build/types/types/defaultABITable.d.ts

@@ -5,15 +5,13 @@ import type { GUID_ABI } from '../abi/guid.js';
 import { OPTIONAL_AGGREGATOR_ABI } from '../abi/optional_aggregator.js';
 import { TABLE_ABI } from '../abi/table.js';
 import { ABIRoot } from './abi.js';
-export type ABITable = {
-    [TAddress in string]: ABIRoot;
-};
-export type DefaultABITable = {
-    '0x1::coin': typeof COIN_ABI;
-    '0x1::event': typeof EVENT_ABI;
-    '0x1::guid': typeof GUID_ABI;
-    '0x1::table': typeof TABLE_ABI;
-    '0x1::optional_aggregator': typeof OPTIONAL_AGGREGATOR_ABI;
-    '0x1::aggregator': typeof AGGREGATOR_ABI;
-};
+export type ABITable = ABIRoot[];
+export type DefaultABITable = [
+    typeof COIN_ABI,
+    typeof EVENT_ABI,
+    typeof GUID_ABI,
+    typeof TABLE_ABI,
+    typeof OPTIONAL_AGGREGATOR_ABI,
+    typeof AGGREGATOR_ABI
+];
 //# sourceMappingURL=defaultABITable.d.ts.map

package/build/types/types/defaultABITable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultABITable.d.ts","sourceRoot":"","sources":["../../../src/types/defaultABITable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,MAAM,QAAQ,GAAG;KACpB,QAAQ,IAAI,MAAM,GAAG,OAAO;CAC9B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,OAAO,QAAQ,CAAC;IAC7B,YAAY,EAAE,OAAO,SAAS,CAAC;IAC/B,WAAW,EAAE,OAAO,QAAQ,CAAC;IAC7B,YAAY,EAAE,OAAO,SAAS,CAAC;IAC/B,0BAA0B,EAAE,OAAO,uBAAuB,CAAC;IAC3D,iBAAiB,EAAE,OAAO,cAAc,CAAC;CAC1C,CAAC"}
+{"version":3,"file":"defaultABITable.d.ts","sourceRoot":"","sources":["../../../src/types/defaultABITable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,QAAQ;IACf,OAAO,SAAS;IAChB,OAAO,QAAQ;IACf,OAAO,SAAS;IAChB,OAAO,uBAAuB;IAC9B,OAAO,cAAc;CACtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thalalabs/surf",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "TypeScript Interfaces & React Hooks for interacting with Aptos Smart Contracts with type safety.",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",
@@ -33,6 +33,7 @@
     }
   },
   "devDependencies": {
+    "@aptos-labs/ts-sdk": "^1.16.0",
     "@aptos-labs/wallet-adapter-react": "^2.2.0",
     "@changesets/cli": "^2.26.1",
     "@types/jest": "~29.5",
@@ -43,19 +44,20 @@
     "eslint": "~8.57",
     "eslint-config-prettier": "~9.1",
     "eslint-plugin-jest": "~27.6",
+    "husky": "^9.0.11",
     "jest": "~29.7",
+    "lint-staged": "^15.2.5",
     "prettier": "~3.1",
     "react": "^18.2.0",
     "rimraf": "~5.0",
     "ts-api-utils": "~0.0.44",
     "ts-jest": "~29.1",
     "tslib": "~2.6",
-    "typescript": "~5.1",
-    "@aptos-labs/ts-sdk": "^1.2.0"
+    "typescript": "~5.1"
   },
   "peerDependencies": {
+    "@aptos-labs/ts-sdk": "^1.16.0",
     "@aptos-labs/wallet-adapter-react": "^2.2.0",
-    "@aptos-labs/ts-sdk": "^1.14.0",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
@@ -81,6 +83,13 @@
     "test:watch": "jest --watch",
     "release": "yarn build && changeset publish"
   },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.json": "prettier --write"
+  },
   "keywords": [
     "move",
     "blockchain",

package/src/core/__tests__/accountResource.test.ts

@@ -10,16 +10,14 @@ import { createSurfClient } from '../Client.js';
 
 describe('get account resource', () => {
   const client = createSurfClient(
-    new Aptos(
-      new AptosConfig({ network: Network.TESTNET })
-    )
+    new Aptos(new AptosConfig({ network: Network.TESTNET })),
   );
 
   // Act before assertions
-  beforeAll(async () => { });
+  beforeAll(async () => {});
 
   // Teardown (cleanup) after assertions
-  afterAll(() => { });
+  afterAll(() => {});
 
   it('get CoinStore', async () => {
     const result = await client.useABI(COIN_ABI).resource.CoinStore({
@@ -33,9 +31,7 @@ describe('get account resource', () => {
     expect(result.withdraw_events).toBeDefined();
 
     // can inference nested struct
-    expect(
-      result.deposit_events.guid.id.creation_num.startsWith,
-    ).toBeDefined();
+    expect(result.deposit_events.guid.id.creation_num.startsWith).toBeDefined();
 
     // @ts-expect-error field not exist
     expect(result.deposit_events.guid.id.abc).toBeUndefined();
@@ -81,14 +77,10 @@ describe('get account resource', () => {
 
   it('use customized ABITable', async () => {
     async () => {
-      type ABITAble = DefaultABITable & {
-        '0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9::fixed_point64': typeof FIXED_POINT64_ABI;
-      };
+      type ABITAble = [...DefaultABITable, ...[typeof FIXED_POINT64_ABI]];
 
       const client = createSurfClient<ABITAble>(
-        new Aptos(
-          new AptosConfig({ network: Network.TESTNET })
-        )
+        new Aptos(new AptosConfig({ network: Network.TESTNET })),
       );
 
       const result = await client.useABI(TEST_ABI).resource.TestStruct({

package/src/types/common.ts

@@ -1,4 +1,4 @@
-export type UnknownStruct<_T extends string> = object;
+export type UnknownStruct<_T extends string> = unknown;
 
 export type AnyNumber = number | bigint | string;
 

package/src/types/convertor/structConvertor.ts

@@ -25,22 +25,22 @@ export type ConvertStructFieldType<
 type ConvertPrimitiveStructField<T extends MovePrimitive> = T extends 'bool'
   ? boolean
   : T extends 'u8'
-  ? number
-  : T extends 'u16'
-  ? number
-  : T extends 'u32'
-  ? number
-  : T extends 'u64'
-  ? string
-  : T extends 'u128'
-  ? string
-  : T extends 'u256'
-  ? string
-  : T extends 'address'
-  ? `0x${string}`
-  : T extends '0x1::string::String'
-  ? string
-  : never;
+    ? number
+    : T extends 'u16'
+      ? number
+      : T extends 'u32'
+        ? number
+        : T extends 'u64'
+          ? string
+          : T extends 'u128'
+            ? string
+            : T extends 'u256'
+              ? string
+              : T extends 'address'
+                ? `0x${string}`
+                : T extends '0x1::string::String'
+                  ? string
+                  : never;
 
 // Convert a struct field non-struct Move type to a TypeScript type
 type ConvertStructFieldNonStructType<
@@ -49,10 +49,10 @@ type ConvertStructFieldNonStructType<
 > = TMoveType extends MovePrimitive
   ? ConvertPrimitiveStructField<TMoveType>
   : TMoveType extends `vector<${infer TInner}>`
-  ? ConvertStructFieldType<TABITable, TInner>[]
-  : TMoveType extends `0x1::option::Option<${infer TInner}>`
-  ? ConvertStructFieldOptionType<TABITable, TInner>
-  : UnknownStruct<TMoveType>;
+    ? ConvertStructFieldType<TABITable, TInner>[]
+    : TMoveType extends `0x1::option::Option<${infer TInner}>`
+      ? ConvertStructFieldOptionType<TABITable, TInner>
+      : UnknownStruct<TMoveType>;
 
 type ConvertStructFieldOptionType<
   TABITable extends ABITable,
@@ -68,16 +68,20 @@ type ConvertStructFieldStructType<
 > = TMoveType extends `${infer TAccountAddress}::${infer TModuleName}::${infer TStructName}${
   | ''
   | `<${infer _TInnerType}>`}`
-  ? `${TAccountAddress}::${TModuleName}` extends keyof TABITable
-    ? OmitInner<TStructName> extends ResourceStructName<
-        TABITable[`${TAccountAddress}::${TModuleName}`]
+  ? OmitInner<TStructName> extends ResourceStructName<
+      Extract<
+        TABITable[number],
+        { address: TAccountAddress; name: TModuleName }
+      >
+    >
+    ? ExtractStructType<
+        TABITable,
+        Extract<
+          TABITable[number],
+          { address: TAccountAddress; name: TModuleName }
+        >,
+        OmitInner<TStructName>
       >
-      ? ExtractStructType<
-          TABITable,
-          TABITable[`${TAccountAddress}::${TModuleName}`],
-          OmitInner<TStructName>
-        >
-      : // Unknown struct, use the default struct type
-        UnknownStruct<TMoveType>
-    : UnknownStruct<TMoveType>
+    : // Unknown struct, use the default struct type
+      UnknownStruct<TMoveType>
   : UnknownStruct<TMoveType>;

package/src/types/defaultABITable.ts

@@ -6,15 +6,13 @@ import { OPTIONAL_AGGREGATOR_ABI } from '../abi/optional_aggregator.js';
 import { TABLE_ABI } from '../abi/table.js';
 import { ABIRoot } from './abi.js';
 
-export type ABITable = {
-  [TAddress in string]: ABIRoot;
-};
+export type ABITable = ABIRoot[];
 
-export type DefaultABITable = {
-  '0x1::coin': typeof COIN_ABI;
-  '0x1::event': typeof EVENT_ABI;
-  '0x1::guid': typeof GUID_ABI;
-  '0x1::table': typeof TABLE_ABI;
-  '0x1::optional_aggregator': typeof OPTIONAL_AGGREGATOR_ABI;
-  '0x1::aggregator': typeof AGGREGATOR_ABI;
-};
+export type DefaultABITable = [
+  typeof COIN_ABI,
+  typeof EVENT_ABI,
+  typeof GUID_ABI,
+  typeof TABLE_ABI,
+  typeof OPTIONAL_AGGREGATOR_ABI,
+  typeof AGGREGATOR_ABI,
+];