tealrb 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94e31d86149bd0b29c7f7a08f2cabd94866246808315a3f70e8ac8fc35ea4e8e
-  data.tar.gz: e63533e3a902192d6425594109ea5a5e72b92eeea5f45956dc73ad093a05ceee
+  metadata.gz: 2480b69400b8916b30ebd58c19b804190a6390780ad335006ac0364ea9d4ad4e
+  data.tar.gz: 6cf7f7f79217b1938f71bf07348923a7d31d3d83d76a4219f43e58bb1db2e3bc
 SHA512:
-  metadata.gz: 4a5c009da5923b564565b8c78f6e62bd75e17bcac9c19d2ae883d7a789a02ddbefc2e28732b0a278d1b8c868a0728f6ecd81d5cb29eaffc8e2b4a3f808c7acd0
-  data.tar.gz: f9310e249ad33ed5199628483916d7e4299da7dbbf76b294cf8fc22d9c6223a58f63135d7ef24d985c3773d3b89a17acffb59bcf9d1cd89c2984be234afdf4c4
+  metadata.gz: c8220e4aadbdcbe9a992ada723431281665edda6a19c07771978b5a8b4ae9cf987a208ed69e9c96f4360a6a3ace9762dc930e4bab99574b2114effc0ffd1060e
+  data.tar.gz: 47790d4ee2171f4c2e95473f7c7cc6674d9634804c8c0dac2eeafff368df073166d9dfd371efc24026e1c94f4c333b1904af9fa4a959992116df7859dc314875

data/lib/tealrb/contract.rb

@@ -6,11 +6,13 @@ module TEALrb
     include Opcodes
     include ABI
     include Rewriters
+    include MaybeOps
 
     attr_reader :teal
 
     class << self
-      attr_accessor :subroutines, :version, :teal_methods, :abi_method_hash, :abi_description, :debug
+      attr_accessor :subroutines, :version, :teal_methods, :abi_method_hash, :abi_description, :debug,
+                    :disable_abi_routing
 
       private
 
@@ -21,6 +23,7 @@ module TEALrb
         klass.abi_description = ABI::ABIDescription.new
         klass.abi_method_hash = {}
         klass.debug = false
+        klass.disable_abi_routing = false
         super
       end
     end
@@ -69,7 +72,8 @@ module TEALrb
     # sets the `#pragma version`, defines teal methods, and defines subroutines
     def initialize
       @teal = TEAL.new ["#pragma version #{self.class.version}"]
-      @scratch = Scratch.new(@teal)
+      IfBlock.id = 0
+      @scratch = Scratch.new
 
       self.class.subroutines.each_key do |name|
         define_singleton_method(name) do |*_args|
@@ -86,13 +90,16 @@ module TEALrb
       end
     end
 
+    # return the input without transpiling to TEAL
+    def rb(input)
+      input
+    end
+
     # defines a method that is transpiled to TEAL
     # @param name [Symbol] name of the method
     # @param definition [Lambda, Proc, UnboundMethod] the method definition
     # @return [nil]
     def define_teal_method(name, definition)
-      @teal.set_as_current
-
       new_source = generate_method_source(name, definition)
 
       define_singleton_method(name) do |*_args|
@@ -107,13 +114,11 @@ module TEALrb
     # @param definition [Lambda, Proc, UnboundMethod] the method definition
     # @return [nil]
     def define_subroutine(name, definition)
-      @teal.set_as_current
-
       define_singleton_method(name) do |*_args|
         callsub(name)
       end
 
-      @teal << 'b main' unless @teal.include? 'b main'
+      TEAL.instance << 'b main' unless TEAL.instance.include? 'b main'
 
       label(name) # add teal label
 
@@ -135,17 +140,17 @@ module TEALrb
     def comment(content, inline: false)
       content = " #{content}" unless content[0] == ' '
       if inline
-        last_line = @teal.pop
-        @teal << "#{last_line} //#{content}"
+        last_line = TEAL.instance.pop
+        TEAL.instance << "#{last_line} //#{content}"
       else
