@sentio/sdk 1.27.9 → 1.27.10

package/src/aptos-codegen/typegen.ts

@@ -2,7 +2,7 @@ import { MoveModule } from 'aptos-sdk/src/generated'
 import { TypeDescriptor } from '../aptos/types'
 import { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../aptos/utils'
 
-function generateTypeForDescriptor(type: TypeDescriptor): string {
+function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {
   // TODO &signer is defintely an address, but what if &OTHER_TYPE?
   if (type.qname.startsWith('&')) {
     return 'Address'
@@ -34,10 +34,10 @@ function generateTypeForDescriptor(type: TypeDescriptor): string {
     if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
       return `${elementTypeQname}[] | string`
     }
-    return generateTypeForDescriptor(type.typeArgs[0]) + '[]'
+    return generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
   }
 
-  const simpleName = generateSimpleType(type.qname)
+  const simpleName = generateSimpleType(type.qname, currentAddress)
   if (simpleName.length === 0) {
     console.error('unexpected error')
   }
@@ -46,18 +46,20 @@ function generateTypeForDescriptor(type: TypeDescriptor): string {
   }
   if (type.typeArgs.length > 0) {
     // return simpleName
-    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t)).join(',') + '>'
+    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress)).join(',') + '>'
   }
   return simpleName
 }
 
