@typemove/aptos 1.8.3 → 1.9.0

package/src/builtin/0x4.ts

@@ -68,10 +68,10 @@ export namespace token {
     }
   }
 
-  export interface MutationInstance extends TypedEventInstance<Mutation> {
+  export type MutationInstance = TypedEventInstance<Mutation> & {
     data_decoded: Mutation;
     type_arguments: [];
-  }
+  };
 
   export interface MutationEvent {
     mutated_field_name: string;
@@ -89,11 +89,10 @@ export namespace token {
     }
   }
 
-  export interface MutationEventInstance
-    extends TypedEventInstance<MutationEvent> {
+  export type MutationEventInstance = TypedEventInstance<MutationEvent> & {
     data_decoded: MutationEvent;
     type_arguments: [];
-  }
+  };
 
   export interface ConcurrentTokenIdentifiers {
     index: _0x1.aggregator_v2.AggregatorSnapshot<bigint>;
@@ -432,10 +431,10 @@ export namespace collection {
     }
   }
 
-  export interface BurnInstance extends TypedEventInstance<Burn> {
+  export type BurnInstance = TypedEventInstance<Burn> & {
     data_decoded: Burn;
     type_arguments: [];
-  }
+  };
 
   export interface BurnEvent {
     index: bigint;
@@ -452,10 +451,10 @@ export namespace collection {
     }
   }
 
-  export interface BurnEventInstance extends TypedEventInstance<BurnEvent> {
+  export type BurnEventInstance = TypedEventInstance<BurnEvent> & {
     data_decoded: BurnEvent;
     type_arguments: [];
-  }
+  };
 
   export interface Collection {
     creator: MoveAddressType;
@@ -493,11 +492,11 @@ export namespace collection {
     }
   }
 
-  export interface ConcurrentBurnEventInstance
-    extends TypedEventInstance<ConcurrentBurnEvent> {
-    data_decoded: ConcurrentBurnEvent;
-    type_arguments: [];
-  }
+  export type ConcurrentBurnEventInstance =
+    TypedEventInstance<ConcurrentBurnEvent> & {
+      data_decoded: ConcurrentBurnEvent;
+      type_arguments: [];
+    };
 
   export interface ConcurrentMintEvent {
     collection_addr: MoveAddressType;
@@ -517,11 +516,11 @@ export namespace collection {
     }
   }
 
-  export interface ConcurrentMintEventInstance
-    extends TypedEventInstance<ConcurrentMintEvent> {
-    data_decoded: ConcurrentMintEvent;
-    type_arguments: [];
-  }
+  export type ConcurrentMintEventInstance =
+    TypedEventInstance<ConcurrentMintEvent> & {
+      data_decoded: ConcurrentMintEvent;
+      type_arguments: [];
+    };
 
   export interface FixedSupply {
     current_supply: bigint;
@@ -557,10 +556,10 @@ export namespace collection {
     }
   }
 
-  export interface MintInstance extends TypedEventInstance<Mint> {
+  export type MintInstance = TypedEventInstance<Mint> & {
     data_decoded: Mint;
     type_arguments: [];
-  }
+  };
 
   export interface MintEvent {
     index: bigint;
@@ -577,10 +576,10 @@ export namespace collection {
     }
   }
 
-  export interface MintEventInstance extends TypedEventInstance<MintEvent> {
+  export type MintEventInstance = TypedEventInstance<MintEvent> & {
     data_decoded: MintEvent;
     type_arguments: [];
-  }
+  };
 
   export interface Mutation {
     mutated_field_name: string;
@@ -599,10 +598,10 @@ export namespace collection {
     }
   }
 
-  export interface MutationInstance extends TypedEventInstance<Mutation> {
+  export type MutationInstance = TypedEventInstance<Mutation> & {
     data_decoded: Mutation;
     type_arguments: [];
-  }
+  };
 
   export interface MutationEvent {
     mutated_field_name: string;
@@ -618,11 +617,10 @@ export namespace collection {
     }
   }
 
-  export interface MutationEventInstance
-    extends TypedEventInstance<MutationEvent> {
+  export type MutationEventInstance = TypedEventInstance<MutationEvent> & {
     data_decoded: MutationEvent;
     type_arguments: [];
-  }
+  };
 
   export interface SetMaxSupply {
     collection: _0x1.object$.Object<collection.Collection>;
@@ -640,11 +638,10 @@ export namespace collection {
     }
   }
 
