Remove optimism-bedrock-contracts, succinctx

solidity/contracts/libs/StateProofHelpers.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity >=0.8.0;
 
-import {RLPReader} from "optimism-bedrock-contracts/rlp/RLPReader.sol";
-import {RLPWriter} from "optimism-bedrock-contracts/rlp/RLPWriter.sol";
-import {MerkleTrie} from "optimism-bedrock-contracts/trie/MerkleTrie.sol";
+import {RLPReader} from "@eth-optimism/contracts-bedrock/src/libraries/rlp/RLPReader.sol";
+import {RLPWriter} from "@eth-optimism/contracts-bedrock/src/libraries/rlp/RLPWriter.sol";
+import {MerkleTrie} from "@eth-optimism/contracts-bedrock/src/libraries/trie/MerkleTrie.sol";
 
 /// @notice Storage Proof library inspired by Succinct (https://github.com/succinctlabs)
 library StorageProof {
@@ -40,6 +40,6 @@ library StorageProof {
             .toRLPItem()
             .readList();
         require(acctFields.length == 4);
-        return bytes32(acctFields[2].readUint256());
+        return bytes32(RLPReader.readBytes(acctFields[2]));
     }
 }

solidity/package.json

@@ -9,9 +9,7 @@
     "@layerzerolabs/lz-evm-oapp-v2": "2.0.2",
     "@openzeppelin/contracts": "^4.9.3",
     "@openzeppelin/contracts-upgradeable": "^v4.9.3",
-    "fx-portal": "^1.0.3",
-    "optimism-bedrock-contracts": "https://github.com/ltyu/optimism-bedrock-contracts",
-    "succinctx": "https://github.com/succinctlabs/succinctx.git#d413b17f678663b6cba25ed4c1a0306bd513f04f"
+    "fx-portal": "^1.0.3"
   },
   "devDependencies": {
     "@layerzerolabs/solidity-examples": "^1.1.0",

solidity/remappings.txt

@@ -4,6 +4,4 @@
 @openzeppelin=../node_modules/@openzeppelin
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-fx-portal/=lib/fx-portal/
-telepathyx=../node_modules/telepathyx
-optimism-bedrock-contracts=../node_modules/optimism-bedrock-contracts
+fx-portal/=lib/fx-portal/

yarn.lock

@@ -7392,14 +7392,12 @@ __metadata:
     hardhat: "npm:^2.22.2"
     hardhat-gas-reporter: "npm:^1.0.9"
     hardhat-ignore-warnings: "npm:^0.2.11"
-    optimism-bedrock-contracts: "https://github.com/ltyu/optimism-bedrock-contracts"
     prettier: "npm:^2.8.8"
     prettier-plugin-solidity: "npm:^1.1.3"
     solhint: "npm:^4.5.4"
     solhint-plugin-prettier: "npm:^0.0.5"
     solidity-bytes-utils: "npm:^0.8.0"
     solidity-coverage: "npm:^0.8.3"
-    succinctx: "https://github.com/succinctlabs/succinctx.git#d413b17f678663b6cba25ed4c1a0306bd513f04f"
     ts-generator: "npm:^0.1.1"
     ts-node: "npm:^10.8.0"
     typechain: "patch:typechain@npm%3A8.3.2#~/.yarn/patches/typechain-npm-8.3.2-b02e27439e.patch"
@@ -24327,13 +24325,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optimism-bedrock-contracts@https://github.com/ltyu/optimism-bedrock-contracts":
-  version: 1.0.0
-  resolution: "optimism-bedrock-contracts@https://github.com/ltyu/optimism-bedrock-contracts.git#commit=1172cc8dcfb735ca9400e37caab8bb659169b0b2"
-  checksum: 23e81efb91dc2fef9d6c92805c09e47c41e356a3e5f1ec071450233bfded89a25c80a417d256ab59cae2e8b2e8d6354cc5b4772b5dcfa160c5a315ffc8fa8deb
-  languageName: node
-  linkType: hard
-
 "optionator@npm:^0.8.1":
   version: 0.8.3
   resolution: "optionator@npm:0.8.3"
@@ -27991,13 +27982,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"succinctx@https://github.com/succinctlabs/succinctx.git#d413b17f678663b6cba25ed4c1a0306bd513f04f":
-  version: 1.0.0
-  resolution: "succinctx@https://github.com/succinctlabs/succinctx.git#commit=d413b17f678663b6cba25ed4c1a0306bd513f04f"
-  checksum: 07ae1bf09e3932a2df0cb3a6476234aca0a8dd1ad5ad0cfc5bf246b0d7b9b437b2f53b5d0828bcad18b729d14b40decef44cbdbfae57dcacdf7297fb768bf88b
-  languageName: node
-  linkType: hard
-
 "sucrase@npm:^3.32.0":
   version: 3.35.0
   resolution: "sucrase@npm:3.35.0"