From 9ffd0a60ab86e15557a51622fab563bf459485b4 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Mon, 2 Aug 2021 20:53:36 +0300 Subject: [PATCH 1/3] Remove duplicate definition --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e447064..1c3e0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -511,7 +511,6 @@ networks: volumes: mysql_init_scripts: cassandra_init_scripts: - cassandra_init_scripts: data-bridge-data-rabbitmq: data-bridge-data-redis: data-mysql: From c7d423d4f2f4951f44921bd6e26996cfcbf2d36f Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Wed, 4 Aug 2021 14:29:22 +0300 Subject: [PATCH 2/3] Add chainlink_config/tempkeys to .gitignore --- .gitignore | 1 + ...15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe | 1 - ...15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64 | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100755 chainlink_config/tempkeys/UTC--2021-06-06T15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe delete mode 100755 chainlink_config/tempkeys/UTC--2021-06-06T15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64 diff --git a/.gitignore b/.gitignore index 059c2b0..dd929a1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ data/ .idea .env certs/ +/chainlink_config/tempkeys diff --git a/chainlink_config/tempkeys/UTC--2021-06-06T15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe b/chainlink_config/tempkeys/UTC--2021-06-06T15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe deleted file mode 100755 index cb03b19..0000000 --- a/chainlink_config/tempkeys/UTC--2021-06-06T15-05-54.430149681Z--7b5f1610920d5baf00d684929272213baf962efe +++ /dev/null @@ -1 +0,0 @@ -{"address":"7b5f1610920d5baf00d684929272213baf962efe","crypto":{"cipher":"aes-128-ctr","ciphertext":"85271a6da2f5310a3b7120d3a2401565b03b83fc8c40e3d6fac0e4343eef33cf","cipherparams":{"iv":"43e3915ee0e323a0b47e37ac17a63ccd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"5c6f877db46bec876ca303abc4a1ba12bfbbc52903fb081ab1e92a4a3a14de6f"},"mac":"bd84013d0ba6dde0a848674ee2871ccd6061d571234f2e119b2230df56312e3e"},"id":"c90a93de-913a-42ba-830c-80761e4b2873","version":3} \ No newline at end of file diff --git a/chainlink_config/tempkeys/UTC--2021-06-06T15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64 b/chainlink_config/tempkeys/UTC--2021-06-06T15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64 deleted file mode 100755 index 300c025..0000000 --- a/chainlink_config/tempkeys/UTC--2021-06-06T15-05-58.631255272Z--1dcaf21e385bbfafa02b0cc936eb2df7da155e64 +++ /dev/null @@ -1 +0,0 @@ -{"address":"1dcaf21e385bbfafa02b0cc936eb2df7da155e64","crypto":{"cipher":"aes-128-ctr","ciphertext":"a02212a07c826d75db11c82dbfe250a5d4e02a2b9c06eeb720c7794a9d739392","cipherparams":{"iv":"9e0dfb63c4a5ff5f9ba6e6e1af3b00bd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"87504cff6c33dec55616c2953bf8373494ab2e1e43235dfb33665bac4b1e221b"},"mac":"fb64389116c49254e91e647a464b8830edc6f0834d99d74fc4fb18ef1d22a50e"},"id":"8363bfd3-6d24-4af6-84f6-821fec3312bf","version":3} \ No newline at end of file From e3c6821c2876d4bda940034ee6048f7701fd89b6 Mon Sep 17 00:00:00 2001 From: Kare Nuorteva Date: Fri, 13 Aug 2021 14:13:30 +0300 Subject: [PATCH 3/3] Unify Chainlink naming --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1c3e0e5..39df133 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -452,7 +452,7 @@ services: timeout: 10s retries: 60 chainlink: - container_name: streamr-dev-chainlink-node + container_name: streamr-dev-chainlink image: smartcontract/chainlink:0.10.5 ports: - '6688:6688' @@ -478,7 +478,7 @@ services: timeout: 10s retries: 60 chainlink-external-adapter: - container_name: streamr-dev-chainlink-adapter + container_name: streamr-dev-chainlink-external-adapter image: streamr/chainlink-external-adapter:dev ports: - 6691:8080