From b4d52345121300acad86202483b2e88bccb1c628 Mon Sep 17 00:00:00 2001
From: Xiangyi Zheng <xyzheng@uchicago.edu>
Date: Fri, 14 Jun 2024 11:58:32 -0700
Subject: [PATCH] fix: dockerfile multichain (#648)

* dependency fix

* fix Dockerfile.multichain
---
 Dockerfile.multichain                         | 10 ++--
 chain-signatures/Cargo.lock                   |  6 +-
 chain-signatures/node/Cargo.toml              |  4 +-
 integration-tests/chain-signatures/Cargo.lock | 60 +++++++++++++++++--
 4 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/Dockerfile.multichain b/Dockerfile.multichain
index e313a9e64..ba6546edb 100644
--- a/Dockerfile.multichain
+++ b/Dockerfile.multichain
@@ -12,12 +12,10 @@ RUN sed -i 's#mpc-keys = { path = "../keys" }##' Cargo.toml
 RUN sed -i 's#mpc-contract = { path = "../contract" }##' Cargo.toml
 RUN sed -i 's#crypto-shared = { path = "../crypto-shared" }##' Cargo.toml
 RUN cargo build --release
-COPY . .
-RUN sed -i 's#"mpc-recovery",##' Cargo.toml
-RUN sed -i 's#"integration-tests",##' Cargo.toml
-RUN sed -i 's#"load-tests",##' Cargo.toml
+COPY chain-signatures/. .
 RUN sed -i 's#"keys",##' Cargo.toml
-RUN sed -i 's#"crypto-shared",##' Cargo.toml
+RUN sed -i 's#"contract",##' Cargo.toml
+RUN sed -i 's#target-dir = "../target"#target-dir = "target"#' .cargo/config.toml
 RUN cargo build --release --package mpc-recovery-node
 
 FROM debian:stable-slim as runtime
@@ -26,4 +24,4 @@ RUN update-ca-certificates
 COPY --from=builder /usr/src/app/target/release/mpc-recovery-node /usr/local/bin/mpc-recovery-node
 WORKDIR /usr/local/bin
 
-ENTRYPOINT [ "mpc-recovery-node" ]
+ENTRYPOINT [ "mpc-recovery-node" ]
\ No newline at end of file
diff --git a/chain-signatures/Cargo.lock b/chain-signatures/Cargo.lock
index 8aec0e83e..c3f268e0d 100644
--- a/chain-signatures/Cargo.lock
+++ b/chain-signatures/Cargo.lock
@@ -4652,7 +4652,7 @@ dependencies = [
 [[package]]
 name = "near-lake-context-derive"
 version = "0.8.0-beta.3"
-source = "git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies#e4eaa0c1b1c1d63c45963474db7ee82c38557d54"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
 dependencies = [
  "quote",
  "syn 2.0.66",
@@ -4661,7 +4661,7 @@ dependencies = [
 [[package]]
 name = "near-lake-framework"
 version = "0.8.0-beta.3"
-source = "git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies#e4eaa0c1b1c1d63c45963474db7ee82c38557d54"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -4684,7 +4684,7 @@ dependencies = [
 [[package]]
 name = "near-lake-primitives"
 version = "0.8.0-beta.3"
-source = "git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies#e4eaa0c1b1c1d63c45963474db7ee82c38557d54"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
 dependencies = [
  "anyhow",
  "near-crypto 0.21.2",
diff --git a/chain-signatures/node/Cargo.toml b/chain-signatures/node/Cargo.toml
index fa64e040f..b75064b36 100644
--- a/chain-signatures/node/Cargo.toml
+++ b/chain-signatures/node/Cargo.toml
@@ -44,8 +44,8 @@ url = { version = "2.4.0", features = ["serde"] }
 near-account-id = "1.0.0"
 near-crypto = "0.21.2"
 near-fetch = "0.3.1"
-near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" }
-near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs", branch = "dmd/bump-dependencies" }
+near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs", rev = "e0b28590ffe6b6441987d302843d45bef55ef50e" }
+near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs", rev = "e0b28590ffe6b6441987d302843d45bef55ef50e" }
 near-primitives = "0.21.2"
 near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "5a9acaedc95c5721d2088f263bc99e3de574decf", features = ["legacy", "unit-testing"] }
 
diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock
index f7b2271ea..6eec7d3cb 100644
--- a/integration-tests/chain-signatures/Cargo.lock
+++ b/integration-tests/chain-signatures/Cargo.lock
@@ -3995,8 +3995,8 @@ dependencies = [
  "near-crypto 0.21.2",
  "near-fetch",
  "near-jsonrpc-client 0.9.0",
- "near-lake-framework",
- "near-lake-primitives",
+ "near-lake-framework 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies)",
+ "near-lake-primitives 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies)",
  "near-primitives 0.21.2",
  "near-workspaces",
  "once_cell",
@@ -4611,8 +4611,8 @@ dependencies = [
  "near-account-id",
  "near-crypto 0.21.2",
  "near-fetch",
- "near-lake-framework",
- "near-lake-primitives",
+ "near-lake-framework 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e)",
+ "near-lake-primitives 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e)",
  "near-primitives 0.21.2",
  "near-sdk",
  "once_cell",
@@ -5047,6 +5047,15 @@ dependencies = [
  "syn 2.0.65",
 ]
 
+[[package]]
+name = "near-lake-context-derive"
+version = "0.8.0-beta.3"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
+dependencies = [
+ "quote",
+ "syn 2.0.65",
+]
+
 [[package]]
 name = "near-lake-framework"
 version = "0.8.0-beta.3"
@@ -5060,8 +5069,31 @@ dependencies = [
  "aws-types",
  "derive_builder",
  "futures",
- "near-lake-context-derive",
- "near-lake-primitives",
+ "near-lake-context-derive 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies)",
+ "near-lake-primitives 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?branch=dmd/bump-dependencies)",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+]
+
+[[package]]
+name = "near-lake-framework"
+version = "0.8.0-beta.3"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "aws-config",
+ "aws-credential-types",
+ "aws-sdk-s3",
+ "aws-types",
+ "derive_builder",
+ "futures",
+ "near-lake-context-derive 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e)",
+ "near-lake-primitives 0.8.0-beta.3 (git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e)",
  "serde",
  "serde_json",
  "thiserror",
@@ -5086,6 +5118,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "near-lake-primitives"
+version = "0.8.0-beta.3"
+source = "git+https://github.com/near/near-lake-framework-rs?rev=e0b28590ffe6b6441987d302843d45bef55ef50e#e0b28590ffe6b6441987d302843d45bef55ef50e"
+dependencies = [
+ "anyhow",
+ "near-crypto 0.21.2",
+ "near-indexer-primitives",
+ "near-primitives 0.21.2",
+ "near-primitives-core 0.21.2",
+ "paste",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "near-o11y"
 version = "0.20.1"