Merge branch 'upgrade-57' into gzeoneth-patch-1

OffchainLabs · Apr 20, 2022 · c34920a · c34920a
2 parents c9ea414 + 014e7ca
commit c34920a
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 33 deletions.
diff --git a/arb_os/arbos-upgrade.mexe b/arb_os/arbos-upgrade.mexe
diff --git a/arb_os/arbos.mexe b/arb_os/arbos.mexe
diff --git a/arb_os/arbos_before.mexe b/arb_os/arbos_before.mexe
diff --git a/arb_os/blockhash.mini b/arb_os/blockhash.mini
@@ -23,10 +23,10 @@ public view func blockhash_getForBlock(blockNum: uint) -> option<bytes32> {
 }
 
 public view write func blockhash_submitHash(ethBlockNum: uint, inboxAccumHash: bytes32) {
-    let b = if ethBlockNum+255 > blockhashes.latestBlockNum {
-        blockhashes.latestBlockNum - 255
+    let b = if ethBlockNum > blockhashes.latestBlockNum + 255 {
+        ethBlockNum - 255
     } else {
-        ethBlockNum
+        blockhashes.latestBlockNum + 1
     };
     while b <= ethBlockNum {  //FORLOOP
         set blockhashes.oldHashes[b%256] = hash(bytes32(b), inboxAccumHash);

diff --git a/arb_os/constants.json b/arb_os/constants.json
@@ -1,5 +1,5 @@
 {
-  "arbos_version": 56,
+  "arbos_version": 57,
   "integer": {
     "AVMSendType_batch": 0,
     "AVM_add": 1,

diff --git a/arb_os/upgrade.json b/arb_os/upgrade.json
diff --git a/benchmarks/boot.aoslog b/benchmarks/boot.aoslog
@@ -1 +1 @@
-{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]}],"sends":[],"total_gas":837692}
+{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]}],"sends":[],"total_gas":837688}
diff --git a/benchmarks/nulltx_100.aoslog b/benchmarks/nulltx_100.aoslog
diff --git a/benchmarks/nulltx_1000.aoslog b/benchmarks/nulltx_1000.aoslog
diff --git a/benchmarks/nulltx_batch_100.aoslog b/benchmarks/nulltx_batch_100.aoslog
diff --git a/benchmarks/nulltx_batch_500.aoslog b/benchmarks/nulltx_batch_500.aoslog
diff --git a/looptest/bridge2.mini b/looptest/bridge2.mini
@@ -33,7 +33,7 @@ public view func remapGlobalsForUpgrade(input_globals: GlobalsBeforeUpgrade) ->
         newGlobal2: newGlobal2,
         newGlobal3: newGlobal3,
         _jump_table: _jump_table,
-    }, 56);
+    }, 57);
 }
 
 

