tron.rb 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be709cc97a1f54ec26a0046e814ad9a0b6a2b080e940b5b9d5edfd5dfcb337b3
-  data.tar.gz: 2a0e026e4dad643ee21f725173b27ed4f53df3be3102b7a79860ed74d279cbf4
+  metadata.gz: ce451efce40a6ad863faba401277f320310875a692adc22fbecda0ad5f0e217c
+  data.tar.gz: 4a78a4d10e09c20c485394bb25e6ba1f20c61b67d46e7d8d6b3b855c86321d60
 SHA512:
-  metadata.gz: f7ed78165a2f0657e80d810f4653393ddfe93ef4598b601595733c9b61a628b3c291840eb8f177c794d3c0a4d1d05ea567d9196475702dc550d1b331f7869bfc
-  data.tar.gz: 98137d8eaa648c76939beb477d0ea8a5c512fba6e7698465ee70fbeb52d7f559caceafde60c9c0a5617b720b5252ec9588259f4994981f792e635b21befa0791
+  metadata.gz: 68fc9765d78659f10991cec77e2fb2ddbf3c82f313b2e9194afa54f4b1184ca90a5789c7db0e39e45eea4732df366137137a6d80b328ce49958299eb8861c74d
+  data.tar.gz: 9f7fc8306018da351129803ba8bd3bd9ee893374a45071e40bd8a7c9fc17b8016e55ca162f7f334cb57f69d24b7ae912a7abd7d098a97438b945d030288664e2

data/lib/tron/client.rb

@@ -150,20 +150,29 @@ module Tron
 
       # Step 3: Process TRC20 tokens
       wallet_data[:trc20_tokens].each do |token|
+        # Handle tokens from TronGrid API that have raw_amount instead of balance
+        if token[:raw_amount] && !token[:balance]
+          # Skip tokens without metadata (caller must look them up)
+          next unless token[:decimals]
+
+          token[:balance] = token[:raw_amount] / (10.0 ** token[:decimals])
+        end
+
         next if token[:balance] <= 0 && !include_zero_balances
 
         # Get USD price for this token
-        price_usd = price_service.get_token_price_usd(token[:symbol].downcase)
+        price_usd = price_service.get_token_price_usd(token[:symbol]&.downcase || '')
         usd_value = price_usd ? (token[:balance] * price_usd) : nil
 
         tokens << {
-          symbol: token[:symbol],
-          name: token[:name],
+          symbol: token[:symbol] || 'UNKNOWN',
+          name: token[:name] || 'Unknown Token',
           token_balance: token[:balance],
           decimals: token[:decimals],
           address: token[:address],
           price_usd: price_usd,
-          usd_value: usd_value
+          usd_value: usd_value,
+          raw_amount: token[:raw_amount]  # Include for caller reference
         }
       end
 

data/lib/tron/services/balance.rb

@@ -92,6 +92,28 @@ module Tron
         # Rate limit before API call
         @rate_limiter.execute_request
 
+        # Use TronGrid API for Shasta (Tronscan is blocked by Cloudflare)
+        # Use Tronscan API for mainnet and nile (better token metadata)
+        if @config.network == :shasta
+          result = get_trc20_from_trongrid(address)
+        else
+          result = get_trc20_from_tronscan(address, strict)
+        end
+
+        # Cache the result
+        @cache.set(cache_key, result) if @config.cache_enabled
+
+        result
+      end
+
+      private
+
+      # Gets TRC20 tokens from Tronscan API
+      #
+      # @param address [String] the TRON address
+      # @param strict [Boolean] whether to enable strict validation
+      # @return [Array<Hash>] array of token information
+      def get_trc20_from_tronscan(address, strict)
         url = "#{@config.tronscan_base_url}/api/account/wallet?address=#{address}&asset_type=1"
         headers = tronscan_headers
 
@@ -102,7 +124,7 @@ module Tron
         raise "Missing 'data' field in TRC20 response" unless response.key?('data')
         raise "Invalid 'data' format in TRC20 response" unless response['data'].is_a?(Array)
 
