solace 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18749af83cf5133c767914f6321a473a710caa5b5c3c613529af9547d6fcd079
-  data.tar.gz: df4de15d443d6033ea92998f7af6450a0bbeae62b5eb389d86fa6ff839ee6f16
+  metadata.gz: 669a517f72b280a594613b55fcd3e86c6e0f7ef9ba3d6633b0edfbd5dc5b0a0c
+  data.tar.gz: a542d3ce4edaeb81d3c6e8aee35fadfb9df4a4cd5a618f9f643ac46544f4cc65
 SHA512:
-  metadata.gz: 8e0aad6a855c4721363f353deeb46ecb68429995db8366f1f475ac98b25fe4caa2616b26f584316e0511e3f8ffb8e0fe7a22d97fea92e1904c6e70834d750477
-  data.tar.gz: 47b02239af795269f2e287fe598961b265283a303ac4c37fff0f4f29b6758a60511794dd85a85809edd390580b0aee9590c49a3420c1e0b2610bed4903d05017
+  metadata.gz: c43a013d3007b0853a5501c96dc7b2e737b0aefa5d35844008127ddcdfd59c0770e4ceaf9db99086aa69c294ae20563b022b3d6e370be84701c9fe8a453ce25d
+  data.tar.gz: 42eab84e19bf00741e1c29a50facb39966f3020a005c2baa3ee63d545d6a43bcc267cb86d17ba09cb05be6d64875504c9a557275f9c365f6ce5764ce95501baf

data/CHANGELOG

