solana-ruby-web3js 1.0.1.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4347561fb0649ad1967e7900b9b0d918324d0b54d41c151073e179ffc062efbc
+  data.tar.gz: 777a7663b8c1c8f986748bcd2ef2e4b18a57244d4b14c3734ea5385f35d640b4
+SHA512:
+  metadata.gz: d70fbb66c1467ca8c0d913072c1085ca231515a7b9dc0ee918dd5ab4976f42a7513534566bc70485e3a3103d9faa31573161a171cbd528d859192ff1700974cc
+  data.tar.gz: a82cfa020893598eda4e95faef76b50a10eb3df871020997ac7ac2fb50f36e53625cc9f9550907331d2e086992a38edd2f049535e6aa1916edee1e4fd51cdabc

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,13 @@
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120

data/.ruby-version

@@ -0,0 +1 @@
+3.3.1

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - 2024-07-31
+
+- Initial release

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at gmudumuntala@navaratan.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in solana.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+
+gem "rubocop", "~> 1.21"
+
+group :development, :test do
+  gem 'rspec'
+  gem 'webmock'
+  gem 'simplecov', require: false
+  gem 'ed25519'
+end

data/Gemfile.lock

@@ -0,0 +1,184 @@
+PATH
+  remote: .
+  specs:
+    solana_ruby (2.0.0)
+      brakeman (~> 6.1.2)
+      pry (~> 0.14.2)
+      rubycritic (~> 4.9.0)
+      simplecov (~> 0.22.0)
+      websocket-client-simple (~> 0.8.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.2)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    bigdecimal (3.1.8)
+    brakeman (6.1.2)
+      racc
+    childprocess (5.0.0)
+    coderay (1.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.3.3)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    dry-configurable (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.1.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.4)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    ed25519 (1.3.0)
+    erubi (1.13.0)
+    event_emitter (0.2.6)
+    flay (2.13.3)
+      erubi (~> 1.10)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.8.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.8)
+    hashdiff (1.1.1)
+    ice_nine (0.11.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    launchy (3.0.1)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
+    method_source (1.1.0)
+    parallel (1.25.1)
+    parser (3.3.4.0)
+      ast (~> 2.4.1)
+      racc
+    path_expander (1.1.2)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    reek (6.3.0)
+      dry-schema (~> 1.13.0)
+      parser (~> 3.3.0)
+      rainbow (>= 2.0, < 4.0)
+      rexml (~> 3.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.2)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    ruby_parser (3.21.1)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
+    rubycritic (4.9.0)
+      flay (~> 2.13)
+      flog (~> 4.7)
+      launchy (>= 2.5.2)
+      parser (>= 3.2.2.1)
+      rainbow (~> 3.1.1)
+      reek (~> 6.0, < 7.0)
+      rexml
+      ruby_parser (~> 3.20)
+      simplecov (>= 0.22.0)
+      tty-which (~> 0.5.0)
+      virtus (~> 2.0)
+    sexp_processor (4.17.2)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    strscan (3.1.0)
+    thread_safe (0.3.6)
+    tty-which (0.5.0)
+    unicode-display_width (2.5.0)
+    virtus (2.0.0)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+    webmock (3.23.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.11)
+    websocket-client-simple (0.8.0)
+      event_emitter
+      websocket
+    zeitwerk (2.6.17)
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  ed25519
+  rake (~> 13.0)
+  rspec
+  rubocop (~> 1.21)
+  simplecov
+  solana_ruby!
+  webmock
+
+BUNDLED WITH
+   2.5.16

data/README.md

@@ -0,0 +1,273 @@
+# SolanaRuby
+
+`SolanaRuby` is a lightweight Ruby client for interacting with the Solana blockchain through its JSON-RPC API. It allows developers to perform various queries on the Solana network such as fetching solana balance, acccount information, and more.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'solana-ruby-web3js'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install solana-ruby-web3js
+
+## Usage
+
+To start using the Solana RPC client, initialize it with or without the RPC URL. The default URL points to the Solana Mainnet. If you wish to connect to another network like Devnet or Testnet, you can specify the URL.
+
+    require 'solana_ruby'
+
+    # Initialize the client (defaults to Mainnet(https://api.mainnet-beta.solana.com))
+    client = SolanaRuby::HttpClient.new()
+
+    # Optionally, provide a custom RPC URL
+    # client = SolanaRuby::HttpClient.new("https://api.devnet.solana.com")
+
+### Fetch Solana Account Balance
+
+Once the client is initialized, you can make API calls to the Solana network. For example, to get the solana balance of a given account:
+
+    # Replace 'pubkey' with the actual public key of the solana account
+
+    pubkey = 'Fg6PaFpoGXkYsidMpWxTWqSKJf6KJkUxX92cnv7WMd2J'
+
+    result = client.get_balance(pubkey)
+
+    puts result
+
+### Fetch Parsed Account Info
+
+    # Replace 'pubkey' with the actual public key of the account
+    pubkey = 'Fg6PaFpoGXkYsidMpWxTWqSKJf6KJkUxX92cnv7WMd2J'
+
+    # Example of options that can be passed:
+    options = {
+      commitment: 'finalized',   # Specifies the level of commitment for querying state (e.g., 'finalized', 'confirmed', 'processed')
+      encoding: 'jsonParsed'     # Specifies the encoding format (e.g., 'jsonParsed', 'base64', etc.)
+    }
+
+    result = client.get_parsed_account_info(pubkey, options)
+
+    puts result
+
+### Options Parameter
+
+The options parameter is a hash that can include the following fields:
+
+commitment: Specifies the level of commitment desired when querying state.
+
+Options include:
+
+    'finalized': Query the most recent block confirmed by supermajority of the cluster.
+    'confirmed': Query the most recent block that has been voted on by supermajority of the cluster.
+    'processed': Query the most recent block regardless of cluster voting.
+
+encoding: Defines the format of the returned account data. Possible values include:
+
+    'jsonParsed': Returns data in a JSON-parsed format.
+    'base64': Returns raw account data in Base64 encoding.
+    'base64+zstd': Returns compressed Base64 data.
+
+By providing options, you can control the nature of the returned data and the reliability of the query.
+
+### Filters Parameter
+
+The filters parameter allows you to specify conditions for querying token accounts. Some common filter types include:
+
+    # Mint Filter: Filter by a specific token mint. This retrieves accounts holding tokens of that mint.
+    filters = { mint: 'TokenMintPublicKey' }
+
+    # Program Filter: Filter by a specific program (e.g., the token program).
+    filters = { programId: 'TokenProgramPublicKey' }
+
+## WebSocket Methods
+
+The SolanaRuby gem also provides WebSocket methods to handle real-time notifications and updates from the Solana blockchain. To use the WebSocket client:
+
+    # Initialize the WebSocket client
+    ws_client = SolanaRuby::WebSocketClient.new("wss://api.mainnet-beta.solana.com")
+
+    # Subscribe to slot change notifications
+    subscription_id = ws_client.on_slot_change do |slot_info|
+      puts "Slot changed: #{slot_info}"
+    end
+
+    # Sleep to hold the process and show updates
+    sleep 60 # Adjust the duration as needed to view updates
+
+    # Unsubscribe from slot change notifications
+    ws_client.remove_slot_change_listener(subscription_id)
+    puts "Unsubscribed from slot change notifications."
+
+The following methods are supported by the WebSocketClient:
+
+- **Account Change**: Subscribe to changes in an account's state.
+
+    ```ws_client.on_account_change(pubkey) { |account_info| puts account_info }```
+
+- **Program Account Change**: Subscribe to changes in accounts owned by a specific program.
+
+    ```ws_client.on_program_account_change(program_id, filters) { |program_account_info| puts program_account_info }```
+
+- **Logs**: Subscribe to transaction logs.
+
+    ```ws_client.on_logs { |logs_info| puts logs_info }```
+
+- **Logs for a Specific Account**: Subscribe to logs related to a specific account.
+
+    ```ws_client.on_logs_for_account(account_pubkey) { |logs_info| puts logs_info }```
+
+- **Logs for a Specific Program**: Subscribe to logs related to a specific program.
+
+    ```ws_client.on_logs_for_program(program_id) { |logs_info| puts logs_info }```
+
+- **Root Change**: Subscribe to root changes.
+
+    ws_client.on_root_change { |root_info| puts root_info }
+
+- **Signature**: Subscribe to a signature notification.
+
+    ```ws_client.on_signature(signature) { |signature_info| puts signature_info }```
+
+- **Slot Change**: Subscribe to slot changes.
+
+    ```ws_client.on_slot_change { |slot_info| puts slot_info }```
+
+- **Unsubscribe Methods**: Each WebSocket method has a corresponding unsubscribe method:
+
+    - remove_account_change_listener(subscription_id)
+    - remove_program_account_listener(subscription_id)
+    - remove_logs_listener(subscription_id)
+    - remove_root_listener(subscription_id)
+    - remove_signature_listener(subscription_id)
+    - remove_slot_change_listener(subscription_id)
+
+
+## Complete List of Available Methods
+
+### HTTP Methods
+
+The following methods are supported by the SolanaRuby::HttpClient:
+
+#### Basic
+    get_balance(pubkey)
+    get_balance_and_context(pubkey)
+    get_slot()
+    get_epoch_info(options)
+    get_epoch_schedule()
+    get_genesis_hash()
+    get_inflation_governor()
+    get_inflation_rate()
+    get_inflation_reward(addresses, options)
+    get_leader_schedule(options)
+    get_minimum_balance_for_rent_exemption(account_data_size, options)
+    get_stake_activation(account_pubkey, options)
+    get_stake_minimum_delegation(options)
+    get_supply(options)
+    get_version()
+    get_total_supply(options)
+    get_health()
+    get_identity()
+    get_recent_performance_samples(limit)
+    get_recent_prioritization_fees(addresses)
+
+#### Account
+    get_account_info(pubkey)
+    get_parsed_account_info(pubkey, options)
+    get_account_info_and_context(pubkey, options)
+    get_multiple_account_info(pubkeys, options)
+    get_multiple_account_info_and_context(pubkeys, options)
+    get_multiple_parsed_accounts(pubkeys, options)
+    get_largest_accounts(options)
+    get_program_accounts(program_id, options)
+    get_parsed_program_accounts(program_id, options)
+    get_vote_accounts(options)
+    get_parsed_token_accounts_by_owner(owner_pubkey, filters, options)
+    get_nonce_and_context(pubkey)
+    get_nonce(pubkey)
+
+#### Block
+    get_nonce(pubkey)
+    get_block(slot, options)
+    get_block_production()
+    get_block_time(slot)
+    get_block_signatures(slot, options)
+    get_cluster_nodes()
+    get_confirmed_block(slot, options)
+    get_confirmed_block_signatures(slot)
+    get_parsed_block(slot, options)
+    get_first_available_block()
+    get_blocks_with_limit(start_slot, limit)
+    get_block_height()
+    get_block_commitment(block_slot)
+
+#### Blockhash
+    get_latest_blockhash()
+    get_latest_blockhash()
+    get_fee_for_message(blockhash, options)
+    is_blockhash_valid?(blockhash, options)
+
+#### Lookup Table
+    get_address_lookup_table(pubkey)
+
+#### Signature
+    get_signature_statuses(signatures)
+    get_signature_status(signature, options)
+    get_signatures_for_address(address, options)
+
+#### Slot
+    get_slot()
+    get_slot_leader(options)
+    get_slot_leaders(start_slot, limit)
+    get_highest_snapshot_slot()
+    get_minimum_ladger_slot()
+    get_max_retransmit_slot()
+    get_max_shred_insert_slot()
+
+#### Token
+    get_token_balance(pubkey, options)
+    get_token_supply(pubkey)
+    get_token_accounts_by_owner(owner_pubkey, filters, options)
+    get_token_largest_accounts(mint_pubkey, options)
+
+#### Transaction
+    send_transaction(signed_transaction, options)
+    confirm_transaction(signature, commitment, timeout)
+    get_transaction(signature, options)
+    get_transaction_count(options)
+    get_transactions(signatures, options)
+    request_airdrop(pubkey, lamports, options)
+    simulate_transaction(transaction, options)
+    send_encoded_transaction(encoded_transaction, options)
+    send_raw_transaction(raw_transaction, options)
+
+### WebSocket Methods
+
+The following methods are supported by the SolanaRuby::WebSocketClient:
+
+    on_account_change(pubkey, options)
+    on_program_account_change(program_id, options, filters)
+    on_logs(options=['all'])
+    on_logs_for_account(public_key)
+    on_logs_for_program(program_id)
+    on_root_change()
+    on_signature(signature)
+    on_signature_with_options(signature, options)
+    remove_account_change_listener(subscription_id)
+    remove_program_account_listener(subscription_id)
+    remove_logs_listener(subscription_id)
+    remove_root_listener(subscription_id)
+    remove_signature_listener(subscription_id)
+    remove_slot_change_listener(subscription_id)
+
+## Default Options
+
+Several methods have optional parameters where default options are defined in the client. These options can be customized or overridden when calling the methods, but if left unspecified, the client will use its internal defaults.
+

data/Rakefile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: :rubocop

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solana_ruby"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/solana_ruby/base_client.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module SolanaRuby
+  class BaseClient
+    require 'active_support/core_ext/string/inflections'
+    
+    private
+
+    def handle_http_response(response)
+      body = JSON.parse(response.body)
+      # puts "body:==== #{body}"
+      if response.is_a?(Net::HTTPSuccess)
+        if body['error']
+          raise "API Error: #{body['error']['code']} - #{body['error']['message']}"
+        else
+          return body
+        end
+      else
+        raise "HTTP Error: #{response.code} - #{body['error']['message']}"
+      end
+    rescue JSON::ParserError
+      raise "Invalid JSON response: #{response.body}"
+    end
+
+    def handle_error(error)
+      case error
+      when Timeout::Error
+        raise SolanaError.new('Request timed out')
+      when SocketError
+        raise SolanaError.new('Failed to connect to the server')
+      else
+        raise SolanaError.new("An unexpected error occurred: #{error.message}")
+      end
+    end
+  end
+
+  class SolanaError < StandardError
+    def initialize(message)
+      super(message)
+    end
+
+    def backtrace
+      []
+    end
+  end
+end