Colin/conf hash

app/app.go

@@ -10,6 +10,7 @@ import (
 
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/ethereum/go-ethereum/common"
 	rlp "github.com/ethereum/go-ethereum/rlp"
 	"github.com/tendermint/go-amino"
 	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
@@ -31,6 +32,8 @@ type ChildChain struct {
 
 	cdc *amino.Codec
 
+	rootchainAddress common.Address
+
 	txIndex uint16
 
 	feeAmount uint64
@@ -74,7 +77,7 @@ func NewChildChain(logger log.Logger, db dbm.DB, traceStore io.Writer) *ChildCha
 	app.SetEndBlocker(app.endBlocker)
 
 	// NOTE: type AnteHandler func(ctx Context, tx Tx) (newCtx Context, result Result, abort bool)
-	app.SetAnteHandler(auth.NewAnteHandler(app.utxoMapper, app.feeUpdater))
+	app.SetAnteHandler(auth.NewAnteHandler(app.utxoMapper, app.getRootchainAddress, app.feeUpdater))
 
 	err := app.LoadLatestVersion(app.capKeyMainStore)
 	if err != nil {
@@ -101,6 +104,7 @@ func (app *ChildChain) initChainer(ctx sdk.Context, req abci.RequestInitChain) a
 		app.utxoMapper.AddUTXO(ctx, utxo)
 	}
 
+	app.rootchainAddress = ethcmn.HexToAddress(genesisState.RootChain)
 	app.validatorAddress = ethcmn.HexToAddress(genesisState.Validator.Address)
 
 	// load the initial stake information
@@ -164,6 +168,13 @@ func (app *ChildChain) feeUpdater(output []utxo.Output) sdk.Error {
 	return nil
 }
 
+// Helper function for getting rootchain address
+// Rootchain Address will be set when genesis state is loaded
+// not upon child chain constructor call
+func (app *ChildChain) getRootchainAddress() common.Address {
+	return app.rootchainAddress
+}
+
 func MakeCodec() *amino.Codec {
 	cdc := amino.NewCodec()
 	cdc.RegisterInterface((*sdk.Msg)(nil), nil)

app/app_test.go

@@ -26,10 +26,14 @@ import (
 
 */
 
+var rootchainAddress = common.BytesToAddress([]byte("rootchain contract address"))
+
 func newChildChain() *ChildChain {
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
 	db := dbm.NewMemDB()
-	return NewChildChain(logger, db, nil)
+	app := NewChildChain(logger, db, nil)
+	app.rootchainAddress = rootchainAddress
+	return app
 }
 
 // Creates a deposit of value 100 for each address in input
@@ -47,6 +51,7 @@ func InitTestChain(cc *ChildChain, valAddr common.Address, addrs ...common.Addre
 	}
 
 	genState := GenesisState{
+		RootChain: rootchainAddress.String(),
 		Validator: genValidator,
 		UTXOs:     genUTXOs,
 	}
@@ -85,8 +90,10 @@ func GenerateSimpleMsg(Owner0, NewOwner0 common.Address, position [4]uint64, amo
 
 // Returns a confirmsig array signed by privKey0 and privKey1
 func CreateConfirmSig(position types.PlasmaPosition, privKey0, privKey1 *ecdsa.PrivateKey, two_inputs bool) (confirmSigs [2]types.Signature) {
-	confirmBytes := position.GetSignBytes()
-	hash := ethcrypto.Keccak256(confirmBytes)
+	rootchainHash := ethcrypto.Keccak256(rootchainAddress.Bytes())
+	posHash := ethcrypto.Keccak256(position.GetSignBytes())
+	confirmHash := append(rootchainHash, posHash...)
+	hash := ethcrypto.Keccak256(confirmHash)
 	confirmSig, _ := ethcrypto.Sign(hash, privKey0)
 
 	var confirmSig1 []byte

app/genesis.go

@@ -22,6 +22,7 @@ import (
 
 // State to Unmarshal
 type GenesisState struct {
+	RootChain string           `json: rootchain_address`
 	Validator GenesisValidator `json: validator`
 	UTXOs     []GenesisUTXO    `json:"UTXOs"`
 }

app/genesis_test.go

@@ -19,7 +19,6 @@ func TestGenesisState(t *testing.T) {
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
 	db := dbm.NewMemDB()
 	app := NewChildChain(logger, db, nil)
-
 	addrs := []common.Address{utils.GenerateAddress(), utils.GenerateAddress()}
 
 	var genUTXOs []GenesisUTXO
@@ -36,6 +35,7 @@ func TestGenesisState(t *testing.T) {
 	}
 
 	genState := GenesisState{
+		RootChain: rootchainAddress.String(),
 		Validator: genValidator,
 		UTXOs:     genUTXOs,
 	}

auth/ante.go

@@ -14,7 +14,7 @@ import (
 
 // NewAnteHandler returns an AnteHandler that checks signatures,
 // confirm signatures, and increments the feeAmount
-func NewAnteHandler(utxoMapper utxo.Mapper, feeUpdater utxo.FeeUpdater) sdk.AnteHandler {
+func NewAnteHandler(utxoMapper utxo.Mapper, rootchainAddress types.GetAddress, feeUpdater utxo.FeeUpdater) sdk.AnteHandler {
 	return func(
 		ctx sdk.Context, tx sdk.Tx,
 	) (_ sdk.Context, _ sdk.Result, abort bool) {
@@ -64,10 +64,9 @@ func NewAnteHandler(utxoMapper utxo.Mapper, feeUpdater utxo.FeeUpdater) sdk.Ante
 		if !res.IsOK() {
 			return ctx, res, true
 		}
-		posSignBytes := position0.GetSignBytes()
 
 		// Verify that confirmation signature
-		res = processConfirmSig(ctx, utxoMapper, position0, addr0, spendMsg.ConfirmSigs0, posSignBytes)
+		res = processConfirmSig(ctx, utxoMapper, position0, addr0, rootchainAddress(), spendMsg.ConfirmSigs0)
 		if !res.IsOK() {
 			return ctx, res, true
 		}
@@ -88,9 +87,7 @@ func NewAnteHandler(utxoMapper utxo.Mapper, feeUpdater utxo.FeeUpdater) sdk.Ante
 				return ctx, res, true
 			}
 
-			posSignBytes = position1.GetSignBytes()
-
-			res = processConfirmSig(ctx, utxoMapper, position1, addr1, spendMsg.ConfirmSigs1, posSignBytes)
+			res = processConfirmSig(ctx, utxoMapper, position1, addr1, rootchainAddress(), spendMsg.ConfirmSigs1)
 			if !res.IsOK() {
 				return ctx, res, true
 			}
@@ -122,7 +119,7 @@ func processSig(
 
 func processConfirmSig(
 	ctx sdk.Context, utxoMapper utxo.Mapper,
-	position types.PlasmaPosition, addr common.Address, sigs [2]types.Signature, signBytes []byte) (
+	position types.PlasmaPosition, addr, rootchainAddress common.Address, sigs [2]types.Signature) (
 	res sdk.Result) {
 
 	// Verify utxo exists
@@ -136,7 +133,10 @@ func processConfirmSig(
 	}
 	inputAddresses := plasmaUTXO.GetInputAddresses()
 
-	hash := ethcrypto.Keccak256(signBytes)
+	rootchainHash := ethcrypto.Keccak256(rootchainAddress.Bytes())
+
+	posHash := ethcrypto.Keccak256(position.GetSignBytes())
+	hash := ethcrypto.Keccak256(append(rootchainHash, posHash...))
 
 	pubKey0, err0 := ethcrypto.SigToPub(hash, sigs[0].Bytes())
 	if err0 != nil || !reflect.DeepEqual(ethcrypto.PubkeyToAddress(*pubKey0).Bytes(), inputAddresses[0].Bytes()) {

auth/ante_test.go

@@ -16,6 +16,12 @@ import (
 	"testing"
 )
 
+var rootchainAddress = common.BytesToAddress([]byte("rootchain contract address"))
+
+func GetRootchainAddress() common.Address {
+	return rootchainAddress
+}
+
 func setup() (sdk.Context, utxo.Mapper, utxo.FeeUpdater) {
 	ms, capKey := utxo.SetupMultiStore()
 
@@ -61,8 +67,10 @@ func GenSpendMsg() types.SpendMsg {
 
 // Returns a confirmsig array signed by privKey0 and privKey1
 func CreateConfirmSig(position types.PlasmaPosition, privKey0, privKey1 *ecdsa.PrivateKey, two_inputs bool) (confirmSigs [2]types.Signature) {
-	confirmBytes := position.GetSignBytes()
-	hash := ethcrypto.Keccak256(confirmBytes)
+	rootchainHash := ethcrypto.Keccak256(rootchainAddress.Bytes())
+	posHash := ethcrypto.Keccak256(position.GetSignBytes())
+	confHash := append(rootchainHash, posHash...)
+	hash := ethcrypto.Keccak256(confHash)
 	confirmSig, _ := ethcrypto.Sign(hash, privKey0)
 
 	var confirmSig1 []byte
@@ -106,7 +114,7 @@ func TestNoSigs(t *testing.T) {
 	var msg = GenSpendMsg()
 	tx := types.NewBaseTx(msg, []types.Signature{})
 
-	handler := NewAnteHandler(mapper, feeUpdater)
+	handler := NewAnteHandler(mapper, GetRootchainAddress, feeUpdater)
 	_, res, abort := handler(ctx, tx)
 
 	assert.Equal(t, true, abort, "did not abort with no signatures")
@@ -123,7 +131,7 @@ func TestNotEnoughSigs(t *testing.T) {
 	sig, _ := ethcrypto.Sign(hash, priv)
 	tx := types.NewBaseTx(msg, []types.Signature{types.Signature{sig}})
 
-	handler := NewAnteHandler(mapper, feeUpdater)
+	handler := NewAnteHandler(mapper, GetRootchainAddress, feeUpdater)
 	_, res, abort := handler(ctx, tx)
 
 	assert.Equal(t, true, abort, "did not abort with incorrect number of signatures")
@@ -224,7 +232,7 @@ func TestDifferentCases(t *testing.T) {
 		owner_index1 := utils.GetIndex(tc.input1.owner_index)
 		tx := GetTx(msg, keys[tc.input0.owner_index], keys[owner_index1], tc.input1.owner_index != -1)
 
-		handler := NewAnteHandler(mapper, feeUpdater)
+		handler := NewAnteHandler(mapper, GetRootchainAddress, feeUpdater)
 		_, res, abort := handler(ctx, tx)
 
 		assert.Equal(t, true, abort, fmt.Sprintf("did not abort on utxo that does not exist. Case: %d", index))

client/plasmacli/cmd/confirmSig.go

@@ -13,12 +13,14 @@ import (
 )
 
 const (
-	flagAddr = "addr"
+	flagAddr          = "addr"
+	flagRootchainAddr = "rootchainAddr"
 )
 
 func init() {
 	rootCmd.AddCommand(signCmd)
 	signCmd.Flags().String(flagAddr, "", "Address to sign with")
+	signCmd.Flags().String(flagRootchainAddr, "", "Contract Address of rootchain")
 	viper.BindPFlags(signCmd.Flags())
 }
 
@@ -60,16 +62,24 @@ var signCmd = &cobra.Command{
 			return err
 		}
 
+		// get the rootchain address
+		rootAddrStr := viper.GetString(flagRootchainAddr)
+		rootAddr, err := client.StrToAddress(rootAddrStr)
+		if err != nil {
+			return err
+		}
+
 		// sign positions
-		signBytes1 := pos[0].GetSignBytes()
-		hash1 := ethcrypto.Keccak256(signBytes1)
-		sig1, err := ks.SignHashWithPassphrase(acct, passphrase, hash1)
+		rootHash := ethcrypto.Keccak256(rootAddr.Bytes())
+		posHash := ethcrypto.Keccak256(pos[0].GetSignBytes())
+		confirmHash := ethcrypto.Keccak256(append(rootHash, posHash...))
+		sig1, err := ks.SignHashWithPassphrase(acct, passphrase, confirmHash)
 
 		var sig2 []byte
 		if len(pos) > 1 {
-			signBytes2 := pos[1].GetSignBytes()
-			hash2 := ethcrypto.Keccak256(signBytes2)
-			sig2, err = ks.SignHashWithPassphrase(acct, passphrase, hash2)
+			posHash = ethcrypto.Keccak256(pos[1].GetSignBytes())
+			confirmHash = ethcrypto.Keccak256(append(rootHash, posHash...))
+			sig2, err = ks.SignHashWithPassphrase(acct, passphrase, confirmHash)
 			if err != nil {
 				return err
 			}

types/utxo.go

@@ -19,6 +19,8 @@ const (
 
 var _ utxo.UTXO = &BaseUTXO{}
 
+type GetAddress func() common.Address
+
 // Implements UTXO interface
 type BaseUTXO struct {
 	InputAddresses [2]common.Address