From b5e0a837bb0b44229bd9f5c6eea4ab5b6190728c Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 20 Nov 2024 14:08:55 +0100 Subject: [PATCH] get all containers working alongside each other --- docker-compose.yml | 13 +++++++++++++ docker/Dockerfile | 4 +--- ibc/lightclients/groth16/groth16.pb.go | 2 +- .../celestia-bridge/keys/NJ3XILLTMVRXEZLUFZVHO5A | 2 +- testing/files/celestia-bridge/keys/OAZHALLLMV4Q | 1 + ...2ecdc0601fd734cfd09445c2fec8f2f8447187db.address | 1 + ...deb29a7b97eacb96f99381e1d79147fa465e35be.address | 1 - .../keys/keyring-test/my_celes_key.info | 2 +- testing/files/da_auth_token | 2 +- testing/files/simapp-validator/entrypoint.sh | 6 ++++++ 10 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 testing/files/celestia-bridge/keys/OAZHALLLMV4Q create mode 100644 testing/files/celestia-bridge/keys/keyring-test/2ecdc0601fd734cfd09445c2fec8f2f8447187db.address delete mode 100644 testing/files/celestia-bridge/keys/keyring-test/deb29a7b97eacb96f99381e1d79147fa465e35be.address create mode 100755 testing/files/simapp-validator/entrypoint.sh diff --git a/docker-compose.yml b/docker-compose.yml index b2e8817..27dc606 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ services: beacond: image: beacond:latest + container_name: beacond environment: - TESTAPP_FILES_DIR=/beacon-kit/testing/files # Add the actual path - JWT_SECRET_PATH=${TESTAPP_FILES_DIR}/jwt.hex @@ -78,6 +79,18 @@ services: networks: - beacon-network + simapp-validator: + image: celestiaorg/celestia-zk-ibc-demo:latest + container_name: simapp-validator + volumes: + - ./.tmp/simapp-validator:/home/celestia + - ./testing/files/simapp-validator:/testapp_files + entrypoint: /testapp_files/entrypoint.sh + ports: + - "5123:26657" + networks: + - beacon-network + networks: beacon-network: driver: bridge diff --git a/docker/Dockerfile b/docker/Dockerfile index dafede8..ab075fe 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,11 +48,9 @@ RUN apk update && apk add --no-cache \ # Copy in the txsim binary COPY --from=builder /celestia_zkevm_ibc_demo/build/simd /bin/simd -COPY --chown=${USER_NAME}:${USER_NAME} ../testing/files/simapp-validator/entrypoint.sh /opt/entrypoint.sh - USER ${USER_NAME} # Set the working directory to the home directory. WORKDIR ${CELESTIA_HOME} -ENTRYPOINT [ "/bin/bash", "/opt/entrypoint.sh" ] +CMD [ "/bin/simd" ] diff --git a/ibc/lightclients/groth16/groth16.pb.go b/ibc/lightclients/groth16/groth16.pb.go index d245471..b475ffe 100644 --- a/ibc/lightclients/groth16/groth16.pb.go +++ b/ibc/lightclients/groth16/groth16.pb.go @@ -6,7 +6,7 @@ package groth16 import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" diff --git a/testing/files/celestia-bridge/keys/NJ3XILLTMVRXEZLUFZVHO5A b/testing/files/celestia-bridge/keys/NJ3XILLTMVRXEZLUFZVHO5A index 61fe55f..2faccd8 100644 --- a/testing/files/celestia-bridge/keys/NJ3XILLTMVRXEZLUFZVHO5A +++ b/testing/files/celestia-bridge/keys/NJ3XILLTMVRXEZLUFZVHO5A @@ -1 +1 @@ -{"body":"8fCADMkIWwIn7/2tpc908N6AK7Iveqll569YrDt/PvQ="} \ No newline at end of file +{"body":"+dvYtXHEU8AZy3xS0cQ6QcyeNkdPFqIuXSbpxf+AdHw="} \ No newline at end of file diff --git a/testing/files/celestia-bridge/keys/OAZHALLLMV4Q b/testing/files/celestia-bridge/keys/OAZHALLLMV4Q new file mode 100644 index 0000000..e007e9e --- /dev/null +++ b/testing/files/celestia-bridge/keys/OAZHALLLMV4Q @@ -0,0 +1 @@ +{"body":"CAESQKyMVVBDjAc1cKl1olk8pKEA1tB74RLKvcJJEOvR5Dfxt4lFMn7l3+BGm947KuuU3oe7AKCnvBxfo756ck4F7X4="} \ No newline at end of file diff --git a/testing/files/celestia-bridge/keys/keyring-test/2ecdc0601fd734cfd09445c2fec8f2f8447187db.address b/testing/files/celestia-bridge/keys/keyring-test/2ecdc0601fd734cfd09445c2fec8f2f8447187db.address new file mode 100644 index 0000000..c83c118 --- /dev/null +++ b/testing/files/celestia-bridge/keys/keyring-test/2ecdc0601fd734cfd09445c2fec8f2f8447187db.address @@ -0,0 +1 @@ +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0xMS0yMCAxMzo0MjozNC4xMjgxMjQgKzAxMDAgQ0VUIG09KzAuMTM3MDA3NTAxIiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoickNTYVp4NHdBUUNQUks3ZCJ9.VdehOzdKEW8Nr1DzW5eD27Pq2W3WiaF9JvlaNlKJAQQshBQlOOWPdQ.6zbw9EECxOZ6yKW4.R6Q4kIHiaZetT8xatCgfmfTG34RE43RYrg_0hrJwHLQjPMROi9IoNAvPSlKnTyB2QoankkrGNA0dQpYQ4Dz6OoKlEJqqZkxRhGgQ7YcAMe1ONAM_hMoWSAohvzoCF-qAGIW5bPhHYVons_fAsBUMKmLXyMl5dunaxO_85fxVFKe5DhvuuBvZEZ450vx5dzpPbGlWQDX0O_nCJG-uKngfyv3pUaXewQHZ0mcIXOjdNCvlXSp_ad7RW_8AQ6yITg.NaV23QFameJqrV0YokWchg \ No newline at end of file diff --git a/testing/files/celestia-bridge/keys/keyring-test/deb29a7b97eacb96f99381e1d79147fa465e35be.address b/testing/files/celestia-bridge/keys/keyring-test/deb29a7b97eacb96f99381e1d79147fa465e35be.address deleted file mode 100644 index f2e7278..0000000 --- a/testing/files/celestia-bridge/keys/keyring-test/deb29a7b97eacb96f99381e1d79147fa465e35be.address +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0xMS0yMCAxMjowNjozOC42Njk4MjQgKzAxMDAgQ0VUIG09KzAuMTkzMzY3NTg0IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoiRXBnRDBqQl9hQ09BMWtkRCJ9.mXVQf7cSu6TZk07m4pmY-DC605Y6-yJAXM3bz2OjxvtkABOzfUR4dg.FHqLWBkb2UieUn8w.S26yIPrc_Lzju6xYtro2Q_N4Yie9Vh_pkUTSKqMyctvrZFk6QYxj2Yag2u6sU09YXFbbuNzsaV4aWTExqxWOqXHy8CjdzxRdUUEUB5vs-IHc4HUTp0bncmZrC1-_uvfZwDYpRR_3C2WPgRWSgfs-_XYi2MF1KWSTGrYA6AtafRVcx7ColMQoYBBwQtQVdgoUs4ZlcSery4Z4HMOUeT-KRONwjvrlZEoLidfTiiJrLhUccSwNHK0QGTDEmXhUXA.3zfdGQ3Sqir_QvzjEa6rdg \ No newline at end of file diff --git a/testing/files/celestia-bridge/keys/keyring-test/my_celes_key.info b/testing/files/celestia-bridge/keys/keyring-test/my_celes_key.info index 7250689..e922c92 100644 --- a/testing/files/celestia-bridge/keys/keyring-test/my_celes_key.info +++ b/testing/files/celestia-bridge/keys/keyring-test/my_celes_key.info @@ -1 +1 @@ -eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0xMS0yMCAxMjowNjozOC42Njg3NDYgKzAxMDAgQ0VUIG09KzAuMTkyMjg5NTg0IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoidDFWdUFQOS1VeWhERE1zSiJ9.tfjEIron_5xwylACiFfZDfOAcOCyHfl6B8TNqffbGszh8bQFgSCAhg.UvWXnSafL6Sikg3Z.O6Q8z5jND2aq7qpNNQRKZzvT8QOn2ihXtpFQIA-Zo9zK_HHWxf1oodyuEtWXDwQsaxigYqUjgJaC-9yRB_-Iud2p0j4FcDSe4w69F9b4CtRrdUR0dn3PMH9X1NEhIrq33ZVizxg7Gyc-o9vAeMbY8rvwF-y7wf1n4nDTLQSnLwB3P220I_4FLNY2vOStfrqxVb5bcA0XdFYOLa-zLG2geIrLzjy1BvSz_z1lKXn6hk2uksiH74aKaCvOIBw9s7xhteDZt539LcGv-FtTW_mNaqi6s6JW2GFEyyzkcLnqM-bVZtHJwUdWAwUf_BEkHAFiFfPGhms0KnjiQ7AKyiIrGpe-mxNmDIWf8TSpfTdDl6lYcXc5zJ4oLUgokeWF_XXiuZWvUaDttKJNVntLpX0IUtN8yGpBu24cq3Ey9OYHhglXynAvD0XpeXWh3FRGF7TPQVZ_BOZvrOwBWJJVvO_S.emS2tfD-sejrffaqdFaHQQ \ No newline at end of file +eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0xMS0yMCAxMzo0MjozNC4xMjY1NTYgKzAxMDAgQ0VUIG09KzAuMTM1NDM5NDYwIiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoia181T3BrZU92dzBoMjBzTiJ9.DTyBbgwgyentoPUI7ZLvEGAzQVyj6NvDXpAXMOhH9q-_HsITt18VFA.9tPVLa0KX03EdVMk.QgQ7kmv7ysL6nsR2IOfaxjx3bQliAU_dTQ9F7sM9i8HdyBsfvLeF8SacHW3KjVm24BX1AHjihBblcsoQ6NaGntVdw3fMJjqQXd5DqZdmyNXZR_k2Wj6iS7nrkbPa_5epR2FAGLmKAGeIa4USsNbzbw-hKRfzwPnrSjifD_IVcTkmrPQVEasjnLTEUfPf3SGW0yfF0XyVWp56mfy-rh88Fiz9EQ8PSS1YbplLRuwD1gSwiQLT2n2AOu2g7GHFS3xKCx9H3XyJfUgpZM5LjN6dHfmeZcUDc7n49L8tjY1FtDtPHEvD0DPOc66XCDTvuvD1J2sa7XkCVXmgjPhM0tgS4PijsA6EkBi_wBQ6lv8-llfMRnZljDQOneqxIuKPG80XNIhHyIcZwD2RRFBtGWdDvXvEDkwrG4ZUBomzGTn4WsY5D1JHLjiqfy6KOl4qQ5YthFbhl58rKEmZ-whwG3DB.wMpFAieZ4gF1kLeerwbCvw \ No newline at end of file diff --git a/testing/files/da_auth_token b/testing/files/da_auth_token index 59fcef9..21d39d6 100644 --- a/testing/files/da_auth_token +++ b/testing/files/da_auth_token @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJwdWJsaWMiLCJyZWFkIiwid3JpdGUiLCJhZG1pbiJdfQ._0UzGBYz3rBWtcWUXXuKCCNc_5i6UQHVOnaQFqv2Zrc +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJwdWJsaWMiLCJyZWFkIiwid3JpdGUiLCJhZG1pbiJdfQ.qxoN_a-k7aZZE77VSpfgyvI_0eNvJ_OgBsT35zxUQnQ diff --git a/testing/files/simapp-validator/entrypoint.sh b/testing/files/simapp-validator/entrypoint.sh new file mode 100755 index 0000000..66f0f15 --- /dev/null +++ b/testing/files/simapp-validator/entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Copy config files from testing/files/celestia-validator to .tmp directory +cp -r /testapp_files/* /home/celestia/ + +exec /bin/simd start --home /home/celestia \ No newline at end of file