From 911c58b57b888413a888b3a5386703f9c439fb24 Mon Sep 17 00:00:00 2001 From: Shay Zluf Date: Fri, 16 Feb 2024 10:26:01 -0600 Subject: [PATCH 1/4] use arbitrum --- packages/web/src/contracts/write/LogClaim.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/web/src/contracts/write/LogClaim.ts b/packages/web/src/contracts/write/LogClaim.ts index bd4b798cc..1762bcf69 100644 --- a/packages/web/src/contracts/write/LogClaim.ts +++ b/packages/web/src/contracts/write/LogClaim.ts @@ -1,5 +1,8 @@ import { HATSVaultV1_abi, HATSVaultsRegistry_abi } from "@hats.finance/shared"; import { IVault } from "types"; +import { IS_PROD } from "settings"; +import * as wagmiChains from "@wagmi/chains"; + import { switchNetworkAndValidate } from "utils/switchNetwork.utils"; import { useContractWrite, useNetwork } from "wagmi"; @@ -14,8 +17,10 @@ export class LogClaimContract { * @param vault - The selected vault to send the claim */ static hook = (vault?: IVault) => { + const DEFAULT_NETWORK_TO_USE = IS_PROD ? wagmiChains.arbitrum.id as number : wagmiChains.sepolia.id as number; + let useChaniId = DEFAULT_NETWORK_TO_USE; + vault!.chainId != wagmiChains.mainnet.id ? useChaniId = vault!.chainId:null; const { chain } = useNetwork(); - const contractAddress = vault?.master.address ?? ""; const registryAbi = vault?.version === "v1" ? HATSVaultV1_abi : HATSVaultsRegistry_abi; const method = vault?.version === "v1" ? "claim" : "logClaim"; @@ -32,7 +37,7 @@ export class LogClaimContract { ...claim, send: async (data: string) => { if (!vault) return; - await switchNetworkAndValidate(chain!.id, vault!.chainId as number); + await switchNetworkAndValidate(chain!.id, useChaniId); return claim.write!({ recklesslySetUnpreparedArgs: [data] }); }, From 4d061808e4965b66d8aaaa47e6104985eb4d9433 Mon Sep 17 00:00:00 2001 From: Shay Zluf Date: Fri, 16 Feb 2024 10:40:51 -0600 Subject: [PATCH 2/4] rename var --- packages/web/src/contracts/write/LogClaim.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/src/contracts/write/LogClaim.ts b/packages/web/src/contracts/write/LogClaim.ts index 1762bcf69..90a8155e9 100644 --- a/packages/web/src/contracts/write/LogClaim.ts +++ b/packages/web/src/contracts/write/LogClaim.ts @@ -18,8 +18,8 @@ export class LogClaimContract { */ static hook = (vault?: IVault) => { const DEFAULT_NETWORK_TO_USE = IS_PROD ? wagmiChains.arbitrum.id as number : wagmiChains.sepolia.id as number; - let useChaniId = DEFAULT_NETWORK_TO_USE; - vault!.chainId != wagmiChains.mainnet.id ? useChaniId = vault!.chainId:null; + let useChaninId = DEFAULT_NETWORK_TO_USE; + vault!.chainId != wagmiChains.mainnet.id ? useChaninId = vault!.chainId:null; const { chain } = useNetwork(); const contractAddress = vault?.master.address ?? ""; const registryAbi = vault?.version === "v1" ? HATSVaultV1_abi : HATSVaultsRegistry_abi; @@ -37,7 +37,7 @@ export class LogClaimContract { ...claim, send: async (data: string) => { if (!vault) return; - await switchNetworkAndValidate(chain!.id, useChaniId); + await switchNetworkAndValidate(chain!.id, useChaninId); return claim.write!({ recklesslySetUnpreparedArgs: [data] }); }, From bb3fd69b43b1b30c96e6fffde736c080a2c1be2c Mon Sep 17 00:00:00 2001 From: Shay Zluf Date: Fri, 16 Feb 2024 11:04:15 -0600 Subject: [PATCH 3/4] fix expression --- packages/web/src/contracts/write/LogClaim.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/contracts/write/LogClaim.ts b/packages/web/src/contracts/write/LogClaim.ts index 90a8155e9..5a7c41f65 100644 --- a/packages/web/src/contracts/write/LogClaim.ts +++ b/packages/web/src/contracts/write/LogClaim.ts @@ -19,7 +19,7 @@ export class LogClaimContract { static hook = (vault?: IVault) => { const DEFAULT_NETWORK_TO_USE = IS_PROD ? wagmiChains.arbitrum.id as number : wagmiChains.sepolia.id as number; let useChaninId = DEFAULT_NETWORK_TO_USE; - vault!.chainId != wagmiChains.mainnet.id ? useChaninId = vault!.chainId:null; + vault!.chainId !== wagmiChains.mainnet.id ? useChaninId = vault!.chainId:null; const { chain } = useNetwork(); const contractAddress = vault?.master.address ?? ""; const registryAbi = vault?.version === "v1" ? HATSVaultV1_abi : HATSVaultsRegistry_abi; From a2e45e9e907f016fe328a7346458eadaec0e388d Mon Sep 17 00:00:00 2001 From: Shay Zluf Date: Fri, 16 Feb 2024 11:54:15 -0600 Subject: [PATCH 4/4] assignment --- packages/web/src/contracts/write/LogClaim.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/src/contracts/write/LogClaim.ts b/packages/web/src/contracts/write/LogClaim.ts index 5a7c41f65..4d0eaf0c5 100644 --- a/packages/web/src/contracts/write/LogClaim.ts +++ b/packages/web/src/contracts/write/LogClaim.ts @@ -19,7 +19,7 @@ export class LogClaimContract { static hook = (vault?: IVault) => { const DEFAULT_NETWORK_TO_USE = IS_PROD ? wagmiChains.arbitrum.id as number : wagmiChains.sepolia.id as number; let useChaninId = DEFAULT_NETWORK_TO_USE; - vault!.chainId !== wagmiChains.mainnet.id ? useChaninId = vault!.chainId:null; + useChaninId = vault!.chainId !== wagmiChains.mainnet.id ? vault!.chainId:useChaninId; const { chain } = useNetwork(); const contractAddress = vault?.master.address ?? ""; const registryAbi = vault?.version === "v1" ? HATSVaultV1_abi : HATSVaultsRegistry_abi;