From eda90a59ac6b04b497959ae4db8381d25e654675 Mon Sep 17 00:00:00 2001 From: Anton Livaja Date: Thu, 5 Jun 2025 17:06:18 -0700 Subject: [PATCH] update containerfile --- Containerfile | 54 ++++++++------------------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/Containerfile b/Containerfile index 709204d..f8ba08d 100644 --- a/Containerfile +++ b/Containerfile @@ -9,54 +9,16 @@ COPY --from=stagex/core-git . / COPY --from=stagex/core-musl . / COPY --from=stagex/core-openssl . / COPY --from=stagex/core-zlib . / +COPY --from=stagex/user-strace . / COPY --from=stagex/core-solidity:0.8.30 . / +COPY --from=stagex/pallet-rust . / +COPY --from=stagex/pallet-gcc-gnu-busybox . / - -#RUN git clone https://github.com/mitche50/keeta-locker.git -#WORKDIR ./keeta-locker -#RUN git checkout 8fb2b54b167dc7d8a91151eae06ec265afa48b06 - +RUN curl -L https://github.com/foundry-rs/foundry/archive/refs/tags/v1.2.2.tar.gz > v1.2.2.tar.gz +RUN tar -xvf v1.2.2.tar.gz +WORKDIR foundry-1.2.2/ +RUN cargo build --release COPY keeta-locker ./ -RUN /usr/bin/solc --via-ir --optimize --combined-json abi,bin ./blockchain/src/LPLocker.sol > storage.js +RUN ./target/release/forge build --contracts blockchain/src/LPLocker.sol --force --use ./usr/bin/solc -RUN curl -L https://github.com/foundry-rs/foundry/releases/download/v1.2.2/foundry_v1.2.2_alpine_amd64.tar.gz > foundry_v1.2.2_linux_amd64.tar.gz - -RUN tar -xvf foundry_v1.2.2_linux_amd64.tar.gz -RUN chmod +x forge -RUN ./forge build --contracts blockchain/src/LPLocker.sol --force --use /usr/bin/solc - -RUN jq '.contracts["blockchain/src/LPLocker.sol:LPLocker"].abi' storage.js > abi_from_solc.json -RUN jq -r '.contracts["blockchain/src/LPLocker.sol:LPLocker"].bin' storage.js > init_from_solc.hex -RUN jq '.abi' ./out/LPLocker.sol/LPLocker.json > abi_from_forge.json -RUN jq -r '.bytecode.object' out/LPLocker.sol/LPLocker.json > init_from_forge.hex -#RUN diff abi_from_solc.json abi_from_forge.json -#RUN diff init_from_solc.hex init_from_forge.hex -#RUN diff ./out/LPLocker.sol/LPLocker.json storage.js -RUN cat init_from_solc.hex - -RUN cat init_from_forge.hex - -RUN /usr/bin/solc \ - --bin \ - --abi \ - --asm \ - --allow-paths . \ - --optimize --optimize-runs=200 \ - -o build \ - ./blockchain/src/LPLocker.sol \ - ./blockchain/src/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol \ - ./blockchain/src/openzeppelin-contracts/contracts/access/Ownable2Step.sol \ - ./blockchain/src/openzeppelin-contracts/contracts/access/Ownable2Step.sol \ - ./blockchain/src/interfaces/IAerodromePool.sol \ - ./blockchain/src/interfaces/ILPLocker.sol - -#RUN /usr/bin/solc --asm --bin-runtime ./blockchain/src/LPLocker.sol -o build/ -#RUN /usr/bin/solc --asm --bin-runtime --opcodes ./blockchain/src/LPLocker.sol -o build/ - -#RUN diff ./pre-built.abi build/LPLocker.abi -#RUN diff ./pre-built.bin build/LPLocker.bin -#RUN diff ./pre-built.bin-runtime build/LPLocker.bin-runtime - -#RUN tr -s '[:space:]' '\n' < build/LPLocker.opcode -#RUN diff -wb ./pre-built.opcode build/LPLocker.opcode