fix txndatalon

Author: amkCha

txndata/txndatalontemp/columns.lisp txndata/txndatalon/columns.lisptxndata/txndatalontemp/columns.lisp renamed to txndata/txndatalon/columns.lisp

@@ -1,4 +1,4 @@
-(module txndata (< EVM_FORK EVM_SHANGHAI))
+(module txndata)
 
 (defcolumns
   (ABS_TX_NUM_MAX          :i16)

txndata/txndatalontemp/constants.lisp txndata/txndatalon/constants.lisptxndata/txndatalontemp/constants.lisp renamed to txndata/txndatalon/constants.lisp

@@ -1,7 +1,5 @@
 (module txndata)
 
-
-
 (defconst
 ;; TODO: this is LONDON
   CT_MAX_TYPE_0_LONDON                                         7
@@ -42,9 +40,8 @@
   TYPE_1_RLP_TXN_PHASE_NUMBER_7                          RLP_TXN_PHASE_ACCESS_LIST
   TYPE_2_RLP_TXN_PHASE_NUMBER_6                          RLP_TXN_PHASE_MAX_FEE_PER_GAS
   TYPE_2_RLP_TXN_PHASE_NUMBER_7                          RLP_TXN_PHASE_ACCESS_LIST
-  ;;
 
-  ;; TODO: this is LONDON
+  ;;
   row-offset---nonce-comparison                         0
   row-offset---initial-balance-comparison               1
   row-offset---sufficient-gas-comparison                2
@@ -53,7 +50,6 @@
   row-offset---detecting-empty-call-data-comparison     5
   row-offset---max-fee-and-basefee-comparison           6
   row-offset---max-fee-and-max-priority-fee-comparison  7
-  row-offset---computing-effective-gas-price-comparison 8
-  )
+  row-offset---computing-effective-gas-price-comparison 8)
 
 

txndata/txndatalontemp/constraints.lisp txndata/txndatalon/constraints.lisptxndata/txndatalontemp/constraints.lisp renamed to txndata/txndatalon/constraints.lisp

@@ -61,7 +61,6 @@
 ;;    2.2 Constancies    ;;
 ;;                       ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 (defun (transaction-constant X)
   (if-not-zero CT
                (eq! X (prev X))))
@@ -155,7 +154,7 @@
 (defun   (optional_to_addr_hi)   (shift OUTGOING_HI 1))
 (defun   (optional_to_addr_lo)   (shift OUTGOING_LO 1))
 (defun   (nonce)                 (shift OUTGOING_LO 2))
-(defun   (is_dep)                (force-bin (shift OUTGOING_HI 3)))
+(defun   (is_dep)                (shift OUTGOING_HI 3))
 (defun   (value)                 (shift OUTGOING_LO 3))
 (defun   (data_cost)             (shift OUTGOING_HI 4))
 (defun   (data_size)             (shift OUTGOING_LO 4))
@@ -250,69 +249,36 @@
 
 (defun (result-must-be-false row-offset) (vanishes! (shift RES row-offset)))
 (defun (result-must-be-true  row-offset) (eq!       (shift RES row-offset) 1))
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                               ;;
 ;;    2.9 Shared computations    ;;
 ;;                               ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defconstraint    comparison---nonce-must-not-exceed-EIP-2681-max-nonce
-                  (:guard (first-row-of-new-transaction))
+(defconstraint    comparison---nonce-must-not-exceed-EIP-2681-max-nonce    (:guard (first-row-of-new-transaction))
                   (begin
                     (small-call-to-LT    row-offset---nonce-comparison NONCE EIP2681_MAX_NONCE)
                     (result-must-be-true row-offset---nonce-comparison)))
 
-(defconstraint    comparison---initial-balance-must-cover-value-plus-maximal-gas-cost
-                  (:guard (first-row-of-new-transaction))
+(defconstraint    comparison---initial-balance-must-cover-value-plus-maximal-gas-cost    (:guard (first-row-of-new-transaction))
                   (begin
                     (small-call-to-LEQ    row-offset---initial-balance-comparison (+ (value) (* (max_fee) (gas_limit))) INITIAL_BALANCE)
                     (result-must-be-true  row-offset---initial-balance-comparison)))
 
-(defconstraint    comparaison---code-size-limit-check
-                  (:guard (first-row-of-new-transaction))
-                  (if-not-zero (is_dep)
-                               (begin 
-                                 (small-call-to-LEQ    row-offset---init-code-size-limit
-                                                       (data_size)
-                                                       MAX_INIT_CODE_SIZE)
-                                 (result-must-be-true  row-offset---init-code-size-limit))))
-
-(defconstraint    euc-call---computing-number-of-words-in-init-code
-                  (:guard (first-row-of-new-transaction))
-                  (if-not-zero (is_dep)
-                               (begin
-                                 (call-to-EUC    row-offset---init-code-pricing
-                                                 (+ (data_size) WORD_SIZE_MO)
-                                                 WORD_SIZE))))
-
-(defun   (number_of_words_in_init_code)   (shift RES row-offset---init-code-pricing))
-
-(defun   (init_code_cost)
-  (*     GAS_CONST_INIT_CODE_WORD
-         (number_of_words_in_init_code)
-         ))
-
-(defun   (upfront_gas_cost)
-  (+     (*   TYPE0   (legacy_upfront_gas_cost))
-         (*   TYPE1   (access_upfront_gas_cost))
-         (*   TYPE2   (access_upfront_gas_cost))))
-
-(defun   (legacy_upfront_gas_cost)
-  (+     (data_cost)
-         (* (is_dep)   GAS_CONST_G_TX_CREATE)
-         (* (is_dep)   (init_code_cost))
-         GAS_CONST_G_TRANSACTION
-         ))
-
-(defun   (access_upfront_gas_cost)
-  (+     (data_cost)
-         (* (is_dep)   GAS_CONST_G_TX_CREATE)
-         (* (is_dep)   (init_code_cost))
-         GAS_CONST_G_TRANSACTION
-         (* (num_addr) GAS_CONST_G_ACCESS_LIST_ADRESS)
-         (* (num_keys) GAS_CONST_G_ACCESS_LIST_STORAGE)))
+(defun (upfront_gas_cost)
+  (+   (*   TYPE0   (legacy_upfront_gas_cost))
+       (*   TYPE1   (access_upfront_gas_cost))
+       (*   TYPE2   (access_upfront_gas_cost))))
+(defun (legacy_upfront_gas_cost)
+  (+   (data_cost)
+       GAS_CONST_G_TRANSACTION
+       (* (is_dep) GAS_CONST_G_TX_CREATE)))
+(defun (access_upfront_gas_cost)
+  (+   (data_cost)
+       GAS_CONST_G_TRANSACTION
+       (* (is_dep)   GAS_CONST_G_TX_CREATE)
+       (* (num_addr) GAS_CONST_G_ACCESS_LIST_ADRESS)
+       (* (num_keys) GAS_CONST_G_ACCESS_LIST_STORAGE)))
 
 (defconstraint    comparison---gas-limit-must-cover-upfront-gas-cost    (:guard (first-row-of-new-transaction))
                   (begin