Fixed new merged conflict created by me force pushing commit that rem…

…oves the previous fixed merge conflict

docs/README.md

@@ -125,7 +125,11 @@ final Market solUsdcMarket = new MarketBuilder()
 final OrderBook bids = solUsdcMarket.getBidOrderBook();
 ```
 
+<<<<<<< HEAD
 ##### Send a legacyTransaction with call to the "Memo" program
+=======
+### Send a Transaction with Memo Program
+>>>>>>> main
 
 ```java
 // Create account from private key
@@ -137,7 +141,11 @@ legacyTransaction.addInstruction(
         MemoProgram.writeUtf8(feePayer.getPublicKey(),"Hello from SolanaJ :)")
 );
 
+<<<<<<< HEAD
 String response = client.getApi().sendTransaction(legacyTransaction, feePayer);
+=======
+String response = client.getApi().sendTransaction(transaction, feePayer);
+>>>>>>> main
 ```
 
 ## 🤝 Contributing

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.mmorrell</groupId>
     <artifactId>solanaj</artifactId>
     <packaging>jar</packaging>
-    <version>1.17.6</version>
+    <version>1.19.3-SNAPSHOT</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java client for Solana RPC</description>
     <url>https://github.com/skynetcap/solanaj</url>
@@ -18,7 +18,7 @@
         <connection>scm:git:git://github.com/skynetcap/solanaj.git</connection>
         <developerConnection>scm:git:ssh://github.com/skynetcap/solanaj.git</developerConnection>
         <url>https://github.com/skynetcap/solanaj/tree/main</url>
-    </scm>
+    </scm>  
     <developers>
         <developer>
             <name>Michael Morrell</name>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.1-android</version>
+            <version>33.3.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -80,7 +80,7 @@
         </dependency>
         <dependency>
             <groupId>com.squareup.moshi</groupId>
-                <artifactId>moshi</artifactId>
+            <artifactId>moshi</artifactId>
             <version>1.15.1</version>
         </dependency>
         <dependency>
@@ -112,12 +112,18 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.17.2</version>
+            <version>2.18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.12.4</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -222,8 +228,8 @@
                                     <goal>sign</goal>
                                 </goals>
                                 <configuration>
-                                    <homedir>/Users/chintan_mbp/.gnupg/</homedir>
-                                    <keyname>4B9021119F83557FF09AEBAAA4751749EC8210A3</keyname>
+                                    <homedir>c:/Users/Michael/.gnupg/</homedir>
+                                    <keyname>0x27FAE7D2</keyname>
                                 </configuration>
                             </execution>
                         </executions>

src/main/java/org/p2p/solanaj/core/Message.java

@@ -14,7 +14,6 @@
 
 import org.p2p.solanaj.utils.GuardedArrayUtils;
 
-
 public class Message {
     @Getter
     public static class MessageHeader {

src/main/java/org/p2p/solanaj/core/Transaction.java

@@ -3,7 +3,6 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 

src/main/java/org/p2p/solanaj/ws/SubscriptionWebSocketClient.java

@@ -106,6 +106,7 @@ public static SubscriptionWebSocketClient getExactPathInstance(String endpoint)
     }
 
     /**
+<<<<<<< HEAD
      * Creates a SubscriptionWebSocketClient instance with a modified URI based on the provided endpoint.
      *
      * @param endpoint The endpoint URL
@@ -125,6 +126,8 @@ public static SubscriptionWebSocketClient getInstance(String endpoint) {
     }
 
     /**
+=======
+>>>>>>> main
      * Constructs a SubscriptionWebSocketClient with the given server URI.
      *
      * @param serverURI The URI of the WebSocket server