Skip to content

Commit

Permalink
Merge pull request ethereum#14 from binance-chain/crossContract
Browse files Browse the repository at this point in the history
[R4R]add cross chain contract to system contract
  • Loading branch information
HaoyangLiu committed Jun 30, 2020
2 parents 511bbf5 + ef1e874 commit 6f40b0e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion consensus/parlia/parlia.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const (
RelayerIncentivizeContract = "0x0000000000000000000000000000000000001005"
RelayerHubContract = "0x0000000000000000000000000000000000001006"
GovHubContract = "0x0000000000000000000000000000000000001007"
CrossChainContract = "0x0000000000000000000000000000000000002000"
)

var (
Expand All @@ -80,6 +81,7 @@ var (
common.HexToAddress(GovHubContract): true,
common.HexToAddress(TokenHubContract): true,
common.HexToAddress(RelayerIncentivizeContract): true,
common.HexToAddress(CrossChainContract): true,
}
)

Expand Down Expand Up @@ -984,7 +986,7 @@ func (p *Parlia) initContract(state *state.StateDB, header *types.Header, chain
// method
method := "init"
// contracts
contracts := []string{ValidatorContract, SlashContract, LightClientContract, RelayerHubContract, GovHubContract, TokenHubContract, RelayerIncentivizeContract}
contracts := []string{ValidatorContract, SlashContract, LightClientContract, RelayerHubContract, TokenHubContract, RelayerIncentivizeContract, CrossChainContract}
// get packed data
data, err := p.validatorSetABI.Pack(method)
if err != nil {
Expand Down Expand Up @@ -1189,3 +1191,4 @@ func applyMessage(
}
return msg.Gas() - returnGas, err
}

0 comments on commit 6f40b0e

Please sign in to comment.