tealrb 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2480b69400b8916b30ebd58c19b804190a6390780ad335006ac0364ea9d4ad4e
-  data.tar.gz: 6cf7f7f79217b1938f71bf07348923a7d31d3d83d76a4219f43e58bb1db2e3bc
+  metadata.gz: 96c56f8bbc18ac1b7fa42f8ad6b553f72296c30a89973d1e95a663f6776c559c
+  data.tar.gz: c7cd2a73fa00da112e0d420224955dc5a9b1a41a0ec23978250f48ac49a2fc59
 SHA512:
-  metadata.gz: c8220e4aadbdcbe9a992ada723431281665edda6a19c07771978b5a8b4ae9cf987a208ed69e9c96f4360a6a3ace9762dc930e4bab99574b2114effc0ffd1060e
-  data.tar.gz: 47790d4ee2171f4c2e95473f7c7cc6674d9634804c8c0dac2eeafff368df073166d9dfd371efc24026e1c94f4c333b1904af9fa4a959992116df7859dc314875
+  metadata.gz: b93a01c924cefb65075160e306436b54a560f2ac5a40465a28dac436a589b252f71d2130dfe39f0f4cf127136223392a0fab9f013acc01c5c4161099732b8bfe
+  data.tar.gz: 1316ccad828bf8a1682f55987dbffaa9dee942f3e11dfe04d54c31432143732b93de31d6c4bed596509a92e3744a667716acc4cae8b326793efd263d6c1e9354

data/lib/tealrb/contract.rb

@@ -4,9 +4,9 @@ module TEALrb
   class Contract
     include TEALrb
     include Opcodes
+    include Opcodes::AllOpcodes
     include ABI
     include Rewriters
-    include MaybeOps
 
     attr_reader :teal
 
@@ -90,6 +90,35 @@ module TEALrb
       end
     end
 