-function generateSimpleType(type: string): string {
+function generateSimpleType(type: string, currentAddress: string): string {
   const parts = type.split(SPLITTER)
   if (parts.length < 2) {
     return parts[0]
   }
-
-  return parts.slice(1).join('.')
+  if (parts[0] === currentAddress) {
+    return parts.slice(1).join('.')
+  }
+  return '_' + parts.join('.')
 }
 
 export function parseMoveType(type: string): TypeDescriptor {
@@ -127,8 +129,8 @@ export function parseMoveType(type: string): TypeDescriptor {
 }
 
 // TODO ctx need to have type parameters
-export function generateType(type: string, ctx?: any): string {
-  return generateTypeForDescriptor(parseMoveType(type))
+export function generateType(type: string, currentAddress: string): string {
+  return generateTypeForDescriptor(parseMoveType(type), currentAddress)
 }
 
 export class AccountModulesImportInfo {

package/src/builtin/aptos/0x1.ts

@@ -4140,7 +4140,7 @@ export namespace transaction_validation {
   );
 }
 
-function loadAllTypes(_r: aptos.TypeRegistry) {
+export function loadAllTypes(_r: aptos.TypeRegistry) {
   _r.load(acl.ABI);
   _r.load(any.ABI);
   _r.load(bcs.ABI);

package/src/builtin/aptos/0x3.ts

@@ -7,7 +7,7 @@
 import { aptos } from "@sentio/sdk";
 import { Address, MoveModule } from "aptos-sdk/src/generated";
 
-import { table, event, simple_map, type_info } from "./0x1";
+import * as _0x1 from "./0x1";
 
 export class token extends aptos.AptosBaseProcessor {
   constructor(options: aptos.AptosBindOptions) {
@@ -248,11 +248,11 @@ export namespace token {
 
   export class Collections {
     static TYPE_QNAME = "0x3::token::Collections";
-    collection_data: table.Table<string, token.CollectionData>;
-    token_data: table.Table<token.TokenDataId, token.TokenData>;
-    create_collection_events: event.EventHandle<token.CreateCollectionEvent>;
-    create_token_data_events: event.EventHandle<token.CreateTokenDataEvent>;
-    mint_token_events: event.EventHandle<token.MintTokenEvent>;
+    collection_data: _0x1.table.Table<string, token.CollectionData>;
+    token_data: _0x1.table.Table<token.TokenDataId, token.TokenData>;
+    create_collection_events: _0x1.event.EventHandle<token.CreateCollectionEvent>;
+    create_token_data_events: _0x1.event.EventHandle<token.CreateTokenDataEvent>;
+    mint_token_events: _0x1.event.EventHandle<token.MintTokenEvent>;
   }
 
   export class CreateCollectionEvent {
@@ -382,12 +382,12 @@ export namespace token {
 
   export class TokenStore {
     static TYPE_QNAME = "0x3::token::TokenStore";
-    tokens: table.Table<token.TokenId, token.Token>;
+    tokens: _0x1.table.Table<token.TokenId, token.Token>;
     direct_transfer: Boolean;
-    deposit_events: event.EventHandle<token.DepositEvent>;
-    withdraw_events: event.EventHandle<token.WithdrawEvent>;
-    burn_events: event.EventHandle<token.BurnTokenEvent>;
-    mutate_token_property_events: event.EventHandle<token.MutateTokenPropertyMapEvent>;
+    deposit_events: _0x1.event.EventHandle<token.DepositEvent>;
+    withdraw_events: _0x1.event.EventHandle<token.WithdrawEvent>;
+    burn_events: _0x1.event.EventHandle<token.BurnTokenEvent>;
+    mutate_token_property_events: _0x1.event.EventHandle<token.MutateTokenPropertyMapEvent>;
   }
 
   export class WithdrawCapability {
@@ -535,7 +535,7 @@ export namespace token {
 export namespace property_map {
   export class PropertyMap {
     static TYPE_QNAME = "0x3::property_map::PropertyMap";
-    map: simple_map.SimpleMap<string, property_map.PropertyValue>;
+    map: _0x1.simple_map.SimpleMap<string, property_map.PropertyValue>;
   }
 
   export class PropertyValue {
@@ -630,7 +630,7 @@ export namespace token_coin_swap {
     amount: bigint;
     min_price: bigint;
     locked_until_secs: bigint;
-    coin_type_info: type_info.TypeInfo;
+    coin_type_info: _0x1.type_info.TypeInfo;
   }
 
   export interface TokenListingEventInstance
@@ -641,14 +641,17 @@ export namespace token_coin_swap {
 
   export class TokenListings<T0> {
     static TYPE_QNAME = "0x3::token_coin_swap::TokenListings";
-    listings: table.Table<token.TokenId, token_coin_swap.TokenCoinSwap<T0>>;
-    listing_events: event.EventHandle<token_coin_swap.TokenListingEvent>;
-    swap_events: event.EventHandle<token_coin_swap.TokenSwapEvent>;
+    listings: _0x1.table.Table<
+      token.TokenId,
+      token_coin_swap.TokenCoinSwap<T0>
+    >;
+    listing_events: _0x1.event.EventHandle<token_coin_swap.TokenListingEvent>;
+    swap_events: _0x1.event.EventHandle<token_coin_swap.TokenSwapEvent>;
   }
 
   export class TokenStoreEscrow {
     static TYPE_QNAME = "0x3::token_coin_swap::TokenStoreEscrow";
-    token_escrows: table.Table<token.TokenId, token_coin_swap.TokenEscrow>;
+    token_escrows: _0x1.table.Table<token.TokenId, token_coin_swap.TokenEscrow>;
   }
 
   export class TokenSwapEvent {
@@ -657,7 +660,7 @@ export namespace token_coin_swap {
     token_buyer: Address;
     token_amount: bigint;
     coin_amount: bigint;
-    coin_type_info: type_info.TypeInfo;
+    coin_type_info: _0x1.type_info.TypeInfo;
   }
 
   export interface TokenSwapEventInstance
@@ -784,10 +787,10 @@ export class token_transfers extends aptos.AptosBaseProcessor {
 export namespace token_transfers {
   export class PendingClaims {
     static TYPE_QNAME = "0x3::token_transfers::PendingClaims";
-    pending_claims: table.Table<token_transfers.TokenOfferId, token.Token>;
-    offer_events: event.EventHandle<token_transfers.TokenOfferEvent>;
-    cancel_offer_events: event.EventHandle<token_transfers.TokenCancelOfferEvent>;
-    claim_events: event.EventHandle<token_transfers.TokenClaimEvent>;
+    pending_claims: _0x1.table.Table<token_transfers.TokenOfferId, token.Token>;
+    offer_events: _0x1.event.EventHandle<token_transfers.TokenOfferEvent>;
+    cancel_offer_events: _0x1.event.EventHandle<token_transfers.TokenCancelOfferEvent>;
+    claim_events: _0x1.event.EventHandle<token_transfers.TokenClaimEvent>;
   }
 
   export class TokenCancelOfferEvent {
@@ -875,11 +878,8 @@ export namespace token_transfers {
   );
 }
 
-function loadAllTypes(_r: aptos.TypeRegistry) {
-  table.loadTypes(_r);
-  event.loadTypes(_r);
-  simple_map.loadTypes(_r);
-  type_info.loadTypes(_r);
+export function loadAllTypes(_r: aptos.TypeRegistry) {
+  _0x1.loadAllTypes(_r);
 
   _r.load(token.ABI);
   _r.load(property_map.ABI);