diff --git a/gas/gas.zkasm b/gas/gas.zkasm index 0ff9b485a..fd7d3d8a1 100644 --- a/gas/gas.zkasm +++ b/gas/gas.zkasm @@ -4,8 +4,8 @@ ;; "Out Of Gas Exception". When OOGX==1, it means the corresponding ;; instruction generated an out-of-gas exception (rather than some ;; other exception kind). -pub fn gas(GAS_COST u64, GAS_ACTUAL u64, XAHOY u1, OOGX u1) { - var tmp u64 +pub fn gas(GAS_COST u32, GAS_ACTUAL u32, XAHOY u1, OOGX u1) { + var tmp u32 var b u1 ;; b, tmp = GAS_ACTUAL - GAS_COST diff --git a/hub/cancun/columns/shared.lisp b/hub/cancun/columns/shared.lisp index 0efc78db5..b66b5708a 100644 --- a/hub/cancun/columns/shared.lisp +++ b/hub/cancun/columns/shared.lisp @@ -64,8 +64,8 @@ ;; gas columns ( GAS_EXPECTED :i64 ) - ( GAS_ACTUAL :i64 ) - ( GAS_COST :i64 ) + ( GAS_ACTUAL :i32 ) + ( GAS_COST :i32 ) ( GAS_NEXT :i64 ) ( REFUND_COUNTER :i32 ) ( REFUND_COUNTER_NEW :i32 ) diff --git a/hub/cancun/columns/transaction.lisp b/hub/cancun/columns/transaction.lisp index 26ad7c997..004aad9b4 100644 --- a/hub/cancun/columns/transaction.lisp +++ b/hub/cancun/columns/transaction.lisp @@ -35,9 +35,9 @@ ;; end of transaction predictions ( STATUS_CODE :binary ) - ( GAS_LEFTOVER :i64 ) - ( REFUND_COUNTER_INFINITY :i64 ) - ( REFUND_EFFECTIVE :i64 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_INFINITY :i25 ) + ( REFUND_EFFECTIVE :i25 ) ;; coinbase related ( COINBASE_ADDRESS_HI :i32 ) diff --git a/hub/london/columns/shared.lisp b/hub/london/columns/shared.lisp index aad7677df..bb7c57e26 100644 --- a/hub/london/columns/shared.lisp +++ b/hub/london/columns/shared.lisp @@ -51,8 +51,8 @@ ;; gas columns ( GAS_EXPECTED :i64 ) - ( GAS_ACTUAL :i64 ) - ( GAS_COST :i64 ) + ( GAS_ACTUAL :i32 ) + ( GAS_COST :i32 ) ( GAS_NEXT :i64 ) ( REFUND_COUNTER :i32 ) ( REFUND_COUNTER_NEW :i32 ) diff --git a/hub/london/columns/transaction.lisp b/hub/london/columns/transaction.lisp index 9ad1605e4..9d325e33c 100644 --- a/hub/london/columns/transaction.lisp +++ b/hub/london/columns/transaction.lisp @@ -35,9 +35,9 @@ ;; end of transaction predictions ( STATUS_CODE :binary) - ( GAS_LEFTOVER :i64 ) - ( REFUND_COUNTER_INFINITY :i64 ) - ( REFUND_EFFECTIVE :i64 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_INFINITY :i25 ) + ( REFUND_EFFECTIVE :i25 ) ;; coinbase related ( COINBASE_ADDRESS_HI :i32 ) diff --git a/hub/osaka/columns/shared.lisp b/hub/osaka/columns/shared.lisp index 0efc78db5..b66b5708a 100644 --- a/hub/osaka/columns/shared.lisp +++ b/hub/osaka/columns/shared.lisp @@ -64,8 +64,8 @@ ;; gas columns ( GAS_EXPECTED :i64 ) - ( GAS_ACTUAL :i64 ) - ( GAS_COST :i64 ) + ( GAS_ACTUAL :i32 ) + ( GAS_COST :i32 ) ( GAS_NEXT :i64 ) ( REFUND_COUNTER :i32 ) ( REFUND_COUNTER_NEW :i32 ) diff --git a/hub/osaka/columns/transaction.lisp b/hub/osaka/columns/transaction.lisp index d62ef3cb0..63d18f02c 100644 --- a/hub/osaka/columns/transaction.lisp +++ b/hub/osaka/columns/transaction.lisp @@ -35,9 +35,9 @@ ;; end of transaction predictions ( STATUS_CODE :binary ) - ( GAS_LEFTOVER :i64 ) - ( REFUND_COUNTER_INFINITY :i64 ) - ( REFUND_EFFECTIVE :i64 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_INFINITY :i25 ) + ( REFUND_EFFECTIVE :i25 ) ;; coinbase related ( COINBASE_ADDRESS_HI :i32 ) diff --git a/hub/prague/columns/shared.lisp b/hub/prague/columns/shared.lisp index 0efc78db5..b66b5708a 100644 --- a/hub/prague/columns/shared.lisp +++ b/hub/prague/columns/shared.lisp @@ -64,8 +64,8 @@ ;; gas columns ( GAS_EXPECTED :i64 ) - ( GAS_ACTUAL :i64 ) - ( GAS_COST :i64 ) + ( GAS_ACTUAL :i32 ) + ( GAS_COST :i32 ) ( GAS_NEXT :i64 ) ( REFUND_COUNTER :i32 ) ( REFUND_COUNTER_NEW :i32 ) diff --git a/hub/prague/columns/transaction.lisp b/hub/prague/columns/transaction.lisp index d62ef3cb0..63d18f02c 100644 --- a/hub/prague/columns/transaction.lisp +++ b/hub/prague/columns/transaction.lisp @@ -35,9 +35,9 @@ ;; end of transaction predictions ( STATUS_CODE :binary ) - ( GAS_LEFTOVER :i64 ) - ( REFUND_COUNTER_INFINITY :i64 ) - ( REFUND_EFFECTIVE :i64 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_INFINITY :i25 ) + ( REFUND_EFFECTIVE :i25 ) ;; coinbase related ( COINBASE_ADDRESS_HI :i32 ) diff --git a/hub/shanghai/columns/shared.lisp b/hub/shanghai/columns/shared.lisp index aad7677df..bb7c57e26 100644 --- a/hub/shanghai/columns/shared.lisp +++ b/hub/shanghai/columns/shared.lisp @@ -51,8 +51,8 @@ ;; gas columns ( GAS_EXPECTED :i64 ) - ( GAS_ACTUAL :i64 ) - ( GAS_COST :i64 ) + ( GAS_ACTUAL :i32 ) + ( GAS_COST :i32 ) ( GAS_NEXT :i64 ) ( REFUND_COUNTER :i32 ) ( REFUND_COUNTER_NEW :i32 ) diff --git a/hub/shanghai/columns/transaction.lisp b/hub/shanghai/columns/transaction.lisp index 9ad1605e4..9d325e33c 100644 --- a/hub/shanghai/columns/transaction.lisp +++ b/hub/shanghai/columns/transaction.lisp @@ -35,9 +35,9 @@ ;; end of transaction predictions ( STATUS_CODE :binary) - ( GAS_LEFTOVER :i64 ) - ( REFUND_COUNTER_INFINITY :i64 ) - ( REFUND_EFFECTIVE :i64 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_INFINITY :i25 ) + ( REFUND_EFFECTIVE :i25 ) ;; coinbase related ( COINBASE_ADDRESS_HI :i32 ) diff --git a/txndata/cancun/columns/common.lisp b/txndata/cancun/columns/common.lisp index f2f0138a0..afaa45403 100644 --- a/txndata/cancun/columns/common.lisp +++ b/txndata/cancun/columns/common.lisp @@ -24,6 +24,6 @@ ;; heartbeat ( CT :i4 ) ( CT_MAX :i4 ) - ( GAS_CUMULATIVE :i128 ) + ( GAS_CUMULATIVE :i32 ) ) diff --git a/txndata/cancun/columns/hub_view.lisp b/txndata/cancun/columns/hub_view.lisp index b6e3b69bf..23510ab79 100644 --- a/txndata/cancun/columns/hub_view.lisp +++ b/txndata/cancun/columns/hub_view.lisp @@ -40,9 +40,9 @@ ( CFI :i16 ) ( INIT_BALANCE :i128 ) ( STATUS_CODE :binary@prove ) - ( GAS_LEFTOVER :i128 ) - ( REFUND_COUNTER_FINAL :i128 ) - ( REFUND_EFFECTIVE :i128 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_FINAL :i25 ) + ( REFUND_EFFECTIVE :i25 ) ( EIP_4788 :binary@prove ) ( EIP_2935 :binary@prove ) ( NOOP :binary@prove ) diff --git a/txndata/london/columns.lisp b/txndata/london/columns.lisp index f4c626eab..18141de27 100644 --- a/txndata/london/columns.lisp +++ b/txndata/london/columns.lisp @@ -30,10 +30,10 @@ (TYPE2 :binary@prove) (REQUIRES_EVM_EXECUTION :binary@prove) (COPY_TXCD :binary@prove) - (GAS_LEFTOVER :i128) - (REFUND_COUNTER :i128) - (REFUND_EFFECTIVE :i128) - (GAS_CUMULATIVE :i128) + (GAS_LEFTOVER :i32 ) + (REFUND_COUNTER :i25 ) + (REFUND_EFFECTIVE :i25 ) + (GAS_CUMULATIVE :i32 ) (STATUS_CODE :binary@prove) (PHASE_RLP_TXN :byte) (PHASE_RLP_TXNRCPT :byte) diff --git a/txndata/osaka/columns/common.lisp b/txndata/osaka/columns/common.lisp index d5f4da6c7..45c7281b2 100644 --- a/txndata/osaka/columns/common.lisp +++ b/txndata/osaka/columns/common.lisp @@ -24,6 +24,6 @@ ;; heartbeat ( CT :i5 ) ( CT_MAX :i5 ) - ( GAS_CUMULATIVE :i128 ) + ( GAS_CUMULATIVE :i32 ) ) diff --git a/txndata/osaka/columns/hub_view.lisp b/txndata/osaka/columns/hub_view.lisp index b6e3b69bf..23510ab79 100644 --- a/txndata/osaka/columns/hub_view.lisp +++ b/txndata/osaka/columns/hub_view.lisp @@ -40,9 +40,9 @@ ( CFI :i16 ) ( INIT_BALANCE :i128 ) ( STATUS_CODE :binary@prove ) - ( GAS_LEFTOVER :i128 ) - ( REFUND_COUNTER_FINAL :i128 ) - ( REFUND_EFFECTIVE :i128 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_FINAL :i25 ) + ( REFUND_EFFECTIVE :i25 ) ( EIP_4788 :binary@prove ) ( EIP_2935 :binary@prove ) ( NOOP :binary@prove ) diff --git a/txndata/prague/columns/common.lisp b/txndata/prague/columns/common.lisp index f2f0138a0..afaa45403 100644 --- a/txndata/prague/columns/common.lisp +++ b/txndata/prague/columns/common.lisp @@ -24,6 +24,6 @@ ;; heartbeat ( CT :i4 ) ( CT_MAX :i4 ) - ( GAS_CUMULATIVE :i128 ) + ( GAS_CUMULATIVE :i32 ) ) diff --git a/txndata/prague/columns/hub_view.lisp b/txndata/prague/columns/hub_view.lisp index b6e3b69bf..23510ab79 100644 --- a/txndata/prague/columns/hub_view.lisp +++ b/txndata/prague/columns/hub_view.lisp @@ -40,9 +40,9 @@ ( CFI :i16 ) ( INIT_BALANCE :i128 ) ( STATUS_CODE :binary@prove ) - ( GAS_LEFTOVER :i128 ) - ( REFUND_COUNTER_FINAL :i128 ) - ( REFUND_EFFECTIVE :i128 ) + ( GAS_LEFTOVER :i32 ) + ( REFUND_COUNTER_FINAL :i25 ) + ( REFUND_EFFECTIVE :i25 ) ( EIP_4788 :binary@prove ) ( EIP_2935 :binary@prove ) ( NOOP :binary@prove ) diff --git a/txndata/shanghai/columns.lisp b/txndata/shanghai/columns.lisp index f4c626eab..962527767 100644 --- a/txndata/shanghai/columns.lisp +++ b/txndata/shanghai/columns.lisp @@ -30,10 +30,10 @@ (TYPE2 :binary@prove) (REQUIRES_EVM_EXECUTION :binary@prove) (COPY_TXCD :binary@prove) - (GAS_LEFTOVER :i128) - (REFUND_COUNTER :i128) - (REFUND_EFFECTIVE :i128) - (GAS_CUMULATIVE :i128) + (GAS_LEFTOVER :i32 ) + (REFUND_COUNTER :i25 ) + (REFUND_EFFECTIVE :i25 ) + (GAS_CUMULATIVE :i32 ) (STATUS_CODE :binary@prove) (PHASE_RLP_TXN :byte) (PHASE_RLP_TXNRCPT :byte)