-        @teal << "//#{content}"
+        TEAL.instance << "//#{content}"
       end
     end
 
     # inserts a string into TEAL source
     # @param string [String] the string to insert
     def placeholder(string)
-      @teal << string
+      TEAL.instance << string
     end
 
     # the hash of the abi description
@@ -157,20 +162,32 @@ module TEALrb
     # @param string [String] string to transpile
     # @return [nil]
     def compile_string(string)
-      @teal.set_as_current
       eval_tealrb(rewrite(string), debug_context: 'compile_string')
       nil
     end
 
-    # transpiles #main
+    # transpiles #main and routes abi methods. To disable abi routing, set `@disable_abi_routing` to true in your
+    # Contract subclass
     def compile
-      @teal.set_as_current
-      @teal << 'main:' if @teal.include? 'b main'
-      eval_tealrb(rewrite(method(:main).source, method_rewriter: true), debug_context: 'main')
+      TEAL.instance << 'main:' if TEAL.instance.include? 'b main'
+      route_abi_methods unless self.class.disable_abi_routing
+      eval_tealrb(rewrite(method(:main).source, method_rewriter: true), debug_context: 'main') if respond_to? :main
     end
 
     private
 
+    def route_abi_methods
+      self.class.abi_description.methods.each do |meth|
+        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
+          callsub(meth[:name])
+          approve
+        end
+      end
+    end
+
     def generate_method_source(name, definition)
       new_source = rewrite(definition.source, method_rewriter: true)
 
@@ -206,7 +223,7 @@ module TEALrb
         puts ''
       end
 