diff --git a/looptest/upgrade2_base.mexe b/looptest/upgrade2_base.mexe
diff --git a/looptest/upgrade2_new.mexe b/looptest/upgrade2_new.mexe
diff --git a/looptest/upgrade2_old.mexe b/looptest/upgrade2_old.mexe
diff --git a/replayTests/evm_direct_deploy_add.aoslog b/replayTests/evm_direct_deploy_add.aoslog
diff --git a/replayTests/evm_direct_deploy_and_call_add.aoslog b/replayTests/evm_direct_deploy_and_call_add.aoslog
diff --git a/replayTests/evm_direct_deploy_and_compressed_call_add.aoslog b/replayTests/evm_direct_deploy_and_compressed_call_add.aoslog
diff --git a/replayTests/evm_eval_sha256.aoslog b/replayTests/evm_eval_sha256.aoslog
@@ -1 +1 @@
-{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"1"},{"Int":"77359400"},{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"1111000000000000000000000000000000001512"},{"Int":"7da3cdb0e6719e006a5ddcdc497343c054123d623187d251ac2652299e398e26"},{"Tuple":[{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"2e8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"ed"},{"Int":"0"}]},{"Tuple":[{"Int":"ed"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"2e8"},{"Int":"0"},{"Int":"ed"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"401"}]}],"sends":[],"total_gas":961586}
+{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"401"},{"Int":"1"},{"Int":"77359400"},{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"1111000000000000000000000000000000001512"},{"Int":"7da3cdb0e6719e006a5ddcdc497343c054123d623187d251ac2652299e398e26"},{"Tuple":[{"Int":"a2"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000cc"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"2e8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"1dd8312636f6a0bf3d21fa2855e63072507453e93a5ced4301b364e91c9d87d6"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"ed"},{"Int":"0"}]},{"Tuple":[{"Int":"ed"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"2e8"},{"Int":"0"},{"Int":"ed"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"401"}]}],"sends":[],"total_gas":961581}
diff --git a/replayTests/evm_test_arbsys.aoslog b/replayTests/evm_test_arbsys.aoslog
diff --git a/replayTests/evm_test_arbsys_direct.aoslog b/replayTests/evm_test_arbsys_direct.aoslog
diff --git a/replayTests/evm_test_create.aoslog b/replayTests/evm_test_create.aoslog
diff --git a/replayTests/evm_test_function_table_access.aoslog b/replayTests/evm_test_function_table_access.aoslog
@@ -1 +1 @@
-{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"1"},{"Int":"77359400"},{"Int":"e5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000ce2ae1590000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000a0123ca0cd2008398968000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"2"},{"Int":"77359400"},{"Int":"a5"},{"Buffer":"0100000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000008898706800000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"3"},{"Int":"77359400"},{"Int":"c5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000b464631b00000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf0000000000000000000000000000000000000000000000000000000000000000"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"205bae445d323d41c2a70638ff83cb0c4359544903850978ded8943e052cf973"},{"Tuple":[{"Int":"e5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000ce2ae1590000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000a0123ca0cd2008398968000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"4a8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"0"},{"Buffer":""}]},{"Tuple":[]}]},{"Tuple":[{"Int":"fc"},{"Int":"0"}]},{"Tuple":[{"Int":"fc"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"4a8"},{"Int":"0"},{"Int":"fc"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"5fa80452b166d50ac062987ccf92fbd09d4d791a0828f45943bd937cb4ec5085"},{"Tuple":[{"Int":"a5"},{"Buffer":"0100000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000008898706800000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf"}]},{"Tuple":[{"Tuple":[{"Int":"2"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"414"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000000001"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"b2"},{"Int":"0"}]},{"Tuple":[{"Int":"1ae"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"414"},{"Int":"0"},{"Int":"b2"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"6da21496ee3c71e35693bb2fb88efaa21b54d17c105fc747d0ca398ed7bab9d4"},{"Tuple":[{"Int":"c5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000b464631b00000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf0000000000000000000000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Tuple":[{"Int":"3"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"494"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"60"},{"Buffer":"23ca0cd20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000989680"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"c8"},{"Int":"0"}]},{"Tuple":[{"Int":"276"},{"Int":"2"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"494"},{"Int":"0"},{"Int":"c8"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]}],"sends":[],"total_gas":1126584}
+{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"1"},{"Int":"77359400"},{"Int":"e5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000ce2ae1590000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000a0123ca0cd2008398968000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"2"},{"Int":"77359400"},{"Int":"a5"},{"Buffer":"0100000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000008898706800000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf"}]},{"Tuple":[{"Int":"3"},{"Int":"186a0"},{"Int":"989680"},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"},{"Int":"3"},{"Int":"77359400"},{"Int":"c5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000b464631b00000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf0000000000000000000000000000000000000000000000000000000000000000"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"205bae445d323d41c2a70638ff83cb0c4359544903850978ded8943e052cf973"},{"Tuple":[{"Int":"e5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000ce2ae1590000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000a0123ca0cd2008398968000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"4a8"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"0"},{"Buffer":""}]},{"Tuple":[]}]},{"Tuple":[{"Int":"fc"},{"Int":"0"}]},{"Tuple":[{"Int":"fc"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"4a8"},{"Int":"0"},{"Int":"fc"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"5fa80452b166d50ac062987ccf92fbd09d4d791a0828f45943bd937cb4ec5085"},{"Tuple":[{"Int":"a5"},{"Buffer":"0100000000000000000000000000000000000000000000000000000000009896800000000000000000000000000000000000000000000000000000000077359400000000000000000000000000000000000000000000000000000000000000006800000000000000000000000000000000000000000000000000000000000000008898706800000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf"}]},{"Tuple":[{"Tuple":[{"Int":"2"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"414"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"20"},{"Buffer":"0000000000000000000000000000000000000000000000000000000000000001"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"b2"},{"Int":"0"}]},{"Tuple":[{"Int":"1ae"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"414"},{"Int":"0"},{"Int":"b2"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"3"},{"Int":"1"},{"Int":"186a0"},{"Int":"989680"},{"Int":"70ac7e36af4ff81688f712fb738bbbc1b7349bbf"},{"Int":"6da21496ee3c71e35693bb2fb88efaa21b54d17c105fc747d0ca398ed7bab9d4"},{"Tuple":[{"Int":"c5"},{"Buffer":"010000000000000000000000000000000000000000000000000000000000989680000000000000000000000000000000000000000000000000000000007735940000000000000000000000000000000000000000000000000000000000000000680000000000000000000000000000000000000000000000000000000000000000b464631b00000000000000000000000070ac7e36af4ff81688f712fb738bbbc1b7349bbf0000000000000000000000000000000000000000000000000000000000000000"}]},{"Tuple":[{"Tuple":[{"Int":"3"},{"Int":"0"},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"}]},{"Tuple":[{"Int":"1"},{"Tuple":[{"Tuple":[{"Int":"0"}]},{"Int":"494"}]}]},{"Int":"0"},{"Tuple":[{"Int":"0"}]}]}]},{"Tuple":[{"Int":"0"},{"Tuple":[{"Int":"60"},{"Buffer":"23ca0cd20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000989680"}]},{"Tuple":[]}]},{"Tuple":[{"Int":"c8"},{"Int":"0"}]},{"Tuple":[{"Int":"276"},{"Int":"2"},{"Int":"0"}]},{"Tuple":[{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"1"},{"Int":"494"},{"Int":"0"},{"Int":"c8"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Int":"0"},{"Int":"0"}]},{"Int":"5f9b7e36af4ff81688f712fb738bbbc1b7348aae"}]}],"sends":[],"total_gas":1126579}
diff --git a/replayTests/evm_xcontract_call_using_batch.aoslog b/replayTests/evm_xcontract_call_using_batch.aoslog
diff --git a/replayTests/evm_xcontract_call_with_constructors.aoslog b/replayTests/evm_xcontract_call_with_constructors.aoslog
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]}],"sends":[],"total_gas":837692}
		{"format_version":1,"inbox":[{"Tuple":[{"Int":"4"},{"Int":"186a0"},{"Int":"989680"},{"Int":"0"},{"Int":"0"},{"Int":"77359400"},{"Int":"40"},{"Buffer":"625a539a292ffb7be735d7db3f6b9b9c88b9ced262ae58163dfb75ba308551f2000000000000000000000000000000000000000000000000000000000000a4b1"}]}],"logs":[{"Tuple":[{"Int":"1"},{"Int":"0"},{"Int":"0"},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"1"},{"Int":"0"}]},{"Tuple":[{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"0"},{"Int":"112a8800"}]},{"Int":"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"},{"Int":"0"}]}],"sends":[],"total_gas":837688}
-Original file line number
+Diff line change
@@ Expand Up @@
             newGlobal2: newGlobal2,
             newGlobal3: newGlobal3,
             _jump_table: _jump_table,
-        }, 56);
+        }, 57);
     }
@@ Expand Down @@