From 78c71dc6cde3440dfd28bf4357a2911cda28cf8e Mon Sep 17 00:00:00 2001 From: noah Date: Tue, 29 Aug 2023 16:30:28 -0600 Subject: [PATCH] Add Stargaze mainnet contracts and fix wallet bug (#1353) --- packages/state/contracts/Sg721Base.ts | 748 ++++++++++++++++++ packages/state/contracts/index.ts | 1 + .../recoil/selectors/contracts/Sg721Base.ts | 237 ++++++ .../state/recoil/selectors/contracts/index.ts | 1 + .../nfts/MintNft/InstantiateNftCollection.tsx | 31 +- .../stateless/InstantiateNftCollection.tsx | 2 + .../components/PfpkNftSelectionModal.tsx | 1 + .../stateful/components/dao/CreateDaoForm.tsx | 11 +- .../stateful/hooks/contracts/Sg721Base.ts | 59 ++ packages/stateful/package.json | 28 +- packages/stateful/recoil/selectors/profile.ts | 8 +- .../widgets/widgets/Press/PressEditor.tsx | 48 +- .../dao/create/pages/CreateDaoStart.tsx | 10 +- packages/types/contracts/Sg721Base.ts | 235 ++++++ packages/types/package.json | 2 +- packages/types/utils.ts | 4 +- packages/utils/constants/chains.ts | 38 +- yarn.lock | 262 +++--- 18 files changed, 1523 insertions(+), 203 deletions(-) create mode 100644 packages/state/contracts/Sg721Base.ts create mode 100644 packages/state/recoil/selectors/contracts/Sg721Base.ts create mode 100644 packages/stateful/hooks/contracts/Sg721Base.ts create mode 100644 packages/types/contracts/Sg721Base.ts diff --git a/packages/state/contracts/Sg721Base.ts b/packages/state/contracts/Sg721Base.ts new file mode 100644 index 000000000..e4f470f9f --- /dev/null +++ b/packages/state/contracts/Sg721Base.ts @@ -0,0 +1,748 @@ +import { Coin, StdFee } from '@cosmjs/amino' +import { + CosmWasmClient, + ExecuteInstruction, + ExecuteResult, + SigningCosmWasmClient, +} from '@cosmjs/cosmwasm-stargate' + +import { Binary, Empty, Expiration } from '@dao-dao/types' +import { + Action, + AllNftInfoResponse, + AllOperatorsResponse, + AllTokensResponse, + ApprovalResponse, + ApprovalsResponse, + CollectionInfoResponse, + ContractInfoResponse, + MinterResponse, + NftInfoResponse, + NumTokensResponse, + OwnerOfResponse, + TokensResponse, + UpdateCollectionInfoMsgForRoyaltyInfoResponse, +} from '@dao-dao/types/contracts/Sg721Base' +import { CHAIN_GAS_MULTIPLIER } from '@dao-dao/utils' +export interface Sg721BaseReadOnlyInterface { + contractAddress: string + ownerOf: ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }) => Promise + approval: ({ + includeExpired, + spender, + tokenId, + }: { + includeExpired?: boolean + spender: string + tokenId: string + }) => Promise + approvals: ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }) => Promise + allOperators: ({ + includeExpired, + limit, + owner, + startAfter, + }: { + includeExpired?: boolean + limit?: number + owner: string + startAfter?: string + }) => Promise + numTokens: () => Promise + contractInfo: () => Promise + nftInfo: ({ tokenId }: { tokenId: string }) => Promise + allNftInfo: ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }) => Promise + tokens: ({ + limit, + owner, + startAfter, + }: { + limit?: number + owner: string + startAfter?: string + }) => Promise + allTokens: ({ + limit, + startAfter, + }: { + limit?: number + startAfter?: string + }) => Promise + minter: () => Promise + collectionInfo: () => Promise +} +export class Sg721BaseQueryClient implements Sg721BaseReadOnlyInterface { + client: CosmWasmClient + contractAddress: string + + constructor(client: CosmWasmClient, contractAddress: string) { + this.client = client + this.contractAddress = contractAddress + this.ownerOf = this.ownerOf.bind(this) + this.approval = this.approval.bind(this) + this.approvals = this.approvals.bind(this) + this.allOperators = this.allOperators.bind(this) + this.numTokens = this.numTokens.bind(this) + this.contractInfo = this.contractInfo.bind(this) + this.nftInfo = this.nftInfo.bind(this) + this.allNftInfo = this.allNftInfo.bind(this) + this.tokens = this.tokens.bind(this) + this.allTokens = this.allTokens.bind(this) + this.minter = this.minter.bind(this) + this.collectionInfo = this.collectionInfo.bind(this) + } + + ownerOf = async ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + owner_of: { + include_expired: includeExpired, + token_id: tokenId, + }, + }) + } + approval = async ({ + includeExpired, + spender, + tokenId, + }: { + includeExpired?: boolean + spender: string + tokenId: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + approval: { + include_expired: includeExpired, + spender, + token_id: tokenId, + }, + }) + } + approvals = async ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + approvals: { + include_expired: includeExpired, + token_id: tokenId, + }, + }) + } + allOperators = async ({ + includeExpired, + limit, + owner, + startAfter, + }: { + includeExpired?: boolean + limit?: number + owner: string + startAfter?: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + all_operators: { + include_expired: includeExpired, + limit, + owner, + start_after: startAfter, + }, + }) + } + numTokens = async (): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + num_tokens: {}, + }) + } + contractInfo = async (): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + contract_info: {}, + }) + } + nftInfo = async ({ + tokenId, + }: { + tokenId: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + nft_info: { + token_id: tokenId, + }, + }) + } + allNftInfo = async ({ + includeExpired, + tokenId, + }: { + includeExpired?: boolean + tokenId: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + all_nft_info: { + include_expired: includeExpired, + token_id: tokenId, + }, + }) + } + tokens = async ({ + limit, + owner, + startAfter, + }: { + limit?: number + owner: string + startAfter?: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + tokens: { + limit, + owner, + start_after: startAfter, + }, + }) + } + allTokens = async ({ + limit, + startAfter, + }: { + limit?: number + startAfter?: string + }): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + all_tokens: { + limit, + start_after: startAfter, + }, + }) + } + minter = async (): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + minter: {}, + }) + } + collectionInfo = async (): Promise => { + return this.client.queryContractSmart(this.contractAddress, { + collection_info: {}, + }) + } +} +export interface Sg721BaseInterface extends Sg721BaseReadOnlyInterface { + contractAddress: string + sender: string + transferNft: ( + { + recipient, + tokenId, + }: { + recipient: string + tokenId: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + sendNft: ( + { + contract, + msg, + tokenId, + }: { + contract: string + msg: Binary + tokenId: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + approve: ( + { + expires, + spender, + tokenId, + }: { + expires?: Expiration + spender: string + tokenId: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + revoke: ( + { + spender, + tokenId, + }: { + spender: string + tokenId: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + approveAll: ( + { + expires, + operator, + }: { + expires?: Expiration + operator: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + revokeAll: ( + { + operator, + }: { + operator: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + mint: ( + { + extension, + owner, + tokenId, + tokenUri, + }: { + extension: Empty + owner: string + tokenId: string + tokenUri?: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + burn: ( + { + tokenId, + }: { + tokenId: string + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + extension: ( + { + msg, + }: { + msg: Empty + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + updateCollectionInfo: ( + { + collectionInfo, + }: { + collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse + }, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + updateStartTradingTime: ( + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise + updateOwnership: ( + action: Action, + fee?: number | StdFee | 'auto', + memo?: string, + _funds?: Coin[] + ) => Promise +} +export class Sg721BaseClient + extends Sg721BaseQueryClient + implements Sg721BaseInterface +{ + client: SigningCosmWasmClient + sender: string + contractAddress: string + + constructor( + client: SigningCosmWasmClient, + sender: string, + contractAddress: string + ) { + super(client, contractAddress) + this.client = client + this.sender = sender + this.contractAddress = contractAddress + this.transferNft = this.transferNft.bind(this) + this.sendNft = this.sendNft.bind(this) + this.sendNftMultiple = this.sendNftMultiple.bind(this) + this.approve = this.approve.bind(this) + this.revoke = this.revoke.bind(this) + this.approveAll = this.approveAll.bind(this) + this.revokeAll = this.revokeAll.bind(this) + this.mint = this.mint.bind(this) + this.burn = this.burn.bind(this) + this.extension = this.extension.bind(this) + this.updateCollectionInfo = this.updateCollectionInfo.bind(this) + this.updateStartTradingTime = this.updateStartTradingTime.bind(this) + this.updateOwnership = this.updateOwnership.bind(this) + } + + transferNft = async ( + { + recipient, + tokenId, + }: { + recipient: string + tokenId: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + transfer_nft: { + recipient, + token_id: tokenId, + }, + }, + fee, + memo, + _funds + ) + } + sendNft = async ( + { + contract, + msg, + tokenId, + }: { + contract: string + msg: Binary + tokenId: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + send_nft: { + contract, + msg, + token_id: tokenId, + }, + }, + fee, + memo, + _funds + ) + } + sendNftMultiple = async ( + { + contract, + msg, + tokenIds, + }: { + contract: string + msg: string + tokenIds: string[] + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string + ): Promise => { + let instructions: ExecuteInstruction[] = tokenIds.map((tokenId) => { + return { + contractAddress: this.contractAddress, + msg: { + send_nft: { + contract, + msg, + token_id: tokenId, + }, + }, + } as ExecuteInstruction + }) + + return await this.client.executeMultiple( + this.sender, + instructions, + fee, + memo + ) + } + approve = async ( + { + expires, + spender, + tokenId, + }: { + expires?: Expiration + spender: string + tokenId: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + approve: { + expires, + spender, + token_id: tokenId, + }, + }, + fee, + memo, + _funds + ) + } + revoke = async ( + { + spender, + tokenId, + }: { + spender: string + tokenId: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + revoke: { + spender, + token_id: tokenId, + }, + }, + fee, + memo, + _funds + ) + } + approveAll = async ( + { + expires, + operator, + }: { + expires?: Expiration + operator: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + approve_all: { + expires, + operator, + }, + }, + fee, + memo, + _funds + ) + } + revokeAll = async ( + { + operator, + }: { + operator: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + revoke_all: { + operator, + }, + }, + fee, + memo, + _funds + ) + } + mint = async ( + { + extension, + owner, + tokenId, + tokenUri, + }: { + extension: Empty + owner: string + tokenId: string + tokenUri?: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + mint: { + extension, + owner, + token_id: tokenId, + token_uri: tokenUri, + }, + }, + fee, + memo, + _funds + ) + } + burn = async ( + { + tokenId, + }: { + tokenId: string + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + burn: { + token_id: tokenId, + }, + }, + fee, + memo, + _funds + ) + } + extension = async ( + { + msg, + }: { + msg: Empty + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + extension: { + msg, + }, + }, + fee, + memo, + _funds + ) + } + updateCollectionInfo = async ( + { + collectionInfo, + }: { + collectionInfo: UpdateCollectionInfoMsgForRoyaltyInfoResponse + }, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + update_collection_info: { + collection_info: collectionInfo, + }, + }, + fee, + memo, + _funds + ) + } + updateStartTradingTime = async ( + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + update_start_trading_time: {}, + }, + fee, + memo, + _funds + ) + } + updateOwnership = async ( + action: Action, + fee: number | StdFee | 'auto' = CHAIN_GAS_MULTIPLIER, + memo?: string, + _funds?: Coin[] + ): Promise => { + return await this.client.execute( + this.sender, + this.contractAddress, + { + update_ownership: action, + }, + fee, + memo, + _funds + ) + } +} diff --git a/packages/state/contracts/index.ts b/packages/state/contracts/index.ts index 0ea807b96..d1f2b05af 100644 --- a/packages/state/contracts/index.ts +++ b/packages/state/contracts/index.ts @@ -26,6 +26,7 @@ export { } from './PolytoneListener' export { PolytoneNoteClient, PolytoneNoteQueryClient } from './PolytoneNote' export { PolytoneProxyClient, PolytoneProxyQueryClient } from './PolytoneProxy' +export { Sg721BaseClient, Sg721BaseQueryClient } from './Sg721Base' export { WyndexFactoryClient, WyndexFactoryQueryClient } from './WyndexFactory' export { WyndexMultiHopClient, diff --git a/packages/state/recoil/selectors/contracts/Sg721Base.ts b/packages/state/recoil/selectors/contracts/Sg721Base.ts new file mode 100644 index 000000000..007c39b3b --- /dev/null +++ b/packages/state/recoil/selectors/contracts/Sg721Base.ts @@ -0,0 +1,237 @@ +/** + * 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. + */ + +import { selectorFamily } from 'recoil' + +import { WithChainId } from '@dao-dao/types' +import { + AllNftInfoResponse, + AllOperatorsResponse, + AllTokensResponse, + ApprovalResponse, + ApprovalsResponse, + CollectionInfoResponse, + ContractInfoResponse, + MinterResponse, + NftInfoResponse, + NumTokensResponse, + OwnerOfResponse, + TokensResponse, +} from '@dao-dao/types/contracts/Sg721Base' + +import { + Sg721BaseClient, + Sg721BaseQueryClient, +} from '../../../contracts/Sg721Base' +import { signingCosmWasmClientAtom } from '../../atoms' +import { cosmWasmClientForChainSelector } from '../chain' + +type QueryClientParams = WithChainId<{ + contractAddress: string +}> + +export const queryClient = selectorFamily< + Sg721BaseQueryClient, + QueryClientParams +>({ + key: 'sg721BaseQueryClient', + get: + ({ contractAddress, chainId }) => + ({ get }) => { + const client = get(cosmWasmClientForChainSelector(chainId)) + return new Sg721BaseQueryClient(client, contractAddress) + }, + dangerouslyAllowMutability: true, +}) + +export type ExecuteClientParams = WithChainId<{ + contractAddress: string + sender: string +}> + +export const executeClient = selectorFamily< + Sg721BaseClient | undefined, + ExecuteClientParams +>({ + key: 'sg721BaseExecuteClient', + get: + ({ chainId, contractAddress, sender }) => + ({ get }) => { + const client = get(signingCosmWasmClientAtom({ chainId })) + if (!client) return + return new Sg721BaseClient(client, sender, contractAddress) + }, + dangerouslyAllowMutability: true, +}) + +export const ownerOfSelector = selectorFamily< + OwnerOfResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseOwnerOf', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.ownerOf(...params) + }, +}) +export const approvalSelector = selectorFamily< + ApprovalResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseApproval', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.approval(...params) + }, +}) +export const approvalsSelector = selectorFamily< + ApprovalsResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseApprovals', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.approvals(...params) + }, +}) +export const allOperatorsSelector = selectorFamily< + AllOperatorsResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseAllOperators', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.allOperators(...params) + }, +}) +export const numTokensSelector = selectorFamily< + NumTokensResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseNumTokens', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.numTokens(...params) + }, +}) +export const contractInfoSelector = selectorFamily< + ContractInfoResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseContractInfo', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.contractInfo(...params) + }, +}) +export const nftInfoSelector = selectorFamily< + NftInfoResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseNftInfo', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.nftInfo(...params) + }, +}) +export const allNftInfoSelector = selectorFamily< + AllNftInfoResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseAllNftInfo', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.allNftInfo(...params) + }, +}) +export const tokensSelector = selectorFamily< + TokensResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseTokens', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.tokens(...params) + }, +}) +export const allTokensSelector = selectorFamily< + AllTokensResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseAllTokens', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.allTokens(...params) + }, +}) +export const minterSelector = selectorFamily< + MinterResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseMinter', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.minter(...params) + }, +}) +export const collectionInfoSelector = selectorFamily< + CollectionInfoResponse, + QueryClientParams & { + params: Parameters + } +>({ + key: 'sg721BaseCollectionInfo', + get: + ({ params, ...queryClientParams }) => + async ({ get }) => { + const client = get(queryClient(queryClientParams)) + return await client.collectionInfo(...params) + }, +}) diff --git a/packages/state/recoil/selectors/contracts/index.ts b/packages/state/recoil/selectors/contracts/index.ts index 8ff2b8a00..7da061bce 100644 --- a/packages/state/recoil/selectors/contracts/index.ts +++ b/packages/state/recoil/selectors/contracts/index.ts @@ -14,5 +14,6 @@ export * as DaoVotingNativeStakedSelectors from './DaoVotingNativeStaked' export * as PolytoneListenerSelectors from './PolytoneListener' export * as PolytoneNoteSelectors from './PolytoneNote' export * as PolytoneProxySelectors from './PolytoneProxy' +export * as Sg721BaseSelectors from './Sg721Base' export * as WyndexFactorySelectors from './WyndexFactory' export * as WyndexMultiHopSelectors from './WyndexMultiHop' diff --git a/packages/stateful/actions/core/nfts/MintNft/InstantiateNftCollection.tsx b/packages/stateful/actions/core/nfts/MintNft/InstantiateNftCollection.tsx index 4bda2a043..3c2739499 100644 --- a/packages/stateful/actions/core/nfts/MintNft/InstantiateNftCollection.tsx +++ b/packages/stateful/actions/core/nfts/MintNft/InstantiateNftCollection.tsx @@ -41,13 +41,28 @@ export const InstantiateNftCollection: ActionComponent = (props) => { setInstantiating(true) try { - const { contractAddress } = await signingCosmWasmClient.instantiate( - walletAddress, - codeIds.Cw721Base, - instantiateMsg, - 'NFT Collection', - CHAIN_GAS_MULTIPLIER - ) + const { contractAddress } = codeIds.Cw721Base + ? await signingCosmWasmClient.instantiate( + walletAddress, + codeIds.Cw721Base, + instantiateMsg, + 'NFT Collection', + CHAIN_GAS_MULTIPLIER + ) + : codeIds.Sg721Base + ? await signingCosmWasmClient.instantiate( + walletAddress, + codeIds.Sg721Base, + instantiateMsg, + 'NFT Collection', + CHAIN_GAS_MULTIPLIER + ) + : { contractAddress: undefined } + + // Should never happen. + if (!contractAddress) { + throw new Error(t('error.loadingData')) + } // Update action form data with address. setValue(props.fieldNamePrefix + 'collectionAddress', contractAddress, { @@ -73,6 +88,8 @@ export const InstantiateNftCollection: ActionComponent = (props) => { } catch (err) { console.error(err) toast.error(processError(err)) + } finally { + setInstantiating(false) } } diff --git a/packages/stateful/actions/core/nfts/MintNft/stateless/InstantiateNftCollection.tsx b/packages/stateful/actions/core/nfts/MintNft/stateless/InstantiateNftCollection.tsx index 3f9e1f519..a903ef029 100644 --- a/packages/stateful/actions/core/nfts/MintNft/stateless/InstantiateNftCollection.tsx +++ b/packages/stateful/actions/core/nfts/MintNft/stateless/InstantiateNftCollection.tsx @@ -68,6 +68,8 @@ export const InstantiateNftCollection: ActionComponent< + {/* TODO(stargaze): Add Stargaze collection info field on for sg721. */} + )} - diff --git a/packages/stateful/hooks/contracts/Sg721Base.ts b/packages/stateful/hooks/contracts/Sg721Base.ts new file mode 100644 index 000000000..fb4d5ed23 --- /dev/null +++ b/packages/stateful/hooks/contracts/Sg721Base.ts @@ -0,0 +1,59 @@ +/* eslint-disable react-hooks/rules-of-hooks */ + +import { ExecuteResult } from '@cosmjs/cosmwasm-stargate' +import { useCallback } from 'react' +import { useRecoilValueLoadable } from 'recoil' + +import { Sg721BaseClient as ExecuteClient } from '@dao-dao/state/contracts/Sg721Base' +import { + ExecuteClientParams, + executeClient, +} from '@dao-dao/state/recoil/selectors/contracts/Sg721Base' +import { useChain } from '@dao-dao/stateless' +import { FunctionKeyOf } from '@dao-dao/types' + +import { useSyncWalletSigner } from '../useSyncWalletSigner' + +// This hook wrapper lets us easily make hooks out of all execution functions on +// the contract clients, without having to fetch the `executeClient` selector as +// a loadable and add `useCallback` hooks in all the components. +const wrapExecuteHook = + >(fn: T) => + (params: Omit) => { + // Make sure we have the signing client for this chain and wallet. + useSyncWalletSigner() + + const { chain_id: chainId } = useChain() + const clientLoadable = useRecoilValueLoadable( + executeClient({ + ...params, + chainId, + }) + ) + const client = + clientLoadable.state === 'hasValue' ? clientLoadable.contents : undefined + + return useCallback( + (...args: Parameters) => { + if (client) + return ( + client[fn] as ( + ...args: Parameters + ) => Promise + )(...args) + throw new Error('Wallet signer not set up.') + }, + [client] + ) + } + +export const useTransferNft = wrapExecuteHook('transferNft') +export const useSendNft = wrapExecuteHook('sendNft') +export const useSendNftMultiple = wrapExecuteHook('sendNftMultiple') +export const useApprove = wrapExecuteHook('approve') +export const useRevoke = wrapExecuteHook('revoke') +export const useApproveAll = wrapExecuteHook('approveAll') +export const useRevokeAll = wrapExecuteHook('revokeAll') +export const useMint = wrapExecuteHook('mint') +export const useBurn = wrapExecuteHook('burn') +export const useUpdateCollectionInfo = wrapExecuteHook('updateCollectionInfo') diff --git a/packages/stateful/package.json b/packages/stateful/package.json index 1ea451395..414a65687 100644 --- a/packages/stateful/package.json +++ b/packages/stateful/package.json @@ -14,20 +14,20 @@ "@cosmjs/encoding": "^0.31.0", "@cosmjs/proto-signing": "^0.31.0", "@cosmjs/stargate": "^0.31.0", - "@cosmos-kit/coin98": "^2.3.1", - "@cosmos-kit/core": "^2.5.1", - "@cosmos-kit/cosmostation": "^2.3.1", - "@cosmos-kit/keplr-extension": "^2.3.1", - "@cosmos-kit/keplr-mobile": "^2.3.1", - "@cosmos-kit/leap": "^2.3.1", - "@cosmos-kit/omni": "^2.3.1", - "@cosmos-kit/react-lite": "^2.4.1", - "@cosmos-kit/shell": "^2.3.1", - "@cosmos-kit/station": "^2.3.1", - "@cosmos-kit/trust": "^2.3.1", - "@cosmos-kit/vectis": "^2.3.1", - "@cosmos-kit/web3auth": "^2.3.1", - "@cosmos-kit/xdefi-extension": "^2.3.1", + "@cosmos-kit/coin98": "^2.3.3", + "@cosmos-kit/core": "^2.5.3", + "@cosmos-kit/cosmostation": "^2.3.3", + "@cosmos-kit/keplr-extension": "^2.3.3", + "@cosmos-kit/keplr-mobile": "^2.3.3", + "@cosmos-kit/leap": "^2.3.3", + "@cosmos-kit/omni": "^2.3.3", + "@cosmos-kit/react-lite": "^2.4.4", + "@cosmos-kit/shell": "^2.3.3", + "@cosmos-kit/station": "^2.3.3", + "@cosmos-kit/trust": "^2.3.3", + "@cosmos-kit/vectis": "^2.3.3", + "@cosmos-kit/web3auth": "^2.3.3", + "@cosmos-kit/xdefi-extension": "^2.3.3", "@dao-dao/i18n": "2.2.0", "@dao-dao/protobuf": "2.2.0", "@dao-dao/state": "2.2.0", diff --git a/packages/stateful/recoil/selectors/profile.ts b/packages/stateful/recoil/selectors/profile.ts index 47403f75a..41295d0df 100644 --- a/packages/stateful/recoil/selectors/profile.ts +++ b/packages/stateful/recoil/selectors/profile.ts @@ -164,10 +164,12 @@ export const walletProfileDataSelector = selectorFamily< // Load Stargaze name as backup if no PFPK set. if (!profile.name) { - const stargazeName = get(stargazeNameSelector(address)) - if (stargazeName) { + const stargazeNameLoadable = get(noWait(stargazeNameSelector(address))) + if (stargazeNameLoadable.state === 'hasValue') { profile.name = - stargazeName + '.' + getChainForChainId(chainId).bech32_prefix + stargazeNameLoadable.contents + + '.' + + getChainForChainId(chainId).bech32_prefix profile.nameSource = 'stargaze' } } diff --git a/packages/stateful/widgets/widgets/Press/PressEditor.tsx b/packages/stateful/widgets/widgets/Press/PressEditor.tsx index afe2572e6..588eb3ccc 100644 --- a/packages/stateful/widgets/widgets/Press/PressEditor.tsx +++ b/packages/stateful/widgets/widgets/Press/PressEditor.tsx @@ -11,6 +11,7 @@ import { } from '@dao-dao/stateless' import { WidgetEditorProps } from '@dao-dao/types' import { InstantiateMsg as Cw721InstantiateMsg } from '@dao-dao/types/contracts/Cw721Base' +import { InstantiateMsg as Sg721InstantiateMsg } from '@dao-dao/types/contracts/Sg721Base' import { CHAIN_GAS_MULTIPLIER, processError } from '@dao-dao/utils' import { useWallet } from '../../../hooks/useWallet' @@ -43,17 +44,42 @@ export const PressEditor = ({ try { const name = `${daoName}'s Press` - const { contractAddress } = await signingCosmWasmClient.instantiate( - walletAddress, - codeIds.Cw721Base, - { - minter: coreAddress, - name: name, - symbol: 'PRESS', - } as Cw721InstantiateMsg, - name, - CHAIN_GAS_MULTIPLIER - ) + const { contractAddress } = codeIds.Cw721Base + ? await signingCosmWasmClient.instantiate( + walletAddress, + codeIds.Cw721Base, + { + minter: coreAddress, + name: name, + symbol: 'PRESS', + } as Cw721InstantiateMsg, + name, + CHAIN_GAS_MULTIPLIER + ) + : codeIds.Sg721Base + ? // TODO(stargaze): test this + await signingCosmWasmClient.instantiate( + walletAddress, + codeIds.Sg721Base, + { + collection_info: { + creator: coreAddress, + description: `${name} on DAO DAO`, + image: '', + }, + minter: coreAddress, + name: name, + symbol: 'PRESS', + } as Sg721InstantiateMsg, + name, + CHAIN_GAS_MULTIPLIER + ) + : { contractAddress: undefined } + + // Should never happen. + if (!contractAddress) { + throw new Error(t('error.loadingData')) + } setValue((fieldNamePrefix + 'contract') as 'contract', contractAddress) diff --git a/packages/stateless/components/dao/create/pages/CreateDaoStart.tsx b/packages/stateless/components/dao/create/pages/CreateDaoStart.tsx index f83ef9e7e..256106a34 100644 --- a/packages/stateless/components/dao/create/pages/CreateDaoStart.tsx +++ b/packages/stateless/components/dao/create/pages/CreateDaoStart.tsx @@ -104,12 +104,10 @@ export const CreateDaoStart = ({ selected={watch('creator.id') === id} supplies={t(suppliesI18nKey)} underDevelopment={ - (id !== MembershipBasedCreatorId && - // Only Juno supports non-multisigs right now. - chainId !== ChainId.JunoMainnet && - chainId !== ChainId.JunoTestnet) || - // TODO(stargaze): remove when mainnet contracts deployed - chainId === ChainId.StargazeMainnet + id !== MembershipBasedCreatorId && + // Only Juno supports non-multisigs right now. + chainId !== ChainId.JunoMainnet && + chainId !== ChainId.JunoTestnet } /> ) diff --git a/packages/types/contracts/Sg721Base.ts b/packages/types/contracts/Sg721Base.ts new file mode 100644 index 000000000..364bb0b49 --- /dev/null +++ b/packages/types/contracts/Sg721Base.ts @@ -0,0 +1,235 @@ +/** + * 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. + */ + +import { Binary, Decimal, Empty, Expiration, Timestamp } from './common' + +export interface AllNftInfoResponse { + access: OwnerOfResponse + info: NftInfoResponseForEmpty +} +export interface OwnerOfResponse { + approvals: Approval[] + owner: string +} +export interface Approval { + expires: Expiration + spender: string +} +export interface NftInfoResponseForEmpty { + extension: Empty + token_uri?: string | null +} +export interface AllOperatorsResponse { + operators: Approval[] +} +export interface AllTokensResponse { + tokens: string[] +} +export interface ApprovalResponse { + approval: Approval +} +export interface ApprovalsResponse { + approvals: Approval[] +} +export interface CollectionInfoResponse { + creator: string + description: string + explicit_content?: boolean | null + external_link?: string | null + image: string + royalty_info?: RoyaltyInfoResponse | null + start_trading_time?: Timestamp | null +} +export interface RoyaltyInfoResponse { + payment_address: string + share: Decimal +} +export interface ContractInfoResponse { + name: string + symbol: string +} +export type ExecuteMsgForEmptyAndEmpty = + | 'freeze_collection_info' + | { + transfer_nft: { + recipient: string + token_id: string + } + } + | { + send_nft: { + contract: string + msg: Binary + token_id: string + } + } + | { + approve: { + expires?: Expiration | null + spender: string + token_id: string + } + } + | { + revoke: { + spender: string + token_id: string + } + } + | { + approve_all: { + expires?: Expiration | null + operator: string + } + } + | { + revoke_all: { + operator: string + } + } + | { + mint: { + extension: Empty + owner: string + token_id: string + token_uri?: string | null + } + } + | { + burn: { + token_id: string + } + } + | { + extension: { + msg: Empty + } + } + | { + update_collection_info: { + collection_info: UpdateCollectionInfoMsgForRoyaltyInfoResponse + } + } + | { + update_start_trading_time: Timestamp | null + } + | { + update_ownership: Action + } +export type Action = + | { + transfer_ownership: { + expiry?: Expiration | null + new_owner: string + } + } + | 'accept_ownership' + | 'renounce_ownership' +export interface UpdateCollectionInfoMsgForRoyaltyInfoResponse { + description?: string | null + explicit_content?: boolean | null + external_link?: string | null + image?: string | null + royalty_info?: (RoyaltyInfoResponse | null) | null +} +export interface InstantiateMsg { + collection_info: CollectionInfoForRoyaltyInfoResponse + minter: string + name: string + symbol: string +} +export interface CollectionInfoForRoyaltyInfoResponse { + creator: string + description: string + explicit_content?: boolean | null + external_link?: string | null + image: string + royalty_info?: RoyaltyInfoResponse | null + start_trading_time?: Timestamp | null +} +export interface MinterResponse { + minter?: string | null +} +export interface NftInfoResponse { + extension: Empty + token_uri?: string | null +} +export interface NumTokensResponse { + count: number +} +export interface OperatorsResponse { + operators: Approval[] +} +export type QueryMsg = + | { + owner_of: { + include_expired?: boolean | null + token_id: string + } + } + | { + approval: { + include_expired?: boolean | null + spender: string + token_id: string + } + } + | { + approvals: { + include_expired?: boolean | null + token_id: string + } + } + | { + all_operators: { + include_expired?: boolean | null + limit?: number | null + owner: string + start_after?: string | null + } + } + | { + num_tokens: {} + } + | { + contract_info: {} + } + | { + nft_info: { + token_id: string + } + } + | { + all_nft_info: { + include_expired?: boolean | null + token_id: string + } + } + | { + tokens: { + limit?: number | null + owner: string + start_after?: string | null + } + } + | { + all_tokens: { + limit?: number | null + start_after?: string | null + } + } + | { + minter: {} + } + | { + collection_info: {} + } + | { + ownership: {} + } +export interface TokensResponse { + tokens: string[] +} diff --git a/packages/types/package.json b/packages/types/package.json index 6bfa34181..6fc13c2f6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -9,7 +9,7 @@ "devDependencies": { "@chain-registry/types": "^0.16.0", "@cosmjs/cosmwasm-stargate": "^0.31.0", - "@cosmos-kit/web3auth": "^2.3.1", + "@cosmos-kit/web3auth": "^2.3.3", "@dao-dao/config": "2.2.0", "next-i18next": "^11.0.0", "pusher-js": "^7.6.0", diff --git a/packages/types/utils.ts b/packages/types/utils.ts index 30cd421c0..adab86368 100644 --- a/packages/types/utils.ts +++ b/packages/types/utils.ts @@ -23,7 +23,9 @@ export interface CodeIdConfig { Cw20Base: number Cw4Group: number // https://github.com/CosmWasm/cw-nfts - Cw721Base: number + Cw721Base?: number + // https://github.com/public-awesome/launchpad/tree/main/contracts/collections/sg721-base + Sg721Base?: number // https://github.com/DA0-DA0/dao-contracts Cw20Stake: number diff --git a/packages/utils/constants/chains.ts b/packages/utils/constants/chains.ts index f845c2efb..c0224057b 100644 --- a/packages/utils/constants/chains.ts +++ b/packages/utils/constants/chains.ts @@ -141,8 +141,8 @@ export const SUPPORTED_CHAINS: Partial> = [ChainId.StargazeMainnet]: { name: 'stargaze', mainnet: true, - // TODO(stargaze) - factoryContractAddress: '', + factoryContractAddress: + 'stars175zvu8psmyxlszsxaa5thz26gjm4y6l24cr9ctgs09g90755tpmqmskl4t', supportsV1GovProposals: false, indexes: { search: 'stargaze_daos', @@ -157,26 +157,26 @@ export const SUPPORTED_CHAINS: Partial> = codeIds: { // https://github.com/CosmWasm/cw-plus Cw20Base: -1, // v0.16 - Cw4Group: 9999999, // v0.16 - // https://github.com/CosmWasm/cw-nfts - // TODO(stargaze): sg721? - Cw721Base: -1, // v0.16 + Cw4Group: 83, // v0.16 + // https://github.com/public-awesome/launchpad/tree/main/contracts/collections/sg721-base + // https://github.com/public-awesome/stargaze-tools/blob/main/config.example.js + Sg721Base: 41, // ContractVersion.V210 // https://github.com/DA0-DA0/dao-contracts/releases/tag/v2.1.0 Cw20Stake: -1, - CwAdminFactory: 9999999, - CwPayrollFactory: 9999999, - CwTokenSwap: 9999999, - CwVesting: 9999999, - DaoCore: 9999999, + CwAdminFactory: 84, + CwPayrollFactory: 85, + CwTokenSwap: 86, + CwVesting: 87, + DaoCore: 88, DaoMigrator: -1, - DaoPreProposeMultiple: 9999999, - DaoPreProposeSingle: 9999999, - DaoProposalMultiple: 9999999, - DaoProposalSingle: 9999999, + DaoPreProposeMultiple: 89, + DaoPreProposeSingle: 90, + DaoProposalMultiple: 91, + DaoProposalSingle: 92, DaoVotingCw20Staked: -1, - DaoVotingCw4: 9999999, + DaoVotingCw4: 93, DaoVotingCw721Staked: -1, DaoVotingNativeStaked: -1, }, @@ -287,9 +287,9 @@ export const SUPPORTED_CHAINS: Partial> = // https://github.com/CosmWasm/cw-plus Cw20Base: -1, // v0.16 Cw4Group: 2887, // v0.16 - // https://github.com/CosmWasm/cw-nfts - // TODO(stargaze): sg721? - Cw721Base: -1, // v0.16 + // https://github.com/public-awesome/launchpad/tree/main/contracts/collections/sg721-base + // https://github.com/public-awesome/stargaze-tools/blob/main/config.example.js + Sg721Base: 2595, // ContractVersion.V210 // https://github.com/DA0-DA0/dao-contracts/releases/tag/v2.1.0 diff --git a/yarn.lock b/yarn.lock index 3d9a7a184..be3746b1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3428,202 +3428,202 @@ "@cosmology/types" "^0.39.0" dotty "0.1.2" -"@cosmos-kit/coin98-extension@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/coin98-extension/-/coin98-extension-2.4.1.tgz#ccdd87de38a5659496df6c82118edbac6c531fbc" - integrity sha512-KAIP1FU20g2Zfkb8FHAmah6y+3bPlGgFYhO++Z6EbvYgdWUdVEwrj4OA3qAiQX7OWoP3B9PQQOzmtJvVpSdJRw== +"@cosmos-kit/coin98-extension@^2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/coin98-extension/-/coin98-extension-2.4.3.tgz#f1210ed74ae0824156f0b39559c04c4842f4994a" + integrity sha512-aH2CiHdWC4RqB52AbxGo6YXQS3gfz8+ps5Sz2ZJfzmMK2NE706SXDrN+r1cMrG/TjgHlnY4bo6rl9qXiwYQ5rg== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/coin98@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/coin98/-/coin98-2.3.1.tgz#7b6b335b1bb44d924c61fe9ece836ab5071f61cf" - integrity sha512-RZIMHypgK+gX5zycEtpvkUeSaoGXKPpQfsb0JlU9Kkv4bnooqNj2PWmB/4a8hm+JauvPclsDigPzgtl7N8rezQ== +"@cosmos-kit/coin98@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/coin98/-/coin98-2.3.3.tgz#58cdffc2cdb64efff516a9c6f53415c2da7bdbda" + integrity sha512-KBzd+oCHaKcyfhyOkrIHnxPwtuJbCM1C9EYS2hMl7HPNf4YQAKpVwBB6C2prqilMGyNjTrAj2yRAHpG5aQvW+g== dependencies: - "@cosmos-kit/coin98-extension" "^2.4.1" + "@cosmos-kit/coin98-extension" "^2.4.3" -"@cosmos-kit/core@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/core/-/core-2.5.1.tgz#e9b2d9fd78eeba37ce67d14c1a13d771a999d569" - integrity sha512-3RTRA7uflUXikTQW/JZpX0GozOs521qJHP4wYGuL30Mnbkmn/vYC5lq4iWQLoFFv9LAOJcMQhHIFlIRagEqrkg== +"@cosmos-kit/core@^2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/core/-/core-2.5.3.tgz#b394a50792b40a09d3642502d6ae6a32c26d9b24" + integrity sha512-Y22/1980C3yYVO1Bo4knoUDl5DYdu8pKtNq1/i6NRFUWK+Vz/hUcaIuxlwGJwjxgAeRD8WlslgP16oIKab96vg== dependencies: "@chain-registry/types" "0.13.0" "@walletconnect/types" "2.7.2" bowser "2.11.0" events "3.3.0" -"@cosmos-kit/cosmostation-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation-extension/-/cosmostation-extension-2.3.1.tgz#4b72a6eaeaea8e5c711f6916b5d0cd499e923dd0" - integrity sha512-TfIdwRYR/qudEL4KL6zHCbboN25OkHLEKMWEg486uwOfvv/xANOAuZqpBqX81Nlt3tECZvm//R0zKgebR/xkVg== +"@cosmos-kit/cosmostation-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation-extension/-/cosmostation-extension-2.3.3.tgz#0ac7312ab4da9c27c95178a937315de2615d2459" + integrity sha512-+shU9uGi1LOSti71VncP52xgJbbWZmGztakrK5/7riYah3OVh5ej4G9VtcE2HE7lNvQqux0RW+Rky4+Dg9jKCg== dependencies: "@chain-registry/cosmostation" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/cosmostation-mobile@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation-mobile/-/cosmostation-mobile-2.3.1.tgz#efe8221a61233b2b02474849bed16036827ad3b7" - integrity sha512-lxIKGEzA0Wyw4tAn77o80e3L1kJF9uFKE4bakVy9DBxKvgLQi6qUMYe6YYZEGM7IU5plR/e0n9kGBiINZ1PUMA== +"@cosmos-kit/cosmostation-mobile@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation-mobile/-/cosmostation-mobile-2.3.3.tgz#01deb1aa05206d24d24b33c6fd5e3c72ed396461" + integrity sha512-q8gCnooi3gMSAu+zh5CsoxVYickw+Psh6IqpfMfgAEsgkMbv85+eEEuaKYKfuOgW3mcffCHtOONimOmtNbMEzg== dependencies: "@chain-registry/cosmostation" "1.8.0" - "@cosmos-kit/core" "^2.5.1" - "@cosmos-kit/walletconnect" "^2.3.1" + "@cosmos-kit/core" "^2.5.3" + "@cosmos-kit/walletconnect" "^2.3.3" -"@cosmos-kit/cosmostation@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation/-/cosmostation-2.3.1.tgz#c0017f103d356649ca8a3144ecd70f3f0c470b53" - integrity sha512-m/+jasRHhLT8u+HE1ZxIaS1h5gHuvBjl4iCxt7fMEC494UrFAocuzbn6EycqYpc/D0EziipB4RYBicUpvP4bKQ== +"@cosmos-kit/cosmostation@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/cosmostation/-/cosmostation-2.3.3.tgz#1ba0a0e012e1986ccfd31bf93d2089f7ad0d8474" + integrity sha512-oribgiKlHi3ZdqMAhaWIp5niThJVS+XPrQI4CsyTSnpsHX/aBgNpY+N/eSJVtLaYH6RLpYEQwrPEak9AQmdPLg== dependencies: - "@cosmos-kit/cosmostation-extension" "^2.3.1" - "@cosmos-kit/cosmostation-mobile" "^2.3.1" + "@cosmos-kit/cosmostation-extension" "^2.3.3" + "@cosmos-kit/cosmostation-mobile" "^2.3.3" -"@cosmos-kit/keplr-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/keplr-extension/-/keplr-extension-2.3.1.tgz#e579c4eaa1872fb7008ea2058cea401f063323fe" - integrity sha512-K/xLpY0ft+sP7i/c0SdioiRdEM7Kt01BuUF20cTRXTeseHuLLl7yUpwPs6QtXgrBttL2MDAwbHh/MSEsGndIaQ== +"@cosmos-kit/keplr-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/keplr-extension/-/keplr-extension-2.3.3.tgz#d4d754c37feea7608efe0a9658c48a93416e1fd6" + integrity sha512-EJgBsf4s8VIEaL7rh0r4REcjcvdcAZ1rBxLz4luJqO20SoV7M9fPcA7PIM40ML7ROygdgmxmwzqcmOuTsq3Aqw== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/keplr-mobile@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/keplr-mobile/-/keplr-mobile-2.3.1.tgz#39f7839720b28ce85bb170840b3cc70a054d57dd" - integrity sha512-0B8tPQZtE9CvVcwXUr/JBMr0ibwIY5LHBz9NV+SKQ8mN59wHkqleq7dyWcU1FFmvdzbclOteLny4doorxNSkbw== +"@cosmos-kit/keplr-mobile@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/keplr-mobile/-/keplr-mobile-2.3.3.tgz#899a45e3c558953fcd6c1483923911f5215f15d2" + integrity sha512-EnHIbNQLPo6a3i2gH18lHbr6mLViP+SbcHWIhxUZ12XIUfPgpWfOZSNaYWby3ZHKH5fZ0K/ew2sUsaSl3tq39w== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" - "@cosmos-kit/walletconnect" "^2.3.1" + "@cosmos-kit/core" "^2.5.3" + "@cosmos-kit/walletconnect" "^2.3.3" -"@cosmos-kit/leap-extension@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/leap-extension/-/leap-extension-2.4.1.tgz#c575c98b60ed389e98ec6a909d86bc2f6150c890" - integrity sha512-EptZlE5u2uAEqn2r83cCq/HWjC66meqtXgS/ZzRDU+WjukpbHHW852wjIyadEum82hgVZOKXgAN1CyeF6jCLvQ== +"@cosmos-kit/leap-extension@^2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/leap-extension/-/leap-extension-2.4.3.tgz#e16c51ad95fe23b8f114d08195c22f4ccc754370" + integrity sha512-GLbrgW7VvJp9FJZl0DZtLDP34QXuk0CRmZrZrqKRJ9VTsSij29T6Vc59hiqqOtMVw3iZ76m95zQHHoIgFkK87w== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/leap-mobile@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/leap-mobile/-/leap-mobile-2.3.1.tgz#a68ac028f9aee41c5026d8e5021f8479ccaf71fb" - integrity sha512-FKVn5XrVwunLDbc3xNVpNAKVAYvEwTXd51GRHR+rLU+4SFo5VuRtsIKjmD0YVA8A2T75vKvvtY+rrt5ejqiLMw== +"@cosmos-kit/leap-mobile@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/leap-mobile/-/leap-mobile-2.3.3.tgz#8728f5c27d61685d0d75e3e22e7f7da29aac4132" + integrity sha512-dofiK2IfzmSmOO8zFzWryG8SvLNyTLaEbPnIPzOoIep03mTTUU581d2C70olYE2/GTTiv7zvujwbFShyjpzivQ== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" - "@cosmos-kit/walletconnect" "^2.3.1" + "@cosmos-kit/core" "^2.5.3" + "@cosmos-kit/walletconnect" "^2.3.3" -"@cosmos-kit/leap@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/leap/-/leap-2.3.1.tgz#d670b399a3f3402e73ceaec18bb4eaf411e49e08" - integrity sha512-0wdt7JSVHkSqne/VUrEqPrjDLqBtofbbQOtNxIJ6uWP0zCayPrwaSVVK9XatOgHeRN+Mqe+dXzI5WMLTm7U89Q== +"@cosmos-kit/leap@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/leap/-/leap-2.3.3.tgz#269e0d9a1fde7d332b5e412e3160bd01f423ffdc" + integrity sha512-rMVX7D+vOAR/X5DlBQKAFLCVqbxW2dYG+4j4kLGrobV45mcwKcKfdber56rQenuyy5beRPfEjuSCs39OXKvohw== dependencies: - "@cosmos-kit/leap-extension" "^2.4.1" - "@cosmos-kit/leap-mobile" "^2.3.1" + "@cosmos-kit/leap-extension" "^2.4.3" + "@cosmos-kit/leap-mobile" "^2.3.3" -"@cosmos-kit/omni-mobile@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/omni-mobile/-/omni-mobile-2.3.1.tgz#e9e9fd1e110ef41979663841ee285bf4bd066102" - integrity sha512-UUvOFsIES2rjJHiTVUQ4P0/+KDr+H8jHPmFDE0grRAJSBdm3Kz3xXdp1KKDoTKNG9WCh3vA2JzM/JCQsRP70TA== +"@cosmos-kit/omni-mobile@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/omni-mobile/-/omni-mobile-2.3.3.tgz#9ae8ab21bb0f6092a0219dc29f3b231ec3d64c20" + integrity sha512-kPtuFdyro26YSoHPJ/psgGOAfnUHofX7jHJm+93UFjppVUTUffQAsCpHvuD2OnXvNatLh2UiC0cFz1Tv1h7eOQ== dependencies: - "@cosmos-kit/core" "^2.5.1" - "@cosmos-kit/walletconnect" "^2.3.1" + "@cosmos-kit/core" "^2.5.3" + "@cosmos-kit/walletconnect" "^2.3.3" -"@cosmos-kit/omni@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/omni/-/omni-2.3.1.tgz#23b0bba6ce1cf697abaea5b544fd9ce83906b831" - integrity sha512-1+BVu8UW1E5OTMWT3Do0qg4JaEDH12l4VAZA1K0UW4hM8MIcaEMqZwoUG39+qjgCy9r9MhjFv66bJNrAmTIBtg== +"@cosmos-kit/omni@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/omni/-/omni-2.3.3.tgz#3d146127536f1cb8121f37a1f4543b2441e8c30c" + integrity sha512-wT+vOKgqgMoEjMNNDQ0lDvAxTJ6uUR3UvEdIVWubhdA24wlBtnZuwxGF6ggFf09aSeA/xIX/BFrhuoHI/09uPg== dependencies: - "@cosmos-kit/omni-mobile" "^2.3.1" + "@cosmos-kit/omni-mobile" "^2.3.3" -"@cosmos-kit/react-lite@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/react-lite/-/react-lite-2.4.1.tgz#01451170cdf7b3827b06ac52b0201c080e13d5c7" - integrity sha512-FzBxCuYQpyB+tr8AxXoGzRBcdf++e64T2h1VkPy1ZAHM6MTBErVoX27p4bh3pjDWn1Ybmn8g6WPD+l7puEw8bA== +"@cosmos-kit/react-lite@^2.4.4": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@cosmos-kit/react-lite/-/react-lite-2.4.4.tgz#8c0cb9688c94ebec7a87c0ede92bb886effb2efa" + integrity sha512-00bmwcTI4aVoVSdNjWMcDpScxYKKeZiIpIggiqGdGxJIccrrHyCbOendV8nWHMjBAhj01rVozNJvKUy6TByZng== dependencies: "@chain-registry/types" "0.13.1" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/shell-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/shell-extension/-/shell-extension-2.3.1.tgz#f0107467e21e485aeb11c01e5d753da32e42e5dd" - integrity sha512-Lm++f0PPWqRZd6wD2K2XVVn+lgV7Uotf1lV02cUJ4NBCmwXppgNZHyle6it+WvgDci/a43IGGS12Z1hboWyONQ== +"@cosmos-kit/shell-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/shell-extension/-/shell-extension-2.3.3.tgz#8a85e663a1afddd961faf0c03e953e6a4a4b6154" + integrity sha512-1d/eawAVekv65j0Ery4+Om7f0cNfZvXadaIWnJzlUiilPMEZ6kbAK5yKZE3YeCEQyQl5yeZ4Miv/pcn4BNg+lw== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/shell@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/shell/-/shell-2.3.1.tgz#eb139154acd02c3cadfb65376ff0941f58398d1b" - integrity sha512-DgwJ4r1vI8dfBPhWS0I23t3TW22xEHh6YLBq3YyzlrX39I4nyjJJBJGZ1WT2QJCAFk48Q5z4V86ED/Q9PC+DeQ== +"@cosmos-kit/shell@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/shell/-/shell-2.3.3.tgz#153169c4dc551b88171a95f3a97d0af5f18ae35c" + integrity sha512-s4exTUVlDqoQ3UnQLTCftS8K7RDTrSNbLSkssgknD/wQnMNE2oSRZNyCSOIPVHScf+Hr0ALtt+E/VldAP2gSjQ== dependencies: - "@cosmos-kit/shell-extension" "^2.3.1" + "@cosmos-kit/shell-extension" "^2.3.3" -"@cosmos-kit/station-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/station-extension/-/station-extension-2.3.1.tgz#9c088a38f32cc90f1b0cc728407fef31f621e7bf" - integrity sha512-Wvbf6JNRCV/THAuvt1/gGAOE43ULPgVHixQarqbeABuQUdlQ7WkeVGIjLqGJ+LYs4QKFjYlHHijPTTBD8gBupA== +"@cosmos-kit/station-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/station-extension/-/station-extension-2.3.3.tgz#115a0eae9635eb00d8680d521bfb94692c371a1a" + integrity sha512-Tz/zehTjAp4sIjc9eCgLkQsUemmyLg+Zv7DELmmY/f8TaY5o96cbQMErO6vZJUyw1tk1LXVSEATnLKNv+fYeZA== dependencies: "@chain-registry/types" "0.13.1" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" "@terra-money/feather.js" "^1.0.8" "@terra-money/station-connector" "^1.0.5" "@terra-money/wallet-types" "^3.11.2" -"@cosmos-kit/station@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/station/-/station-2.3.1.tgz#7dcfded5d012f0919498fc4d980fd4f6def3211a" - integrity sha512-2lrFHU4QIszRn25LkTUubGadDyGi6dRzxxXFOozTACFsEh/DK8R/jQJN/0k3KvCOKxFcfrlKqTb2226lwvWWIA== +"@cosmos-kit/station@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/station/-/station-2.3.3.tgz#bc117c3e9fd31d1499bc10ec8e3b7b17782c8289" + integrity sha512-A9WjcTa4iYmWn7+htJvRR8l+tRj3TB/UtvuPv2CcZq2B4B+RLRS4sZGxAKgOzissvCTXicX+nw4ho1IzmkesNw== dependencies: - "@cosmos-kit/station-extension" "^2.3.1" + "@cosmos-kit/station-extension" "^2.3.3" -"@cosmos-kit/trust-mobile@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/trust-mobile/-/trust-mobile-2.3.1.tgz#1dab01129fe45954a03cc51e324772d49597559b" - integrity sha512-wdmnkfIORA2V/W43NgtYJeHf3cCjW06q6XI4r/Zy/FdyqkhqjH5XqD2cyy4Ufev8a8sXKW6dfENN7UfgCDEI0g== +"@cosmos-kit/trust-mobile@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/trust-mobile/-/trust-mobile-2.3.3.tgz#30a33b9891742ad7bf9c436b4eecfb0e1caf666a" + integrity sha512-rDzhbx5HJj0qMesqQNWeXbBIpD9uwUbcgwfu/g5qj75bd/FyF74xTFgGt4As21ranMgy5KB2jO1YnMTSbNPpTg== dependencies: - "@cosmos-kit/core" "^2.5.1" - "@cosmos-kit/walletconnect" "^2.3.1" + "@cosmos-kit/core" "^2.5.3" + "@cosmos-kit/walletconnect" "^2.3.3" -"@cosmos-kit/trust@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/trust/-/trust-2.3.1.tgz#fd66ad14bbbabd911c2b28715d8c46b447505b4d" - integrity sha512-nTz+TQlr7zGDOwx3uujygCUv1In7KBdcrhjXP8laCXMRAVfSAsTZQERCh2FvV3QHAa1WsbyDe4YnwstggMRn4g== +"@cosmos-kit/trust@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/trust/-/trust-2.3.3.tgz#08606baf6baeb447e8d9753baa0c05e6a08f8017" + integrity sha512-2VS73BXv3TQdQg8cygVvBkZOLxG+2mNeppZeMGCBmtZCrR2Ick2y0gdkSdeasdTxfwNFOeSRaFC0lkr7NkONVg== dependencies: - "@cosmos-kit/trust-mobile" "^2.3.1" + "@cosmos-kit/trust-mobile" "^2.3.3" -"@cosmos-kit/vectis-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/vectis-extension/-/vectis-extension-2.3.1.tgz#e08c3ee4ec3eef3d2d01bee389e2189a27bcc030" - integrity sha512-0sxVwpwIuZowiHSzceEWUV/wfT+SQx2KNUU0JRKjfq47KvMsNidNBc3PQsUSrfKGh+pEFUG+jZiVoXp3HQGk8w== +"@cosmos-kit/vectis-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/vectis-extension/-/vectis-extension-2.3.3.tgz#f3df63fc1a186777cdae279f0ac3df9514590a24" + integrity sha512-90b2d+0FOaromblvM7/eddGNJ1qF42fYyG5oiSg7Fupkg1qZKZCsflrPrz5njyNIK5aWYWd//13DJCRIaWldig== dependencies: "@chain-registry/keplr" "1.8.0" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" -"@cosmos-kit/vectis@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/vectis/-/vectis-2.3.1.tgz#5bc7850d31cd54601c8525dafe31db0759ddcea4" - integrity sha512-wNg+6dwZKoK+jJX08fi1wAzblTz/m0i+FiPLaad8bL2PrWb5d2sITVi7Rq8AYevlQVFKOAPdXxLYSayFyFuRvA== +"@cosmos-kit/vectis@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/vectis/-/vectis-2.3.3.tgz#136711648d52ed7c200cc494575e6f9c2d415d74" + integrity sha512-gEgfnvCZ7amuNd51MWiinjvnDxcd+A4W8a7wOV+6BsbjEPgFrzYkGTDVzXORYdKh82x6sCVBAmvnZT6qUoTTEA== dependencies: - "@cosmos-kit/vectis-extension" "^2.3.1" + "@cosmos-kit/vectis-extension" "^2.3.3" -"@cosmos-kit/walletconnect@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/walletconnect/-/walletconnect-2.3.1.tgz#da74a04e1ebd8ea86ff32036641ea784fefd0a0f" - integrity sha512-Q3AAjA8ncpF2BlLin4P5I44bHOmiHwkJMiK7MHERjzn6E/m4rVr+xkAKKOCkPe3ASASaOaL7862e6X0BGIJ8Ow== +"@cosmos-kit/walletconnect@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/walletconnect/-/walletconnect-2.3.3.tgz#69baff7f0e9577ac920546c4da8c1b151d31cb9b" + integrity sha512-aYubUdqXDMgl7DpyD7ZDimNMD0fSHr8HHk5uVmYd6bAywLAus9dFSi29+7kQ0nXX9+C28YCsJHmkx2+Lfuo/Uw== dependencies: - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" "@walletconnect/sign-client" "^2.9.0" "@walletconnect/types" "^2.9.0" "@walletconnect/utils" "^2.9.0" events "3.3.0" -"@cosmos-kit/web3auth@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/web3auth/-/web3auth-2.3.1.tgz#5ae65711bde81483c4ad8ad4192acb05fae89790" - integrity sha512-7+lTcxTOlAqIr5vJGMtU39vpPeHgfEDh3CvFq7YVuYUa8e8MG0YReLOaVdKENycF7ygFQiBuojKm+3VsX1vStg== +"@cosmos-kit/web3auth@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/web3auth/-/web3auth-2.3.3.tgz#86fbc47c29b0cff892b7496134fb7148117f038f" + integrity sha512-ncVJ+ygDfXQj0nTPWAG2fMcnw1Imyu+Lh+eTBoniYwrPLFx7J2M/FBgQxBant205/1LVfrAwSn1lGlK1HkrGnQ== dependencies: "@chain-registry/types" "0.13.1" - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" "@solana/web3.js" "^1.77.3" "@toruslabs/eccrypto" "^2.1.1" "@web3auth/base" "^5.1.0" @@ -3635,12 +3635,12 @@ ethereum-cryptography "^2.1.2" url "^0.11.1" -"@cosmos-kit/xdefi-extension@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@cosmos-kit/xdefi-extension/-/xdefi-extension-2.3.1.tgz#b1201c700810633181939f7565dfb2c0f3286c61" - integrity sha512-KtyfJqdeZ0DRsUDZXG8yNnTmANwfEkfEiQhIwOoPQInAEHRHO638NEyoJtLdCXHfHFBKvU/zEuKklqPKaiFQ6A== +"@cosmos-kit/xdefi-extension@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@cosmos-kit/xdefi-extension/-/xdefi-extension-2.3.3.tgz#62a0c789f4f2f3eec172ab1defa182de8030addc" + integrity sha512-PQVcLbI1vSbNKTwFHWYpjif1aHrRMWUgS7PNVsi2Io2Qg8jmWLf6i8e0F/aL1bDfuhIJSLy55GJhVVqODgh7RQ== dependencies: - "@cosmos-kit/core" "^2.5.1" + "@cosmos-kit/core" "^2.5.3" "@cosmostation/extension-client@0.1.11": version "0.1.11"