chore: remove foundry install

reown-com · Nov 5, 2024 · b8cc060 · b8cc060
1 parent eb1c194
commit b8cc060
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 118 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,3 +36,17 @@ jobs:
     steps:
         - uses: actions/checkout@v4
         - run: cargo fmt --all -- --check
+
+  verify-bytecode:
+    name: Verify Bytecode
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: curl -L https://foundry.paradigm.xyz | bash && foundryup
+    - run: forge build --contracts=contracts
+    - run: mkdir -p bytecode/Erc6492.sol
+    - run: jq -r .bytecode.object out/Erc6492.sol/ValidateSigOffchain.json | xxd -r -p > bytecode/Erc6492.sol/ValidateSigOffchain.bytecode
+    - run: mkdir -p bytecode/Erc1271Mock.sol
+    - run: jq -r .bytecode.object out/Erc1271Mock.sol/Erc1271Mock.json | xxd -r -p > bytecode/Erc1271Mock.sol/Erc1271Mock.bytecode
+    - run: git diff bytecode
+    - run: if [ -n "$(git diff bytecode)" ]; then exit 1; fi
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /target
+/out
+/cache
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,3 @@ alloy = { version = "0.3", features = ["signer-local"] }
 alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7" }
 regex = "1"
 tokio = { version = "1", features = ["full"] }
-
-[build-dependencies]
-alloy-primitives = { version = "0.8.0" }
-serde_json = "1"
diff --git a/build.rs b/build.rs
diff --git a/bytecode/Erc1271Mock.sol/Erc1271Mock.bytecode b/bytecode/Erc1271Mock.sol/Erc1271Mock.bytecode
diff --git a/bytecode/Erc6492.sol/ValidateSigOffchain.bytecode b/bytecode/Erc6492.sol/ValidateSigOffchain.bytecode
diff --git a/devloop.sh b/devloop.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 set -e
 
+forge build --contracts=contracts
+
+mkdir -p bytecode/Erc6492.sol
+jq -r .bytecode.object out/Erc6492.sol/ValidateSigOffchain.json | xxd -r -p > bytecode/Erc6492.sol/ValidateSigOffchain.bytecode
+
+mkdir -p bytecode/Erc1271Mock.sol
+jq -r .bytecode.object out/Erc1271Mock.sol/Erc1271Mock.json | xxd -r -p > bytecode/Erc1271Mock.sol/Erc1271Mock.bytecode
+
 cargo fmt --all
 cargo clippy --workspace --all-features --all-targets -- -D warnings
 cargo test --workspace --all-features --all-targets

diff --git a/src/lib.rs b/src/lib.rs
@@ -13,10 +13,8 @@ sol! {
     constructor (address _signer, bytes32 _hash, bytes memory _signature);
   }
 }
-const VALIDATE_SIG_OFFCHAIN_BYTECODE: &[u8] = include_bytes!(concat!(
-    env!("OUT_DIR"),
-    "/../../../../.foundry/forge/out/Erc6492.sol/ValidateSigOffchain.bytecode"
-));
+const VALIDATE_SIG_OFFCHAIN_BYTECODE: &[u8] =
+    include_bytes!("../bytecode/Erc6492.sol/ValidateSigOffchain.bytecode");
 
 #[must_use]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -374,10 +372,8 @@ mod test {
         );
     }
 
-    const ERC1271_MOCK_BYTECODE: &[u8] = include_bytes!(concat!(
-        env!("OUT_DIR"),
-        "/../../../../.foundry/forge/out/Erc1271Mock.sol/Erc1271Mock.bytecode"
-    ));
+    const ERC1271_MOCK_BYTECODE: &[u8] =
+        include_bytes!("../bytecode/Erc1271Mock.sol/Erc1271Mock.bytecode");
     const ERC6492_MAGIC_BYTES: [u16; 16] = [
         0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492, 0x6492,
         0x6492, 0x6492, 0x6492, 0x6492, 0x6492,
-Original file line number
+Diff line change
@@ -1 +1,3 @@
     /target
+    /out
+    /cache