Added custom type for Deployed contracts throughout the repo wherever necessary

Added custom type for Deployed contracts throughout the repo wherever necessary #7745