Merge pull request #1038 from rlan35/rj_fork

Fix init shard state bug and remove faucet

core/resharding.go

@@ -251,7 +251,7 @@ func GetInitShardState() types.ShardState {
 			// priKey.DeserializeHexStr(genesis.GenesisFNAccounts[index].BlsPriKey)
 
 			pub := &bls.PublicKey{}
-			pub.DeserializeHexStr(genesis.GenesisAccounts[index].BlsPublicKey)
+			pub.DeserializeHexStr(genesis.GenesisFNAccounts[index].BlsPublicKey)
 
 			pubKey := types.BlsPublicKey{}
 			pubKey.FromLibBLSPublicKey(pub)

node/node.go

@@ -333,7 +333,7 @@ func New(host p2p.Host, consensusObj *consensus.Consensus, chainDBFactory shardc
 		// TODO (leo): we need to have support of cross-shard tx later so that the token can be transferred from beacon chain shard to other tx shards.
 		if node.isFirstTime {
 			// Setup one time smart contracts
-			node.AddFaucetContractToPendingTransactions()
+			//node.AddFaucetContractToPendingTransactions()
 		} else {
 			node.AddContractKeyAndAddress(scFaucet)
 		}