@@ -16,6 +16,28 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 ```
 
+## [0.0.10] - yyyy-mm-dd
+  
+### Added
+1. 
+
+### Changed
+2. Updated `build_instructions` method on `TransactionComposer` to flatten the array, allowing composers to return multiple instructions when relevant (i.e. creating an account and then writing to it).
+3. Changed get_latest_blockhash to use the expected comittment level by the connection or passed options and return array (blockhash and lastValidBlockheight)
+4. Changed default commitment level to `processed` in `Solace::Connection`.
+
+### Fixed
+
+## [0.0.9] - 2025-08-12
+  
+### Added
+1. Added `get_program_accounts` to `Solace::Connection`.
+
+### Changed
+ 
+### Fixed
+1. Removed use of the `try` method for supporting non-rails environments.
+
 ## [0.0.8] - 2025-08-11
   
 ### Added
@@ -27,7 +49,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Changed
 1. All methods that take a `Solace::Keypair` or `Solace::Pubkey` where an address is needed now also accept a plain string address. This prevents the need of creating instances of the classes when all that is needed is the address. This is with the exception of the low-level instruction builders, which only expect the correct data and indicies with no required casting.
-2. Changed `wait_for_confirmed_signature` method to accept a `timeout`, `interval`, and `commitment` keyword arguments (breaking change on commitment).
+2. Changed `wait_for_confirmed_signature` method to accept a `timeout`, `interval`, and `commitment` arguments.
  
 ### Fixed
 1. Fixed `get_or_create_address` method in `Solace::Programs::AssociatedTokenAccount` to return the address of the associated token account if it already exists by checking if there is any data at the address.

data/README.md

@@ -61,7 +61,7 @@ message = Solace::Message.new(
         system_program_id
     ],
     instructions: [transfer_instruction],
-    recent_blockhash: connection.get_latest_blockhash,
+    recent_blockhash: connection.get_latest_blockhash[0],
 )
 
 # Create and sign transaction

data/lib/solace/connection.rb

@@ -51,7 +51,7 @@ module Solace
     # @param [Integer] http_read_timeout The timeout for reading an HTTP response
     def initialize(
       rpc_url = 'http://localhost:8899',
-      commitment: 'confirmed',
+      commitment: 'processed',
       http_open_timeout: 30,
       http_read_timeout: 60
     )
@@ -69,23 +69,6 @@ module Solace
       }
     end
 
-    # Sends a JSON-RPC request to the configured Solana RPC server.
-    #
-    # @param method [String] the JSON-RPC method name
-    # @param params [Array] the parameters for the RPC method
-    # @return [Hash] the parsed JSON response
-    # @raise [
-    #   Solace::Errors::HTTPError,
-    #   Solace::Errors::ParseError,
-    #   Solace::Errors::RPCError,
-    #   Solace::Errors::ConfirmationTimeout
-    # ]
-    def rpc_request(method, params = [])
-      request = build_rpc_request(method, params)
-      response = perform_http_request(request)
-      handle_rpc_response(response)
-    end
-
     # Request an airdrop of lamports to a given address
     #
     # @param pubkey [String] The public key of the account to receive the airdrop
@@ -103,11 +86,23 @@ module Solace
       )
     end
 
+    # Build options for get_latest_blockhash
+    #
+    # @return [Hash{Symbol => Object}]
+    def build_get_latest_blockhash_options
+      {
+        commitment: default_options[:commitment]
+      }
+    end
+
     # Get the latest blockhash from the Solana node
     #
-    # @return [String] The latest blockhash
+    # @return [Array<String, Integer>] The latest blockhash and lastValidBlockHeight
     def get_latest_blockhash
-      @rpc_client.rpc_request('getLatestBlockhash').dig('result', 'value', 'blockhash')
+      @rpc_client
+        .rpc_request('getLatestBlockhash', [build_get_latest_blockhash_options])
+        .dig('result', 'value')
+        .values_at('blockhash', 'lastValidBlockHeight')
     end
 
     # Get the minimum required lamports for rent exemption
@@ -160,6 +155,16 @@ module Solace
                               [signatures, default_options.merge({ 'searchTransactionHistory' => true })])['result']
     end
 
+    # Get the program accounts
+    #
+    # @param program_id [String] The program ID
+    # @param filters [Array] The filters
+    # @return [Array] The program accounts
+    # @param [Hash{Symbol => Object}] options
+    def get_program_accounts(program_id, filters)
+      @rpc_client.rpc_request('getProgramAccounts', [program_id, default_options.merge(filters: filters)])['result']
+    end
+
     # Get the signature status
     #
     # @param signature [String] The signature of the transaction
@@ -168,13 +173,26 @@ module Solace
       get_signature_statuses([signature])
     end
 
+    # Builds send_tranaction options
+    #
+    # @params [Hash] The overrides for the options
+    # @return [Hash] The options for the send_transaction call
+    def build_send_transaction_options(overrides)
+      {
+        skipPreflight: false,
+        encoding: default_options[:encoding],
+        commitment: default_options[:commitment],
+        preflightCommitment: default_options[:commitment]
+      }.merge(overrides)
+    end
+
     # Send a transaction to the Solana node
     #
     # @param transaction [Solace::Transaction] The transaction to send
+    # @param [Hash{Symbol => Object}] overrides
     # @return [String] The signature of the transaction
-    # @param [Hash{Symbol => Object}] options
-    def send_transaction(transaction, options = {})
-      @rpc_client.rpc_request('sendTransaction', [transaction, default_options.merge(options)])
+    def send_transaction(transaction, overrides = {})
+      @rpc_client.rpc_request('sendTransaction', [transaction, build_send_transaction_options(overrides)])
     end
 
     # Wait until the yielded signature reaches the desired commitment or timeout.

data/lib/solace/programs/associated_token_account.rb

@@ -1,5 +1,14 @@
 # frozen_string_literal: true
 
+# The AssociatedTokenAccount program is a Solana program that provides a standardized way to create and manage token accounts.
+#
+# This class provides a Ruby interface to the Associated Token Account program, allowing you to easily
+# find or create associated token accounts for a given wallet and mint.
+#
+# @see https://spl.solana.com/associated-token-account Solana Associated Token Account Program
+#
+# @author Sebastian Scholl
+# @since 0.1.0
 module Solace
   module Programs
     # Client for interacting with the Associated Token Account Program.
@@ -106,20 +115,18 @@ module Solace
       )
         ata_address, = get_address(owner: owner, mint: mint)
 
-        TransactionComposer.new(connection: connection).try do |tx_composer|
-          tx_composer.set_fee_payer(payer)
-
-          tx_composer.add_instruction(
-            Solace::Composers::AssociatedTokenAccountProgramCreateAccountComposer.new(
-              mint: mint,
-              owner: owner,
-              funder: payer,
-              ata_address: ata_address
-            )
-          )
-
-          tx_composer.compose_transaction
-        end
+        ix = Solace::Composers::AssociatedTokenAccountProgramCreateAccountComposer.new(
+          mint: mint,
+          owner: owner,
+          funder: payer,
+          ata_address: ata_address
+        )
+
+        TransactionComposer
+          .new(connection: connection)
+          .set_fee_payer(payer)
+          .add_instruction(ix)
+          .compose_transaction
       end
     end
   end

data/lib/solace/programs/spl_token.rb

@@ -95,7 +95,7 @@ module Solace
         message = Message.new(
           header: [2, 0, 3],
           accounts: accounts,
-          recent_blockhash: @connection.get_latest_blockhash,
+          recent_blockhash: @connection.get_latest_blockhash[0],
           instructions: [create_account_ix, initialize_mint_ix]
         )
 
@@ -153,7 +153,7 @@ module Solace
           header: [2, 0, 1],
           accounts: accounts,
           instructions: [ix],
-          recent_blockhash: connection.get_latest_blockhash
+          recent_blockhash: connection.get_latest_blockhash[0]
         )
 
         tx = Solace::Transaction.new(message: message)
@@ -210,7 +210,7 @@ module Solace
           header: [2, 0, 1],
           accounts: accounts,
           instructions: [ix],
-          recent_blockhash: connection.get_latest_blockhash
+          recent_blockhash: connection.get_latest_blockhash[0]
         )
 
         tx = Solace::Transaction.new(message: message)

data/lib/solace/transaction_composer.rb

@@ -90,7 +90,7 @@ module Solace
         header: context.header,
         accounts: context.accounts,
         instructions: build_instructions,
-        recent_blockhash: connection.get_latest_blockhash
+        recent_blockhash: connection.get_latest_blockhash[0]
       )
 
       Solace::Transaction.new(message: message)
@@ -102,7 +102,7 @@ module Solace
     #
     # @return [Array<Solace::Instruction>] The built instructions
     def build_instructions
-      instruction_composers.map { _1.build_instruction(context) }
+      instruction_composers.map { _1.build_instruction(context) }.flatten
     end
 
     # Merge all accounts from another AccountContext into this one

data/lib/solace/utils/account_context.rb

@@ -105,7 +105,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is a fee payer
       def fee_payer?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| acc[:fee_payer] }
+        @pubkey_account_map.dig(pubkey, :fee_payer)
       end
 
       # Predicate to check if an account is a signer
@@ -113,7 +113,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is a signer
       def signer?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| acc[:signer] }
+        @pubkey_account_map.dig(pubkey, :signer)
       end
 
       # Predicate to check if an account is writable
@@ -121,7 +121,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is writable
       def writable?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| acc[:writable] }
+        @pubkey_account_map.dig(pubkey, :writable)
       end
 
       # Predicate to check if an account is a writable signer
@@ -129,7 +129,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is a writable signer
       def writable_signer?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| acc[:signer] && acc[:writable] }
+        (acc = @pubkey_account_map[pubkey]) && acc[:signer] && acc[:writable]
       end
 
       # Predicate to check if an account is writable and not a signer
@@ -137,7 +137,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is writable and not a signer
       def writable_nonsigner?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| !acc[:signer] && acc[:writable] }
+        (acc = @pubkey_account_map[pubkey]) && !acc[:signer] && acc[:writable]
       end
 
       # Predicate to check if an account is a readonly signer
@@ -145,7 +145,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is a readonly signer
       def readonly_signer?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| acc[:signer] && !acc[:writable] }
+        (acc = @pubkey_account_map[pubkey]) && acc[:signer] && !acc[:writable]
       end
 
       # Predicate to check if an account is readonly and not a signer
@@ -153,7 +153,7 @@ module Solace
       # @param pubkey [String] The pubkey of the account
       # @return [Boolean] Whether the account is readonly and not a signer
       def readonly_nonsigner?(pubkey)
-        @pubkey_account_map[pubkey].try { |acc| !acc[:signer] && !acc[:writable] }
+        (acc = @pubkey_account_map[pubkey]) && !acc[:signer] && !acc[:writable]
       end
 
       # Merge all accounts from another AccountContext into this one

data/lib/solace/version.rb

@@ -2,5 +2,5 @@
 
 # Solace::VERSION is the version of the Solace gem
 module Solace
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solace
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Sebastian Scholl