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.

Sign up for GitHub

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(cli): fix verify with sourcify for dependencies #2750

Merged
merged 12 commits into from
Apr 27, 2024
Merged

fix(cli): fix verify with sourcify for dependencies #2750

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
246ed7e
fix(store,world,world-modules): publish solidity-files-cache.json on npm
yonadaa Apr 26, 2024
c45f2b8
refactor: move line
yonadaa Apr 26, 2024
5d3a93b
add more rules
yonadaa Apr 26, 2024
b5a6263
fix: install npm in dependency
yonadaa Apr 26, 2024
2d3a1a1
refactor: dont install world twice
yonadaa Apr 26, 2024
2a129fc
feat: only verify is sourcify
yonadaa Apr 26, 2024
17f3bce
chore: remove foundry profile from dependency verification
yonadaa Apr 26, 2024
87a3a4e
refactor: do not use foundry profile
yonadaa Apr 26, 2024
5407d2a
feat: default to sourcify
yonadaa Apr 26, 2024
a91bf9e
chore: update comment
yonadaa Apr 26, 2024
193bc4d
chore: concurrency of 4
yonadaa Apr 26, 2024
55c8f21
chore: changeset
yonadaa Apr 26, 2024
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
189 changes: 105 additions & 84 deletions packages/cli/src/verify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { getDeployer } from "./deploy/getDeployer";
import { MUDError } from "@latticexyz/common/errors";
import { salt } from "./deploy/common";
import { getStorageAt } from "viem/actions";
import { execa } from "execa";

type VerifyOptions = {
client: Client<Transport, Chain | undefined>;
Expand Down Expand Up @@ -73,94 +74,114 @@ export async function verify({
),
);

Object.entries(
usesProxy ? getWorldProxyFactoryContracts(deployerAddress) : getWorldFactoryContracts(deployerAddress),
).map(([name, { bytecode }]) =>
verifyQueue.add(() =>
verifyContract(
{
name,
rpc,
verifier,
verifierUrl,
address: getCreate2Address({
from: deployerAddress,
bytecode: bytecode,
salt,
}),
},
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world",
},
).catch((error) => {
console.error(`Error verifying world factory contract ${name}:`, error);
}),
),
);
{
const cwd = "node_modules/@latticexyz/world";

modules.map(({ name, bytecode }) =>
verifyQueue.add(() =>
verifyContract(
{
name: name,
rpc,
verifier,
verifierUrl,
address: getCreate2Address({
from: deployerAddress,
bytecode: bytecode,
salt,
}),
},
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world-modules",
},
).catch((error) => {
console.error(`Error verifying module contract ${name}:`, error);
}),
),
);
await execa("npm", ["install"], {
cwd,
});
yonadaa marked this conversation as resolved.
Show resolved Hide resolved

// If the world was deployed as a Proxy, verify the proxy and implementation.
if (usesProxy) {
const implementationAddress = sliceHex(implementationStorage, -20);

verifyQueue.add(() =>
verifyContract(
{ name: "WorldProxy", rpc, verifier, verifierUrl, address: worldAddress },
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world",
},
).catch((error) => {
console.error(`Error verifying WorldProxy contract:`, error);
}),
Object.entries(
usesProxy ? getWorldProxyFactoryContracts(deployerAddress) : getWorldFactoryContracts(deployerAddress),
).map(([name, { bytecode }]) =>
verifyQueue.add(() =>
verifyContract(
{
name,
rpc,
verifier,
verifierUrl,
address: getCreate2Address({
from: deployerAddress,
bytecode: bytecode,
salt,
}),
},
{
profile: foundryProfile,
cwd,
},
holic marked this conversation as resolved.
Show resolved Hide resolved
).catch((error) => {
console.error(`Error verifying world factory contract ${name}:`, error);
}),
),
);
}

verifyQueue.add(() =>
verifyContract(
{ name: "World", rpc, verifier, verifierUrl, address: implementationAddress },
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world",
},
).catch((error) => {
console.error(`Error verifying World contract:`, error);
}),
);
} else {
verifyQueue.add(() =>
verifyContract(
{ name: "World", rpc, verifier, verifierUrl, address: worldAddress },
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world",
},
).catch((error) => {
console.error(`Error verifying World contract:`, error);
}),
{
const cwd = "node_modules/@latticexyz/world-modules";

await execa("npm", ["install"], {
cwd,
});

modules.map(({ name, bytecode }) =>
verifyQueue.add(() =>
verifyContract(
{
name: name,
rpc,
verifier,
verifierUrl,
address: getCreate2Address({
from: deployerAddress,
bytecode: bytecode,
salt,
}),
},
{
profile: foundryProfile,
cwd,
},
).catch((error) => {
console.error(`Error verifying module contract ${name}:`, error);
}),
),
);
}

{
const cwd = "node_modules/@latticexyz/world";

// If the world was deployed as a Proxy, verify the proxy and implementation.
if (usesProxy) {
const implementationAddress = sliceHex(implementationStorage, -20);

verifyQueue.add(() =>
verifyContract(
{ name: "WorldProxy", rpc, verifier, verifierUrl, address: worldAddress },
{
profile: foundryProfile,
cwd,
},
).catch((error) => {
console.error(`Error verifying WorldProxy contract:`, error);
}),
);

verifyQueue.add(() =>
verifyContract(
{ name: "World", rpc, verifier, verifierUrl, address: implementationAddress },
{
profile: foundryProfile,
cwd,
},
).catch((error) => {
console.error(`Error verifying World contract:`, error);
}),
);
} else {
verifyQueue.add(() =>
verifyContract(
{ name: "World", rpc, verifier, verifierUrl, address: worldAddress },
{
profile: foundryProfile,
cwd: "node_modules/@latticexyz/world",
},
).catch((error) => {
console.error(`Error verifying World contract:`, error);
}),
);
}
}
}
8 changes: 7 additions & 1 deletion packages/schema-type/.npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@
!dist/**
!src/**
!package.json
!README.md
!README.md

!out/**/*.json
!out/**/*.abi.json
!out/**/*.abi.json.d.ts
!cache/solidity-files-cache.json
!foundry.toml
2 changes: 2 additions & 0 deletions packages/store/.npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
!out/**/*.json
!out/**/*.abi.json
!out/**/*.abi.json.d.ts
!cache/solidity-files-cache.json
!foundry.toml
!src/**
!ts/**
!mud.config.ts
Expand Down
2 changes: 2 additions & 0 deletions packages/world-modules/.npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
!out/**/*.json
!out/**/*.abi.json
!out/**/*.abi.json.d.ts
!cache/solidity-files-cache.json
!foundry.toml
!src/**
!ts/**
!package.json
Expand Down
2 changes: 2 additions & 0 deletions packages/world/.npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
!out/**/*.json
!out/**/*.abi.json
!out/**/*.abi.json.d.ts
!cache/solidity-files-cache.json
!foundry.toml
!src/**
!test/MudTest.t.sol
!ts/**
Expand Down
Loading