Resolve conflicts.

mars-protocol · Jun 5, 2024 · ccce629 · ccce629
2 parents c624d2e + 9572675
commit ccce629
Show file tree

Hide file tree

Showing 69 changed files with 929 additions and 1,799 deletions.
diff --git a/scripts/health/example-react/dist/assets/index-0d6505f2.js b/scripts/health/example-react/dist/assets/index-0d6505f2.js
diff --git a/scripts/types/generated/mars-account-nft/MarsAccountNft.client.ts b/scripts/types/generated/mars-account-nft/MarsAccountNft.client.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * This file was automatically generated by @cosmwasm/ts-codegen@1.10.0.
+ * This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
  */
@@ -106,6 +106,7 @@ export interface MarsAccountNftReadOnlyInterface {
 export class MarsAccountNftQueryClient implements MarsAccountNftReadOnlyInterface {
   client: CosmWasmClient
   contractAddress: string
+
   constructor(client: CosmWasmClient, contractAddress: string) {
     this.client = client
     this.contractAddress = contractAddress
@@ -124,6 +125,7 @@ export class MarsAccountNftQueryClient implements MarsAccountNftReadOnlyInterfac
     this.minter = this.minter.bind(this)
     this.ownership = this.ownership.bind(this)
   }
+
   config = async (): Promise<NftConfigBaseForString> => {
     return this.client.queryContractSmart(this.contractAddress, {
       config: {},
@@ -401,6 +403,7 @@ export class MarsAccountNftClient
   client: SigningCosmWasmClient
   sender: string
   contractAddress: string
+
   constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
     super(client, contractAddress)
     this.client = client
@@ -418,6 +421,7 @@ export class MarsAccountNftClient
     this.revokeAll = this.revokeAll.bind(this)
     this.updateOwnership = this.updateOwnership.bind(this)
   }
+
   updateConfig = async (
     {
       updates,

diff --git a/scripts/types/generated/mars-account-nft/MarsAccountNft.react-query.ts b/scripts/types/generated/mars-account-nft/MarsAccountNft.react-query.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * This file was automatically generated by @cosmwasm/ts-codegen@1.10.0.
+ * This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
  */
@@ -45,123 +45,48 @@ export const marsAccountNftQueryKeys = {
     },
   ] as const,
   address: (contractAddress: string | undefined) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.contract[0],
-        address: contractAddress,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.contract[0], address: contractAddress }] as const,
   config: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'config',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'config', args }] as const,
   nextId: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'next_id',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'next_id', args }] as const,
   ownerOf: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'owner_of',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'owner_of', args }] as const,
   approval: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'approval',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'approval', args }] as const,
   approvals: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'approvals',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'approvals', args },
     ] as const,
   allOperators: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'all_operators',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'all_operators', args },
     ] as const,
   numTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'num_tokens',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'num_tokens', args },
     ] as const,
   contractInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'contract_info',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'contract_info', args },
     ] as const,
   nftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'nft_info',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'nft_info', args }] as const,
   allNftInfo: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'all_nft_info',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'all_nft_info', args },
     ] as const,
   tokens: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'tokens',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'tokens', args }] as const,
   allTokens: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'all_tokens',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'all_tokens', args },
     ] as const,
   minter: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
