ST-549 Fix libsovtoken identifier

devops/docker/ci/xenial/Dockerfile

@@ -36,12 +36,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 #         or python3-rocksdb are not specified here)
 ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.5}
 ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.5}
-ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.6.53}
-ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.11}
-ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.6.78}
-ENV TOKEN_VER  ${TOKEN_VER:-0.9.5}
-RUN echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list
-RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list \
+ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.8.0~dev780}
+ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.32}
+ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.8.0~dev920}
+ENV TOKEN_VER  ${TOKEN_VER:-0.9.6~18}
+RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list
+RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list \
     && apt-get update && apt-get install -y --no-install-recommends \
         libindy-crypto=${LIBINDY_CRYPTO_VERSION} \
         python3-indy-crypto=${PYTHON3_INDY_CRYPTO_VERSION} \
@@ -69,4 +69,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh
 ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"]
 
-ENV LIBSOVTOKEN_CI_ENV_VERSION=0.55.0
+ENV LIBSOVTOKEN_CI_ENV_VERSION=0.56.0

devops/indy-pool/Dockerfile

@@ -22,13 +22,13 @@ ARG uid=1000
 ARG indy_stream=master
 
 
-ARG indy_plenum_ver=1.6.735
-ARG indy_node_ver=1.6.874
+ARG indy_plenum_ver=1.8.0~dev780
+ARG indy_node_ver=1.8.0~dev920
 ARG indy_anoncreds_ver=1.0.32
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5
-ARG token_ver=0.9.6~2
-ARG fees_ver=0.9.6~2
+ARG token_ver=0.9.6~18
+ARG fees_ver=0.9.6~18
 
 # Install environment
 RUN apt-get update -y && apt-get install -y \

libsovtoken/src/api/mod.rs

@@ -660,11 +660,13 @@ pub extern "C" fn build_get_txn_fees_handler(
 
     let did = match opt_res_to_res_opt!(did) {
         Ok(did) => did,
-        Err(e) => { return e as i32; }
+        Err(e) => None
     };
 
+    let did = Some(did.unwrap_or(Did::new("LibsovtokenDid11111111")));
+
     let get_txn_request = GetFeesRequest::new().as_request(did);
-    info!("Built GET_TXN_FEES request: {:?}", get_txn_request);
+    print!("Built GET_TXN_FEES request: {:?}", get_txn_request);
 
     let request_pointer = match get_txn_request.serialize_to_pointer() {
         Ok(p) => p,

libsovtoken/src/logic/build_payment.rs

@@ -207,6 +207,6 @@ mod test_handle_signing {
                 .get(0).unwrap().as_object().unwrap()
                 .get("address").unwrap().as_str().unwrap()
         );
-        assert_eq!("7LSfLv2S6K7zMPrgmJDkZoJNhWvWRzpU7qt9uMR5yz8G".to_string(), request.identifier);
+        assert_eq!(Some("7LSfLv2S6K7zMPrgmJDkZoJNhWvWRzpU7qt9uMR5yz8G".to_string()), request.identifier);
     }
 }

libsovtoken/src/logic/request.rs

@@ -24,7 +24,8 @@ pub struct Request<T>
     pub operation: T,
     pub req_id: ReqId,
     pub protocol_version: ProtocolVersion,
-    pub identifier: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub identifier : Option<String>,
 }
 
 impl<T> Request<T>
@@ -36,7 +37,7 @@ impl<T> Request<T>
             operation,
             protocol_version: PROTOCOL_VERSION,
             req_id,
-            identifier: identifier.unwrap_or(DEFAULT_LIBSOVTOKEN_DID.to_string())
+            identifier
         };
     }
 

libsovtoken/tests/utils/mint.rs

@@ -29,7 +29,7 @@ pub fn mint_tokens(cfg: HashMap<String, u64>, pool_handle: i32, wallet_handle: i
 
     let mint_req = Request::<MintRequest>::multi_sign_request(wallet_handle, &mint_req, trustee_dids.to_vec()).unwrap();
 
-    let result = indy::ledger::sign_and_submit_request(pool_handle, wallet_handle, did, &mint_req).wait().unwrap();
+    let result = indy::ledger::submit_request(pool_handle, &mint_req).wait().unwrap();
 
     utils::parse_mint_response::ParseMintResponse::from_json(&result).map_err(|_| ErrorCode::CommonInvalidStructure)
 }