fix: attest turnstone messages (#1259)

# Background

Adapt turnstone message attestation test code to the new compass ABI.

# Testing completed

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

# Breaking changes

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

---------

Co-authored-by: Christian Lohr <[email protected]>

Author: maharifu

x/evm/keeper/attest.go

@@ -156,8 +156,8 @@ func attestTransactionIntegrity(
 	msg consensustypes.QueuedSignedMessageI,
 	k *Keeper,
 	proof *types.TxExecutedProof,
-	chainReferenceID string,
-	verifyTx func(context.Context, *ethtypes.Transaction, consensustypes.QueuedSignedMessageI, *types.Valset, *types.SmartContract) error,
+	chainReferenceID, relayer string,
+	verifyTx func(context.Context, *ethtypes.Transaction, consensustypes.QueuedSignedMessageI, *types.Valset, *types.SmartContract, string) error,
 ) (*ethtypes.Transaction, error) {
 	// check if correct thing was called
 	tx, err := proof.GetTX()
@@ -199,7 +199,7 @@ func attestTransactionIntegrity(
 		}
 	}
 
-	err = verifyTx(ctx, tx, msg, &valset, compass)
+	err = verifyTx(ctx, tx, msg, &valset, compass, relayer)
 	if err != nil {
 		// passed in transaction doesn't seem to be created from this smart contract
 		return nil, fmt.Errorf("tx failed to verify: %w", err)

x/evm/keeper/attest_submit_logic_call.go

@@ -42,7 +42,7 @@ func (a *submitLogicCallAttester) Execute(ctx sdk.Context) error {
 
 func (a *submitLogicCallAttester) attest(ctx sdk.Context, evidence *types.TxExecutedProof) (err error) {
 	_, err = attestTransactionIntegrity(ctx, a.originalMessage, a.k, evidence,
-		a.chainReferenceID, a.action.VerifyAgainstTX)
+		a.chainReferenceID, a.msg.AssigneeRemoteAddress, a.action.VerifyAgainstTX)
 	if err != nil {
 		a.logger.WithError(err).Error("Failed to verify transaction integrity.")
 		return err

x/evm/keeper/attest_test.go

@@ -29,11 +29,14 @@ var (
 	contractAbi         = string(whoops.Must(os.ReadFile("testdata/sample-abi.json")))
 	contractBytecodeStr = string(whoops.Must(os.ReadFile("testdata/sample-bytecode.out")))
 
-	sampleTx1RawBytes = common.FromHex(string(whoops.Must(os.ReadFile("testdata/sample-tx-raw.hex"))))
-
-	sampleTx1 = func() *ethcoretypes.Transaction {
+	// Keeping the upload_smart_contract test on the old ABI until compass becomes more stable as
+	// updates to this test harness are tedious.
+	uscAbi         = string(whoops.Must(os.ReadFile("testdata/usc-abi.json")))
+	uscBytecodeStr = string(whoops.Must(os.ReadFile("testdata/usc-bytecode.out")))
+	uscTx1RawBytes = common.FromHex(string(whoops.Must(os.ReadFile("testdata/usc-tx-raw.hex"))))
+	uscTx1         = func() *ethcoretypes.Transaction {
 		tx := new(ethcoretypes.Transaction)
-		whoops.Assert(tx.UnmarshalBinary(sampleTx1RawBytes))
+		whoops.Assert(tx.UnmarshalBinary(uscTx1RawBytes))
 		return tx
 	}()
 
@@ -163,7 +166,9 @@ var _ = g.Describe("attest router", func() {
 	})
 
 	g.BeforeEach(func() {
-		consensusMsg = &types.Message{}
+		consensusMsg = &types.Message{
+			AssigneeRemoteAddress: "0x28E9e9bfedEd29747FCc33ccA25b4B75f05E434B",
+		}
 	})
 
 	g.JustBeforeEach(func() {
@@ -183,6 +188,7 @@ var _ = g.Describe("attest router", func() {
 			PublicAccessData: &consensustypes.PublicAccessData{
 				ValsetID: 1,
 			},
+			GasEstimate: 1000,
 		}
 	})
 
@@ -372,6 +378,11 @@ var _ = g.Describe("attest router", func() {
 								HexContractAddress: "0x51eca2efb15afacc612278c71f5edb35986f172f",
 								Abi:                []byte(contractAbi),
 								Payload:            common.FromHex(slcPayload),
+								Fees: &types.SubmitLogicCall_Fees{
+									RelayerFee:   1,
+									CommunityFee: 2,
+									SecurityFee:  3,
+								},
 							},
 						}
 					})
@@ -542,7 +553,7 @@ var _ = g.Describe("attest router", func() {
 
 				g.When("message is UploadSmartContract", func() {
 					g.BeforeEach(func() {
-						execTx = sampleTx1
+						execTx = uscTx1
 						proof := whoops.Must(codectypes.NewAnyWithValue(&types.TxExecutedProof{SerializedTX: whoops.Must(execTx.MarshalBinary())}))
 						evidence = []*consensustypes.Evidence{
 							{
@@ -561,8 +572,8 @@ var _ = g.Describe("attest router", func() {
 						consensusMsg.Action = &types.Message_UploadSmartContract{
 							UploadSmartContract: &types.UploadSmartContract{
 								Id:       1,
-								Abi:      contractAbi,
-								Bytecode: common.FromHex(contractBytecodeStr),
+								Abi:      uscAbi,
+								Bytecode: common.FromHex(uscBytecodeStr),
 							},
 						}
 						address, err := sdk.ValAddressFromBech32("cosmosvaloper1pzf9apnk8yw7pjw3v9vtmxvn6guhkslanh8r07")

x/evm/keeper/attest_update_valset.go

@@ -52,7 +52,7 @@ func (a *updateValsetAttester) Execute(ctx sdk.Context) error {
 
 func (a *updateValsetAttester) attest(ctx sdk.Context, evidence *types.TxExecutedProof) error {
 	_, err := attestTransactionIntegrity(ctx, a.originalMessage, a.k, evidence,
-		a.chainReferenceID, a.action.VerifyAgainstTX)
+		a.chainReferenceID, a.msg.AssigneeRemoteAddress, a.action.VerifyAgainstTX)
 	if err != nil {
 		a.logger.WithError(err).Error("Failed to verify transaction integrity.")
 		return err

x/evm/keeper/attest_upload_smart_contract.go

@@ -65,7 +65,7 @@ func (a *uploadSmartContractAttester) Execute(ctx sdk.Context) error {
 
 func (a *uploadSmartContractAttester) attest(ctx sdk.Context, evidence *types.TxExecutedProof) error {
 	tx, err := attestTransactionIntegrity(ctx, a.originalMessage, a.k, evidence,
-		a.chainReferenceID, a.action.VerifyAgainstTX)
+		a.chainReferenceID, a.msg.AssigneeRemoteAddress, a.action.VerifyAgainstTX)
 	if err != nil {
 		a.logger.WithError(err).Error("Failed to verify transaction integrity.")
 		return err