diff --git a/consensus/consensus.go b/consensus/consensus.go index 54790190a..de4ec7a83 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -109,8 +109,8 @@ type Consensus struct { OfflinePeerList []p2p.Peer //List of nodes related to beaconchain funcs - Waiting_Nodes []proto_node.Info - Active_Nodes []proto_node.Info + WaitingNodes []proto_node.Info + ActiveNodes []proto_node.Info } // BFTBlockInfo send the latest block that was in BFT consensus process as well as its consensusID to state syncing diff --git a/node/node.go b/node/node.go index ba19b53c1..78d6f4ef8 100644 --- a/node/node.go +++ b/node/node.go @@ -449,7 +449,7 @@ func (node *Node) AddDepositContractToPendingTransactions() { dataEnc := common.FromHex(contractData) // Unsigned transaction to avoid the case of transaction address. mycontracttx, _ := types.SignTx(types.NewContractCreation(uint64(0), node.Consensus.ShardID, contractFunds, params.TxGasContractCreation*10, nil, dataEnc), types.HomesteadSigner{}, priKey) - node.ContractAddresses = append(node.ContractAddresses, crypto.CreateAddress(crypto.PubkeyToAddress(priKey.PublicKey), uint64(0))) + node.ContractAddresses = append(node.ContractAddresses, crypto.CreateAddress(contractAddress, uint64(0))) node.addPendingTransactions(types.Transactions{mycontracttx}) }