fixup deployment

evm/evm.nix

@@ -193,14 +193,12 @@ _: {
           rpc-url = "https://rpc-sepolia.rockx.com";
           private-key = ''"$1"'';
           extra-args = ''--verify --verifier etherscan --etherscan-api-key "$2"'';
-          weth = "0x7b79995e5f793a07bc00c21412e50ecae098e7f9";
         }
         {
           network = "holesky";
           rpc-url = "https://1rpc.io/holesky";
           private-key = ''"$1"'';
           extra-args = ''--verify --verifier etherscan --etherscan-api-key "$2"'';
-          weth = "0x94373a4919b3240d86ea41593d5eba789fef3848";
         }
         {
           network = "0g-testnet";
@@ -247,6 +245,7 @@ _: {
 
               PRIVATE_KEY=${private-key} \
               DEPLOYER="$3" \
+              FOUNDRY_LIBS='["libs"]' \
               FOUNDRY_PROFILE="script" \
                 forge script scripts/Deploy.s.sol:DeployIBC \
                 -vvvv \
@@ -278,6 +277,7 @@ _: {
               cp --no-preserve=mode -r ${evmSources}/* .
 
               PRIVATE_KEY=${private-key} \
+              FOUNDRY_LIBS='["libs"]' \
               FOUNDRY_PROFILE="script" \
                 forge script scripts/Deploy.s.sol:DeployDeployerAndIBC \
                 -vvvv \
@@ -371,6 +371,7 @@ _: {
               DEPLOYER="$argc_deployer_pk" \
               SENDER="$argc_sender_pk" \
               PRIVATE_KEY="$argc_private_key" \
+              FOUNDRY_LIBS='["libs"]' \
               FOUNDRY_PROFILE="script" \
                 forge script scripts/Deploy.s.sol:Deploy${kind} \
                 -vvvv \
@@ -388,7 +389,6 @@ _: {
           dry ? false,
           rpc-url,
           protocol,
-          weth ? "",
           ...
         }:
         mkCi false (
@@ -427,14 +427,15 @@ _: {
               cp --no-preserve=mode -r ${self'.packages.evm-contracts}/* .
               cp --no-preserve=mode -r ${evmSources}/* .
 
-              WETH=${weth} \
               DEPLOYER="$argc_deployer_pk" \
               SENDER="$argc_sender_pk" \
               OWNER="${pkgs.lib.optionalString dry "$argc_owner_pk"}" \
               PRIVATE_KEY="${pkgs.lib.optionalString (!dry) "$argc_private_key"}" \
-              FOUNDRY_PROFILE="script" forge script scripts/Deploy.s.sol:${pkgs.lib.optionalString dry "Dry"}Upgrade${protocol} -vvvvv \
-                --rpc-url ${rpc-url} \
-                --broadcast
+              FOUNDRY_LIBS='["libs"]' \
+              FOUNDRY_PROFILE="script" \
+                  forge script scripts/Deploy.s.sol:${pkgs.lib.optionalString dry "Dry"}Upgrade${protocol} -vvvvv \
+                    --rpc-url ${rpc-url} \
+                    --broadcast
 
               rm -rf "$OUT"
               popd
@@ -652,7 +653,9 @@ _: {
                 cd /evm
                 cp --no-preserve=mode -r ${self'.packages.evm-contracts}/* .
                 cp --no-preserve=mode -r ${self'.packages.evm-sources}/* .
-                FOUNDRY_PROFILE="script" forge script scripts/Deploy.s.sol:DeployDeployerAndIBC -vvv --rpc-url "$RPC_URL" --broadcast
+                FOUNDRY_LIBS='["libs"]' \
+                FOUNDRY_PROFILE="script" \
+                   forge script scripts/Deploy.s.sol:DeployDeployerAndIBC -vvv --rpc-url "$RPC_URL" --broadcast
               '';
             };
           in

evm/scripts/Deploy.s.sol

@@ -226,6 +226,7 @@ abstract contract UnionScript is UnionBase {
             StateLensIcs23Ics23Client,
             StateLensIcs23SmtClient,
             PingPong,
+            UCS03Zkgm,
             Multicall
         )
     {
@@ -238,6 +239,7 @@ abstract contract UnionScript is UnionBase {
         StateLensIcs23SmtClient stateLensIcs23SmtClient =
             deployStateLensIcs23SmtClient(handler, owner);
         PingPong pingpong = deployUCS00(handler, owner, 100000000000000);
+        UCS03Zkgm zkgm = deployUCS03(handler, owner);
         Multicall multicall = deployMulticall();
         return (
             handler,
@@ -246,6 +248,7 @@ abstract contract UnionScript is UnionBase {
             stateLensIcs23Ics23Client,
             stateLensIcs23SmtClient,
             pingpong,
+            zkgm,
             multicall
         );
     }
@@ -478,6 +481,7 @@ contract DeployIBC is UnionScript {
             StateLensIcs23Ics23Client stateLensIcs23Ics23Client,
             StateLensIcs23SmtClient stateLensIcs23SmtClient,
             PingPong pingpong,
+            UCS03Zkgm zkgm,
             Multicall multicall
         ) = deployIBC(vm.addr(privateKey));
         handler.registerClient(LightClients.COMETBLS, cometblsClient);
@@ -532,6 +536,7 @@ contract DeployDeployerAndIBC is UnionScript {
             StateLensIcs23Ics23Client stateLensIcs23Ics23Client,
             StateLensIcs23SmtClient stateLensIcs23SmtClient,
             PingPong pingpong,
+            UCS03Zkgm zkgm,
             Multicall multicall
         ) = deployIBC(vm.addr(privateKey));
         handler.registerClient(LightClients.COMETBLS, cometblsClient);

networks/services/blockscout/frontend.env

@@ -1,4 +1,4 @@
-NEXT_PUBLIC_API_HOST=localhost
+NEXT_PUBLIC_API_HOST=localhost:81
 NEXT_PUBLIC_API_PROTOCOL=http
 NEXT_PUBLIC_STATS_API_HOST=http://localhost:8080
 NEXT_PUBLIC_NETWORK_NAME=Devnet
@@ -8,7 +8,7 @@ NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH
 NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS=18
 NEXT_PUBLIC_API_BASE_PATH=/
-NEXT_PUBLIC_APP_HOST=localhost
+NEXT_PUBLIC_APP_HOST=localhost:81
 NEXT_PUBLIC_APP_PROTOCOL=http
 NEXT_PUBLIC_HOMEPAGE_CHARTS=['daily_txs']
 NEXT_PUBLIC_VISUALIZE_API_HOST=http://localhost:8081

networks/services/blockscout/proxy.nix

@@ -17,7 +17,7 @@ in
       FRONT_PROXY_PASS = "http://blockscout-frontend:3000";
     };
     ports = [
-      "80:80"
+      "81:80"
       "8080:8080"
       "8081:8081"
     ];

networks/services/forge.nix

@@ -14,7 +14,12 @@ let
       cd /evm
       cp --no-preserve=mode -r ${evm-contracts}/* .
       cp --no-preserve=mode -r ${evm-sources}/* .
-      PRIVATE_KEY=0x${builtins.readFile ./../genesis/devnet-eth/dev-key0.prv} FOUNDRY_PROFILE="script" forge script scripts/Deploy.s.sol:DeployDeployerAndIBC -vvv --rpc-url http://geth:8545 --broadcast ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 "--verify --verifier blockscout --verifier-url http://blockscout-proxy/api"}
+      PRIVATE_KEY=0x${builtins.readFile ./../genesis/devnet-eth/dev-key0.prv} \
+      FOUNDRY_LIBS='["libs"]' \
+      FOUNDRY_PROFILE="script" \
+          forge script scripts/Deploy.s.sol:DeployDeployerAndIBC -vvv \
+            --rpc-url http://geth:8545 \
+            --broadcast ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 "--verify --verifier blockscout --verifier-url http://blockscout-proxy/api"}
     '';
   };
 in