-  export interface SetMaxSupplyInstance
-    extends TypedEventInstance<SetMaxSupply> {
+  export type SetMaxSupplyInstance = TypedEventInstance<SetMaxSupply> & {
     data_decoded: SetMaxSupply;
     type_arguments: [];
-  }
+  };
 
   export interface UnlimitedSupply {
     current_supply: bigint;

package/src/move-coder.ts

@@ -27,6 +27,7 @@ export class MoveCoder extends AbstractMoveCoder<MoveModuleBytecode, Event | Mov
     if (m) {
       return m
     }
+    this.accounts.add(module.abi.address)
     m = toInternalModule(module)
     this.loadInternal(m, address)
     return m

package/src/tests/types/0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af.ts

@@ -150,11 +150,11 @@ export namespace base_pool {
     }
   }
 
-  export interface BasePoolParamChangeEventInstance
-    extends TypedEventInstance<BasePoolParamChangeEvent> {
-    data_decoded: BasePoolParamChangeEvent;
-    type_arguments: [];
-  }
+  export type BasePoolParamChangeEventInstance =
+    TypedEventInstance<BasePoolParamChangeEvent> & {
+      data_decoded: BasePoolParamChangeEvent;
+      type_arguments: [];
+    };
 
   export interface BasePoolParams {
     swap_fee_protocol_allocation_ratio: _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64;
@@ -320,11 +320,12 @@ export namespace stable_pool {
     }
   }
 
-  export interface AddLiquidityEventInstance
-    extends TypedEventInstance<AddLiquidityEvent<any, any, any, any>> {
+  export type AddLiquidityEventInstance = TypedEventInstance<
+    AddLiquidityEvent<any, any, any, any>
+  > & {
     data_decoded: AddLiquidityEvent<any, any, any, any>;
     type_arguments: [string, string, string, string];
-  }
+  };
 
   export interface Flashloan<T0, T1, T2, T3> {
     amount_0: bigint;
@@ -376,11 +377,12 @@ export namespace stable_pool {
     }
   }
 
-  export interface FlashloanEventInstance
-    extends TypedEventInstance<FlashloanEvent<any, any, any, any>> {
+  export type FlashloanEventInstance = TypedEventInstance<
+    FlashloanEvent<any, any, any, any>
+  > & {
     data_decoded: FlashloanEvent<any, any, any, any>;
     type_arguments: [string, string, string, string];
-  }
+  };
 
   export interface FlashloanHelper<T0, T1, T2, T3> {
     locked: boolean;
@@ -434,11 +436,12 @@ export namespace stable_pool {
     }
   }
 
-  export interface RemoveLiquidityEventInstance
-    extends TypedEventInstance<RemoveLiquidityEvent<any, any, any, any>> {
+  export type RemoveLiquidityEventInstance = TypedEventInstance<
+    RemoveLiquidityEvent<any, any, any, any>
+  > & {
     data_decoded: RemoveLiquidityEvent<any, any, any, any>;
     type_arguments: [string, string, string, string];
-  }
+  };
 
   export interface StablePool<T0, T1, T2, T3> {
     asset_0: _0x1.coin.Coin<T0>;
@@ -507,11 +510,12 @@ export namespace stable_pool {
     }
   }
 
-  export interface StablePoolCreationEventInstance
-    extends TypedEventInstance<StablePoolCreationEvent<any, any, any, any>> {
+  export type StablePoolCreationEventInstance = TypedEventInstance<
+    StablePoolCreationEvent<any, any, any, any>
+  > & {
     data_decoded: StablePoolCreationEvent<any, any, any, any>;
     type_arguments: [string, string, string, string];
-  }
+  };
 
   export interface StablePoolEvents<T0, T1, T2, T3> {
     pool_creation_events: _0x1.event.EventHandle<
@@ -601,11 +605,11 @@ export namespace stable_pool {
     }
   }
 
-  export interface StablePoolParamChangeEventInstance
-    extends TypedEventInstance<StablePoolParamChangeEvent> {
-    data_decoded: StablePoolParamChangeEvent;
-    type_arguments: [];
-  }
+  export type StablePoolParamChangeEventInstance =
+    TypedEventInstance<StablePoolParamChangeEvent> & {
+      data_decoded: StablePoolParamChangeEvent;
+      type_arguments: [];
+    };
 
   export interface StablePoolParams {
     default_swap_fee_ratio: _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64;
@@ -678,11 +682,12 @@ export namespace stable_pool {
     }
   }
 
