Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reuse @cosmjs clients #480

Merged
merged 3 commits into from
Apr 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/dapp/pages/dao/[contractAddress]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useRouter } from 'next/router'

import { useRecoilState, useRecoilValue } from 'recoil'

import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
import { LibraryIcon, PlusSmIcon, UsersIcon } from '@heroicons/react/outline'
import { useThemeContext } from 'ui'

Expand Down Expand Up @@ -43,6 +42,7 @@ import {
walletTokenBalanceLoading,
} from 'selectors/treasury'
import { addToken } from 'util/addToken'
import { cosmWasmClientRouter } from 'util/chainClientRouter'
import { getFastAverageColor } from 'util/colors'
import { convertMicroDenomToDenomWithDecimals } from 'util/conversion'

Expand Down Expand Up @@ -324,7 +324,7 @@ export const getStaticProps: GetStaticProps<StaticProps> = async ({
}

try {
const client = await CosmWasmClient.connect(CHAIN_RPC_ENDPOINT)
const client = await cosmWasmClientRouter.connect(CHAIN_RPC_ENDPOINT)
const daoInfo = await client.queryContractSmart(contractAddress, {
get_config: {},
})
Expand Down
4 changes: 2 additions & 2 deletions apps/dapp/pages/multisig/[contractAddress]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useRouter } from 'next/router'

import { useRecoilState, useRecoilValue } from 'recoil'

import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
import { Threshold } from '@dao-dao/types/contracts/cw3-multisig'
import {
ScaleIcon,
Expand Down Expand Up @@ -35,6 +34,7 @@ import {
sigSelector,
totalWeight,
} from 'selectors/multisigs'
import { cosmWasmClientRouter } from 'util/chainClientRouter'
import { getFastAverageColor } from 'util/colors'

const thresholdString = (t: Threshold) => {
Expand Down Expand Up @@ -232,7 +232,7 @@ export const getStaticProps: GetStaticProps<StaticProps> = async ({
}

try {
const client = await CosmWasmClient.connect(CHAIN_RPC_ENDPOINT)
const client = await cosmWasmClientRouter.connect(CHAIN_RPC_ENDPOINT)
const sigInfo = await client.queryContractSmart(contractAddress, {
get_config: {},
})
Expand Down
20 changes: 12 additions & 8 deletions apps/dapp/selectors/cosm.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { selector, selectorFamily, atom } from 'recoil'
import { GasPrice, StargateClient } from '@cosmjs/stargate'

import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'
import { GasPrice } from '@cosmjs/stargate'

import {
CosmWasmClient,
SigningCosmWasmClient,
} from '@cosmjs/cosmwasm-stargate'
cosmWasmClientRouter,
stargateClientRouter,
} from 'util/chainClientRouter'
import { NATIVE_DENOM, GAS_PRICE } from 'util/constants'

import { localStorageEffect } from '../atoms/localStorageEffect'
import { connectKeplrWithoutAlerts } from '../services/keplr'
import { walletTokenBalanceUpdateCountAtom } from './treasury'
import { localStorageEffect } from '../atoms/localStorageEffect'
import { NATIVE_DENOM, GAS_PRICE } from 'util/constants'

export type WalletConnection = 'keplr' | ''

Expand All @@ -18,14 +22,14 @@ const CHAIN_ID = process.env.NEXT_PUBLIC_CHAIN_ID
export const stargateClient = selector({
key: 'stargateClient',
get: () => {
return StargateClient.connect(CHAIN_RPC_ENDPOINT)
return stargateClientRouter.connect(CHAIN_RPC_ENDPOINT)
},
})

export const cosmWasmClient = selector({
key: 'cosmWasmClient',
get: () => {
return CosmWasmClient.connect(CHAIN_RPC_ENDPOINT)
return cosmWasmClientRouter.connect(CHAIN_RPC_ENDPOINT)
},
})

Expand Down
64 changes: 64 additions & 0 deletions apps/dapp/util/chainClientRouter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
import { StargateClient } from '@cosmjs/stargate'

type ChainClientRoutes<T> = {
[rpcEndpoint: string]: T
}

type HandleConnect<T> = (rpcEndpoint: string) => Promise<T>

/*
* This is a workaround for `@cosmjs` clients to avoid connecting to the chain more than once.
*
* @example
* export const stargateClientRouter = new ChainClientRouter({
* handleConnect: (rpcEndpoint: string) => StargateClient.connect(rpcEndpoint),
* })
*
* const client = await stargateClientRouter.connect(RPC_ENDPOINT);
*
* const queryResponse = await client.queryContractSmart(...);
* */
class ChainClientRouter<T> {
private readonly handleConnect: HandleConnect<T>
private instances: ChainClientRoutes<T> = {}

constructor({ handleConnect }: { handleConnect: HandleConnect<T> }) {
this.handleConnect = handleConnect
}

/*
* Connect to the chain and return the client
* or return an existing instance of the client.
* */
async connect(rpcEndpoint: string) {
if (!this.getClientInstance(rpcEndpoint)) {
const instance = await this.handleConnect(rpcEndpoint)
this.setClientInstance(rpcEndpoint, instance)
}

return this.getClientInstance(rpcEndpoint)
}

private getClientInstance(rpcEndpoint: string) {
return this.instances[rpcEndpoint]
}

private setClientInstance(rpcEndpoint: string, client: T) {
this.instances[rpcEndpoint] = client
}
}

/*
* Router for connecting to `CosmWasmClient`.
* */
export const cosmWasmClientRouter = new ChainClientRouter({
handleConnect: (rpcEndpoint: string) => CosmWasmClient.connect(rpcEndpoint),
})

/*
* Router for connecting to `StargateClient`.
* */
export const stargateClientRouter = new ChainClientRouter({
handleConnect: (rpcEndpoint: string) => StargateClient.connect(rpcEndpoint),
})