Update generate commands and run them.

Author: pavel-raykov

contracts/GNUmakefile

@@ -87,15 +87,15 @@ data-feeds-precommit:
 .PHONY: wrappers
 wrappers: pnpmdep mockery abigen ## Recompiles solidity contracts and their go wrappers.
 	./scripts/native_solc_compile_all_$(FOUNDRY_PROFILE)
-	go generate ../core/gethwrappers/$(FOUNDRY_PROFILE)
+	go generate ../gethwrappers/$(FOUNDRY_PROFILE)
 
 # This call generates all gethwrappers for all products. It does so based on the
 # assumption that native_solc_compile_all contains sub-calls to each product, and
 # go_generate does the same.
 .PHONY: wrappers-all
 wrappers-all: pnpmdep mockery abigen ## Recompiles solidity contracts and their go wrappers.
 	# go_generate contains a call to  compile all contracts before generating wrappers
-	go generate ../core/gethwrappers/go_generate.go
+	go generate ../gethwrappers/go_generate.go
 
 # Use this to generate compiled JSON artifacts for gauntlet-plus-plus.
 # This is currently only used for CCIP.

gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt

@@ -1,9 +1,9 @@
 GETH_VERSION: 1.15.3
-functions_allow_list: ../../../contracts/solc/functions/TermsOfServiceAllowList/TermsOfServiceAllowList.sol/TermsOfServiceAllowList.abi.json ../../../contracts/solc/functions/TermsOfServiceAllowList/TermsOfServiceAllowList.sol/TermsOfServiceAllowList.bin b9a4aeba7da7d3b98e6cf4366d73d03b861232b3b89a53040fedcb0953ccf1d3
-functions_client: ../../../contracts/solc/functions/FunctionsClient/FunctionsClient.sol/FunctionsClient.abi.json ../../../contracts/solc/functions/FunctionsClient/FunctionsClient.sol/FunctionsClient.bin 266c3a9f2b6539e43486af588a7bc3c58694061d7155917c59b106f4217f68e5
-functions_client_example: ../../../contracts/solc/functions/FunctionsClientExample/FunctionsClientExample.sol/FunctionsClientExample.abi.json ../../../contracts/solc/functions/FunctionsClientExample/FunctionsClientExample.sol/FunctionsClientExample.bin e52846aad97167917823e93aa105804e6a0d66acd7d07cc514b5bf4488b0a19f
-functions_coordinator: ../../../contracts/solc/functions/FunctionsCoordinator/FunctionsCoordinator.sol/FunctionsCoordinator.abi.json ../../../contracts/solc/functions/FunctionsCoordinator/FunctionsCoordinator.sol/FunctionsCoordinator.bin f4ea51a9f44c9191eec5aab5dde08002a297caad08e8ba345f343557ad3a3304
-functions_load_test_client: ../../../contracts/solc/functions/FunctionsLoadTestClient/FunctionsLoadTestClient.sol/FunctionsLoadTestClient.abi.json ../../../contracts/solc/functions/FunctionsLoadTestClient/FunctionsLoadTestClient.sol/FunctionsLoadTestClient.bin af4cccdbebfd0841b143601de5f9912b199508b5b79e85342d1dc9ede21fbd9c
+functions_allow_list: ../../contracts/solc/functions/TermsOfServiceAllowList/TermsOfServiceAllowList.sol/TermsOfServiceAllowList.abi.json ../../contracts/solc/functions/TermsOfServiceAllowList/TermsOfServiceAllowList.sol/TermsOfServiceAllowList.bin b9a4aeba7da7d3b98e6cf4366d73d03b861232b3b89a53040fedcb0953ccf1d3
+functions_client: ../../contracts/solc/functions/FunctionsClient/FunctionsClient.sol/FunctionsClient.abi.json ../../contracts/solc/functions/FunctionsClient/FunctionsClient.sol/FunctionsClient.bin 266c3a9f2b6539e43486af588a7bc3c58694061d7155917c59b106f4217f68e5
+functions_client_example: ../../contracts/solc/functions/FunctionsClientExample/FunctionsClientExample.sol/FunctionsClientExample.abi.json ../../contracts/solc/functions/FunctionsClientExample/FunctionsClientExample.sol/FunctionsClientExample.bin e52846aad97167917823e93aa105804e6a0d66acd7d07cc514b5bf4488b0a19f
+functions_coordinator: ../../contracts/solc/functions/FunctionsCoordinator/FunctionsCoordinator.sol/FunctionsCoordinator.abi.json ../../contracts/solc/functions/FunctionsCoordinator/FunctionsCoordinator.sol/FunctionsCoordinator.bin f4ea51a9f44c9191eec5aab5dde08002a297caad08e8ba345f343557ad3a3304
+functions_load_test_client: ../../contracts/solc/functions/FunctionsLoadTestClient/FunctionsLoadTestClient.sol/FunctionsLoadTestClient.abi.json ../../contracts/solc/functions/FunctionsLoadTestClient/FunctionsLoadTestClient.sol/FunctionsLoadTestClient.bin af4cccdbebfd0841b143601de5f9912b199508b5b79e85342d1dc9ede21fbd9c
 functions_request: ../../../contracts/solc/functions/FunctionsRequest/FunctionsRequest.sol/FunctionsRequest.abi.json ../../../contracts/solc/functions/FunctionsRequest/FunctionsRequest.sol/FunctionsRequest.bin 625c8610b3ea483809dd21c2a3a893cd626670216b9d87bbadb2ecd4aa2b447c
-functions_router: ../../../contracts/solc/functions/FunctionsRouter/FunctionsRouter.sol/FunctionsRouter.abi.json ../../../contracts/solc/functions/FunctionsRouter/FunctionsRouter.sol/FunctionsRouter.bin ba218c8feb73cb8669b452d1c72860a6262d327a72e5e906e39d329e9b9fb8d5
-functions_v1_events_mock: ../../../contracts/solc/functions/FunctionsV1EventsMock/FunctionsV1EventsMock.sol/FunctionsV1EventsMock.abi.json ../../../contracts/solc/functions/FunctionsV1EventsMock/FunctionsV1EventsMock.sol/FunctionsV1EventsMock.bin a4b4cb19ab5fce8fd4fca28564aeddd95bb321adb632cdc261bca6a8b517c11a
+functions_router: ../../contracts/solc/functions/FunctionsRouter/FunctionsRouter.sol/FunctionsRouter.abi.json ../../contracts/solc/functions/FunctionsRouter/FunctionsRouter.sol/FunctionsRouter.bin ba218c8feb73cb8669b452d1c72860a6262d327a72e5e906e39d329e9b9fb8d5
+functions_v1_events_mock: ../../contracts/solc/functions/FunctionsV1EventsMock/FunctionsV1EventsMock.sol/FunctionsV1EventsMock.abi.json ../../contracts/solc/functions/FunctionsV1EventsMock/FunctionsV1EventsMock.sol/FunctionsV1EventsMock.bin a4b4cb19ab5fce8fd4fca28564aeddd95bb321adb632cdc261bca6a8b517c11a

gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt

@@ -10,7 +10,7 @@ import (
 // drop the {digits} in the output wrapper go class. Once such classes are removed/renamed,
 // we can drop the current wrap.go and switch to core/gethwrappers/generation/wrap.go.
 func main() {
-	rootDir := "../../contracts/solc/"
+	rootDir := "../contracts/solc/"
 	project := "automation"
 	inputClassName := os.Args[1]
 	outputClassName := os.Args[2]