-        result = response['data'].select { |token| token['token_type'] == 20 && token['balance'].to_f > 0 }
+        response['data'].select { |token| token['token_type'] == 20 && token['balance'].to_f > 0 }
           .map do |token|
             validate_token_data!(token)
             {
@@ -113,11 +135,48 @@ module Tron
               address: token['token_id']
             }
           end
+      end
 
-        # Cache the result
-        @cache.set(cache_key, result) if @config.cache_enabled
+      # Gets TRC20 tokens from TronGrid API (used for Shasta)
+      # Returns raw token data with amounts, caller must look up token details from database
+      #
+      # @param address [String] the TRON address
+      # @return [Array<Hash>] array of token information with raw amounts
+      def get_trc20_from_trongrid(address)
+        url = "#{@config.base_url}/v1/accounts/#{address}"
+        headers = api_headers
 
-        result
+        response = Utils::HTTP.get(url, headers)
+
+        # Validate response structure
+        raise "Unexpected API response format" unless response.is_a?(Hash)
+        raise "Missing 'data' field in response" unless response.key?('data')
+        raise "Invalid 'data' format in response" unless response['data'].is_a?(Array)
+
+        # Handle empty data array (new/inactive accounts)
+        return [] if response['data'].empty?
+
+        account_data = response['data'].first
+        raise "Invalid account data format" unless account_data.is_a?(Hash)
+
+        # Parse TRC20 tokens from account data
+        trc20_data = account_data.fetch('trc20', [])
+        return [] unless trc20_data.is_a?(Array)
+
+        trc20_data.flat_map do |token_hash|
+          # Each token_hash is like: {"TKnF3Ugr8FFPMLZyvLBJR4Di2fEH42amw3"=>"989550000000"}
+          token_hash.map do |token_address, raw_amount|
+            # Return raw data, let caller convert based on actual token decimals
+            {
+              symbol: nil,  # TronGrid doesn't provide symbol/name/decimals
+              name: nil,    # Caller must look these up from database
+              balance: nil, # Will be calculated by caller using correct decimals
+              raw_amount: raw_amount.to_i,  # Raw amount from API
+              decimals: nil,  # Caller must look up from database
+              address: token_address
+            }
+          end
+        end.select { |token| token[:raw_amount] > 0 }
       end
 
       # Gets cache statistics for the balance service

data/lib/tron/utils/chain_id.rb

@@ -0,0 +1,34 @@
+# lib/tron/utils/chain_id.rb
+module Tron
+  module Utils
+    module ChainId
+      # Chain ID constants for different TRON networks
+      MAINNET = 0x2b6653dc  # 728126428 decimal
+      NILE = 0xcd8690dc     # 3448148188 decimal
+
+      # Get the chain ID for a given network
+      #
+      # @param network [Symbol] the network symbol (:mainnet, :nile)
+      # @return [Integer] the chain ID for the network
+      # @raise [ArgumentError] if the network is unknown
+      def self.for_network(network)
+        case network
+        when :mainnet
+          MAINNET
+        when :nile
+          NILE
+        else
+          raise ArgumentError, "Unknown network: #{network}. Supported networks: :mainnet, :nile"
+        end
+      end
+
+      # Get the chain ID from a client instance
+      #
+      # @param client [Tron::Client] the client instance
+      # @return [Integer] the chain ID for the client's network
+      def self.from_client(client)
+        for_network(client.configuration.network)
+      end
+    end
+  end
+end

data/lib/tron/version.rb

@@ -2,5 +2,5 @@
 
 # lib/tron/version.rb
 module Tron
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tron.rb
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Bolo Michelin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58-alphabets
@@ -160,6 +160,7 @@ files:
 - lib/tron/signature.rb
 - lib/tron/utils/address.rb
 - lib/tron/utils/cache.rb
+- lib/tron/utils/chain_id.rb
 - lib/tron/utils/crypto.rb
 - lib/tron/utils/http.rb
 - lib/tron/utils/rate_limiter.rb