-  export interface SwapEventInstance
-    extends TypedEventInstance<SwapEvent<any, any, any, any>> {
+  export type SwapEventInstance = TypedEventInstance<
+    SwapEvent<any, any, any, any>
+  > & {
     data_decoded: SwapEvent<any, any, any, any>;
     type_arguments: [string, string, string, string];
-  }
+  };
 
   export namespace entry {
     export async function setAmpFactor<T0 = any, T1 = any, T2 = any, T3 = any>(
@@ -1090,10 +1095,9 @@ export namespace weighted_pool {
     }
   }
 
-  export interface AddLiquidityEventInstance
-    extends TypedEventInstance<
-      AddLiquidityEvent<any, any, any, any, any, any, any, any>
-    > {
+  export type AddLiquidityEventInstance = TypedEventInstance<
+    AddLiquidityEvent<any, any, any, any, any, any, any, any>
+  > & {
     data_decoded: AddLiquidityEvent<any, any, any, any, any, any, any, any>;
     type_arguments: [
       string,
@@ -1105,7 +1109,7 @@ export namespace weighted_pool {
       string,
       string,
     ];
-  }
+  };
 
   export interface Flashloan<T0, T1, T2, T3, T4, T5, T6, T7> {
     amount_0: bigint;
@@ -1165,10 +1169,9 @@ export namespace weighted_pool {
     }
   }
 
-  export interface FlashloanEventInstance
-    extends TypedEventInstance<
-      FlashloanEvent<any, any, any, any, any, any, any, any>
-    > {
+  export type FlashloanEventInstance = TypedEventInstance<
+    FlashloanEvent<any, any, any, any, any, any, any, any>
+  > & {
     data_decoded: FlashloanEvent<any, any, any, any, any, any, any, any>;
     type_arguments: [
       string,
@@ -1180,7 +1183,7 @@ export namespace weighted_pool {
       string,
       string,
     ];
-  }
+  };
 
   export interface FlashloanHelper<T0, T1, T2, T3, T4, T5, T6, T7> {
     locked: boolean;
@@ -1242,10 +1245,9 @@ export namespace weighted_pool {
     }
   }
 
-  export interface RemoveLiquidityEventInstance
-    extends TypedEventInstance<
-      RemoveLiquidityEvent<any, any, any, any, any, any, any, any>
-    > {
+  export type RemoveLiquidityEventInstance = TypedEventInstance<
+    RemoveLiquidityEvent<any, any, any, any, any, any, any, any>
+  > & {
     data_decoded: RemoveLiquidityEvent<any, any, any, any, any, any, any, any>;
     type_arguments: [
       string,
@@ -1257,7 +1259,7 @@ export namespace weighted_pool {
       string,
       string,
     ];
-  }
+  };
 
   export interface SwapEvent<T0, T1, T2, T3, T4, T5, T6, T7> {
     idx_in: bigint;
@@ -1293,10 +1295,9 @@ export namespace weighted_pool {
     }
   }
 
-  export interface SwapEventInstance
-    extends TypedEventInstance<
-      SwapEvent<any, any, any, any, any, any, any, any>
-    > {
+  export type SwapEventInstance = TypedEventInstance<
+    SwapEvent<any, any, any, any, any, any, any, any>
+  > & {
     data_decoded: SwapEvent<any, any, any, any, any, any, any, any>;
     type_arguments: [
       string,
@@ -1308,7 +1309,7 @@ export namespace weighted_pool {
       string,
       string,
     ];
-  }
+  };
 
   export interface Weight_10 {
     dummy_field: boolean;
@@ -1674,10 +1675,9 @@ export namespace weighted_pool {
     }
   }
 
-  export interface WeightedPoolCreationEventInstance
-    extends TypedEventInstance<
-      WeightedPoolCreationEvent<any, any, any, any, any, any, any, any>
-    > {
+  export type WeightedPoolCreationEventInstance = TypedEventInstance<
+    WeightedPoolCreationEvent<any, any, any, any, any, any, any, any>
+  > & {
     data_decoded: WeightedPoolCreationEvent<
       any,
       any,
@@ -1698,7 +1698,7 @@ export namespace weighted_pool {
       string,
       string,
     ];
-  }
+  };
 
   export interface WeightedPoolEvents<T0, T1, T2, T3, T4, T5, T6, T7> {
     pool_creation_events: _0x1.event.EventHandle<
@@ -1795,11 +1795,11 @@ export namespace weighted_pool {
     }
   }
 
-  export interface WeightedPoolParamChangeEventInstance
-    extends TypedEventInstance<WeightedPoolParamChangeEvent> {
-    data_decoded: WeightedPoolParamChangeEvent;
-    type_arguments: [];
-  }
+  export type WeightedPoolParamChangeEventInstance =
+    TypedEventInstance<WeightedPoolParamChangeEvent> & {
+      data_decoded: WeightedPoolParamChangeEvent;
+      type_arguments: [];
+    };
 
   export interface WeightedPoolParams {
     default_swap_fee_ratio: _0x4dcae85fc5559071906cd5c76b7420fcbb4b0a92f00ab40ffc394aadbbff5ee9.fixed_point64.FixedPoint64;

package/src/tests/types/0x6b3720cd988adeaf721ed9d4730da4324d52364871a68eac62b46d21e4d2fa99.ts

@@ -44,11 +44,11 @@ export namespace farming {
     }
   }
 
-  export interface BoostMultiplierChangeEventInstance
-    extends TypedEventInstance<BoostMultiplierChangeEvent> {
-    data_decoded: BoostMultiplierChangeEvent;
-    type_arguments: [];
-  }
+  export type BoostMultiplierChangeEventInstance =
+    TypedEventInstance<BoostMultiplierChangeEvent> & {
+      data_decoded: BoostMultiplierChangeEvent;
+      type_arguments: [];
+    };
 
   export interface BoostedFarming {
     boost_multipliers: _0x1.smart_table.SmartTable<
@@ -87,10 +87,10 @@ export namespace farming {
     }
   }
 
-  export interface ClaimEventInstance extends TypedEventInstance<ClaimEvent> {
+  export type ClaimEventInstance = TypedEventInstance<ClaimEvent> & {
     data_decoded: ClaimEvent;
     type_arguments: [];
-  }
+  };
 
   export interface EpochInfo {
     start_sec: bigint;
@@ -195,11 +195,10 @@ export namespace farming {
     }
   }
 
-  export interface PoolChangeEventInstance
-    extends TypedEventInstance<PoolChangeEvent> {
+  export type PoolChangeEventInstance = TypedEventInstance<PoolChangeEvent> & {
     data_decoded: PoolChangeEvent;
     type_arguments: [];
-  }
+  };
 
   export interface PoolInfo {
     stake_coin: string;
@@ -259,11 +258,11 @@ export namespace farming {
     }
   }
 
-  export interface RateLimitMaxQtyUpdateEventInstance
-    extends TypedEventInstance<RateLimitMaxQtyUpdateEvent> {
-    data_decoded: RateLimitMaxQtyUpdateEvent;
-    type_arguments: [];
-  }
+  export type RateLimitMaxQtyUpdateEventInstance =
+    TypedEventInstance<RateLimitMaxQtyUpdateEvent> & {
+      data_decoded: RateLimitMaxQtyUpdateEvent;
+      type_arguments: [];
+    };
 
   export interface RateLimitWindowDurationUpdateEvent {
     window_duration_seconds: bigint;
@@ -282,11 +281,11 @@ export namespace farming {
     }
   }
 
-  export interface RateLimitWindowDurationUpdateEventInstance
-    extends TypedEventInstance<RateLimitWindowDurationUpdateEvent> {
-    data_decoded: RateLimitWindowDurationUpdateEvent;
-    type_arguments: [];
-  }
+  export type RateLimitWindowDurationUpdateEventInstance =
+    TypedEventInstance<RateLimitWindowDurationUpdateEvent> & {
+      data_decoded: RateLimitWindowDurationUpdateEvent;
+      type_arguments: [];
+    };
 
   export interface RewardEpochEvent {
     reward_coin: string;
@@ -308,11 +307,11 @@ export namespace farming {
     }
   }
 
-  export interface RewardEpochEventInstance
-    extends TypedEventInstance<RewardEpochEvent> {
-    data_decoded: RewardEpochEvent;
-    type_arguments: [];
-  }
+  export type RewardEpochEventInstance =
+    TypedEventInstance<RewardEpochEvent> & {
+      data_decoded: RewardEpochEvent;
+      type_arguments: [];
+    };
 
   export interface StakeEvent {
     pid: bigint;
@@ -331,10 +330,10 @@ export namespace farming {
     }
   }
 
-  export interface StakeEventInstance extends TypedEventInstance<StakeEvent> {
+  export type StakeEventInstance = TypedEventInstance<StakeEvent> & {
     data_decoded: StakeEvent;
     type_arguments: [];
-  }
+  };
 
   export interface StakeEventV2 {
     pid: bigint;
@@ -355,11 +354,10 @@ export namespace farming {
     }
   }
 
-  export interface StakeEventV2Instance
-    extends TypedEventInstance<StakeEventV2> {
+  export type StakeEventV2Instance = TypedEventInstance<StakeEventV2> & {
     data_decoded: StakeEventV2;
     type_arguments: [];
-  }
+  };
 
   export interface Staker {
     pool_info: _0x1.table.Table<bigint, farming.UserPoolInfo>;
@@ -393,11 +391,10 @@ export namespace farming {
     }
   }
 
-  export interface UnstakeEventInstance
-    extends TypedEventInstance<UnstakeEvent> {
+  export type UnstakeEventInstance = TypedEventInstance<UnstakeEvent> & {
     data_decoded: UnstakeEvent;
     type_arguments: [];
-  }
+  };
 
   export interface UnstakeEventV2 {
     pid: bigint;
@@ -418,11 +415,10 @@ export namespace farming {
     }
   }
 
-  export interface UnstakeEventV2Instance
-    extends TypedEventInstance<UnstakeEventV2> {
+  export type UnstakeEventV2Instance = TypedEventInstance<UnstakeEventV2> & {
     data_decoded: UnstakeEventV2;
     type_arguments: [];
-  }
+  };
 
   export interface UserPoolInfo {
     amount: bigint;