Agreed to a two-year, $22 million contract with the Giants that includes a club option for 2013 in Nov. 2010. Huff gets about $10 million per season the next two years and then the Giants have a $10 million club option for 2013 with a $2 million buyout.