From f94cdcc4ae169113cab287f16707694a5f645108 Mon Sep 17 00:00:00 2001
From: Paul Lange <palango@gmx.de>
Date: Thu, 15 Feb 2024 12:23:33 +0100
Subject: [PATCH] Send Ethereum style transactions

---
 airgap/api.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/airgap/api.go b/airgap/api.go
index 4dbbd259..6803ac2f 100644
--- a/airgap/api.go
+++ b/airgap/api.go
@@ -130,14 +130,11 @@ type TxMetadata struct {
 
 func (tm *TxMetadata) AsCallMessage() ethereum.CallMsg {
 	return ethereum.CallMsg{
-		From:                tm.From,
-		GatewayFee:          tm.GatewayFee,
-		GatewayFeeRecipient: tm.GatewayFeeRecipient,
-		GasPrice:            tm.GasPrice,
-		To:                  &tm.To,
-		Data:                tm.Data,
-		Value:               tm.Value,
-		FeeCurrency:         tm.FeeCurrency,
+		From:     tm.From,
+		GasPrice: tm.GasPrice,
+		To:       &tm.To,
+		Data:     tm.Data,
+		Value:    tm.Value,
 	}
 }
 
@@ -151,15 +148,12 @@ func (tx *Transaction) Signed() bool {
 }
 
 func (tx *Transaction) AsGethTransaction() (*types.Transaction, error) {
-	gethTx := types.NewCeloTransaction(
+	gethTx := types.NewTransaction(
 		tx.Nonce,
 		tx.To,
 		tx.Value,
 		tx.Gas,
 		tx.GasPrice,
-		tx.FeeCurrency,
-		tx.GatewayFeeRecipient,
-		tx.GatewayFee,
 		tx.Data,
 	)
 	if tx.Signed() {