Merge pull request #31 from subsquid/develop

release

src/App.tsx

@@ -9,6 +9,7 @@ import { WagmiProvider } from 'wagmi';
 
 import { queryClient } from '@api/client';
 import { Alert } from '@components/Alert';
+import { SquidHeightProvider } from '@hooks/useSquidNetworkHeightHooks';
 import { wagmiConfig } from '@network/config';
 
 import { AppRoutes } from './AppRoutes';
@@ -22,24 +23,26 @@ function App() {
   return (
     <WagmiProvider config={wagmiConfig}>
       <QueryClientProvider client={queryClient}>
-        <ThemeProvider theme={theme}>
-          <RainbowKitProvider modalSize="compact" theme={rainbowkitTheme}>
-            <SnackbarProvider
-              hideIconVariant
-              preventDuplicate
-              maxSnack={3}
-              Components={{
-                subsquid: Alert,
-              }}
-              anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-            >
-              <CssBaseline />
-              <BrowserRouter>
-                <AppRoutes />
-              </BrowserRouter>
-            </SnackbarProvider>
-          </RainbowKitProvider>
-        </ThemeProvider>
+        <SquidHeightProvider>
+          <ThemeProvider theme={theme}>
+            <RainbowKitProvider modalSize="compact" theme={rainbowkitTheme}>
+              <SnackbarProvider
+                hideIconVariant
+                preventDuplicate
+                maxSnack={3}
+                Components={{
+                  subsquid: Alert,
+                }}
+                anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
+              >
+                <CssBaseline />
+                <BrowserRouter>
+                  <AppRoutes />
+                </BrowserRouter>
+              </SnackbarProvider>
+            </RainbowKitProvider>
+          </ThemeProvider>
+        </SquidHeightProvider>
       </QueryClientProvider>
     </WagmiProvider>
   );

src/api/contracts/claim.ts

@@ -7,7 +7,7 @@ import { useWriteContract, useClient } from 'wagmi';
 import { REWARD_TREASURY_CONTRACT_ABI } from '@api/contracts/reaward-treasury.abi';
 import { VESTING_CONTRACT_ABI } from '@api/contracts/vesting.abi';
 import { AccountType, SourceWallet } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount.ts';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -67,7 +67,7 @@ function useClaimFromVestingContract() {
 
 export function useClaim() {
   const client = useClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 

src/api/contracts/gateway-registration/useRegisterGateway.ts

@@ -6,7 +6,7 @@ import { encodeFunctionData } from 'viem';
 import { usePublicClient, useWriteContract } from 'wagmi';
 
 import { AccountType } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -82,7 +82,7 @@ export function useRegisterGateway() {
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setLoading] = useState(false);
 
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const registerGatewayFromWallet = useRegisterGatewayFromWallet();
   const registerGatewayFromVestingContract = useRegisterGatewayFromVestingContract();
 

src/api/contracts/gateway-registration/useStakeGateway.ts

@@ -5,7 +5,7 @@ import { encodeFunctionData } from 'viem';
 import { usePublicClient, useWriteContract } from 'wagmi';
 
 import { AccountType, SourceWallet } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -105,7 +105,7 @@ function useStakeFromVestingContract() {
 
 export function useStakeGateway() {
   const client = usePublicClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 

src/api/contracts/gateway-registration/useUnregisterGateway.ts

@@ -7,7 +7,7 @@ import { useWriteContract, usePublicClient } from 'wagmi';
 
 import { AccountType } from '@api/subsquid-network-squid';
 import { BlockchainGateway } from '@api/subsquid-network-squid/gateways-graphql';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -78,7 +78,7 @@ export function useUnregisterGateway() {
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setLoading] = useState(false);
 
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const unregisterGatewayFromWallet = useUnregisterGatewayFromWallet();
   const unregisterGatewayFromVestingContract = useUnregisterGatewayFromVestingContract();
 

src/api/contracts/gateway-registration/useUnstakeGateway.ts

@@ -4,7 +4,7 @@ import { encodeFunctionData } from 'viem';
 import { useWriteContract, usePublicClient } from 'wagmi';
 
 import { AccountType, GatewayStakeFragmentFragment } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -65,7 +65,7 @@ function useUnstakeFromVestingContract() {
 
 export function useUnstakeGateway() {
   const client = usePublicClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 

src/api/contracts/staking.ts

@@ -15,8 +15,8 @@ import {
 
 import { useApproveSqd } from '@api/contracts/sqd';
 import { VESTING_CONTRACT_ABI } from '@api/contracts/vesting.abi';
-import { AccountType, BlockchainApiWorker, SourceWallet } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { AccountType, Worker, SourceWallet } from '@api/subsquid-network-squid';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -25,7 +25,7 @@ import { STAKING_CONTRACT_ABI } from './staking.abi';
 import { errorMessage, TxResult, isApproveRequiredError, WriteContractRes } from './utils';
 
 type WorkerDepositRequest = {
-  worker: BlockchainApiWorker;
+  worker: Pick<Worker, 'id'>;
   amount: string;
   wallet: Pick<SourceWallet, 'id' | 'type'>;
 };
@@ -104,7 +104,7 @@ function useDepositFromVestingContract() {
 
 export function useWorkerDelegate() {
   const client = useClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -195,7 +195,7 @@ function useUndelegateFromVestingContract() {
 
 export function useWorkerUndelegate() {
   const client = usePublicClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -238,7 +238,7 @@ export function useWorkerUndelegate() {
 
 export function useCapedStake({ workerId }: { workerId?: string }) {
   const contracts = useContracts();
-  const { currentHeight, isLoading: isHeightLoading } = useSquidNetworkHeightHooks();
+  const { currentHeight, isLoading: isHeightLoading } = useSquidNetworkHeight();
 
   const { data, isLoading } = useReadContract({
     address: contracts.SOFT_CAP,

src/api/contracts/vesting.ts

@@ -5,15 +5,15 @@ import { erc20Abi, MulticallResponse } from 'viem';
 import { waitForTransactionReceipt } from 'viem/actions';
 import { useReadContracts, useWriteContract, useClient } from 'wagmi';
 
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useContracts } from '@network/useContracts';
 
 import { errorMessage, WriteContractRes } from './utils';
 import { VESTING_CONTRACT_ABI } from './vesting.abi';
 
 export function useVestingContracts({ addresses }: { addresses: `0x${string}`[] }) {
   const contracts = useContracts();
-  const { currentHeight, isLoading: isSquidHeightLoading } = useSquidNetworkHeightHooks();
+  const { currentHeight, isLoading: isSquidHeightLoading } = useSquidNetworkHeight();
 
   const { data, isLoading } = useReadContracts({
     contracts: addresses.flatMap(address => {
@@ -60,7 +60,7 @@ export function useVestingContracts({ addresses }: { addresses: `0x${string}`[]
     allowFailure: true,
     blockNumber: BigInt(currentHeight),
     query: {
-      enabled: !isSquidHeightLoading && !!addresses.length,
+      enabled: !isSquidHeightLoading,
       select: r => {
         if (r?.some(r => r.status === 'success')) {
           return chunk(r, 8).map(ch => ({
@@ -94,7 +94,11 @@ export function useVestingContracts({ addresses }: { addresses: `0x${string}`[]
     | undefined
   >(undefined);
   useEffect(() => {
-    if (!addresses.length) res.current = [];
+    if (!addresses.length) {
+      res.current = [];
+      return;
+    }
+
     if (!isLoading) res.current = data;
   }, [addresses, data, isLoading]);
 
@@ -119,7 +123,7 @@ function unwrapResult<T>(result?: MulticallResponse<T>): T | undefined {
 
 export function useVestingContractRelease() {
   const client = useClient();
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [isLoading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const { SQD } = useContracts();

src/api/contracts/worker-registration/useRegisterWorker.ts

@@ -9,7 +9,7 @@ import { useWriteContract, usePublicClient, useClient } from 'wagmi';
 import { useApproveSqd } from '@api/contracts/sqd';
 import { VESTING_CONTRACT_ABI } from '@api/contracts/vesting.abi';
 import { AccountType, SourceWallet } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -120,7 +120,7 @@ export function useRegisterWorker() {
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setLoading] = useState(false);
 
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const registerWorkerContract = useRegisterFromWallet();
   const registerVestingContract = useRegisterWorkerFromVestingContract();
 

src/api/contracts/worker-registration/useUnregisterWorker.ts

@@ -8,7 +8,7 @@ import { useWriteContract, useClient } from 'wagmi';
 
 import { VESTING_CONTRACT_ABI } from '@api/contracts/vesting.abi';
 import { AccountType } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -76,7 +76,7 @@ export function useUnregisterWorker() {
   const client = useClient();
   const { address } = useAccount();
   const [isLoading, setLoading] = useState(false);
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [error, setError] = useState<string | null>(null);
 
   const unregisterWorkerFromWallet = useUnregisterWorkerFromWallet();

src/api/contracts/worker-registration/useUpdateWorker.ts

@@ -7,7 +7,7 @@ import { waitForTransactionReceipt } from 'viem/actions';
 import { useWriteContract, useClient } from 'wagmi';
 
 import { AccountType } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -79,7 +79,7 @@ export function useUpdateWorker() {
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setLoading] = useState(false);
 
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const updateWorkerFromWallet = useUpdateWorkerFromWallet();
   const updateWorkerFromVestingContract = useUpdateWorkerFromVestingContract();
 

src/api/contracts/worker-registration/useWithdrawWorker.ts

@@ -9,7 +9,7 @@ import { useWriteContract, useClient } from 'wagmi';
 import { VESTING_CONTRACT_ABI } from '@api/contracts/vesting.abi';
 import { UnregisterWorkerRequest } from '@api/contracts/worker-registration/useUnregisterWorker';
 import { AccountType } from '@api/subsquid-network-squid';
-import { useSquidNetworkHeightHooks } from '@hooks/useSquidNetworkHeightHooks.ts';
+import { useSquidNetworkHeight } from '@hooks/useSquidNetworkHeightHooks';
 import { useAccount } from '@network/useAccount';
 import { useContracts } from '@network/useContracts.ts';
 
@@ -69,7 +69,7 @@ export function useWithdrawWorker() {
   const client = useClient();
   const { address } = useAccount();
   const [isLoading, setLoading] = useState(false);
-  const { setWaitHeight } = useSquidNetworkHeightHooks();
+  const { setWaitHeight } = useSquidNetworkHeight();
   const [error, setError] = useState<string | null>(null);
 
   const withdrawWorkerFromWallet = useWithdrawWorkerFromWallet();