Updated docker-compose files to Sawtooth 1.1

Signed-off-by: kulkarniamol <amol.kulkarni@intel.com>

docker-compose-installed.yaml

@@ -32,7 +32,7 @@ services:
  entrypoint: grid-track-and-trace-tp -C tcp://validator:4004 -v
 
  validator:
- image: hyperledger/sawtooth-validator:1.0
+ image: hyperledger/sawtooth-validator:1.1
  container_name: grid-sawtooth-validator
  expose:
  - 4004
@@ -43,16 +43,29 @@ services:
  sawadm keygen &&
  sawtooth keygen my_key &&
  sawset genesis -k /root/.sawtooth/keys/my_key.priv &&
- sawadm genesis config-genesis.batch
+ sawset proposal create \
+ -k /root/.sawtooth/keys/my_key.priv \
+ sawtooth.consensus.algorithm.name=Devmode \
+ sawtooth.consensus.algorithm.version=0.1 \
+ -o config.batch && 
+ sawadm genesis config-genesis.batch config.batch
  fi;
  sawtooth-validator -v \
  --endpoint tcp://validator:8800 \
  --bind component:tcp://eth0:4004 \
- --bind network:tcp://eth0:8800
+ --bind network:tcp://eth0:8800 \
+ --bind consensus:tcp://eth0:5050
  "
 
+ devmode-engine:
+ image: hyperledger/sawtooth-devmode-engine-rust:1.1
+ container_name: sawtooth-devmode-engine-rust-default
+ depends_on:
+ - validator
+ entrypoint: devmode-engine-rust -C tcp://validator:5050
+
  settings-tp:
- image: hyperledger/sawtooth-settings-tp:1.0
+ image: hyperledger/sawtooth-settings-tp:1.1
  container_name: grid-sawtooth-settings-tp
  depends_on:
  - validator

docker-compose.yaml

@@ -43,7 +43,7 @@ services:
  "
 
  validator:
- image: hyperledger/sawtooth-validator:1.0
+ image: hyperledger/sawtooth-validator:1.1
  container_name: grid-sawtooth-validator
  expose:
  - 4004
@@ -56,23 +56,36 @@ services:
  sawadm keygen &&
  sawtooth keygen my_key &&
  sawset genesis -k /root/.sawtooth/keys/my_key.priv &&
- sawadm genesis config-genesis.batch
+ sawset proposal create \
+ -k /root/.sawtooth/keys/my_key.priv \
+ sawtooth.consensus.algorithm.name=Devmode \
+ sawtooth.consensus.algorithm.version=0.1 \
+ -o config.batch && 
+ sawadm genesis config-genesis.batch config.batch
  fi;
  sawtooth-validator -vv \
  --endpoint tcp://validator:8800 \
  --bind component:tcp://eth0:4004 \
- --bind network:tcp://eth0:8800
+ --bind network:tcp://eth0:8800 \
+ --bind consensus:tcp://eth0:5050
  "
 
+ devmode-engine:
+ image: hyperledger/sawtooth-devmode-engine-rust:1.1
+ container_name: sawtooth-devmode-engine-rust-default
+ depends_on:
+ - validator
+ entrypoint: devmode-engine-rust -C tcp://validator:5050
+
  settings-tp:
- image: hyperledger/sawtooth-settings-tp:1.0
+ image: hyperledger/sawtooth-settings-tp:1.1
  container_name: grid-sawtooth-settings-tp
  depends_on:
  - validator
  entrypoint: settings-tp -vv -C tcp://validator:4004
 
  rest-api:
- image: hyperledger/sawtooth-rest-api:1.0
+ image: hyperledger/sawtooth-rest-api:1.1
  container_name: grid-sawtooth-rest-api
  expose:
  - 8008