-    [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'minter',
-        args,
-      },
-    ] as const,
+    [{ ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'minter', args }] as const,
   ownership: (contractAddress: string | undefined, args?: Record<string, unknown>) =>
     [
-      {
-        ...marsAccountNftQueryKeys.address(contractAddress)[0],
-        method: 'ownership',
-        args,
-      },
+      { ...marsAccountNftQueryKeys.address(contractAddress)[0], method: 'ownership', args },
     ] as const,
 }
 export interface MarsAccountNftReactQuery<TResponse, TData = TResponse> {
@@ -182,10 +107,7 @@ export function useMarsAccountNftOwnershipQuery<TData = OwnershipForAddr>({
   return useQuery<OwnershipForAddr, Error, TData>(
     marsAccountNftQueryKeys.ownership(client?.contractAddress),
     () => (client ? client.ownership() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftMinterQuery<TData>
@@ -197,10 +119,7 @@ export function useMarsAccountNftMinterQuery<TData = MinterResponse>({
   return useQuery<MinterResponse, Error, TData>(
     marsAccountNftQueryKeys.minter(client?.contractAddress),
     () => (client ? client.minter() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftAllTokensQuery<TData>
@@ -224,10 +143,7 @@ export function useMarsAccountNftAllTokensQuery<TData = TokensResponse>({
             startAfter: args.startAfter,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftTokensQuery<TData>
@@ -253,10 +169,7 @@ export function useMarsAccountNftTokensQuery<TData = TokensResponse>({
             startAfter: args.startAfter,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftAllNftInfoQuery<TData>
@@ -280,10 +193,7 @@ export function useMarsAccountNftAllNftInfoQuery<TData = AllNftInfoResponseForEm
             tokenId: args.tokenId,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftNftInfoQuery<TData>
@@ -305,10 +215,7 @@ export function useMarsAccountNftNftInfoQuery<TData = NftInfoResponseForEmpty>({
             tokenId: args.tokenId,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftContractInfoQuery<TData>
@@ -320,10 +227,7 @@ export function useMarsAccountNftContractInfoQuery<TData = ContractInfoResponse>
   return useQuery<ContractInfoResponse, Error, TData>(
     marsAccountNftQueryKeys.contractInfo(client?.contractAddress),
     () => (client ? client.contractInfo() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftNumTokensQuery<TData>
@@ -335,10 +239,7 @@ export function useMarsAccountNftNumTokensQuery<TData = NumTokensResponse>({
   return useQuery<NumTokensResponse, Error, TData>(
     marsAccountNftQueryKeys.numTokens(client?.contractAddress),
     () => (client ? client.numTokens() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftAllOperatorsQuery<TData>
@@ -366,10 +267,7 @@ export function useMarsAccountNftAllOperatorsQuery<TData = OperatorsResponse>({
             startAfter: args.startAfter,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftApprovalsQuery<TData>
@@ -393,10 +291,7 @@ export function useMarsAccountNftApprovalsQuery<TData = ApprovalsResponse>({
             tokenId: args.tokenId,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftApprovalQuery<TData>
@@ -422,10 +317,7 @@ export function useMarsAccountNftApprovalQuery<TData = ApprovalResponse>({
             tokenId: args.tokenId,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftOwnerOfQuery<TData>
@@ -449,10 +341,7 @@ export function useMarsAccountNftOwnerOfQuery<TData = OwnerOfResponse>({
             tokenId: args.tokenId,
           })
         : Promise.reject(new Error('Invalid client')),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftNextIdQuery<TData> extends MarsAccountNftReactQuery<String, TData> {}
@@ -463,10 +352,7 @@ export function useMarsAccountNftNextIdQuery<TData = String>({
   return useQuery<String, Error, TData>(
     marsAccountNftQueryKeys.nextId(client?.contractAddress),
     () => (client ? client.nextId() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftConfigQuery<TData>
@@ -478,10 +364,7 @@ export function useMarsAccountNftConfigQuery<TData = NftConfigBaseForString>({
   return useQuery<NftConfigBaseForString, Error, TData>(
     marsAccountNftQueryKeys.config(client?.contractAddress),
     () => (client ? client.config() : Promise.reject(new Error('Invalid client'))),
-    {
-      ...options,
-      enabled: !!client && (options?.enabled != undefined ? options.enabled : true),
-    },
+    { ...options, enabled: !!client && (options?.enabled != undefined ? options.enabled : true) },
   )
 }
 export interface MarsAccountNftUpdateOwnershipMutation {

diff --git a/scripts/types/generated/mars-account-nft/MarsAccountNft.types.ts b/scripts/types/generated/mars-account-nft/MarsAccountNft.types.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * This file was automatically generated by @cosmwasm/ts-codegen@1.10.0.
+ * This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
  */

diff --git a/scripts/types/generated/mars-account-nft/bundle.ts b/scripts/types/generated/mars-account-nft/bundle.ts
@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * This file was automatically generated by @cosmwasm/ts-codegen@1.10.0.
+ * This file was automatically generated by @cosmwasm/ts-codegen@0.35.3.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run the @cosmwasm/ts-codegen generate command to regenerate this file.
  */
@@ -9,9 +9,5 @@ import * as _0 from './MarsAccountNft.types'
 import * as _1 from './MarsAccountNft.client'
 import * as _2 from './MarsAccountNft.react-query'
 export namespace contracts {
-  export const MarsAccountNft = {
-    ..._0,
-    ..._1,
-    ..._2,
-  }
+  export const MarsAccountNft = { ..._0, ..._1, ..._2 }
 }