Skip to content
Draft

wip #75

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
2 changes: 1 addition & 1 deletion apps/enterprise/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@mui/icons-material": "^5.10.2",
"@mui/material": "^5.10.2",
"@popperjs/core": "^2.11.6",
"@terra-money/feather.js": "^1.0.1",
"@terra-money/log-finder-ruleset": "^3.0.2",
"@terra-money/terra.js": "^3.1.6",
"@terra-money/wallet-provider": "^3.11.1",
"@terra.kitchen/utils": "^1.0.7",
"assert": "^2.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useTx } from '@terra-money/apps/libs/transactions';
import { MsgExecuteContract } from '@terra-money/terra.js';
import { MsgExecuteContract } from '@terra-money/feather.js';
import { useAssertMyAddress } from 'chain/hooks/useAssertMyAddress';
import { TX_KEY } from 'tx';
import { isDenom, toAmount } from "@terra.kitchen/utils"
import { funds_distributor } from 'types/contracts';
import { hookMsg } from '@terra-money/apps/libs/transactions/utils/hookMsg';

import { assertEnvVar } from '../../../../../indexers/shared/utils/assertEnvVar';
interface DepositTxParams {
address: string;
amount: number;
Expand All @@ -21,6 +21,7 @@ interface SendCW20Msg {
msg: string;
}
}
const chainId = assertEnvVar('CHAIN_ID');

const getMsg = ({ address, amount, decimals, denom, walletAddress }: DepositTxParams & { walletAddress: string }) => {
if (isDenom(denom)) {
Expand Down Expand Up @@ -49,7 +50,7 @@ export const useDepositIntoFundsDistributorTx = () => {
const walletAddress = useAssertMyAddress();

return useTx<DepositTxParams>(
(params) => {
(params, chainId) => {
return {
msgs: [getMsg({ ...params, walletAddress })]
};
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/fetchStakingAmount.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NetworkInfo } from '@terra-money/wallet-provider';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';
import Big from 'big.js';
import { contractQuery } from '@terra-money/apps/queries';
import { enterprise } from 'types/contracts';
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/useCW20TokenInfoQuery.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
import { QUERY_KEY } from 'queries';
import { NetworkInfo, useWallet } from '@terra-money/wallet-provider';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';

export interface CW20TokenInfoResponse {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/useClaimsQuery.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
import { QUERY_KEY } from 'queries';
import { NetworkInfo, useWallet } from '@terra-money/wallet-provider';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';
import { contractQuery } from '@terra-money/apps/queries';
import { enterprise } from 'types/contracts';
import { CW20Addr } from '@terra-money/apps/types';
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/useNFTStakingQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { NetworkInfo, useWallet } from '@terra-money/wallet-provider';
import { CW20Addr } from '@terra-money/apps/types';
import { enterprise } from 'types/contracts';
import { contractQuery } from '@terra-money/apps/queries';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';

export const fetchNFTStaking = async (
networkOrLCD: NetworkInfo | LCDClient,
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/useReleasableClaimsQuery.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
import { QUERY_KEY } from 'queries';
import { NetworkInfo, useWallet } from '@terra-money/wallet-provider';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';
import { contractQuery } from '@terra-money/apps/queries';
import { enterprise } from 'types/contracts';
import { CW20Addr } from '@terra-money/apps/types';
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/queries/useVotingPowerQuery.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
import { QUERY_KEY } from 'queries';
import { NetworkInfo, useWallet } from '@terra-money/wallet-provider';
import { LCDClient } from '@terra-money/terra.js';
import { LCDClient } from '@terra-money/feather.js';
import Big from 'big.js';
import { contractQuery } from '@terra-money/apps/queries';
import { enterprise } from 'types/contracts';
Expand Down
2 changes: 1 addition & 1 deletion apps/enterprise/src/tx/useFeeOverrides.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CreateTxOptions, Fee } from '@terra-money/terra.js';
import { CreateTxOptions, Fee } from '@terra-money/feather.js';
import { useWallet } from '@terra-money/wallet-provider';

export const useTxOverrides = (): Partial<CreateTxOptions> => {
Expand Down
2 changes: 1 addition & 1 deletion apps/shared/libs/transactions/TxBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
MsgSend,
MsgSubmitProposal,
MsgVote,
} from '@terra-money/terra.js';
} from '@terra-money/feather.js';
import { hookMsg } from './utils/hookMsg';

type Msg = MsgExecuteContract | MsgSubmitProposal | MsgVote | MsgSend;
Expand Down
2 changes: 1 addition & 1 deletion apps/shared/libs/transactions/useTx.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CreateTxOptions } from '@terra-money/terra.js';
import { CreateTxOptions } from '@terra-money/feather.js';
import { useConnectedWallet, useLCDClient, ConnectedWallet, TxResult } from '@terra-money/wallet-provider';
import { useAsyncFn } from 'react-use';
import { useTransactionsContext } from '.';
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3981,8 +3981,8 @@ __metadata:
"@mui/icons-material": ^5.10.2
"@mui/material": ^5.10.2
"@popperjs/core": ^2.11.6
"@terra-money/feather.js": ^1.0.1
"@terra-money/log-finder-ruleset": ^3.0.2
"@terra-money/terra.js": ^3.1.6
"@terra-money/wallet-provider": ^3.11.1
"@terra.kitchen/utils": ^1.0.7
"@testing-library/jest-dom": ^5.16.5
Expand Down