feat: OZ fixes from (GW + Governance audit) + ZK as base token for GW combined

feat: OZ fixes from (GW + Governance audit) + ZK as base token for GW combined #2514