Skip to content

Commit

Permalink
chore(dep): remove sdk, use step directly
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenctw committed Sep 14, 2024
1 parent 7c8a3b0 commit 65b1976
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 14 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ prt/lua_poc/pixels/
node_modules
**/contract-bindings/src/contract
**/contract-bindings/Cargo.lock
prt/machine-emulator-sdk
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "machine-emulator-sdk"]
path = machine-emulator-sdk
url = https://github.com/cartesi/machine-emulator-sdk
[submodule "machine/step"]
path = machine/step
url = https://github.com/cartesi/machine-solidity-step
[submodule "prt/contracts/lib/forge-std"]
path = prt/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
Expand Down
4 changes: 2 additions & 2 deletions cartesi-rollups/contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ libs = ["lib"]
remappings = [
'rollups-contracts/=lib/rollups-contracts/contracts/',
'prt-contracts/=../../prt/contracts/src/',
'step/=../../machine-emulator-sdk/solidity-step/',
'step/=../../machine/step/',
]

allow_paths = [
'../../prt/contracts/src/',
'../../machine-emulator-sdk/solidity-step/',
'../../machine/step/',
]

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
1 change: 0 additions & 1 deletion cartesi-rollups/node/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ RUN cartesi-machine --ram-image=./linux.bin \
# copy dependencies
COPY ./machine /app/machine
COPY ./common-rs /app/common-rs
COPY ./machine-emulator-sdk /app/machine-emulator-sdk
COPY ./prt /app/prt

# copy rollups-node application
Expand Down
1 change: 0 additions & 1 deletion machine-emulator-sdk
Submodule machine-emulator-sdk deleted from afaade
1 change: 1 addition & 0 deletions machine/step
Submodule step added at e3f125
4 changes: 2 additions & 2 deletions prt/contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ src = "src"
out = "out"
libs = ["lib"]

allow_paths = ['../../machine-emulator-sdk/solidity-step/']
allow_paths = ['../../machine/step/']
remappings = [
'step/=../../machine-emulator-sdk/solidity-step/',
'step/=../../machine/step/',
]

[fmt]
Expand Down
3 changes: 1 addition & 2 deletions prt/prt-rs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN cargo chef cook --release --recipe-path recipe.json
COPY --from=ethereum/solc:0.8.23 /usr/bin/solc /usr/bin/solc
RUN chmod u+x /usr/bin/solc

COPY ./machine-emulator-sdk /app/machine-emulator-sdk
COPY ./prt /app/prt

WORKDIR /app/prt/prt-rs
Expand Down Expand Up @@ -58,7 +57,7 @@ RUN curl -sSL https://github.com/cartesi/dave/releases/download/v0.0.9-rc-test/d
RUN curl -sSL https://github.com/cartesi/dave/releases/download/v0.0.10-rc-test/simple-program.tar.gz | \
tar -zx -C /root/program

COPY ./machine-emulator-sdk /root/machine-emulator-sdk
COPY ./machine/step /root/machine/step
COPY ./prt /root/prt
COPY --from=builder /app/prt/prt-rs/target/release/cartesi-prt-compute /root/prt/prt-rs/target/release/cartesi-prt-compute

Expand Down
4 changes: 2 additions & 2 deletions prt/tests/compute/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ RUN curl -sSL https://github.com/cartesi/dave/releases/download/v0.0.9-rc-test/d
RUN curl -sSL https://github.com/cartesi/dave/releases/download/v0.0.10-rc-test/simple-program.tar.gz | \
tar -zx -C "/app/tests/compute/program"

WORKDIR "/machine-emulator-sdk"
ADD ./machine-emulator-sdk/ .
WORKDIR "/machine/step"
ADD ./machine/step/ .

WORKDIR "/app/contracts"
ADD ./prt/contracts/foundry.toml .
Expand Down

0 comments on commit 65b1976

Please sign in to comment.