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

fix: do not request verification info when running local node #53

Merged
merged 8 commits into from
Oct 16, 2023
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
3 changes: 3 additions & 0 deletions packages/app/src/composables/useAddress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ export default (context = useContext()) => {
const item = ref(<null | AddressItem>null);

const getContractVerificationInfo = async (address: string): Promise<ContractVerificationInfo | null> => {
if (!context.currentNetwork.value.verificationApiUrl) {
return null;
}
try {
return await $fetch(`${context.currentNetwork.value.verificationApiUrl}/contract_verification/info/${address}`);
} catch (e) {
Expand Down
3 changes: 3 additions & 0 deletions packages/app/src/composables/useContractABI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { checksumAddress } from "@/utils/formatters";

const retrieveAddressInfo = useMemoize(
async (address: Address, context: Context = useContext()) => {
if (!context.currentNetwork.value.verificationApiUrl) {
return null;
}
return await $fetch(`${context.currentNetwork.value.verificationApiUrl}/contract_verification/info/${address}`);
},
{
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/configs/dev.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"networks": [
{
"apiUrl": "http://localhost:3020",
"verificationApiUrl": "http://127.0.0.1:3070",
"bridgeUrl": "http://localhost:3000/bridge",
"hostnames": [
"localhost"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/configs/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export type NetworkConfig = {
name: string;
icon: string;
verificationApiUrl: string;
verificationApiUrl?: string;
apiUrl: string;
newProverUrl: string;
rpcUrl: string;
Expand Down
1 change: 0 additions & 1 deletion packages/app/src/configs/local.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"networks": [
{
"apiUrl": "http://localhost:3020",
"verificationApiUrl": "http://127.0.0.1:3070",
"bridgeUrl": "http://localhost:3000/bridge",
"hostnames": [
"localhost"
Expand Down
16 changes: 16 additions & 0 deletions packages/app/tests/composables/useAddress.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,22 @@ describe("useAddresses", () => {
});
});

it("doesn't make contract verification request when network has no verificationApiUrl", async () => {
const currentNetwork = computed(() => ({ apiUrl: "http://api.url" }));
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const { item, getByAddress } = useAddress({ currentNetwork } as any);
await getByAddress("0xc31f9d4cbf557b6cf0ad2af66d44c358f7fa7a1c");
expect($fetch).toHaveBeenCalledOnce();
expect($fetch).toHaveBeenCalledWith("http://api.url/address/0xc31f9d4cbf557b6cf0ad2af66d44c358f7fa7a1c");
expect(item.value).toEqual({
address: "0xc31f9d4cbf557b6cf0ad2af66d44c358f7fa7a1c",
balances: {},
type: "contract",
verificationInfo: null,
proxyInfo: null,
});
});

it("takes proxy implementation contract from implementation function when it exists", async () => {
const { item, getByAddress } = useAddress();
await getByAddress("0xc31f9d4cbf557b6cf0ad2af66d44c358f7fa7a1c");
Expand Down
10 changes: 9 additions & 1 deletion packages/app/tests/composables/useContractABI.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ref } from "vue";
import { computed, ref } from "vue";

import { describe, expect, it, type SpyInstance, vi } from "vitest";

Expand Down Expand Up @@ -66,6 +66,14 @@ describe("useContractABI:", () => {
expect(isRequestFailed.value).toEqual(true);
mock.mockRestore();
});
it("doesn't make request when there is no verification api url", async () => {
const mock = ($fetch as unknown as SpyInstance).mockClear();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const { getCollection } = useContractABI({ currentNetwork: computed(() => ({})) } as any);
await getCollection(["0x5550000000000000000000000000000000000000"]);
expect(mock).toHaveBeenCalledTimes(0);
mock.mockRestore();
});
it("caches the results", async () => {
const mock = ($fetch as unknown as SpyInstance).mockClear();
const { getCollection } = useContractABI();
Expand Down
4 changes: 2 additions & 2 deletions packages/app/tests/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import type { Provider } from "zksync-web3";

export const GOERLI_NETWORK: NetworkConfig = {
name: "goerli",
verificationApiUrl: "",
verificationApiUrl: "https://zksync2-testnet-explorer.zksync.dev",
apiUrl: "https://block-explorer-api.testnets.zksync.dev",
icon: "",
l2ChainId: 280,
Expand All @@ -37,7 +37,7 @@ export const GOERLI_NETWORK: NetworkConfig = {
};
export const GOERLI_BETA_NETWORK: NetworkConfig = {
name: "goerli-beta",
verificationApiUrl: "",
verificationApiUrl: "https://zksync2-testnet-explorer.zksync.dev",
apiUrl: "https://block-explorer-api.mock.zksync.dev",
icon: "",
l2ChainId: 270,
Expand Down
Loading