tests pass

ethereum-optimism · Aug 9, 2024 · c880c01 · c880c01
1 parent 29e847e
commit c880c01
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 53 deletions.
diff --git a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
@@ -374,9 +374,9 @@ func DiffTestUtils() {
 		if len(args) == 5 {
 			memAddr, err := strconv.ParseUint(args[3], 10, 64)
 			checkErr(err, "Error decoding memAddr")
-			memValue, err := strconv.ParseUint(args[4], 10, 64)
+			memValue, err := strconv.ParseUint(args[4], 10, 32)
 			checkErr(err, "Error decoding memValue")
-			mem.SetDoubleWord(uint64(memAddr), uint64(memValue))
+			mem.SetMemory(uint64(memAddr), uint32(memValue))
 			memProof = mem.MerkleProof(uint64(memAddr))
 		}
 		insnProof = mem.MerkleProof(uint64(pc))

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
@@ -136,12 +136,12 @@
     "sourceCodeHash": "0x3ff4a3f21202478935412d47fd5ef7f94a170402ddc50e5c062013ce5544c83f"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0xfc2381da4ad202f1ff7b97776be0e9a510ef3c36c0f557cbada1a0943f376e62",
-    "sourceCodeHash": "0x5f5d13be282305b2947079cbf8f01e750e5c88a2b7a7a7267e79cba3ee4616fa"
+    "initCodeHash": "0xba5b7b97b6dae783e5e4bb763257109293952d563d3f1dc8faed774c4a148693",
+    "sourceCodeHash": "0xbd549332b7575b575dc3d1e2e4b03b347a8b3757d6bafc36e69a8311878f018e"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0xd75b7541ca736dff03b1fa7116a9835f97bc82507287bf90f3dd739299f5aa03",
-    "sourceCodeHash": "0x115bd6a4c4d77ed210dfd468675b409fdae9f79b932063c138f0765ba9063462"
+    "initCodeHash": "0x19c1d081a5c86f44896a3d61f5033fefcf8a1cd3fb94121db8b414099f231d9e",
+    "sourceCodeHash": "0x12848e0b5e30a51f503f21d6e0b480194781960005d04c46afb3742180b1466c"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0xe5db668fe41436f53995e910488c7c140766ba8745e19743773ebab508efd090",

diff --git a/packages/contracts-bedrock/snapshots/state-diff/Kontrol-31337.json b/packages/contracts-bedrock/snapshots/state-diff/Kontrol-31337.json
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -193,7 +193,7 @@ library MIPSInstructions {
                     case 0x8 { _fun := 0x20 }
                     // addiu
                     case 0x9 { _fun := 0x21 }
-                    // stli
+                    // slti
                     case 0xA { _fun := 0x2A }
                     // sltiu
                     case 0xB { _fun := 0x2B }
@@ -459,9 +459,9 @@ library MIPSInstructions {
                 }
                 //  lwr
                 else if (_opcode == 0x26) {
-                    uint64 val = _mem >> (24 - (_rs & 3) * 8);
-                    uint64 mask = WORD_MASK >> (24 - (_rs & 3) * 8);
-                    return signExtend((_rt & ~mask) | val, 32);
+                    uint64 val = _mem >> (24 - ((_rs & 3) * 8));
+                    uint64 mask = WORD_MASK >> (24 - ((_rs & 3) * 8));
+                    return signExtend(((_rt & ~mask) | val) & WORD_MASK, 32);
                 }
                 //  sb
                 else if (_opcode == 0x28) {

diff --git a/packages/contracts-bedrock/test/cannon/MIPS.t.sol b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
@@ -27,7 +27,7 @@ contract DeploymentSummary is DeploymentSummaryCode {
     address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
     address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
     address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
-    address internal constant mipsAddress = 0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773;
+    address internal constant mipsAddress = 0x42412A1C0d08F8DB9F7715efa7BeDa7BD7b9CB24;
     address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
     address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
     address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;

diff --git a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol
@@ -27,7 +27,7 @@ contract DeploymentSummaryFaultProofs is DeploymentSummaryFaultProofsCode {
     address internal constant l1StandardBridgeProxyAddress = 0x20A42a5a785622c6Ba2576B2D6e924aA82BFA11D;
     address internal constant l2OutputOracleAddress = 0x19652082F846171168Daf378C4fD3ee85a0D4A60;
     address internal constant l2OutputOracleProxyAddress = 0x39Af23E00F1e662025aA01b0cEdA19542B78DF99;
-    address internal constant mipsAddress = 0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773;
+    address internal constant mipsAddress = 0x42412A1C0d08F8DB9F7715efa7BeDa7BD7b9CB24;
     address internal constant optimismMintableERC20FactoryAddress = 0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567;
     address internal constant optimismMintableERC20FactoryProxyAddress = 0xc7B87b2b892EA5C3CfF47168881FE168C00377FB;
     address internal constant optimismPortalAddress = 0xbdD90485FCbcac869D5b5752179815a3103d8131;

diff --git a/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol b/packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol