version bump

arb_os/constants.json

@@ -1,5 +1,5 @@
 {
-  "arbos_version": 57,
+  "arbos_version": 58,
   "integer": {
     "AVMSendType_batch": 0,
     "AVM_add": 1,

looptest/bridge2.mini

@@ -33,7 +33,7 @@ public view func remapGlobalsForUpgrade(input_globals: GlobalsBeforeUpgrade) ->
         newGlobal2: newGlobal2,
         newGlobal3: newGlobal3,
         _jump_table: _jump_table,
-    }, 57);
+    }, 58);
 }
 
 

src/compile/mod.rs

@@ -54,7 +54,7 @@ pub struct CompileStruct {
     pub warnings_are_errors: bool,
     #[clap(short, long)]
     pub output: Option<String>,
-    #[clap(short = 'O', long, default_value = "7168")]
+    #[clap(short = 'O', long, default_value = "2")]
     pub optimization_level: usize,
     #[clap(short, long)]
     pub format: Option<String>,

src/evm/preinstalled_contracts.rs

@@ -1658,7 +1658,7 @@ fn test_upgrade_arbos_to_different_version() -> Result<(), ethabi::Error> {
     let arbsys_orig_binding = ArbSys::new(&wallet, false);
     assert_eq!(
         arbsys_orig_binding.arbos_version(&mut machine)?,
-        Uint256::from_u64(56),
+        Uint256::from_u64(57),
     );
 
     arbowner._add_chain_owner(&mut machine, my_addr.clone(), true, false)?;

upgradetests/regcopy_new.mexe

@@ -1 +1 @@
-{"arbos_version":57,"code":[{"opcode":59,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":null,"debug_info":{"location":{"line":6,"column":11,"absolute":108,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":{"Tuple":[]},"debug_info":{"location":{"line":6,"column":11,"absolute":108,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":64,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":144,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":64,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":82,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":144,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":82,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":20,"immediate":{"Int":"3"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":53,"immediate":{"CodePoint":{"Internal":17}},"debug_info":{"location":{"line":9,"column":4,"absolute":222,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":{"Int":"0"},"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":{"CodePoint":{"Internal":17}},"debug_info":{"location":{"line":9,"column":4,"absolute":222,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":{"Int":"1"},"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}}],"static_val":{"Tuple":[]},"globals":[{"id":18446744073709551615,"name":"_jump_table","tipe":"Any","offset":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}}],"file_info_chart":{"5167093027911251668":"regcopy_new","9360984261226144135":"core::kvs","11013747379006575874":"core::array"},"type_tree":{"inner":{"core, array, 0":[{"FixedArray":["Any",8]},"block"],"core, array, 1":[{"Struct":[{"name":"size","tipe":"Uint"},{"name":"topstep","tipe":"Uint"},{"name":"contents","tipe":{"Nominal":[["core","array"],0,[]]}}]},"array"],"core, array, 31":[{"Struct":[{"name":"bloc","tipe":{"Nominal":[["core","array"],0,[]]}},{"name":"val","tipe":"Any"}]},"arraySwapSubResult"],"core, array, 33":[{"Struct":[{"name":"f","tipe":{"Func":[{"view":false,"write":false,"throw":false,"safe":false,"sensitive":false,"closure":false,"public":false,"returns":true,"nargs":2,"nouts":1},["Any","Any"],{"Tuple":["Any","Any"]}]}},{"name":"val","tipe":"Any"}]},"opClosure"],"core, kvs, 0":[{"Struct":[{"name":"tree","tipe":{"Nominal":[["core","kvs"],2,[]]}},{"name":"size","tipe":"Uint"}]},"Kvs"],"core, kvs, 14":[{"Struct":[{"name":"kvs","tipe":{"FixedArray":["Any",8]}},{"name":"index","tipe":"Uint"},{"name":"next","tipe":{"Option":{"Nominal":[["core","kvs"],14,[]]}}}]},"Unwinder"],"core, kvs, 2":[{"FixedArray":["Any",8]},"KvsNode"],"core, kvs, 4":[{"Struct":[{"name":"key","tipe":"Any"},{"name":"value","tipe":{"Option":"Any"}}]},"KvsCell"],"regcopy_new, 0":[{"Struct":[{"name":"global1","tipe":"Uint"},{"name":"global2","tipe":{"Option":"Int"}},{"name":"jump_table","tipe":"Any"}]},"OldGlobals"]}}}
+{"arbos_version":58,"code":[{"opcode":59,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":null,"debug_info":{"location":{"line":6,"column":11,"absolute":108,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":{"Tuple":[]},"debug_info":{"location":{"line":6,"column":11,"absolute":108,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":64,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":82,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":20,"immediate":{"Int":"3"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":67,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":64,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":144,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":82,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":144,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":53,"immediate":{"CodePoint":{"Internal":18}},"debug_info":{"location":{"line":9,"column":4,"absolute":222,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":{"Int":"0"},"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":10,"column":8,"absolute":265,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":{"CodePoint":{"Internal":18}},"debug_info":{"location":{"line":9,"column":4,"absolute":222,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":{"Int":"1"},"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":12,"column":4,"absolute":289,"file_id":5167093027911251668},"attributes":{"breakpoint":false}}}],"static_val":{"Tuple":[]},"globals":[{"id":18446744073709551615,"name":"_jump_table","tipe":"Any","offset":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}}],"file_info_chart":{"5167093027911251668":"regcopy_new","9360984261226144135":"core::kvs","11013747379006575874":"core::array"},"type_tree":{"inner":{"core, array, 0":[{"FixedArray":["Any",8]},"block"],"core, array, 1":[{"Struct":[{"name":"size","tipe":"Uint"},{"name":"topstep","tipe":"Uint"},{"name":"contents","tipe":{"Nominal":[["core","array"],0,[]]}}]},"array"],"core, array, 31":[{"Struct":[{"name":"bloc","tipe":{"Nominal":[["core","array"],0,[]]}},{"name":"val","tipe":"Any"}]},"arraySwapSubResult"],"core, array, 33":[{"Struct":[{"name":"f","tipe":{"Func":[{"view":false,"write":false,"throw":false,"safe":false,"sensitive":false,"closure":false,"public":false,"returns":true,"nargs":2,"nouts":1},["Any","Any"],{"Tuple":["Any","Any"]}]}},{"name":"val","tipe":"Any"}]},"opClosure"],"core, kvs, 0":[{"Struct":[{"name":"tree","tipe":{"Nominal":[["core","kvs"],2,[]]}},{"name":"size","tipe":"Uint"}]},"Kvs"],"core, kvs, 14":[{"Struct":[{"name":"kvs","tipe":{"FixedArray":["Any",8]}},{"name":"index","tipe":"Uint"},{"name":"next","tipe":{"Option":{"Nominal":[["core","kvs"],14,[]]}}}]},"Unwinder"],"core, kvs, 2":[{"FixedArray":["Any",8]},"KvsNode"],"core, kvs, 4":[{"Struct":[{"name":"key","tipe":"Any"},{"name":"value","tipe":{"Option":"Any"}}]},"KvsCell"],"regcopy_new, 0":[{"Struct":[{"name":"global1","tipe":"Uint"},{"name":"global2","tipe":{"Option":"Int"}},{"name":"jump_table","tipe":"Any"}]},"OldGlobals"]}}}

upgradetests/regcopy_old.mexe

@@ -1 +1 @@
-{"arbos_version":57,"code":[{"opcode":59,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"0"}]},{"Tuple":[]}]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":{"Tuple":[]},"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":50,"immediate":{"Int":"5"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":81,"immediate":{"Int":"0"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":50,"immediate":{"Tuple":[{"Int":"1"},{"Int":"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd"}]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":81,"immediate":{"Int":"1"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}}],"static_val":{"Tuple":[]},"globals":[{"id":0,"name":"global1","tipe":"Uint","offset":0,"debug_info":{"location":{"line":0,"column":4,"absolute":4,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"id":1,"name":"global2","tipe":{"Option":"Int"},"offset":1,"debug_info":{"location":{"line":1,"column":4,"absolute":23,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"id":18446744073709551615,"name":"_jump_table","tipe":"Any","offset":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}}],"file_info_chart":{"4324297106567844897":"regcopy_old","9360984261226144135":"core::kvs","11013747379006575874":"core::array"},"type_tree":{"inner":{"core, array, 0":[{"FixedArray":["Any",8]},"block"],"core, array, 1":[{"Struct":[{"name":"size","tipe":"Uint"},{"name":"topstep","tipe":"Uint"},{"name":"contents","tipe":{"Nominal":[["core","array"],0,[]]}}]},"array"],"core, array, 31":[{"Struct":[{"name":"bloc","tipe":{"Nominal":[["core","array"],0,[]]}},{"name":"val","tipe":"Any"}]},"arraySwapSubResult"],"core, array, 33":[{"Struct":[{"name":"f","tipe":{"Func":[{"view":false,"write":false,"throw":false,"safe":false,"sensitive":false,"closure":false,"public":false,"returns":true,"nargs":2,"nouts":1},["Any","Any"],{"Tuple":["Any","Any"]}]}},{"name":"val","tipe":"Any"}]},"opClosure"],"core, kvs, 0":[{"Struct":[{"name":"tree","tipe":{"Nominal":[["core","kvs"],2,[]]}},{"name":"size","tipe":"Uint"}]},"Kvs"],"core, kvs, 14":[{"Struct":[{"name":"kvs","tipe":{"FixedArray":["Any",8]}},{"name":"index","tipe":"Uint"},{"name":"next","tipe":{"Option":{"Nominal":[["core","kvs"],14,[]]}}}]},"Unwinder"],"core, kvs, 2":[{"FixedArray":["Any",8]},"KvsNode"],"core, kvs, 4":[{"Struct":[{"name":"key","tipe":"Any"},{"name":"value","tipe":{"Option":"Any"}}]},"KvsCell"]}}}
+{"arbos_version":58,"code":[{"opcode":59,"immediate":{"Tuple":[]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"0"}]},{"Tuple":[]}]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":56,"immediate":{"Tuple":[]},"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":50,"immediate":{"Int":"5"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":81,"immediate":{"Int":"0"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":50,"immediate":{"Tuple":[{"Int":"1"},{"Int":"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd"}]},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":81,"immediate":{"Int":"1"},"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":51,"immediate":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":48,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":57,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"opcode":52,"immediate":null,"debug_info":{"location":{"line":3,"column":11,"absolute":57,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}}],"static_val":{"Tuple":[]},"globals":[{"id":0,"name":"global1","tipe":"Uint","offset":0,"debug_info":{"location":{"line":0,"column":4,"absolute":4,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"id":1,"name":"global2","tipe":{"Option":"Int"},"offset":1,"debug_info":{"location":{"line":1,"column":4,"absolute":23,"file_id":4324297106567844897},"attributes":{"breakpoint":false}}},{"id":18446744073709551615,"name":"_jump_table","tipe":"Any","offset":null,"debug_info":{"location":null,"attributes":{"breakpoint":false}}}],"file_info_chart":{"4324297106567844897":"regcopy_old","9360984261226144135":"core::kvs","11013747379006575874":"core::array"},"type_tree":{"inner":{"core, array, 0":[{"FixedArray":["Any",8]},"block"],"core, array, 1":[{"Struct":[{"name":"size","tipe":"Uint"},{"name":"topstep","tipe":"Uint"},{"name":"contents","tipe":{"Nominal":[["core","array"],0,[]]}}]},"array"],"core, array, 31":[{"Struct":[{"name":"bloc","tipe":{"Nominal":[["core","array"],0,[]]}},{"name":"val","tipe":"Any"}]},"arraySwapSubResult"],"core, array, 33":[{"Struct":[{"name":"f","tipe":{"Func":[{"view":false,"write":false,"throw":false,"safe":false,"sensitive":false,"closure":false,"public":false,"returns":true,"nargs":2,"nouts":1},["Any","Any"],{"Tuple":["Any","Any"]}]}},{"name":"val","tipe":"Any"}]},"opClosure"],"core, kvs, 0":[{"Struct":[{"name":"tree","tipe":{"Nominal":[["core","kvs"],2,[]]}},{"name":"size","tipe":"Uint"}]},"Kvs"],"core, kvs, 14":[{"Struct":[{"name":"kvs","tipe":{"FixedArray":["Any",8]}},{"name":"index","tipe":"Uint"},{"name":"next","tipe":{"Option":{"Nominal":[["core","kvs"],14,[]]}}}]},"Unwinder"],"core, kvs, 2":[{"FixedArray":["Any",8]},"KvsNode"],"core, kvs, 4":[{"Struct":[{"name":"key","tipe":"Any"},{"name":"value","tipe":{"Option":"Any"}}]},"KvsCell"]}}}