+    VOID_OPS = %w[assert err return app_global_put b bnz bz store
+                  stores app_local_put app_global_del app_local_del callsub retsub
+                  log itxn_submit itxn_next].freeze
+
+    def teal_source
+      teal_lines = []
+
+      @teal.each_with_index do |line, i|
+        ln = line.strip
+
+        teal_lines << '' if VOID_OPS.include? @teal[i - 1][/\S+/]
+
+        if (ln[%r{\S+:($| //)}] && !ln[/^if\d+/]) || ln == 'b main' || ln[/^#/]
+          teal_lines << ln
+        elsif ln == 'retsub'
+          teal_lines << "    #{ln}"
+          teal_lines << ''
+        else
+          teal_lines << "    #{ln}"
+        end
+      end
+
+      teal_lines.delete_if.with_index do |t, i|
+        t.empty? && teal_lines[i - 1].empty?
+      end
+
+      teal_lines.join("\n")
+    end
+
     # return the input without transpiling to TEAL
     def rb(input)
       input
@@ -143,6 +172,7 @@ module TEALrb
         last_line = TEAL.instance.pop
         TEAL.instance << "#{last_line} //#{content}"
       else
+        TEAL.instance << '' unless TEAL.instance.last[%r{^//}]
         TEAL.instance << "//#{content}"
       end
     end
@@ -178,7 +208,7 @@ module TEALrb
 
     def route_abi_methods
       self.class.abi_description.methods.each do |meth|
-        signature = "#{meth[:name]}(#{meth[:args].map{ _1[:type]}.join(',')})#{meth[:returns][:type]}"
+        signature = "#{meth[:name]}(#{meth[:args].map { _1[:type] }.join(',')})#{meth[:returns][:type]}"
         selector = OpenSSL::Digest.new('SHA512-256').hexdigest(signature)[..7]
 
         IfBlock.new(AppArgs[0] == byte(selector)) do
@@ -223,7 +253,8 @@ module TEALrb
         puts ''
       end
 
-      [CommentRewriter, ComparisonRewriter, WhileRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
+      [CommentRewriter, ComparisonRewriter, WhileRewriter, InlineIfRewriter, IfRewriter, OpRewriter,
+       AssignRewriter].each do |rw|
         string = rewrite_with_rewriter(string, rw)
       end
 
@@ -257,7 +288,7 @@ module TEALrb
     rescue SyntaxError, StandardError => e
       @eval_tealrb_rescue_count ||= 0
 
-      eval_locations = e.backtrace.select {_1[/\(eval\)/]}
+      eval_locations = e.backtrace.select { _1[/\(eval\)/] }
       error_line = eval_locations[@eval_tealrb_rescue_count].split(':')[1].to_i
 
       warn "'#{e}' when evaluating transpiled TEALrb source" if @eval_tealrb_rescue_count.zero?

data/lib/tealrb/opcode_modules.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
 module TEALrb
-  module ExtendedOpcodes
-    extend Opcodes
-  end
-
   module Opcodes
     class AccountLocal
-      include TEALrb::Opcodes
-
       def initialize(account)
         @account = account
       end
 
       def [](key)
-        app_local_get @account, key
+        ExtendedOpcodes.app_local_get @account, key
       end
 
       def []=(key, value)
-        app_local_put @account, key, value
+        ExtendedOpcodes.app_local_put @account, key, value
       end
     end
 
@@ -393,132 +387,6 @@ module TEALrb
       end
     end
 
-    module AppFields
-      # @return [[]byte] Bytecode of Approval Program
-      def app_approval_program(*args)
-        opcode('AppApprovalProgram', *args)
-      end
-
-      # @return [[]byte] Bytecode of Clear State Program
-      def app_clear_state_program(*args)
-        opcode('AppClearStateProgram', *args)
-      end
-
-      # @return [uint64] Number of uint64 values allowed in Global State
-      def app_global_num_uint(*args)
-        opcode('AppGlobalNumUint', *args)
-      end
-
-      # @return [uint64] Number of byte array values allowed in Global State
-      def app_global_num_byte_slice(*args)
-        opcode('AppGlobalNumByteSlice', *args)
-      end
-
-      # @return [uint64] Number of uint64 values allowed in Local State
-      def app_local_num_uint(*args)
-        opcode('AppLocalNumUint', *args)
-      end
-
-      # @return [uint64] Number of byte array values allowed in Local State
-      def app_local_num_byte_slice(*args)
-        opcode('AppLocalNumByteSlice', *args)
-      end
-
-      # @return [uint64] Number of Extra Program Pages of code space
-      def app_extra_program_pages(*args)
-        opcode('AppExtraProgramPages', *args)
-      end
-
-      # @return [[]byte] Creator address
-      def app_creator(*args)
-        opcode('AppCreator', *args)
-      end
-
-      # @return [[]byte] Address for which this application has authority
-      def app_address(*args)
-        opcode('AppAddress', *args)
-      end
-    end
-
-    module AssetFields
-      # @return [uint64] Total number of units of this asset (v1)
-      def asset_total(*args)
-        opcode('AssetTotal', *args)
-      end
-
-      # @return [uint64] See AssetParams.Decimals (v1)
-      def asset_decimals(*args)
-        opcode('AssetDecimals', *args)
-      end
-
-      # @return [uint64] Frozen by default or not (v1)
-      def asset_default_frozen(*args)
-        opcode('AssetDefaultFrozen', *args)
-      end
-
-      # @return [[]byte] Asset unit name (v1)
-      def asset_unit_name(*args)
-        opcode('AssetUnitName', *args)
-      end
-
-      # @return [[]byte] Asset name (v1)
-      def asset_name(*args)
-        opcode('AssetName', *args)
-      end
-
-      # @return [[]byte] URL with additional info about the asset (v1)
-      def asset_url(*args)
-        opcode('AssetURL', *args)
-      end
-
-      # @return [[]byte] Arbitrary commitment (v1)
-      def asset_metadata_hash(*args)
-        opcode('AssetMetadataHash', *args)
-      end
-
-      # @return [[]byte] Manager commitment (v1)
-      def asset_manager(*args)
-        opcode('AssetManager', *args)
-      end
-
-      # @return [[]byte] Reserve address (v1)
-      def asset_reserve(*args)
-        opcode('AssetReserve', *args)
-      end
-
-      # @return [[]byte] Freeze address (v1)
-      def asset_freeze(*args)
-        opcode('AssetFreeze', *args)
-      end
-
-      # @return [[]byte] Clawback address (v1)
-      def asset_clawback(*args)
-        opcode('AssetClawback', *args)
-      end
-
-      # @return [[]byte] Creator address (v5)
-      def asset_creator(*args)
-        opcode('AssetCreator', *args)
-      end
-    end
-
-    module AccountFields
-      # @return [uint64] Account balance in microalgos
-      def acct_balance(*args)
-        opcode('AcctBalance', *args)
-      end
-
-      # @return [uint64] in microalgos (Minimum required blance for account)
-      def acct_min_balance(*args)
-        opcode('AcctMinBalance', *args)
-      end
-
-      # @return [[]byte] Address the account is rekeyed to.
-      def acct_auth_addr(*args)
-        opcode('AcctAuthAddr', *args)
-      end
-    end
-
     module GlobalFields
       # @return [uint64] microalgos (v1)
       def min_txn_fee(*args)
@@ -598,48 +466,19 @@ module TEALrb
       end
     end
 
-    module App
-      extend Opcodes
-      extend AppFields
-
-      def self.opcode(field, app_id = nil)
-        app_params_get field, app_id
-      end
-    end
-
-    module Asset
-      extend Opcodes
-      extend AssetFields
-
-      def self.opcode(field, asset = nil)
-        asset_params_get field, asset
-      end
-    end
-
-    module Account
-      extend Opcodes
-      extend AccountFields
-
-      def self.opcode(field, account = nil)
-        acct_params_get field, account
-      end
-    end
-
     module Txn
-      extend Opcodes
       extend TxnFields
 
       def self.opcode(field)
-        txn field
+        ExtendedOpcodes.txn field
       end
     end
 
     module Gtxn
       extend TxnFields
-      extend Opcodes
 
       def self.opcode(field, index)
-        gtxn index, field
+        ExtendedOpcodes.gtxn index, field
       end
 
       def self.[](index)
@@ -647,67 +486,325 @@ module TEALrb
       end
     end
 
+    module Gtxns
+      extend TxnFields
+
+      def self.opcode(field)
+        ExtendedOpcodes.gtxns field
+      end
+
+      def self.[](_index)
+        self
+      end
+    end
+
     class GroupTransaction
       include TxnFields
-      include Opcodes
 
       def initialize(index)
         @index = index
       end
 
       def opcode(field)
-        gtxn @index, field
+        ExtendedOpcodes.gtxn @index, field
       end
     end
 
-    class TxnaField
-      include Opcodes
+    class TxnArray
+      TEALrb::Opcodes::BINARY_OPCODE_METHOD_MAPPING.each do |meth, opcode|
+        define_method(meth) do |other|
+          ExtendedOpcodes.send(opcode, self, other)
+        end
+      end
+
+      TEALrb::Opcodes::UNARY_OPCODE_METHOD_MAPPING.each do |meth, opcode|
+        define_method(meth) do
+          ExtendedOpcodes.send(opcode, self)
+        end
+      end
 
-      def initialize(field)
-        @field = field
+      def self.[](index)
+        new[index]
       end
 
       def [](index)
-        txna @field, index
+        ExtendedOpcodes.txna @field, index
+        self
+      end
+    end
+
+    class ApplicationArgs < TxnArray
+      def initialize
+        super
+        @field = 'ApplicationArgs'
+      end
+    end
+
+    class Logs < TxnArray
+      def initialize
+        super
+        @field = 'Logs'
+      end
+    end
+
+    class Accounts < TxnArray
+      def initialize
+        super
+        @field = 'Accounts'
+      end
+
+      def min_balance
+        ExtendedOpcodes.acct_param_value 'AcctMinBalance'
+      end
+
+      def balance
+        ExtendedOpcodes.acct_param_value 'AcctBalance'
+      end
+
+      def auth_addr
+        ExtendedOpcodes.acct_param_value 'AcctAuthAddr'
+      end
+
+      def balance?
+        ExtendedOpcodes.acct_has_balance?
+      end
+    end
+
+    class Apps < TxnArray
+      def initialize
+        super
+        @field = 'Applications'
+      end
+
+      # @return [[]byte] Bytecode of Approval Program
+      def approval_program(*_args)
+        ExtendedOpcodes.app_param_value 'AppApprovalProgram'
+      end
+
+      # @return [[]byte] Bytecode of Clear State Program
+      def clear_state_program(*_args)
+        ExtendedOpcodes.app_param_value 'AppClearStateProgram'
+      end
+
+      # @return [uint64] Number of uint64 values allowed in Global State
+      def global_num_uint(*_args)
+        ExtendedOpcodes.app_param_value 'AppGlobalNumUint'
+      end
+
+      # @return [uint64] Number of byte array values allowed in Global State
+      def global_num_byte_slice(*_args)
+        ExtendedOpcodes.app_param_value 'AppGlobalNumByteSlice'
+      end
+
+      # @return [uint64] Number of uint64 values allowed in Local State
+      def local_num_uint(*_args)
+        ExtendedOpcodes.app_param_value 'AppLocalNumUint'
+      end
+
+      # @return [uint64] Number of byte array values allowed in Local State
+      def local_num_byte_slice(*_args)
+        ExtendedOpcodes.app_param_value 'AppLocalNumByteSlice'
+      end
+
+      # @return [uint64] Number of Extra Program Pages of code space
+      def extra_program_pages(*_args)
+        ExtendedOpcodes.app_param_value 'AppExtraProgramPages'
+      end
+
+      # @return [[]byte] Creator address
+      def creator(*_args)
+        ExtendedOpcodes.app_param_value 'AppCreator'
+      end
+
+      # @return [[]byte] Address for which this application has authority
+      def address(*_args)
+        ExtendedOpcodes.app_param_value 'AppAddress'
+      end
+
+      # @return [[]byte] Bytecode of Approval Program
+      def approval_program?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppApprovalProgram'
+      end
+
+      # @return [[]byte] Bytecode of Clear State Program
+      def clear_state_program?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppClearStateProgram'
+      end
+
+      # @return [uint64] Number of uint64 values allowed in Global State
+      def global_num_uint?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppGlobalNumUint'
+      end
+
+      # @return [uint64] Number of byte array values allowed in Global State
+      def global_num_byte_slice?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppGlobalNumByteSlice'
+      end
+
+      # @return [uint64] Number of uint64 values allowed in Local State
+      def local_num_uint?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppLocalNumUint'
+      end
+
+      # @return [uint64] Number of byte array values allowed in Local State
+      def local_num_byte_slice?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppLocalNumByteSlice'
+      end
+
+      # @return [uint64] Number of Extra Program Pages of code space
+      def extra_program_pages?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppExtraProgramPages'
+      end
+
+      # @return [[]byte] Creator address
+      def creator?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppCreator'
+      end
+
+      # @return [[]byte] Address for which this application has authority
+      def address?(*_args)
+        ExtendedOpcodes.app_param_exists? 'AppAddress'
+      end
+    end
+
+    class Assets < TxnArray
+      def initialize
+        super
+        @field = 'Assets'
+      end
+
+      def total
+        ExtendedOpcodes.asset_param_value 'AssetTotal'
+      end
+
+      def decimals
+        ExtendedOpcodes.asset_param_value 'AssetDecimals'
+      end
+
+      def default_frozen
+        ExtendedOpcodes.asset_param_value 'AssetDefaultFrozen'
+      end
+
+      def name
+        ExtendedOpcodes.asset_param_value 'AssetName'
+      end
+
+      def unit_name
+        ExtendedOpcodes.asset_param_value 'AssetUnitName'
+      end
+
+      def url
+        ExtendedOpcodes.asset_param_value 'AssetURL'
+      end
+
+      def metadata_hash
+        ExtendedOpcodes.asset_param_value 'AssetMetadataHash'
+      end
+
+      def manager
+        ExtendedOpcodes.asset_param_value 'AssetManager'
+      end
+
+      def reserve
+        ExtendedOpcodes.asset_param_value 'AssetReserve'
+      end
+
+      def freeze
+        ExtendedOpcodes.asset_param_value 'AssetFreeze'
+      end
+
+      def clawback
+        ExtendedOpcodes.asset_param_value 'AssetClawback'
+      end
+
+      def creator
+        ExtendedOpcodes.asset_param_value 'AssetCreator'
+      end
+
+      def total?
+        ExtendedOpcodes.asset_param_exists? 'AssetTotal'
+      end
+
+      def decimals?
+        ExtendedOpcodes.asset_param_exists? 'AssetDecimals'
+      end
+
+      def default_frozen?
+        ExtendedOpcodes.asset_param_exists? 'AssetDefaultFrozen'
+      end
+
+      def name?
+        ExtendedOpcodes.asset_param_exists? 'AssetName'
+      end
+
+      def unit_name?
+        ExtendedOpcodes.asset_param_exists? 'AssetUnitName'
+      end
+
+      def url?
+        ExtendedOpcodes.asset_param_exists? 'AssetURL'
+      end
+
+      def metadata_hash?
+        ExtendedOpcodes.asset_param_exists? 'AssetMetadataHash'
+      end
+
+      def manager?
+        ExtendedOpcodes.asset_param_exists? 'AssetManager'
+      end
+
+      def reserve?
+        ExtendedOpcodes.asset_param_exists? 'AssetReserve'
+      end
+
+      def freeze?
+        ExtendedOpcodes.asset_param_exists? 'AssetFreeze'
+      end
+
+      def clawback?
+        ExtendedOpcodes.asset_param_exists? 'AssetClawback'
+      end
+
+      def creator?
+        ExtendedOpcodes.asset_param_exists? 'AssetCreator'
       end
     end
 
     module Txna
       def self.application_args
-        TxnaField.new('ApplicationArgs')
+        ApplicationArgs.new
       end
 
       def self.accounts
-        TxnaField.new('Accounts')
+        Accounts.new
       end
 
       def self.assets
-        TxnaField.new('Assets')
+        Assets.new
       end
 
       def self.applications
-        TxnaField.new('Applications')
+        Apps.new
       end
 
       def self.logs
-        TxnaField.new('Logs')
+        Logs.new
       end
     end
 
     module Global
-      extend Opcodes
       extend GlobalFields
 
       def self.opcode(field)
-        global field
+        ExtendedOpcodes.global field
       end
 
       def self.[](key)
-        app_global_get key
+        ExtendedOpcodes.app_global_get key
       end
 
       def self.[]=(key, value)
-        app_global_put key, value
+        ExtendedOpcodes.app_global_put key, value
       end
     end
 
@@ -718,8 +815,6 @@ module TEALrb
     end
 
     module MaybeOps
-      include Opcodes
-
       def app_param_exists?(field, _app_id = nil)
         app_params_get field
         swap
@@ -742,6 +837,17 @@ module TEALrb
         pop
       end
 
+      def acct_has_balance?(_asset_id = nil)
+        acct_params_get 'AcctBalance'
+        swap
+        pop
+      end
+
+      def acct_param_value(field, _asset_id = nil)
+        acct_params_get field
+        pop
+      end
+
       def app_local_ex_exists?(_account = nil, _applicaiton = nil, _key = nil)
         app_local_get_ex
         swap
@@ -764,5 +870,14 @@ module TEALrb
         pop
       end
     end
+
+    module AllOpcodes
+      include TEALOpcodes
+      include MaybeOps
+    end
+
+    module ExtendedOpcodes
+      extend AllOpcodes
+    end
   end
 end