From 9a821f3da077b243f224bfa7179fc1aaecef5b49 Mon Sep 17 00:00:00 2001 From: Dimitri Roche Date: Tue, 13 Feb 2018 14:04:24 -0500 Subject: [PATCH 1/3] Add scripts to stitch up cl with devnet --- .gitignore | 2 ++ cldevnet | 8 ++++++++ ...0-42-24.637Z--9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f | 1 + rundevnet | 4 ++++ 4 files changed, 15 insertions(+) create mode 100755 cldevnet create mode 100644 devnet/keys/UTC--2017-01-05T20-42-24.637Z--9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f create mode 100755 rundevnet diff --git a/.gitignore b/.gitignore index c7c44093a9d..01953e7b2b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ vendor/ tmp/ +devnet/db.bolt +devnet/log.jsonl diff --git a/cldevnet b/cldevnet new file mode 100755 index 00000000000..aa8bb6073f5 --- /dev/null +++ b/cldevnet @@ -0,0 +1,8 @@ +#!/bin/bash + +export LOG_LEVEL=debug +export ROOT=./devnet +export ETH_URL=ws://localhost:18546 +export ETH_CHAIN_ID=17 + +go run main.go node -d -p "T.tLHkcmwePT/p,]sYuntjwHKAsrhm#4eRs4LuKHwvHejWYAC2JP4M8HimwgmbaZ" diff --git a/devnet/keys/UTC--2017-01-05T20-42-24.637Z--9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f b/devnet/keys/UTC--2017-01-05T20-42-24.637Z--9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f new file mode 100644 index 00000000000..662138cbe4c --- /dev/null +++ b/devnet/keys/UTC--2017-01-05T20-42-24.637Z--9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f @@ -0,0 +1 @@ +{"version":3,"id":"f8c91297-5bf7-458e-b8e5-39e9c79d5f2a","address":"9ca9d2d5e04012c9ed24c0e513c9bfaa4a2dd77f","Crypto":{"ciphertext":"ee5391a20f42e0b11a0a0824ce5f047bfc4c1391a62184f48952a0ad05deb55b","cipherparams":{"iv":"4a27487d3892df5250fb7d1d9b5c00ac"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"1839f222ed3759e0146252e9557f860ffff9575f8b4ba9c6c59ec40904c9580e","n":1024,"r":8,"p":1},"mac":"c7099685c6903529d9e6abf356c59ee9ae70cc9365b2b700ad183671c5009058"}} \ No newline at end of file diff --git a/rundevnet b/rundevnet new file mode 100755 index 00000000000..fdc60cfe8bf --- /dev/null +++ b/rundevnet @@ -0,0 +1,4 @@ +#!/bin/bash + +docker pull smartcontract/devnet:latest +docker run -p 18546:8546 smartcontract/devnet:latest From 955113a6b2be4d53f261e050ef1c4b3d0ae346f8 Mon Sep 17 00:00:00 2001 From: Dimitri Roche Date: Tue, 13 Feb 2018 17:42:50 -0500 Subject: [PATCH 2/3] Add scripts to start devnet and cl against devnet --- cldevnet | 7 +++++++ devnet/devnet | 4 ++++ rundevnet | 4 ---- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 devnet/devnet delete mode 100755 rundevnet diff --git a/cldevnet b/cldevnet index aa8bb6073f5..1394739de8e 100755 --- a/cldevnet +++ b/cldevnet @@ -1,5 +1,12 @@ #!/bin/bash +# Runs a Chainlink node preconfigured to communicate with smartcontract/devnet(parity). +# Steps: +# 0. Have docker installed and configured +# 1. ./devnet/devnet +# 2. cd solidity && truffle migrate --network devnet +# 3. ./cldevnet + export LOG_LEVEL=debug export ROOT=./devnet export ETH_URL=ws://localhost:18546 diff --git a/devnet/devnet b/devnet/devnet new file mode 100755 index 00000000000..4b45659c611 --- /dev/null +++ b/devnet/devnet @@ -0,0 +1,4 @@ +#!/bin/bash + +docker pull smartcontract/devnet:latest +docker run -p 18545:8545 -p 18546:8546 smartcontract/devnet:latest diff --git a/rundevnet b/rundevnet deleted file mode 100755 index fdc60cfe8bf..00000000000 --- a/rundevnet +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker pull smartcontract/devnet:latest -docker run -p 18546:8546 smartcontract/devnet:latest From 232440add22dc8dec719cf3f20d5918367ddd89a Mon Sep 17 00:00:00 2001 From: Dimitri Roche Date: Wed, 14 Feb 2018 17:52:47 -0500 Subject: [PATCH 3/3] Update truffle network devnet port --- solidity/truffle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidity/truffle.js b/solidity/truffle.js index 205ff4283e8..0634a947117 100644 --- a/solidity/truffle.js +++ b/solidity/truffle.js @@ -4,7 +4,7 @@ module.exports = { networks: { devnet: { host: "127.0.0.1", - port: 7434, + port: 18545, network_id: "*", gas: 4700000 }