Skip to content

Commit 125b94f

Browse files
fix(evm): non failing verification
1 parent 4f1c0df commit 125b94f

File tree

1 file changed

+7
-44
lines changed

1 file changed

+7
-44
lines changed

evm/evm.nix

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,14 @@ _: {
316316
if [ "$address" != "0x0000000000000000000000000000000000000000" ]
317317
then
318318
PRIVATE_KEY=${private-key} \
319+
FOUNDRY_LIBS='["libs"]' \
319320
FOUNDRY_PROFILE="script" \
320-
forge verify-contract --force --watch "$address" "$contract" --constructor-args "$args" --api-key "$3" \
321-
--rpc-url ${rpc-url}
321+
forge verify-contract \
322+
--force \
323+
--watch "$address" "$contract" \
324+
--constructor-args "$args" \
325+
--api-key "$3" \
326+
--rpc-url ${rpc-url} || true
322327
fi
323328
done
324329
@@ -583,15 +588,6 @@ _: {
583588
${contracts}/out/OwnableIBCHandler.sol/OwnableIBCHandler.json > core.json
584589
585590
jq --compact-output --slurp 'map(.abi) | add' \
586-
${contracts}/out/Relay.sol/IRelay.json \
587-
${contracts}/out/Relay.sol/UCS01Relay.json \
588-
${contracts}/out/Relay.sol/RelayLib.json \
589-
${contracts}/out/Relay.sol/RelayPacketLib.json > app.ucs01.json
590-
591-
jq --compact-output --slurp 'map(.abi) | add' \
592-
${contracts}/out/NFT.sol/NFTLib.json \
593-
${contracts}/out/NFT.sol/NFTPacketLib.json \
594-
${contracts}/out/NFT.sol/UCS02NFT.json > app.ucs02.json
595591
596592
jq --compact-output --slurp 'map(.abi) | add' \
597593
${contracts}/out/Zkgm.sol/ZkgmLib.json \
@@ -615,15 +611,6 @@ _: {
615611
''
616612
);
617613

618-
solidity-build-tests = pkgs.writeShellApplication {
619-
name = "run-solidity-build-tests";
620-
runtimeInputs = [ self'.packages.forge ];
621-
text = ''
622-
${ensureAtRepositoryRoot}
623-
FOUNDRY_LIBS=["${evm-libs}"] FOUNDRY_PROFILE="test" FOUNDRY_TEST="evm/tests/src" forge test -vvv --gas-report "$@"
624-
'';
625-
};
626-
627614
evm-contracts-addresses = mkCi false (
628615
pkgs.writeShellApplication {
629616
name = "evm-contracts-addresses";
@@ -738,18 +725,6 @@ _: {
738725
value = eth-deploy-single ({ kind = "Multicall"; } // args);
739726
}) networks
740727
)
741-
// builtins.listToAttrs (
742-
builtins.map (args: {
743-
name = "eth-dryupgrade-${args.network}-ucs01";
744-
value = eth-upgrade (
745-
{
746-
dry = true;
747-
protocol = "UCS01";
748-
}
749-
// args
750-
);
751-
}) networks
752-
)
753728
// builtins.listToAttrs (
754729
builtins.map (args: {
755730
name = "eth-dryupgrade-${args.network}-ucs03";
@@ -840,18 +815,6 @@ _: {
840815
value = eth-upgrade ({ protocol = "UCS00"; } // args);
841816
}) networks
842817
)
843-
// builtins.listToAttrs (
844-
builtins.map (args: {
845-
name = "eth-upgrade-${args.network}-ucs01";
846-
value = eth-upgrade ({ protocol = "UCS01"; } // args);
847-
}) networks
848-
)
849-
// builtins.listToAttrs (
850-
builtins.map (args: {
851-
name = "eth-upgrade-${args.network}-ucs00";
852-
value = eth-upgrade ({ protocol = "UCS00"; } // args);
853-
}) networks
854-
)
855818
// builtins.listToAttrs (
856819
builtins.map (args: {
857820
name = "eth-upgrade-${args.network}-cometbls-client";

0 commit comments

Comments
 (0)