old style with ECDSA

src/Catalyst.Core.Modules.Ledger.Tests/IntegrationTests/TruffleTest/truffle-config.js

@@ -18,6 +18,7 @@
  *
  */
 
+// const {HDWalletProvider} = require("@catalyst-net-js/truffle-provider");
 const HDWalletProvider = require('truffle-hdwallet-provider');
 // const infuraKey = "fj4jll3k.....";
 //

src/Catalyst.Core.Modules.Web3/Controllers/Handlers/EthSendRawTransactionHandler.cs

@@ -22,16 +22,20 @@
 #endregion
 
 using System;
+using System.IO;
 using Catalyst.Abstractions.Ledger;
 using Catalyst.Core.Lib.Extensions;
-using Catalyst.Protocol.Cryptography;
 using Catalyst.Protocol.Transaction;
+using Catalyst.Protocol.Wire;
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Encoding;
+using Nethermind.Core.Extensions;
+using Nethermind.Core.Specs;
 using Nethermind.Dirichlet.Numerics;
+using Nethermind.Logging;
 
 namespace Catalyst.Core.Modules.Web3.Controllers.Handlers
 {
@@ -40,25 +44,54 @@ public class EthSendRawTransactionHandler : EthWeb3RequestHandler<byte[], Keccak
     {
         protected override Keccak Handle(byte[] transaction, IWeb3EthApi api)
         {
-            Transaction tx = Rlp.Decode<Transaction>(transaction);
+            PublicEntry publicEntry;
+            try
+            {
+                Transaction tx = Rlp.Decode<Transaction>(transaction);
+                EthereumEcdsa ecdsa = new EthereumEcdsa(MainNetSpecProvider.Instance, LimboLogs.Instance);
+                tx.SenderAddress = ecdsa.RecoverAddress(tx, MainNetSpecProvider.IstanbulBlockNumber);
+                tx.Timestamp = (UInt256) DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                publicEntry = new PublicEntry
+                {
+                    Data = (tx.Data ?? tx.Init).ToByteString(),
+                    GasLimit = (ulong) tx.GasLimit,
+                    GasPrice = tx.GasPrice.ToUint256ByteString(),
+                    Nonce = (ulong) tx.Nonce,
+                    SenderAddress = tx.SenderAddress.Bytes.ToByteString(),
+                    ReceiverAddress = tx.To?.Bytes.ToByteString() ?? ByteString.Empty,
+                    Amount = tx.Value.ToUint256ByteString(),
+                    Timestamp = new Timestamp {Seconds = (long) tx.Timestamp},
+                    Signature = new Protocol.Cryptography.Signature
+                    {
+                        RawBytes = ByteString.CopyFrom((byte) 1)
+                    }
+                };
+            }
+            catch
+            {
+                try
+                {
+                    TransactionBroadcast transactionBroadcast = TransactionBroadcast.Parser.ParseFrom(transaction);
+                    publicEntry = transactionBroadcast.PublicEntry;
+                    if (publicEntry.ReceiverAddress.Length == 1)
+                    {
+                        publicEntry.ReceiverAddress = ByteString.Empty;
+                    }
 
-            tx.Timestamp = (UInt256) DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                    if (publicEntry.SenderAddress.Length == 32)
+                    {
+                        byte[] kvmAddressBytes = Keccak.Compute(publicEntry.SenderAddress.ToByteArray()).Bytes.AsSpan(12).ToArray();
+                        string hex = kvmAddressBytes.ToHexString() ?? throw new ArgumentNullException("kvmAddressBytes.ToHexString()");
+                        publicEntry.SenderAddress = kvmAddressBytes.ToByteString();
+                    }
 
-            PublicEntry publicEntry = new PublicEntry
-            {
-                Data = (tx.Data ?? tx.Init).ToByteString(),
-                GasLimit = (ulong) tx.GasLimit,
-                GasPrice = tx.GasPrice.ToUint256ByteString(),
-                Nonce = (ulong) tx.Nonce,
-                SenderAddress = new Address("0xb77aec9f59f9d6f39793289a09aea871932619ed").Bytes.ToByteString(),
-                ReceiverAddress = tx.To?.Bytes.ToByteString() ?? ByteString.Empty,
-                Amount = tx.Value.ToUint256ByteString(),
-                Timestamp = new Timestamp {Seconds = (long) tx.Timestamp},
-                Signature = new Protocol.Cryptography.Signature
+                    publicEntry.Timestamp = Timestamp.FromDateTime(DateTime.UtcNow);
+                }
+                catch (Exception)
                 {
-                    RawBytes = ByteString.CopyFrom((byte) 1)
+                    throw new InvalidDataException($"Transaction data could not be deserialized into a {nameof(PublicEntry)}");
                 }
-            };
+            }
 
             return api.SendTransaction(publicEntry);
         }

src/Catalyst.Node.POA.CE/Program.cs

@@ -173,9 +173,9 @@ public static async Task<int> Main(string[] args)
         private static async Task<int> RunAsync(Options options)
         {
             // uncomment to speed up node launching
-            // options.IpfsPassword = options.IpfsPassword ?? "ipfs";
-            // options.NodePassword = options.NodePassword ?? "node";
-            // options.SslCertPassword = options.SslCertPassword ?? "cert";
+            options.IpfsPassword ??= "ipfs";
+            options.NodePassword ??= "node";
+            options.SslCertPassword ??= "cert";
 
             Kernel.Logger.Information("Catalyst.Node started with process id {0}",
                 Process.GetCurrentProcess().Id.ToString());

src/Catalyst.sln.DotSettings

@@ -136,6 +136,7 @@ Guard.Argument($EXPR$, $NAME$).NotNull()</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Crockford/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datagram/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=deserialised/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ecdsa/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=EIPS/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ethereum/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=EXTCODECOPY/@EntryIndexedValue">True</s:Boolean>