From 0a0168ae964532c96e483d71ed20b7b7219ca1c2 Mon Sep 17 00:00:00 2001 From: Itzik Grossman Date: Sun, 8 Jan 2023 20:56:06 +0200 Subject: [PATCH] Fixed paths to repos instead of local --- .dockerignore | 2 +- deployment/dockerfiles/Dockerfile | 19 ++++++++++++++++--- go.mod | 4 ++-- go.sum | 7 ++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index 08bc99e89..5390f588a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,7 +4,7 @@ docs *.md **/target **/*.a -**/*.so + **/Enclave_t.* **/Enclave_u.* third_party/vendor diff --git a/deployment/dockerfiles/Dockerfile b/deployment/dockerfiles/Dockerfile index 44e0d751b..a63f2db0c 100644 --- a/deployment/dockerfiles/Dockerfile +++ b/deployment/dockerfiles/Dockerfile @@ -60,6 +60,16 @@ RUN --mount=type=cache,target=/root/.cargo/registry . /opt/sgxsdk/environment & ENTRYPOINT ["/bin/bash"] +FROM prepare-compile-enclave AS compile-tendermint-enclave + +ARG SGX_MODE=SW + +RUN git clone https://github.com/scrtlabs/tm-secret-enclave.git + +WORKDIR tm-secret-enclave + +RUN . /opt/sgxsdk/environment && env && SGX_MODE=${SGX_MODE} make build + # ***************** COMPILE SECRETD ************** # FROM $TEST AS compile-secretd @@ -151,8 +161,8 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ ARG SGX_MODE=SW ENV SGX_MODE=${SGX_MODE} -ARG SECRET_NODE_TYPE=NODE -ENV SECRET_NODE_TYPE=${SECRET_NODE_TYPE} +#ARG SECRET_NODE_TYPE=NODE +#ENV SECRET_NODE_TYPE=${SECRET_NODE_TYPE} ENV PKG_CONFIG_PATH="" ENV SCRT_ENCLAVE_DIR=/usr/lib/ @@ -168,6 +178,9 @@ WORKDIR /root COPY --from=compile-secretd /go/src/github.com/enigmampc/SecretNetwork/go-cosmwasm/target/release/libgo_cosmwasm.so /usr/lib/ COPY --from=compile-secretd /go/src/github.com/enigmampc/SecretNetwork/go-cosmwasm/librust_cosmwasm_enclave.signed.so /usr/lib/ COPY --from=compile-secretd /go/src/github.com/enigmampc/SecretNetwork/secretd /usr/bin/secretd +COPY --from=compile-tendermint-enclave /tm-secret-enclave/tendermint_enclave.signed.so /usr/lib/tendermint_enclave.signed.so +COPY --from=compile-tendermint-enclave /tm-secret-enclave/api/librandom_api.so /usr/lib/librandom_api.so + COPY deployment/docker/testnet/bootstrap_init.sh . COPY deployment/docker/testnet/node_init.sh . @@ -182,7 +195,7 @@ RUN chmod +x node_init.sh RUN secretd completion > /root/secretd_completion -RUN echo "SECRET_NODE_TYPE=${SECRET_NODE_TYPE}" >> ~/.bashrc +# RUN echo "SECRET_NODE_TYPE=${SECRET_NODE_TYPE}" >> ~/.bashrc RUN echo 'source /root/secretd_completion' >> ~/.bashrc RUN mkdir -p /root/.secretd/.compute/ diff --git a/go.mod b/go.mod index bba9b12d5..369f76586 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ replace ( // Fix OSX Ledger Connection Issues - Premerged https://github.com/cosmos/ledger-cosmos-go/pull/36/files github.com/cosmos/ledger-cosmos-go => github.com/chillyvee/ledger-cosmos-go v0.12.2 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/scrtlabs/tm-secret-enclave => github.com/scrtlabs/tm-secret-enclave v0.0.0-20221225155739-1edd95f00cd9 - github.com/tendermint/tendermint => github.com/scrtlabs/tendermint v0.34.23-0.20230107000510-11cfca7deda0 + github.com/scrtlabs/tm-secret-enclave => github.com/scrtlabs/tm-secret-enclave v0.0.0-20230107000306-69cfb1fb0e4c + github.com/tendermint/tendermint => github.com/scrtlabs/tendermint v0.34.23-0.20230108184122-dfb6a6d6b728 // enforce grpc version google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index b051e457f..2a2f92e27 100644 --- a/go.sum +++ b/go.sum @@ -691,9 +691,10 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/scrtlabs/tendermint v0.34.23-0.20230107000510-11cfca7deda0/go.mod h1:sQgfE3LR+zOmUra9EQQr4OK6AaNWrrsSqSL+22SmlDs= -github.com/scrtlabs/tm-secret-enclave v0.0.0-20221225155739-1edd95f00cd9 h1:SYaPwraMeBlQDdZcrXnEVu4mqh5RB3Tq0Gcw/h2hmrU= -github.com/scrtlabs/tm-secret-enclave v0.0.0-20221225155739-1edd95f00cd9/go.mod h1:qdFKkARpxJArJ6QiJiJFDu2LWl88hcSPuz6oOgq+cKQ= +github.com/scrtlabs/cosmos-sdk v0.45.11-0.20230107000730-6c3cf2623cd1 h1:h9PR/2NsdwuAFBdKVscyro/SGI+u68+YqW4os+ltDX8= +github.com/scrtlabs/cosmos-sdk v0.45.11-0.20230107000730-6c3cf2623cd1/go.mod h1:Ac4tZxP/WI8l+pCtOX2iY4cNeJZ9vERl7i+E+vmEFpY= +github.com/scrtlabs/tm-secret-enclave v0.0.0-20230107000306-69cfb1fb0e4c h1:WkUd+ocEa5/OTLRYxLg6OgzTYiarnTImzvSycDoW9pQ= +github.com/scrtlabs/tm-secret-enclave v0.0.0-20230107000306-69cfb1fb0e4c/go.mod h1:qdFKkARpxJArJ6QiJiJFDu2LWl88hcSPuz6oOgq+cKQ= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=