From 9c61f49cfd41aac0f1b53175b2f966f65fd8e720 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Wed, 18 May 2016 13:57:30 -0400 Subject: [PATCH] Merge continue 5 Not sure why the merge tool changed this file and removed that but it did. --- params/util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/params/util.go b/params/util.go index 3ef018b91c..d8033f7d40 100644 --- a/params/util.go +++ b/params/util.go @@ -19,6 +19,6 @@ package params import "math/big" var ( - TestNetHomesteadBlock = big.NewInt(494000) // testnet homestead block - MainNetHomesteadBlock = big.NewInt(1150000) // mainnet homestead block + TestNetHomesteadBlock = big.NewInt(0) // testnet homestead block + MainNetHomesteadBlock = big.NewInt(200000) // mainnet homestead block )