-      [CommentRewriter, ComparisonRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
+      [CommentRewriter, ComparisonRewriter, WhileRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
         string = rewrite_with_rewriter(string, rw)
       end
 
@@ -222,7 +239,7 @@ module TEALrb
     end
 
     def eval_tealrb(s, debug_context:)
-      pre_teal = Array.new @teal
+      pre_teal = Array.new TEAL.instance
 
       if self.class.debug
         puts "DEBUG: Evaluating the following code (#{debug_context}):"
@@ -234,7 +251,7 @@ module TEALrb
 
       if self.class.debug
         puts "DEBUG: Resulting TEAL (#{debug_context}):"
-        puts Array.new(@teal) - pre_teal
+        puts Array.new(TEAL.instance) - pre_teal
         puts ''
       end
     rescue SyntaxError, StandardError => e

data/lib/tealrb/if_block.rb

@@ -6,39 +6,38 @@ module TEALrb
       attr_accessor :id
     end
 
-    @id = {}.compare_by_identity
+    @id = 0
 
-    def initialize(teal, _cond, &blk)
-      self.class.id[teal] ||= 0
-      @teal = teal
+    def initialize(_cond, &blk)
+      self.class.id ||= 0
       @else_count = 0
-      @id = self.class.id[@teal]
+      @id = self.class.id
       @end_label = "if#{@id}_end:"
 
-      self.class.id[@teal] += 1
+      self.class.id += 1
 
-      @teal << "bz if#{@id}_else0"
+      TEAL.instance << "bz if#{@id}_else0"
       blk.call
-      @teal << "b if#{@id}_end"
-      @teal << "if#{@id}_else0:"
-      @teal << @end_label
+      TEAL.instance << "b if#{@id}_end"
+      TEAL.instance << "if#{@id}_else0:"
+      TEAL.instance << @end_label
     end
 
     def elsif(_cond, &blk)
       @else_count += 1
-      @teal.delete @end_label
-      @teal << "bz if#{@id}_else#{@else_count}"
+      TEAL.instance.delete @end_label
+      TEAL.instance << "bz if#{@id}_else#{@else_count}"
       blk.call
-      @teal << "b if#{@id}_end"
-      @teal << "if#{@id}_else#{@else_count}:"
-      @teal << @end_label
+      TEAL.instance << "b if#{@id}_end"
+      TEAL.instance << "if#{@id}_else#{@else_count}:"
+      TEAL.instance << @end_label
       self
     end
 
     def else(&blk)
-      @teal.delete @end_label
+      TEAL.instance.delete @end_label
       blk.call
-      @teal << @end_label
+      TEAL.instance << @end_label
     end
   end
 end

data/lib/tealrb/opcode_modules.rb

@@ -33,7 +33,7 @@ module TEALrb
         private
 
         def txn_type_int(type)
-          TEALrb::TEAL.current[Thread.current] << "int #{type}"
+          TEAL.instance << "int #{type}"
         end
       end
 
@@ -603,7 +603,6 @@ module TEALrb
       extend AppFields
 
       def self.opcode(field, app_id = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         app_params_get field, app_id
       end
     end
@@ -613,7 +612,6 @@ module TEALrb
       extend AssetFields
 
       def self.opcode(field, asset = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         asset_params_get field, asset
       end
     end
@@ -623,7 +621,6 @@ module TEALrb
       extend AccountFields
 
       def self.opcode(field, account = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         acct_params_get field, account
       end
     end
@@ -642,7 +639,6 @@ module TEALrb
       extend Opcodes
 
       def self.opcode(field, index)
-        @teal = TEALrb::TEAL.current[Thread.current]
         gtxn index, field
       end
 
@@ -667,37 +663,34 @@ module TEALrb
     class TxnaField
       include Opcodes
 
-      def initialize(field, index = nil)
+      def initialize(field)
         @field = field
-        @teal = TEALrb::TEAL.current[Thread.current]
-        txna(field, index) if index
       end
 
       def [](index)
-        @teal = TEALrb::TEAL.current[Thread.current]
         txna @field, index
       end
     end
 
     module Txna
-      def self.application_args(index = nil)
-        TxnaField.new('ApplicationArgs', index)
+      def self.application_args
+        TxnaField.new('ApplicationArgs')
       end
 
-      def self.accounts(index = nil)
-        TxnaField.new('Accounts', index)
+      def self.accounts
+        TxnaField.new('Accounts')
       end
 
-      def self.assets(index = nil)
-        TxnaField.new('Assets', index)
+      def self.assets
+        TxnaField.new('Assets')
       end
 
-      def self.applications(index = nil)
-        TxnaField.new('Applications', index)
+      def self.applications
+        TxnaField.new('Applications')
       end
 
-      def self.logs(index = nil)
-        TxnaField.new('Logs', index)
+      def self.logs
+        TxnaField.new('Logs')
       end
     end
 
@@ -706,7 +699,6 @@ module TEALrb
       extend GlobalFields
 
       def self.opcode(field)
-        @teal = TEALrb::TEAL.current[Thread.current]
         global field
       end
 
@@ -724,5 +716,53 @@ module TEALrb
         Txna.application_args[index]
       end
     end
+
+    module MaybeOps
+      include Opcodes
+
+      def app_param_exists?(field, _app_id = nil)
+        app_params_get field
+        swap
+        pop
+      end
+
+      def app_param_value(field, _app_id = nil)
+        app_params_get field
+        pop
+      end
+
+      def asset_param_exists?(field, _asset_id = nil)
+        asset_params_get field
+        swap
+        pop
+      end
+
+      def asset_param_value(field, _asset_id = nil)
+        asset_params_get field
+        pop
+      end
+
+      def app_local_ex_exists?(_account = nil, _applicaiton = nil, _key = nil)
+        app_local_get_ex
+        swap
+        pop
+      end
+
+      def app_local_ex_value(_account = nil, _applicaiton = nil, _key = nil)
+        app_local_get_ex
+        pop
+      end
+
+      def app_global_ex_exists?(_account = nil, _applicaiton = nil, _key = nil)
+        app_global_get_ex
+        swap
+        pop
+      end
+
+      def app_global_ex_value(_account = nil, _applicaiton = nil, _key = nil)
+        app_global_get_ex
+        pop
+      end
+    end
   end
 end