Skip to content

Commit 364678a

Browse files
jaybuidljaybuidl
committed
fix: coderabbitai
1 parent c8a174f commit 364678a

File tree

8 files changed

+72
-33
lines changed

8 files changed

+72
-33
lines changed

‎contracts/test/evidence/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ function getEmittedEvent(eventName: any, receipt: any) {
1717
describe("Home Evidence contract", async () => {
1818
const arbitrationFee = 1000;
1919
const appealFee = arbitrationFee;
20-
const arbitratorExtraData =
21-
"0x" +
22-
"0000000000000000000000000000000000000000000000000000000000000001" + // courtId 1
23-
"0000000000000000000000000000000000000000000000000000000000000001"; // minJurors 1
20+
const arbitratorExtraData = ethers.utils.defaultAbiCoder.encode(
21+
["uint256", "uint256"],
22+
[1, 1] // courtId 1, minJurors 1
23+
);
2424
const appealTimeout = 100;
2525
const bondTimeout = 60 * 10;
2626
const totalCostMultiplier = 15000;

‎web-devtools/scripts/runEnv.sh‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
11
#!/usr/bin/env bash
22

3-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
3+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
4+
RED='\033[0;31m'
5+
GREEN='\033[0;32m'
6+
NC='\033[0m'
47

58
deployment="$1"
69
shift
7-
commands="$@"
10+
commands="$*"
811

912
if [[ -z "$deployment" ]]; then
10-
echo "usage: $(basename $0) <local|devnet|devnet-neo|devnet-university|testnet|mainnet-neo>"
13+
echo "usage: $(basename "$0") <local|devnet|devnet-neo|devnet-university|testnet|mainnet-neo>"
1114
exit 1
1215
fi
1316

1417
valid_deployments=("local" "devnet" "devnet-neo" "devnet-university" "testnet" "mainnet-neo")
15-
if [[ ! " ${valid_deployments[@]} " =~ " ${deployment} " ]]; then
16-
echo "Invalid deployment option. Please choose either: ${valid_deployments[@]}."
18+
if [[ ! " ${valid_deployments[*]} " =~ ${deployment} ]]; then
19+
echo "Invalid deployment option. Please choose either: ${valid_deployments[*]}."
1720
exit 1
1821
fi
1922

23+
function sourceEnvFile() { #envFile
24+
envFile="$1"
25+
if [ -f "$envFile" ]; then
26+
echo -e "${GREEN}✔${NC} $(basename "$envFile")"
27+
# shellcheck source=SCRIPTDIR/../.env.devnet
28+
. "$envFile"
29+
else
30+
echo -e "${RED}✖${NC} $(basename "$envFile")"
31+
fi
32+
}
33+
2034
envFile="$SCRIPT_DIR/../.env.${deployment}"
21-
[ -f "$envFile.public" ] && . $envFile.public
22-
[ -f "$envFile" ] && . $envFile
35+
sourceEnvFile "$envFile"
36+
sourceEnvFile "$envFile.public"
2337

2438
eval "$commands"

‎web-devtools/src/app/(main)/dispute-template/FetchDisputeRequestInput.tsx‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,14 @@ const FetchDisputeRequestInput: React.FC<IFetchDisputeRequestInput> = ({ setPara
8686
useEffect(() => {
8787
const fetchData = async () => {
8888
setLoading(true);
89-
const params = await getDisputeRequestParamsFromTxn(debouncedTxnHash as `0x${string}`, chainId);
90-
setLoading(false);
91-
if (!isUndefined(params)) setParams(params);
89+
try {
90+
const params = await getDisputeRequestParamsFromTxn(debouncedTxnHash as `0x${string}`, chainId);
91+
if (!isUndefined(params)) setParams(params);
92+
} catch (error) {
93+
console.error("Error fetching dispute request params:", error);
94+
} finally {
95+
setLoading(false);
96+
}
9297
};
9398
if (debouncedTxnHash && chainId) fetchData();
9499
}, [debouncedTxnHash]);

‎web-devtools/src/app/(main)/dispute-template/FetchFromIdInput.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@ const FetchFromIDInput: React.FC<IFetchFromID> = ({
4141
[templateId]
4242
);
4343
useEffect(() => setTemplateId(defaultTemplateID), [defaultTemplateID]);
44-
const { data: templateFromId, isLoading } = useDisputeTemplateFromId(debouncedTemplateId);
44+
const { data: templateFromId, isLoading, error } = useDisputeTemplateFromId(debouncedTemplateId);
4545

4646
useEffect(() => {
4747
const templateData = templateFromId?.disputeTemplate?.templateData;
4848
const templateDataMappings = templateFromId?.disputeTemplate?.templateDataMappings;
4949
if (!isUndefined(templateData)) setDisputeTemplateInput(tryPrettify(templateData));
5050
if (!isUndefined(templateDataMappings)) setDataMappingsInput(tryPrettify(templateDataMappings));
51-
}, [templateFromId]);
51+
if (error) {
52+
console.error("Error fetching template:", error);
53+
}
54+
}, [templateFromId, error]);
5255

5356
return (
5457
<Container>

‎web-devtools/src/app/(main)/ruler/ChangeDeveloper.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ const ChangeDeveloper: React.FC = () => {
4848
isError,
4949
} = useSimulateKlerosCoreRulerChangeRuler({
5050
query: {
51-
enabled: !isUndefined(arbitrable) && !isUndefined(newDeveloper) && isAddress(newDeveloper),
51+
enabled:
52+
!isUndefined(arbitrable) && !isUndefined(newDeveloper) && isAddress(arbitrable) && isAddress(newDeveloper),
5253
},
53-
args: [(arbitrable ?? "") as Address, newDeveloper as Address],
54+
args: [arbitrable as Address, newDeveloper as Address],
5455
});
5556

5657
const { writeContractAsync: changeRuler } = useWriteKlerosCoreRulerChangeRuler();

‎web-devtools/src/components/ConnectWallet/index.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useCallback } from "react";
1+
import React, { useCallback, useState } from "react";
22

33
import { useWeb3Modal, useWeb3ModalState } from "@web3modal/wagmi/react";
44
import { useAccount, useSwitchChain } from "wagmi";
@@ -10,17 +10,18 @@ import { SUPPORTED_CHAINS, DEFAULT_CHAIN } from "consts/chains";
1010
export const SwitchChainButton: React.FC<{ className?: string }> = ({ className }) => {
1111
// TODO isLoading is not documented, but exists in the type, might have changed to isPending
1212
const { switchChain, isLoading } = useSwitchChain();
13+
const [, setError] = useState<string | null>(null);
1314
const handleSwitch = useCallback(() => {
1415
if (!switchChain) {
15-
console.error("Cannot switch network. Please do it manually.");
16+
setError("Cannot switch network. Please do it manually.");
1617
return;
1718
}
1819
try {
1920
switchChain({ chainId: DEFAULT_CHAIN });
2021
} catch (err) {
21-
console.error(err);
22+
setError(err as string);
2223
}
23-
}, [switchChain]);
24+
}, [switchChain, setError]);
2425
return (
2526
<Button
2627
{...{ className }}

‎web-devtools/src/utils/shortenAddress.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
import { getAddress } from "viem";
1+
import { getAddress, isAddress } from "viem";
22

33
export function shortenAddress(address: string): string {
4+
if (!isAddress(address)) {
5+
throw new TypeError("Invalid input: address must be a valid Ethereum address");
6+
}
47
try {
58
const formattedAddress = getAddress(address);
69
return formattedAddress.substring(0, 6) + "..." + formattedAddress.substring(formattedAddress.length - 4);
710
} catch {
8-
throw new TypeError("Invalid input, address can't be parsed");
11+
throw new TypeError("Invalid input: address must be a valid Ethereum address");
912
}
1013
}

‎web/scripts/runEnv.sh‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
#!/usr/bin/env bash
22

3-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
3+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
4+
RED='\033[0;31m'
5+
GREEN='\033[0;32m'
6+
NC='\033[0m'
47

58
deployment="$1"
69
shift
7-
commands="$@"
10+
commands="$*"
811

912
if [[ -z "$deployment" ]]; then
10-
echo "usage: $(basename $0) <local|devnet|devnet-neo|devnet-university|testnet|mainnet-neo>"
13+
echo "usage: $(basename "$0") <local|devnet|devnet-neo|devnet-university|testnet|mainnet-neo>"
1114
exit 1
1215
fi
1316

1417
valid_deployments=("local" "devnet" "devnet-neo" "devnet-university" "testnet" "mainnet-neo")
15-
if [[ ! " ${valid_deployments[@]} " =~ " ${deployment} " ]]; then
16-
echo "Invalid deployment option. Please choose either: ${valid_deployments[@]}."
18+
if [[ ! " ${valid_deployments[*]} " =~ ${deployment} ]]; then
19+
echo "Invalid deployment option. Please choose either: ${valid_deployments[*]}."
1720
exit 1
1821
fi
1922

20-
envFile="$SCRIPT_DIR/../.env.${deployment}"
21-
[ -f "$envFile.public" ] && . $envFile.public
22-
[ -f "$envFile" ] && . $envFile
23+
function sourceEnvFile() { #envFile
24+
envFile="$1"
25+
if [ -f "$envFile" ]; then
26+
echo -e "${GREEN}✔${NC} $(basename "$envFile")"
27+
# shellcheck source=SCRIPTDIR/../.env.devnet
28+
. "$envFile"
29+
else
30+
echo -e "${RED}✖${NC} $(basename "$envFile")"
31+
fi
32+
}
2333

24-
$SCRIPT_DIR/generateBuildInfo.sh
34+
envFile="$SCRIPT_DIR/../.env.${deployment}"
35+
sourceEnvFile "$envFile"
36+
sourceEnvFile "$envFile.public"
2537

2638
eval "$commands"

0 commit comments

Comments
 (0)