chore: gas estimates in sign bytes (#1257)

# Background

Include gas estimate and fee structure in turnstone messages hash.

# Testing completed

- [ ] test coverage exists or has been added/updated
- [ ] tested in a private testnet

# Breaking changes

- [ ] I have checked my code for breaking changes
- [ ] If there are breaking changes, there is a supporting migration.

Author: maharifu

proto/palomachain/paloma/evm/turnstone.proto

@@ -72,6 +72,8 @@ message Message {
     (amino.dont_omitempty) = true,
     (gogoproto.nullable) = false
   ];
+
+  string assigneeRemoteAddress = 10;
 }
 
 message TxExecutedProof { bytes serializedTX = 1; }

x/consensus/keeper/cleanup.go

@@ -86,15 +86,15 @@ func (k Keeper) ReassignOrphanedMessages(ctx sdk.Context, blockAge int64) (err e
 					return fmt.Errorf("failed to parse to evm message: %w", err)
 				}
 				req := deriveMessageRequirements(evmmsg, k.cdc)
-				newVal, err := k.evmKeeper.PickValidatorForMessage(ctx, evmmsg.ChainReferenceID, req)
+				newVal, newRemoteAddr, err := k.evmKeeper.PickValidatorForMessage(ctx, evmmsg.ChainReferenceID, req)
 				if err != nil {
 					logger.WithError(err).Error("failed to pick new validator for message.")
 					return fmt.Errorf("failed to pick validator for message: %w", err)
 				}
 
 				logger = logger.WithFields("current-validator", currentVal, "new-validator", newVal)
 				logger.Debug("Attepting to reassign message...")
-				if err := k.reassignMessageValidator(ctx, newVal, msg.GetId(), opt.QueueTypeName); err != nil {
+				if err := k.reassignMessageValidator(ctx, newVal, newRemoteAddr, msg.GetId(), opt.QueueTypeName); err != nil {
 					logger.WithError(err).Error("failed to reassign new validator to message.")
 					return err
 				}

x/consensus/keeper/concensus_keeper.go

@@ -641,7 +641,7 @@ func (k Keeper) SetMessageErrorData(
 
 func (k Keeper) reassignMessageValidator(
 	ctx sdk.Context,
-	valAddr string,
+	valAddr, remoteAddr string,
 	msgID uint64,
 	queueTypeName string,
 ) error {
@@ -659,7 +659,7 @@ func (k Keeper) reassignMessageValidator(
 		"new-assignee", valAddr,
 	)
 
-	return cq.ReassignValidator(ctx, msgID, valAddr)
+	return cq.ReassignValidator(ctx, msgID, valAddr, remoteAddr)
 }
 
 func nonceFromID(id uint64) []byte {

x/consensus/keeper/consensus/batch.go

@@ -169,8 +169,8 @@ func (c BatchQueue) AddEvidence(ctx context.Context, id uint64, evidence *types.
 	return c.base.AddEvidence(sdkCtx, id, evidence)
 }
 
-func (c BatchQueue) ReassignValidator(ctx sdk.Context, id uint64, val string) error {
-	return c.base.ReassignValidator(ctx, id, val)
+func (c BatchQueue) ReassignValidator(ctx sdk.Context, id uint64, val, remoteAddr string) error {
+	return c.base.ReassignValidator(ctx, id, val, remoteAddr)
 }
 
 func (c BatchQueue) SetPublicAccessData(ctx context.Context, id uint64, data *types.PublicAccessData) error {

x/consensus/keeper/consensus/consensus.go

@@ -226,10 +226,10 @@ func (c Queue) AddEvidence(ctx context.Context, msgID uint64, evidence *types.Ev
 
 type assignableMessage interface {
 	proto.Message
-	SetAssignee(ctx sdk.Context, val string)
+	SetAssignee(ctx sdk.Context, val, remoteAddr string)
 }
 
-func (c Queue) ReassignValidator(ctx sdk.Context, msgID uint64, val string) error {
+func (c Queue) ReassignValidator(ctx sdk.Context, msgID uint64, val, remoteAddr string) error {
 	imsg, err := c.GetMsgByID(ctx, msgID)
 	if err != nil {
 		return err
@@ -243,7 +243,7 @@ func (c Queue) ReassignValidator(ctx sdk.Context, msgID uint64, val string) erro
 	if !ok {
 		return fmt.Errorf("message does not support setting assignee")
 	}
-	assignable.SetAssignee(ctx, val)
+	assignable.SetAssignee(ctx, val, remoteAddr)
 	var a proto.Message
 	a = assignable
 	msg := imsg.(*types.QueuedSignedMessage)

x/consensus/keeper/consensus/mocks/Queuer.go

@@ -37,7 +37,7 @@ type Queuer interface {
 	GetAll(context.Context) ([]types.QueuedSignedMessageI, error)
 	GetMsgByID(ctx context.Context, id uint64) (types.QueuedSignedMessageI, error)
 	ChainInfo() (types.ChainType, string)
-	ReassignValidator(ctx sdk.Context, id uint64, val string) error
+	ReassignValidator(ctx sdk.Context, id uint64, val, remoteAddr string) error
 }
 
 type QueueBatcher interface {

x/consensus/keeper/consensus/types.go

@@ -90,10 +90,10 @@ func (q *QueuedSignedMessage) GetBytesToSign(unpacker AnyUnpacker) ([]byte, erro
 	}
 
 	k := msg.(interface {
-		Keccak256(uint64) []byte
+		Keccak256WithSignedMessage(*QueuedSignedMessage) ([]byte, error)
 	})
 
-	return k.Keccak256(q.GetId()), nil
+	return k.Keccak256WithSignedMessage(q)
 }
 
 func (q *QueuedSignedMessage) String() string {
@@ -179,8 +179,8 @@ func (b *Batch) GetSignBytes() []byte {
 }
 
 // TODO should compute hash from msgs hashes
-func (b *Batch) Keccak256(_ uint64) []byte {
-	return nil
+func (b *Batch) Keccak256WithSignedMessage(_ *QueuedSignedMessage) ([]byte, error) {
+	return nil, nil
 }
 
 func Queue(queueTypeName string, typ xchain.Type, refID xchain.ReferenceID) string {

x/consensus/types/consensus.go

@@ -31,5 +31,5 @@ type ValsetKeeper interface {
 
 //go:generate mockery --name=EvmKeeper
 type EvmKeeper interface {
-	PickValidatorForMessage(ctx context.Context, chainReferenceID string, requirements *xchain.JobRequirements) (string, error)
+	PickValidatorForMessage(ctx context.Context, chainReferenceID string, requirements *xchain.JobRequirements) (string, string, error)
 }