From a54ed4112f7bb18c9c249000ebeee91feeb5dd13 Mon Sep 17 00:00:00 2001 From: GuillaumeBourque-QC Date: Fri, 14 Feb 2025 11:27:52 -0500 Subject: [PATCH 1/6] Add legacy repo until all as been move to new lib Signed-off-by: GuillaumeBourque-QC --- .devcontainer/Dockerfile | 13 ++++++++ .../workflows/build/Dockerfile.ubuntu-2204 | 13 ++++++++ build-scripts/ubuntu-2204/Dockerfile | 30 ++++++++++++++----- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e54e30555..26d53d211 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -21,6 +21,14 @@ RUN apt-get update -y && apt-get install -y \ # Hyperledger RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg + +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +# bionic key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ + gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg +# sovrin key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ + gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # Plenum @@ -28,6 +36,11 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # - Needed to pick up rocksdb=5.8.8 RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list + RUN apt update -y && apt install -y \ # Python python3-pip \ diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index 35ce801d0..da867461e 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -20,6 +20,14 @@ RUN apt update -y && apt install -y \ # Hyperledger RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg + +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +# bionic key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ + gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg +# sovrin key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ + gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # ToDo: @@ -30,6 +38,11 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # - Needed to pick up rocksdb=5.8.8 RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list + RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* # install fpm diff --git a/build-scripts/ubuntu-2204/Dockerfile b/build-scripts/ubuntu-2204/Dockerfile index 66936a206..6294ba227 100644 --- a/build-scripts/ubuntu-2204/Dockerfile +++ b/build-scripts/ubuntu-2204/Dockerfile @@ -18,6 +18,14 @@ RUN apt update -y && apt install -y \ # Hyperledger RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ gpg --export 9692C00E657DDE61 > /etc/apt/keyrings/hyperledger.gpg + +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +# bionic key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ + gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg +# sovrin key +RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ + gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # Plenum @@ -25,6 +33,12 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # - Needed to pick up rocksdb=5.8.8 RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy jammy dev rc" > /etc/apt/sources.list.d/hyperledger.list +# todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx +RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list + + RUN apt update -y && apt install -y \ # Python python3-pip \ @@ -47,14 +61,14 @@ RUN apt update -y && apt install -y \ make \ # Indy Node and Plenum libssl3 - # Indy Node and Plenum - # Indy SDK is not used anymore - #libindy \ - # rsa=0.3.2-1 \ - # Indy SDK - # libindy=1.15.0~1625-bionic \ - # Need to move libursa.so to parent dir - # && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa +# Indy Node and Plenum +# Indy SDK is not used anymore +#libindy \ +# rsa=0.3.2-1 \ +# Indy SDK +# libindy=1.15.0~1625-bionic \ +# Need to move libursa.so to parent dir +# && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa RUN pip3 install -U \ # Required by setup.py From eaa3472c8e49ecce0afd3b1958f1cbad6b184b94 Mon Sep 17 00:00:00 2001 From: Nicholas Massad Date: Fri, 14 Feb 2025 12:53:29 -0500 Subject: [PATCH 2/6] modified the ioflo package import to fix issues wwith new version of collections. Tests can now be run Signed-off-by: Nicholas Massad --- .devcontainer/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 26d53d211..405dfd412 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -72,6 +72,10 @@ RUN pip3 install -U \ pyzmq==22.3.0 \ Cython==0.29.36 +RUN pip3 uninstall -y ioflo || true + +RUN pip3 install --no-cache-dir git+https://github.com/ioflo/ioflo.git + # install fpm RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 && \ pip3 install Cython==0.29.36 From aaa9303f8289de24d113e49c1216a3f24fd3b86a Mon Sep 17 00:00:00 2001 From: Nicholas Massad Date: Fri, 14 Feb 2025 15:25:43 -0500 Subject: [PATCH 3/6] Changed Plenum Package import to temporarily point towards Adam's Fork of plenum in order to work on node in parralel Signed-off-by: Nicholas Massad --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 522f7a4ef..2dfb5fa0a 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,8 @@ BASE_DIR = os.path.join(os.path.expanduser("~"), ".indy") tests_require = ['attrs>=20.3.0', 'pytest>=6.2.2', 'pytest-xdist>=2.2.1', 'pytest-forked>=1.3.0', - 'python3-indy==1.16.0.post236', 'pytest-asyncio>=0.14.0'] + 'pytest-asyncio>=0.14.0', + 'indy_vdr==0.4.0.dev5', 'aries-askar==0.2.7', 'indy-credx==0.3.1'] setup( name=metadata['__title__'], @@ -55,14 +56,20 @@ (BASE_DIR, ['data/nssm_original.exe']) )], - install_requires=['indy-plenum==1.14.0-rc0', + install_requires=[# Changed the import path for the plenum package to point to indy-plenum fork on AdamBurdett Repo for parallel dev change back to regular version once PR is complete + 'indy-plenum @ git+https://github.com/burdettadam/indy-plenum.git@feature/indy-vdr-upgrade#egg=indy-plenum', + # 'indy-plenum==1.14.0-rc0', # importlib-metadata needs to be pinned to 3.10.1 because from v4.0.0 the package # name ends in python3-importlib-metadata_0.0.0_amd64.deb # see also build-scripts/ubuntu-2004/build-3rd-parties.sh # https://github.com/hyperledger/indy-plenum/blob/eac38674252b539216be2c40bb13e53c5b70dad2/build-scripts/ubuntu-2004/build-3rd-parties.sh#L104-L106 + 'indy_vdr==0.4.0.dev5', + 'aries-askar==0.2.7', + 'indy-credx==0.3.1', 'importlib-metadata==3.10.1', 'timeout-decorator>=0.5.0', 'distro==1.7.0'], + setup_requires=['pytest-runner'], extras_require={ 'tests': tests_require From 15d278721687686aba496bf08ab49c5175ba7676 Mon Sep 17 00:00:00 2001 From: Nicholas Massad Date: Mon, 17 Feb 2025 13:49:25 -0500 Subject: [PATCH 4/6] Upgrading from indy-sdk to indy_vdr *ongoing* Signed-off-by: Nicholas Massad --- indy_node/test/anon_creds/conftest.py | 15 ++- indy_node/test/anon_creds/helper.py | 34 +++--- indy_node/test/api/helper.py | 16 +-- indy_node/test/api/test_attrib_reply.py | 4 +- indy_node/test/api/test_claim_def_reply.py | 17 +-- indy_node/test/api/test_nym_reply.py | 4 +- .../test/attrib_txn/test_attrib_txn_digest.py | 5 +- .../test/attrib_txn/test_send_get_attr.py | 4 +- indy_node/test/helper.py | 21 ++-- indy_node/test/utils.py | 103 ++++++++++++++++++ 10 files changed, 160 insertions(+), 63 deletions(-) create mode 100644 indy_node/test/utils.py diff --git a/indy_node/test/anon_creds/conftest.py b/indy_node/test/anon_creds/conftest.py index ddfeb37dc..80e7dd4b4 100644 --- a/indy_node/test/anon_creds/conftest.py +++ b/indy_node/test/anon_creds/conftest.py @@ -2,11 +2,11 @@ import time import json -from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_cred_def_request +from indy_vdr import ledger from indy_common.state.domain import make_state_path_for_claim_def from indy_node.test.anon_creds.helper import get_cred_def_id, create_revoc_reg, create_revoc_reg_entry +from indy_node.test.utils import create_and_store_cred_def from plenum.common.util import randomString from indy_common.constants import REVOC_REG_ENTRY, REVOC_REG_DEF_ID, ISSUED, \ REVOKED, PREV_ACCUM, ACCUM, REVOC_REG_DEF, ISSUANCE_BY_DEFAULT, \ @@ -27,7 +27,10 @@ CRED_DEF_VERSION = '1.0' SCHEMA_VERSION = '1.0' - +# Is sdk_wallet_handle same as wallet handle? +# Is sdk wallet_steward a issuer/submitter did? +# is the schema the same with vdr upgrade as with the sdk? +# Is tag here a string? @pytest.fixture(scope="module") def claim_def(looper, sdk_wallet_handle, sdk_wallet_steward, send_schema_req): schema = json.loads(send_schema_req[0]) @@ -36,10 +39,10 @@ def claim_def(looper, sdk_wallet_handle, sdk_wallet_steward, send_schema_req): schema['seqNo'] = schema_seq_no definition_id, definition_json = \ - looper.loop.run_until_complete(issuer_create_and_store_credential_def( + looper.loop.run_until_complete(create_and_store_cred_def( sdk_wallet_handle, sdk_wallet_steward[1], json.dumps(schema), - tag, "CL", json.dumps({"support_revocation": True}))) - cred_def = looper.loop.run_until_complete(build_cred_def_request(sdk_wallet_steward[1], definition_json)) + tag, "CL", True)) + cred_def = looper.loop.run_until_complete(ledger.build_cred_def_request(sdk_wallet_steward[1], definition_json)) return json.loads(cred_def)['operation'] diff --git a/indy_node/test/anon_creds/helper.py b/indy_node/test/anon_creds/helper.py index d9f4bcfa5..fc109403b 100644 --- a/indy_node/test/anon_creds/helper.py +++ b/indy_node/test/anon_creds/helper.py @@ -1,9 +1,7 @@ -import json import time -from indy import blob_storage -from indy.anoncreds import issuer_create_and_store_revoc_reg -from indy.ledger import build_revoc_reg_def_request, build_revoc_reg_entry_request +from indy_node.test.utils import create_and_store_revoc_reg +from indy_vdr import ledger from plenum.common.types import f @@ -40,35 +38,29 @@ def get_revoc_reg_entry_id(submitter_did, def_revoc_id): entry_revoc_id = ':'.join([submitter_did, domain.MARKER_REVOC_REG_ENTRY, def_revoc_id]) return entry_revoc_id - +# create_and_store_revoc_reg does not seem to store tails in blob storage is this +# taken care of in the wallet_hanlde insert now? def create_revoc_reg(looper, wallet_handle, submitter_did, tag, cred_def_id, issuance): - tails_writer_config = json.dumps({'base_dir': 'tails', 'uri_pattern': ''}) - tails_writer = looper.loop.run_until_complete(blob_storage.open_writer( - 'default', tails_writer_config)) _, revoc_reg_def_json, revoc_reg_entry_json = \ - looper.loop.run_until_complete(issuer_create_and_store_revoc_reg( + looper.loop.run_until_complete(create_and_store_revoc_reg( wallet_handle, submitter_did, "CL_ACCUM", tag, cred_def_id, - json.dumps({"max_cred_num": 5, "issuance_type": issuance}), - tails_writer)) + max_cred_num= 5, issuance_type= issuance)) return looper.loop.run_until_complete( - build_revoc_reg_def_request(submitter_did, revoc_reg_def_json)) - + ledger.build_revoc_reg_def_request(submitter_did, revoc_reg_def_json)) +# Removed tail writer from blob storage does this need to be added using a different +# method or it's taken care of in wallet handle? def create_revoc_reg_entry(looper, wallet_handle, submitter_did, tag, cred_def_id, issuance): - tails_writer_config = json.dumps({'base_dir': 'tails', 'uri_pattern': ''}) - tails_writer = looper.loop.run_until_complete(blob_storage.open_writer( - 'default', tails_writer_config)) revoc_reg_def_id, revoc_reg_def_json, revoc_reg_entry_json = \ - looper.loop.run_until_complete(issuer_create_and_store_revoc_reg( + looper.loop.run_until_complete(create_and_store_revoc_reg( wallet_handle, submitter_did, "CL_ACCUM", tag, cred_def_id, - json.dumps({"max_cred_num": 5, "issuance_type": issuance}), - tails_writer)) + max_cred_num= 5, issuance_type= issuance)) revoc_reg_def = looper.loop.run_until_complete( - build_revoc_reg_def_request(submitter_did, revoc_reg_def_json)) + ledger.build_revoc_reg_def_request(submitter_did, revoc_reg_def_json)) entry_revoc_request = looper.loop.run_until_complete( - build_revoc_reg_entry_request( + ledger.build_revoc_reg_entry_request( submitter_did, revoc_reg_def_id, "CL_ACCUM", revoc_reg_entry_json)) return revoc_reg_def, entry_revoc_request diff --git a/indy_node/test/api/helper.py b/indy_node/test/api/helper.py index 9d23df191..1f400781d 100644 --- a/indy_node/test/api/helper.py +++ b/indy_node/test/api/helper.py @@ -2,8 +2,8 @@ import random import base58 -from indy.anoncreds import issuer_create_schema -from indy.ledger import build_schema_request +from indy_node.test.utils import create_schema +from indy_vdr import ledger from indy_common.constants import RS_ID, RS_TYPE, RS_NAME, RS_VERSION, RS_CONTENT from plenum.common.constants import TXN_TYPE @@ -203,19 +203,19 @@ def validate_rich_schema_txn(txn, txn_type): # Misc utility - +# sdk_wallet_client must be the wallet_handle def sdk_build_schema_request(looper, sdk_wallet_client, attributes=[], name="", version=""): _, identifier = sdk_wallet_client _, schema_json = looper.loop.run_until_complete( - issuer_create_schema( + create_schema(sdk_wallet_client, identifier, name, version, json.dumps(attributes) )) return looper.loop.run_until_complete( - build_schema_request(identifier, schema_json) + ledger.build_schema_request(identifier, schema_json) ) @@ -265,11 +265,11 @@ def sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_client, multi_attribute _, identifier = sdk_wallet_client if multi_attribute: _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, name, version, json.dumps(multi_attribute))) + create_schema(sdk_wallet_client, identifier, name, version, json.dumps(multi_attribute))) else: _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, "name", "1.0", json.dumps(["first", "last"]))) - request = looper.loop.run_until_complete(build_schema_request(identifier, schema_json)) + create_schema(sdk_wallet_client, identifier, "name", "1.0", json.dumps(["first", "last"]))) + request = looper.loop.run_until_complete(ledger.build_schema_request(identifier, schema_json)) return schema_json, \ sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, request))[1] diff --git a/indy_node/test/api/test_attrib_reply.py b/indy_node/test/api/test_attrib_reply.py index 1af7ccb09..a8fb58761 100644 --- a/indy_node/test/api/test_attrib_reply.py +++ b/indy_node/test/api/test_attrib_reply.py @@ -1,6 +1,6 @@ import json -from indy.ledger import build_attrib_request +from indy_vdr import ledger from indy_node.test.api.helper import validate_write_reply, validate_attrib_txn from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req from hashlib import sha256 @@ -8,7 +8,7 @@ def execute_attrib_txn(looper, sdk_pool_handle, sdk_wallet_steward, xhash, raw, enc): _, identifier = sdk_wallet_steward - request = looper.loop.run_until_complete(build_attrib_request(identifier, identifier, xhash, raw, enc)) + request = looper.loop.run_until_complete(ledger.build_attrib_request(identifier, identifier, xhash, raw, enc)) return sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request))[1] diff --git a/indy_node/test/api/test_claim_def_reply.py b/indy_node/test/api/test_claim_def_reply.py index 35153e513..e4f39fe00 100644 --- a/indy_node/test/api/test_claim_def_reply.py +++ b/indy_node/test/api/test_claim_def_reply.py @@ -1,24 +1,27 @@ import json -from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_cred_def_request, build_get_schema_request, parse_get_schema_response +from indy.ledger import parse_get_schema_response +from indy_node.test.utils import create_and_store_cred_def +from indy_vdr import ledger from indy_node.test.api.helper import validate_write_reply, validate_claim_def_txn, sdk_write_schema from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req - +# need to look a how the reply is formatted to replace the parsing method +# build_cred_def_request and build_get_schema_requests already returns a request might not need to use the looper to create one +# Needs to be tested once plenum is updated to use indy-vdr def test_claim_def_reply_is_valid(looper, sdk_pool_handle, sdk_wallet_steward): wallet_handle, identifier = sdk_wallet_steward schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_steward) schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request))[1] _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( - wallet_handle, identifier, schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( + wallet_handle, identifier, schema_json, "some_tag", "CL", True)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request))[1] validate_write_reply(reply) diff --git a/indy_node/test/api/test_nym_reply.py b/indy_node/test/api/test_nym_reply.py index b04063b97..2888146a2 100644 --- a/indy_node/test/api/test_nym_reply.py +++ b/indy_node/test/api/test_nym_reply.py @@ -1,4 +1,4 @@ -from indy.ledger import build_nym_request +from indy_vdr import ledger from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey from indy_node.test.api.helper import validate_write_reply, validate_nym_txn from plenum.test.helper import sdk_get_reply, sdk_sign_and_submit_req @@ -8,7 +8,7 @@ def test_nym_reply_is_valid(looper, sdk_pool_handle, sdk_wallet_steward): idr, verkey = createHalfKeyIdentifierAndAbbrevVerkey() _, identifier = sdk_wallet_steward - request = looper.loop.run_until_complete(build_nym_request(identifier, idr, verkey, None, None)) + request = ledger.build_nym_request(identifier, idr, verkey, None, None, None, None) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request))[1] validate_write_reply(reply) diff --git a/indy_node/test/attrib_txn/test_attrib_txn_digest.py b/indy_node/test/attrib_txn/test_attrib_txn_digest.py index 7332f499b..d6ec69cdb 100644 --- a/indy_node/test/attrib_txn/test_attrib_txn_digest.py +++ b/indy_node/test/attrib_txn/test_attrib_txn_digest.py @@ -1,7 +1,8 @@ import json import pytest -from indy.ledger import build_attrib_request, sign_request +from indy_vdr import ledger +from indy_node.test.utils import sign_request from indy_common.types import Request from plenum.common.request import Request as PRequest @@ -16,7 +17,7 @@ def req_json(looper, sdk_wallet_steward): wallet_handle, identifier = sdk_wallet_steward raw = json.dumps({'answer': 42}) return looper.loop.run_until_complete( - build_attrib_request(identifier, identifier, raw=raw, xhash=None, enc=None)) + ledger.build_attrib_request(identifier, identifier, raw=raw, xhash=None, enc=None)) @pytest.fixture(scope="module") diff --git a/indy_node/test/attrib_txn/test_send_get_attr.py b/indy_node/test/attrib_txn/test_send_get_attr.py index 6764189c5..4a0c56659 100644 --- a/indy_node/test/attrib_txn/test_send_get_attr.py +++ b/indy_node/test/attrib_txn/test_send_get_attr.py @@ -4,7 +4,7 @@ import time from typing import Optional -from indy.ledger import build_get_attrib_request +from indy_vdr import ledger from libnacl.secret import SecretBox from plenum.common.exceptions import RequestNackedException from plenum.test.helper import sdk_get_and_check_replies @@ -76,7 +76,7 @@ def test_send_get_attr_fails_for_nonexistent_uuid_dest( looper, sdk_pool_handle, sdk_wallet_trustee, send_raw_attrib): _, submitter_did = sdk_wallet_trustee req = looper.loop.run_until_complete( - build_get_attrib_request(submitter_did, submitter_did, attrib_name, None, None)) + ledger.build_get_attrib_request(submitter_did, submitter_did, attrib_name, None, None, None, None)) req = modify_field(req, submitter_did[:-10], 'operation', 'dest') request_couple = sdk_sign_and_send_prepared_request(looper, sdk_wallet_trustee, sdk_pool_handle, req) diff --git a/indy_node/test/helper.py b/indy_node/test/helper.py index a5c1fd2dc..8219b616d 100644 --- a/indy_node/test/helper.py +++ b/indy_node/test/helper.py @@ -3,10 +3,7 @@ import base58 from indy.did import replace_keys_start, replace_keys_apply -from indy.ledger import ( - build_attrib_request, build_get_attrib_request, - build_get_auth_rule_request, build_auth_rule_request, - build_auth_rules_request) +from indy_vdr import ledger from libnacl import randombytes from indy_common.authorize.auth_actions import ADD_PREFIX, EDIT_PREFIX @@ -105,20 +102,18 @@ def sdk_send_and_check_req_json( resp = sdk_get_and_check_replies(looper, [req]) return resp - def sdk_add_attribute_and_check(looper, sdk_pool_handle, sdk_wallet_handle, attrib, dest=None, xhash=None, enc=None): _, s_did = sdk_wallet_handle t_did = dest or s_did attrib_req = looper.loop.run_until_complete( - build_attrib_request(s_did, t_did, xhash, attrib, enc)) + ledger.build_attrib_request(s_did, t_did, xhash, attrib, enc)) return sdk_send_and_check_req_json(looper, sdk_pool_handle, sdk_wallet_handle, attrib_req) - def sdk_get_attribute_and_check(looper, sdk_pool_handle, submitter_wallet, target_did, attrib_name): _, submitter_did = submitter_wallet req = looper.loop.run_until_complete( - build_get_attrib_request(submitter_did, target_did, attrib_name, None, None)) + ledger.build_get_attrib_request(submitter_did, target_did, attrib_name, None, None, None, None)) return sdk_send_and_check_req_json(looper, sdk_pool_handle, submitter_wallet, req) @@ -136,7 +131,7 @@ def build_auth_rule_request_json( auth_action, auth_type, field, constraint, old_value=None, new_value=None ): return looper.loop.run_until_complete( - build_auth_rule_request( + ledger.build_auth_rule_request( submitter_did=submitter_did, txn_type=auth_type, action=auth_action, @@ -157,7 +152,7 @@ def build_get_auth_rule_request_json( new_value=None ): return looper.loop.run_until_complete( - build_get_auth_rule_request( + ledger.build_get_auth_rule_request( submitter_did=submitter_did, txn_type=auth_type, action=auth_action, @@ -173,7 +168,7 @@ def sdk_send_and_check_auth_rule_request( auth_action, auth_type, field, constraint, old_value=None, new_value=None, no_wait=False ): - req_json = build_auth_rule_request_json( + req_json = ledger.build_auth_rule_request_json( looper, sdk_wallet[1], auth_action=auth_action, auth_type=auth_type, @@ -196,7 +191,7 @@ def sdk_send_and_check_auth_rules_request(looper, sdk_pool_handle, generate_auth_rule(EDIT_PREFIX, NYM, ROLE, ENDORSER, TRUSTEE)] req_json = looper.loop.run_until_complete( - build_auth_rules_request(submitter_did=sdk_wallet[1], data=json.dumps(rules))) + ledger.build_auth_rules_request(submitter_did=sdk_wallet[1], data=json.dumps(rules))) return sdk_send_and_check_req_json( looper, sdk_pool_handle, sdk_wallet, req_json, no_wait=no_wait ) @@ -210,7 +205,7 @@ def sdk_send_and_check_get_auth_rule_request( old_value=None, new_value=None ): - req_json = build_get_auth_rule_request_json( + req_json = ledger.build_get_auth_rule_request_json( looper, sdk_wallet[1], auth_type=auth_type, auth_action=auth_action, diff --git a/indy_node/test/utils.py b/indy_node/test/utils.py new file mode 100644 index 000000000..70e9b415c --- /dev/null +++ b/indy_node/test/utils.py @@ -0,0 +1,103 @@ +import time +from datetime import datetime, timedelta, timezone +import os +import string +from typing import Optional +import subprocess +import base58 +import asyncio +from random import sample, shuffle, randrange +from collections import Counter +from collections.abc import Iterable +from inspect import isawaitable +import random +import itertools +import functools +import testinfra +import json +from json import JSONDecodeError +import hashlib +import indy_vdr +from indy_vdr import ledger, open_pool +from aries_askar import Store, Key, KeyAlg, AskarError, AskarErrorCode +from indy_credx import Schema, CredentialDefinition, RevocationRegistryDefinition +from indy_vdr.error import VdrError + +import logging + +logger = logging.getLogger(__name__) + + +async def create_and_store_cred_def(wallet_handle, submitter_did, schema, tag, signature_type, support_revocation): + ( + cred_def, + cred_def_private, + key_proof, + ) = await asyncio.get_event_loop().run_in_executor( + None, + lambda: CredentialDefinition.create( + submitter_did, + schema, + signature_type or "CL", + tag or "default", + support_revocation=support_revocation, + ), + ) + cred_def_id = cred_def.id + cred_def_json = cred_def.to_json() + + await wallet_handle.insert("credential_def", cred_def_id, cred_def_json, tags={"schema_id": schema["id"]}) + await wallet_handle.insert("credential_def_private", cred_def_id, cred_def_private.to_json_buffer()) + await wallet_handle.insert("credential_def_key_proof", cred_def_id, key_proof.to_json_buffer()) + return cred_def_id, cred_def_json + +async def create_and_store_revoc_reg(wallet_handle, submitter_did, revoc_def_type, tag, cred_def_id, max_cred_num=1, + issuance_type=None): + cred_def = await wallet_handle.fetch("credential_def", cred_def_id) + ( + rev_reg_def, + rev_reg_def_private, + rev_reg, + _rev_reg_delta, + ) = await asyncio.get_event_loop().run_in_executor( + None, + lambda: RevocationRegistryDefinition.create( + submitter_did, + cred_def.raw_value, + tag, + revoc_def_type, + max_cred_num, + issuance_type=issuance_type + ), + ) + + rev_reg_def_id = rev_reg_def.id + rev_reg_def_json = rev_reg_def.to_json() + rev_reg_json = rev_reg.to_json() + + await wallet_handle.insert("revocation_reg", rev_reg_def_id, rev_reg_json) + await wallet_handle.insert("revocation_reg_info", rev_reg_def_id, value_json={"curr_id": 0, "used_ids": []}) + await wallet_handle.insert("revocation_reg_def", rev_reg_def_id, rev_reg_def_json) + await wallet_handle.insert("revocation_reg_def_private", rev_reg_def_id, rev_reg_def_private.to_json_buffer()) + return rev_reg_def_id, rev_reg_def_json, rev_reg_json + +async def create_schema(wallet_handle, submitter_did, schema_name, schema_version, schema_attrs): + schema = Schema.create(submitter_did, schema_name, schema_version, schema_attrs) + schema_id = schema.id + schema_json = schema.to_json() + await wallet_handle.insert("schema", schema_id, schema_json) + return schema_id, schema_json + +async def get_did_signing_key(wallet_handle, did): + item = await wallet_handle.fetch("did", did, for_update=False) + if item: + kp = await wallet_handle.fetch_key(item.value_json.get("verkey")) + return kp.key + return None + +async def sign_request(wallet_handle, submitter_did, req): + key = await get_did_signing_key(wallet_handle, submitter_did) + if not key: + raise Exception(f"Key for DID {submitter_did} is empty") + req.set_signature(key.sign_message(req.signature_input)) + return req \ No newline at end of file From c858a543227ccba16c07c2495f110457b1ea2ae2 Mon Sep 17 00:00:00 2001 From: Nicholas Massad Date: Thu, 20 Feb 2025 14:12:32 -0500 Subject: [PATCH 5/6] Further modified the indy_node tests to upgrade to indy_vdr Signed-off-by: Nicholas Massad --- .devcontainer/Dockerfile | 7 +- acceptance/tests/test_ledger.py | 50 ++++++------- acceptance/tests/utils.py | 2 +- .../auth_rule/auth_framework/claim_def.py | 5 +- .../auth_rule/auth_framework/disable_taa.py | 4 +- .../auth_rule/auth_framework/revoc_reg_def.py | 5 +- .../auth_framework/txn_author_agreement.py | 4 +- .../txn_author_agreement_aml.py | 4 +- indy_node/test/auth_rule/helper.py | 2 +- .../test_node_txn_demote_by_endorser.py | 2 +- .../test_node_txn_promote_by_endorser.py | 2 +- indy_node/test/claim_def/conftest.py | 10 +-- .../test/claim_def/test_send_claim_def.py | 46 ++++++------ .../test/claim_def/test_send_get_claim_def.py | 22 +++--- indy_node/test/did/conftest.py | 16 +++-- .../test/endorser/test_send_by_endorser.py | 9 +-- .../test_create_did_without_endorser.py | 18 ++--- .../nym_txn/test_demote_network_monitor.py | 8 +-- indy_node/test/nym_txn/test_nym_additional.py | 13 ++-- indy_node/test/nym_txn/test_nym_auth_rules.py | 5 +- .../test/nym_txn/test_nym_blacklisting.py | 12 ++-- indy_node/test/nym_txn/test_nym_no_role.py | 6 +- indy_node/test/nym_txn/test_nym_resend.py | 7 +- .../test_idr_cache_update_after_catchup.py | 5 +- indy_node/test/pool_config/helper.py | 6 +- indy_node/test/pool_restart/helper.py | 14 ++-- .../test_successive_batch_no_state_change.py | 6 +- .../test_request_propagates.py | 19 +++-- indy_node/test/schema/test_send_get_schema.py | 20 +++--- .../test_state_proof_for_get_requests.py | 8 +-- .../txn_author_agreement/test_node_taa.py | 2 +- .../test_send_attrib_validation.py | 4 +- .../test_send_get_nym_validation.py | 8 +-- indy_node/test/upgrade/helper.py | 4 +- indy_node/test/utils.py | 70 ++++++++++++++++++- indy_node/test/validator_info/helper.py | 8 +-- ..._view_change_during_alternating_unstash.py | 6 +- .../test_send_write_permission_no_client.py | 12 ++-- scripts/performance/perf_load/perf_client.py | 4 +- .../performance/perf_load/perf_client_fees.py | 8 +-- .../perf_load/perf_req_gen_definition.py | 2 +- .../perf_load/perf_req_gen_demoted_node.py | 4 +- .../perf_load/perf_req_gen_schema.py | 2 +- setup.py | 13 ++-- 44 files changed, 281 insertions(+), 203 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 405dfd412..70fd8fddf 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -63,8 +63,11 @@ RUN apt update -y && apt install -y \ make \ # Indy Node and Plenum # Indy SDK is not used anymore - #libindy \ - libssl3 + # libindy \ + ursa=0.3.2-1 \ + libssl3 \ + # Need to move libursa.so to parent dir + && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa RUN pip3 install -U \ # Required by setup.py diff --git a/acceptance/tests/test_ledger.py b/acceptance/tests/test_ledger.py index 338d5d771..710eea225 100644 --- a/acceptance/tests/test_ledger.py +++ b/acceptance/tests/test_ledger.py @@ -16,10 +16,10 @@ async def test_send_and_get_nym_positive(writer_role, reader_role): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}') - writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}') - reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}') - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}') + writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}') + reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}') + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds NYM writer await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role) @@ -47,9 +47,9 @@ async def test_send_and_get_nym_negative(submitter_seed): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}') - submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, submitter_seed) - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}') + submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, submitter_seed) + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds submitter await nym_helper(pool_handle, wallet_handle, trustee_did, submitter_did, submitter_vk) @@ -74,8 +74,8 @@ async def test_send_and_get_attrib_positive(xhash, raw, enc): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}') - submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}') + submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) await nym_helper(pool_handle, wallet_handle, submitter_did, target_did, target_vk) res1 = json.loads(await attrib_helper(pool_handle, wallet_handle, target_did, target_did, xhash, raw, enc)) @@ -100,8 +100,8 @@ async def test_send_and_get_attrib_negative(xhash, raw, enc, error): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}') - submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}') + submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) await nym_helper(pool_handle, wallet_handle, submitter_did, target_did, target_vk) if error: @@ -126,9 +126,9 @@ async def test_send_and_get_schema_positive(writer_role, reader_role): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}') - reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}') - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}') + reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}') + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds SCHEMA writer await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role) @@ -154,7 +154,7 @@ async def test_send_and_get_schema_negative(): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) res = await get_schema_helper(pool_handle, wallet_handle, trustee_did, '7kqbG8zcdAMc9Q6SMU4xZy:2:schema1:1.0') @@ -172,9 +172,9 @@ async def test_send_and_get_cred_def_positive(writer_role, reader_role): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}') - reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}') - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}') + reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}') + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds CRED_DEF writer await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role) @@ -202,7 +202,7 @@ async def test_send_and_get_cred_def_negative(): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) res = await get_cred_def_helper(pool_handle, wallet_handle, trustee_did, 'AfdMw5jMX9pcNAuSwppbC7:3:CL:297:cred_def_tag') @@ -220,9 +220,9 @@ async def test_send_and_get_revoc_reg_def_positive(writer_role, reader_role): await pool.set_protocol_version(2) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}') - reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}') - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}') + reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}') + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds REVOC_REG_DEF writer await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role) @@ -259,9 +259,9 @@ async def test_send_and_get_revoc_reg_entry_positive(writer_role, reader_role): timestamp0 = int(time.time()) pool_handle, _ = await pool_helper() wallet_handle, _, _ = await wallet_helper() - writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}') - reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}') - trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps( + writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}') + reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}') + trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps( {'seed': '000000000000000000000000Trustee1'})) # Trustee adds REVOC_REG_ENTRY writer await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role) diff --git a/acceptance/tests/utils.py b/acceptance/tests/utils.py index c6a8f1641..90a527d26 100644 --- a/acceptance/tests/utils.py +++ b/acceptance/tests/utils.py @@ -80,7 +80,7 @@ async def attrib_helper(pool_handle, wallet_handle, submitter_did, target_did, x async def schema_helper(pool_handle, wallet_handle, submitter_did, schema_name, schema_version, schema_attrs): - schema_id, schema_json = await anoncreds.issuer_create_schema(submitter_did, schema_name, schema_version, + schema_id, schema_json = await create_schema(submitter_did, schema_name, schema_version, schema_attrs) req = await ledger.build_schema_request(submitter_did, schema_json) res = await ledger.sign_and_submit_request(pool_handle, wallet_handle, submitter_did, req) diff --git a/indy_node/test/auth_rule/auth_framework/claim_def.py b/indy_node/test/auth_rule/auth_framework/claim_def.py index 7290052d6..4ef78d21e 100644 --- a/indy_node/test/auth_rule/auth_framework/claim_def.py +++ b/indy_node/test/auth_rule/auth_framework/claim_def.py @@ -1,7 +1,8 @@ import json import pytest -from indy.ledger import build_get_schema_request, parse_get_schema_response +from indy_node.test.utils import parse_get_schema_response +from indy_vdr import ledger from indy_common.authorize import auth_map from indy_common.authorize.auth_actions import ADD_PREFIX, EDIT_PREFIX @@ -25,7 +26,7 @@ def get_schema_json(looper, sdk_pool_handle, sdk_wallet_trustee): schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_trustee) schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1] _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) return schema_json diff --git a/indy_node/test/auth_rule/auth_framework/disable_taa.py b/indy_node/test/auth_rule/auth_framework/disable_taa.py index 55535d207..0e494a5f4 100644 --- a/indy_node/test/auth_rule/auth_framework/disable_taa.py +++ b/indy_node/test/auth_rule/auth_framework/disable_taa.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_vdr import ledger from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, IDENTITY_OWNER @@ -29,7 +29,7 @@ def prepare(self): self.send_taa() def taa_aml_request(self): - return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request( + return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request( self.trustee_wallet[1], json.dumps({ 'Nice way': 'very good way to accept agreement'}), diff --git a/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py b/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py index db1586569..8ac623f32 100644 --- a/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py +++ b/indy_node/test/auth_rule/auth_framework/revoc_reg_def.py @@ -1,7 +1,8 @@ import json import pytest -from indy.ledger import build_get_schema_request, parse_get_schema_response +from indy_vdr import ledger +from indy_node.test.utils import parse_get_schema_response from indy_common.state.domain import make_state_path_for_claim_def from plenum.common.types import OPERATION @@ -32,7 +33,7 @@ def get_schema_json(looper, sdk_pool_handle, sdk_wallet_trustee): schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_trustee) schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1] _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) return schema_json diff --git a/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py b/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py index 9d82ec49b..4b140c617 100644 --- a/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py +++ b/indy_node/test/auth_rule/auth_framework/txn_author_agreement.py @@ -1,7 +1,7 @@ import pytest import json -from indy.ledger import build_acceptance_mechanisms_request +from indy_vdr import ledger from plenum.common.util import randomString @@ -73,7 +73,7 @@ def get_changed_auth_rule(self): ) def taa_aml_request(self): - return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request( + return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request( self.trustee_wallet[1], json.dumps({ 'Nice way': 'very good way to accept agreement'}), diff --git a/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py b/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py index be632bd4e..50deb1f90 100644 --- a/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py +++ b/indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_vdr import ledger from plenum.common.util import randomString @@ -70,7 +70,7 @@ def get_changed_auth_rule(self): ) def taa_aml_request_module(self, wallet): - return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request( + return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request( wallet[1], json.dumps({ 'Nice way': 'very good way to accept agreement'}), diff --git a/indy_node/test/auth_rule/helper.py b/indy_node/test/auth_rule/helper.py index a039f9e8a..ad385185a 100644 --- a/indy_node/test/auth_rule/helper.py +++ b/indy_node/test/auth_rule/helper.py @@ -47,7 +47,7 @@ def generate_auth_rule_operation(auth_action=ADD_PREFIX, auth_type=NYM, def create_verkey_did(looper, wh): seed = randomString(32) return looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': seed}))) + create_and_store_did(wh, json.dumps({'seed': seed}))) def sdk_send_and_check_auth_rule_request( diff --git a/indy_node/test/auth_rule/test_node_txn_demote_by_endorser.py b/indy_node/test/auth_rule/test_node_txn_demote_by_endorser.py index bc9012a10..a93cadb22 100644 --- a/indy_node/test/auth_rule/test_node_txn_demote_by_endorser.py +++ b/indy_node/test/auth_rule/test_node_txn_demote_by_endorser.py @@ -18,7 +18,7 @@ def test_node_txn_demote_by_endorser(txnPoolNodeSet, validators_before = get_pool_validator_count(txnPoolNodeSet) new_end_did, new_end_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + did.create_and_store_did(sdk_wallet_trustee[0], "{}")) # Step 1. Add new Endorser sdk_add_new_nym(looper, sdk_pool_handle, diff --git a/indy_node/test/auth_rule/test_node_txn_promote_by_endorser.py b/indy_node/test/auth_rule/test_node_txn_promote_by_endorser.py index a398f3c2d..57f210fca 100644 --- a/indy_node/test/auth_rule/test_node_txn_promote_by_endorser.py +++ b/indy_node/test/auth_rule/test_node_txn_promote_by_endorser.py @@ -18,7 +18,7 @@ def test_node_txn_promote_by_endorser(txnPoolNodeSet, validators_before = get_pool_validator_count(txnPoolNodeSet) new_end_did, new_end_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + did.create_and_store_did(sdk_wallet_trustee[0], "{}")) # Step 1. Demote node using default auth rule demote_node(looper, sdk_wallet_trustee, sdk_pool_handle, txnPoolNodeSet[-1]) diff --git a/indy_node/test/claim_def/conftest.py b/indy_node/test/claim_def/conftest.py index 3c33d2590..7be55c8f5 100644 --- a/indy_node/test/claim_def/conftest.py +++ b/indy_node/test/claim_def/conftest.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import parse_get_schema_response, build_get_schema_request +from indy_vdr import ledger from indy_common.config import SCHEMA_ATTRIBUTES_LIMIT from indy_node.test.api.helper import sdk_write_schema @@ -16,9 +16,9 @@ def schema_json(looper, sdk_pool_handle, sdk_wallet_trustee): schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_trustee) schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1] - _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) + _, schema_json = looper.loop.run_until_complete(ledger.parse_get_schema_response(json.dumps(reply))) return schema_json @@ -30,7 +30,7 @@ def large_schema_json(looper, sdk_pool_handle, sdk_wallet_trustee): multi_attribute=attrs, name="name_large", version="2.0") schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1] - _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) + _, schema_json = looper.loop.run_until_complete(ledger.parse_get_schema_response(json.dumps(reply))) return schema_json diff --git a/indy_node/test/claim_def/test_send_claim_def.py b/indy_node/test/claim_def/test_send_claim_def.py index a6a20514f..9ce786ae8 100644 --- a/indy_node/test/claim_def/test_send_claim_def.py +++ b/indy_node/test/claim_def/test_send_claim_def.py @@ -1,8 +1,8 @@ import json import pytest -from indy.anoncreds import issuer_create_and_store_credential_def, issuer_create_schema -from indy.ledger import build_cred_def_request, build_schema_request +from indy_vdr import ledger +from indy_node.test.utils import create_schema, create_and_store_cred_def from indy_common.constants import REF from indy_node.test.helper import modify_field @@ -14,9 +14,9 @@ def sdk_send_claim_def(looper, sdk_pool_handle, sdk_wallet, tag, schema_json): wallet_handle, identifier = sdk_wallet - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, tag, "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) reply = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet, request)]) return reply @@ -25,9 +25,9 @@ def test_send_claim_def_succeeds( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -35,9 +35,9 @@ def test_send_claim_def_succeeds_for_large_schema( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, large_schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, large_schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -49,16 +49,16 @@ def test_send_claim_def_schema_and_claim_def_in_one_batch( # send SCHEMA _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, "name2", "2.0", json.dumps(["first", "last"]))) + create_schema(identifier, "name2", "2.0", json.dumps(["first", "last"]))) schema_req_json = looper.loop.run_until_complete( - build_schema_request(identifier, schema_json)) + ledger.build_schema_request(identifier, schema_json)) schema_req = sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, schema_req_json) # send CLAIM_DEF - _, claim_def_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, claim_def_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) claim_def_req_json = looper.loop.run_until_complete( - build_cred_def_request(identifier, claim_def_json)) + ledger.build_cred_def_request(identifier, claim_def_json)) claim_def_req_json = modify_field(claim_def_req_json, initial_seq_no + 1, OPERATION, REF) claim_def_req = sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, claim_def_req_json) @@ -70,9 +70,9 @@ def test_send_claim_def_fails_if_ref_is_seqno_of_non_schema_txn( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag1", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) request = modify_field(request, 1, OPERATION, REF) with pytest.raises(RequestRejectedException) as e: sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -83,9 +83,9 @@ def test_send_claim_def_fails_if_ref_is_not_existing_seqno( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag2", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) request = modify_field(request, 999999, OPERATION, REF) with pytest.raises(RequestRejectedException) as e: sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -96,13 +96,13 @@ def test_update_claim_def_for_same_schema_and_signature_type( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag3", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) definition_json = modify_field(definition_json, '999', 'value', 'primary', 'n') - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -110,13 +110,13 @@ def test_can_send_same_claim_def_by_different_issuers( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, sdk_wallet_steward, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag4", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) wallet_handle, identifier = sdk_wallet_steward - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag4", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request)]) diff --git a/indy_node/test/claim_def/test_send_get_claim_def.py b/indy_node/test/claim_def/test_send_get_claim_def.py index 792bc7da7..a23a49db8 100644 --- a/indy_node/test/claim_def/test_send_get_claim_def.py +++ b/indy_node/test/claim_def/test_send_get_claim_def.py @@ -1,8 +1,8 @@ import json import pytest -from indy.anoncreds import issuer_create_and_store_credential_def -from indy.ledger import build_get_cred_def_request, build_cred_def_request +from indy_vdr import ledger +from indy_node.test.utils import create_and_store_cred_def from plenum.common.exceptions import RequestNackedException from plenum.common.constants import TXN_METADATA, TXN_METADATA_ID @@ -15,9 +15,9 @@ def added_claim_def_id(looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) return rep[0][1]['result'][TXN_METADATA][TXN_METADATA_ID] @@ -26,9 +26,9 @@ def added_claim_def_id(looper, sdk_pool_handle, nodeSet, def added_claim_def_id_large_schema(looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, large_schema_json): wallet_handle, identifier = sdk_wallet_trustee - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, large_schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) return rep[0][1]['result'][TXN_METADATA][TXN_METADATA_ID] @@ -36,14 +36,14 @@ def added_claim_def_id_large_schema(looper, sdk_pool_handle, nodeSet, def test_send_get_claim_def_succeeds(looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, added_claim_def_id): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_cred_def_request(did, added_claim_def_id)) + request = looper.loop.run_until_complete(ledger.build_get_cred_def_request(did, added_claim_def_id)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) def test_send_get_claim_def_succeeds_for_large_schema(looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, added_claim_def_id_large_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_cred_def_request(did, added_claim_def_id_large_schema)) + request = looper.loop.run_until_complete(ledger.build_get_cred_def_request(did, added_claim_def_id_large_schema)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -54,14 +54,14 @@ def test_send_get_claim_def_as_client_succeeds( added_claim_def_id, sdk_wallet_client): _, did = sdk_wallet_client - request = looper.loop.run_until_complete(build_get_cred_def_request(did, added_claim_def_id)) + request = looper.loop.run_until_complete(ledger.build_get_cred_def_request(did, added_claim_def_id)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, request)]) def test_send_get_claim_def_with_invalid_ref_fails(looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, added_claim_def_id): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_cred_def_request(did, added_claim_def_id)) + request = looper.loop.run_until_complete(ledger.build_get_cred_def_request(did, added_claim_def_id)) request = modify_field(request, '!@#', 'operation', 'ref') with pytest.raises(RequestNackedException) as e: sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -71,7 +71,7 @@ def test_send_get_claim_def_with_invalid_ref_fails(looper, sdk_pool_handle, node def test_send_get_claim_def_with_invalid_signature_not_get_claim( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, added_claim_def_id): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_cred_def_request(did, added_claim_def_id)) + request = looper.loop.run_until_complete(ledger.build_get_cred_def_request(did, added_claim_def_id)) request = modify_field(request, 'ABC', 'operation', 'signature_type') rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) assert rep[0][1]['result']['data'] is None diff --git a/indy_node/test/did/conftest.py b/indy_node/test/did/conftest.py index 4658e50f6..07a9f079d 100644 --- a/indy_node/test/did/conftest.py +++ b/indy_node/test/did/conftest.py @@ -1,8 +1,10 @@ import pytest import json -from indy.did import abbreviate_verkey, create_and_store_my_did -from indy.ledger import build_get_nym_request, build_nym_request +# Can't find how to replace abbreviate_verkey need to findd out if the call still exist within new packages +from indy.did import abbreviate_verkey +from indy_node.test.utils import create_and_store_did +from indy_vdr import ledger from plenum.common.util import randomString from plenum.test.helper import sdk_get_and_check_replies @@ -11,7 +13,7 @@ def add_new_nym(looper, sdk_pool_handle, creators_wallet, dest, verkey=None): wh, submitter_did = creators_wallet - nym_request = looper.loop.run_until_complete(build_nym_request(submitter_did, dest, verkey, None, None)) + nym_request = looper.loop.run_until_complete(ledger.build_nym_request(submitter_did, dest, verkey, None, None)) req = sdk_sign_and_send_prepared_request(looper, creators_wallet, sdk_pool_handle, nym_request) sdk_get_and_check_replies(looper, [req]) return wh, dest @@ -21,7 +23,7 @@ def add_new_nym(looper, sdk_pool_handle, creators_wallet, dest, verkey=None): def nym_full_vk(looper, tconf, nodeSet, sdk_pool_handle, sdk_wallet_trustee): wh, tr_did = sdk_wallet_trustee (new_did, new_verkey) = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': randomString(32)}))) + create_and_store_did(wh, json.dumps({'seed': randomString(32)}))) assert not new_verkey.startswith("~") nwh, nd = add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=new_did, verkey=new_verkey) return nwh, nd, new_verkey @@ -31,7 +33,7 @@ def nym_full_vk(looper, tconf, nodeSet, sdk_pool_handle, sdk_wallet_trustee): def nym_abbrv_vk(looper, tconf, nodeSet, sdk_pool_handle, sdk_wallet_trustee): wh, tr_did = sdk_wallet_trustee (new_did, new_verkey) = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': randomString(32)}))) + create_and_store_did(wh, json.dumps({'seed': randomString(32)}))) abbrv_vk = looper.loop.run_until_complete(abbreviate_verkey(new_did, new_verkey)) assert abbrv_vk.startswith("~") nwh, nd = add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=new_did, verkey=abbrv_vk) @@ -42,14 +44,14 @@ def nym_abbrv_vk(looper, tconf, nodeSet, sdk_pool_handle, sdk_wallet_trustee): def nym_empty_vk(looper, tconf, nodeSet, sdk_pool_handle, sdk_wallet_trustee): wh, tr_did = sdk_wallet_trustee (new_did, new_verkey) = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': randomString(32)}))) + create_and_store_did(wh, json.dumps({'seed': randomString(32)}))) nwh, nd = add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=new_did) return nwh, nd def nym_get(looper, sdk_pool_handle, sdk_wallet_sign, did): sign_w, sign_did = sdk_wallet_sign - get_nym_req = looper.loop.run_until_complete(build_get_nym_request(sign_did, did)) + get_nym_req = looper.loop.run_until_complete(ledger.build_get_nym_request(sign_did, did)) req = sdk_sign_and_send_prepared_request(looper, sdk_wallet_sign, sdk_pool_handle, get_nym_req) repl_data = sdk_get_and_check_replies(looper, [req])[0][1].get("result", {}).get("data", "") dt = json.loads(repl_data) diff --git a/indy_node/test/endorser/test_send_by_endorser.py b/indy_node/test/endorser/test_send_by_endorser.py index 969d82fa6..36f8d767c 100644 --- a/indy_node/test/endorser/test_send_by_endorser.py +++ b/indy_node/test/endorser/test_send_by_endorser.py @@ -1,8 +1,9 @@ import json import pytest -from indy.did import create_and_store_my_did -from indy.ledger import build_nym_request + +from indy_node.test.utils import create_and_store_did +from indy_vdr import ledger from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, IDENTITY_OWNER @@ -110,10 +111,10 @@ def test_endorser_required_when_multi_sig_with_off_ledger_signature(looper, txnP new_did, verkey = \ looper.loop.run_until_complete( - create_and_store_my_did(sdk_wallet_client[0], json.dumps({'seed': randomString(32)}))) + create_and_store_did(sdk_wallet_client[0], json.dumps({'seed': randomString(32)}))) sdk_wallet_new_client = (sdk_wallet_client[0], new_did) nym_request = looper.loop.run_until_complete( - build_nym_request(new_did, new_did, verkey, None, IDENTITY_OWNER)) + ledger.build_nym_request(new_did, new_did, verkey, None, IDENTITY_OWNER)) # can not send without Endorser with pytest.raises(RequestRejectedException, diff --git a/indy_node/test/nym_txn/test_create_did_without_endorser.py b/indy_node/test/nym_txn/test_create_did_without_endorser.py index ceb892b43..98ca7db54 100644 --- a/indy_node/test/nym_txn/test_create_did_without_endorser.py +++ b/indy_node/test/nym_txn/test_create_did_without_endorser.py @@ -1,8 +1,8 @@ import json import pytest -from indy.did import create_and_store_my_did -from indy.ledger import build_nym_request +from indy_node.test.utils import create_and_store_did +from indy_vdr import ledger from indy_common.authorize.auth_actions import ADD_PREFIX from indy_common.authorize.auth_constraints import AuthConstraint, OFF_LEDGER_SIGNATURE, CONSTRAINT_ID @@ -29,7 +29,7 @@ def nym_txn_data(looper, sdk_wallet_client): wh, _ = sdk_wallet_client sender_did, sender_verkey = \ - looper.loop.run_until_complete(create_and_store_my_did(wh, json.dumps({'seed': seed}))) + looper.loop.run_until_complete(create_and_store_did(wh, json.dumps({'seed': seed}))) return wh, randomString(5), sender_did, sender_verkey @@ -50,7 +50,7 @@ def change_auth_rule(looper, sdk_pool_handle, sdk_wallet_trustee, constraint): def test_create_did_without_endorser_fails(looper, txnPoolNodeSet, nym_txn_data, sdk_pool_handle): wh, alias, sender_did, sender_verkey = nym_txn_data nym_request = looper.loop.run_until_complete( - build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) + ledger.build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) with pytest.raises(RequestRejectedException, match='is not found in the Ledger'): @@ -64,7 +64,7 @@ def test_create_did_without_endorser(looper, txnPoolNodeSet, nym_txn_data, sdk_p wh, alias, sender_did, sender_verkey = nym_txn_data nym_request = looper.loop.run_until_complete( - build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) + ledger.build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) sdk_get_and_check_replies(looper, [request_couple]) @@ -77,7 +77,7 @@ def test_create_did_without_endorser(looper, txnPoolNodeSet, nym_txn_data, sdk_p def test_create_did_without_endorser_empty_verkey(looper, nym_txn_data, sdk_wallet_client, sdk_pool_handle): wh, alias, sender_did, sender_verkey = nym_txn_data - nym_request = looper.loop.run_until_complete(build_nym_request(sender_did, sender_did, None, alias, NEW_ROLE)) + nym_request = looper.loop.run_until_complete(ledger.build_nym_request(sender_did, sender_did, None, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) @@ -89,7 +89,7 @@ def test_create_did_without_endorser_with_different_dest(looper, nym_txn_data, s wh, alias, sender_did, sender_verkey = nym_txn_data nym_request = looper.loop.run_until_complete( - build_nym_request(sender_did, sdk_wallet_client[1], sender_verkey, alias, NEW_ROLE)) + ledger.build_nym_request(sender_did, sdk_wallet_client[1], sender_verkey, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) @@ -105,7 +105,7 @@ def test_create_did_without_endorser_sig_count_0(looper, txnPoolNodeSet, nym_txn wh, alias, sender_did, sender_verkey = nym_txn_data nym_request = looper.loop.run_until_complete( - build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) + ledger.build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) sdk_get_and_check_replies(looper, [request_couple]) @@ -123,7 +123,7 @@ def test_create_did_without_endorser_need_to_be(looper, txnPoolNodeSet, nym_txn_ wh, alias, sender_did, sender_verkey = nym_txn_data nym_request = looper.loop.run_until_complete( - build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) + ledger.build_nym_request(sender_did, sender_did, sender_verkey, alias, NEW_ROLE)) request_couple = sdk_sign_and_send_prepared_request(looper, (wh, sender_did), sdk_pool_handle, nym_request) with pytest.raises(RequestRejectedException, match='is not found in the Ledger'): diff --git a/indy_node/test/nym_txn/test_demote_network_monitor.py b/indy_node/test/nym_txn/test_demote_network_monitor.py index 71c635e19..8ed5c3d6e 100644 --- a/indy_node/test/nym_txn/test_demote_network_monitor.py +++ b/indy_node/test/nym_txn/test_demote_network_monitor.py @@ -1,5 +1,5 @@ import pytest -from indy import did +from indy_node.test.utils import create_and_store_did from indy_common.constants import NETWORK_MONITOR from indy_node.test.validator_info.helper import sdk_get_validator_info @@ -16,9 +16,9 @@ def test_network_monitor_suspension_by_another_steward(looper, sdk_wallet_handle, with_verkey): new_steward_did, new_steward_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) new_network_monitor_did, new_network_monitor_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_steward[0], "{}")) + create_and_store_did(sdk_wallet_steward[0], "{}")) """Adding new steward""" sdk_add_new_nym(looper, sdk_pool_handle, @@ -57,7 +57,7 @@ def test_network_monitor_suspension_by_itself(looper, sdk_wallet_handle, with_verkey): new_network_monitor_did, new_network_monitor_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_steward[0], "{}")) + create_and_store_did(sdk_wallet_steward[0], "{}")) """Adding NETWORK_MONITOR role by steward""" op = {'type': '1', diff --git a/indy_node/test/nym_txn/test_nym_additional.py b/indy_node/test/nym_txn/test_nym_additional.py index 612f84b1f..70e358ece 100644 --- a/indy_node/test/nym_txn/test_nym_additional.py +++ b/indy_node/test/nym_txn/test_nym_additional.py @@ -1,8 +1,9 @@ import json import pytest -from indy.did import create_and_store_my_did, replace_keys_start, replace_keys_apply -from indy.ledger import build_get_nym_request +from indy.did import replace_keys_start, replace_keys_apply +from indy_node.test.utils import create_and_store_did +from indy_vdr import ledger from indy_common.constants import ENDORSER_STRING from indy_node.test.helper import sdk_add_attribute_and_check from plenum.common.exceptions import RequestRejectedException @@ -29,7 +30,7 @@ def set_verkey(looper, sdk_pool_handle, sdk_wallet_sender, dest, verkey): def endorser_did_verkey(looper, sdk_wallet_client): wh, _ = sdk_wallet_client named_did, verkey = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': ENDORSER_SEED}))) + create_and_store_did(wh, json.dumps({'seed': ENDORSER_SEED}))) return named_did, verkey @@ -49,14 +50,14 @@ def test_send_same_nyms_only_first_gets_written( wh, _ = sdk_wallet seed = randomString(32) did, verkey = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': seed}))) + create_and_store_did(wh, json.dumps({'seed': seed}))) # request 1 _, did1 = sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet, dest=did, verkey=verkey) seed = randomString(32) _, verkey = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': seed}))) + create_and_store_did(wh, json.dumps({'seed': seed}))) # request 2 with pytest.raises(RequestRejectedException) as e: _, did2 = sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet, dest=did, verkey=verkey) @@ -65,7 +66,7 @@ def test_send_same_nyms_only_first_gets_written( def get_nym(looper, sdk_pool_handle, sdk_wallet_steward, t_did): _, s_did = sdk_wallet_steward - get_nym_req = looper.loop.run_until_complete(build_get_nym_request(s_did, t_did)) + get_nym_req = looper.loop.run_until_complete(ledger.build_get_nym_request(s_did, t_did)) req = sdk_sign_and_send_prepared_request(looper, sdk_wallet_steward, sdk_pool_handle, get_nym_req) return sdk_get_and_check_replies(looper, [req]) diff --git a/indy_node/test/nym_txn/test_nym_auth_rules.py b/indy_node/test/nym_txn/test_nym_auth_rules.py index f1c5f8c92..6500daf21 100644 --- a/indy_node/test/nym_txn/test_nym_auth_rules.py +++ b/indy_node/test/nym_txn/test_nym_auth_rules.py @@ -3,7 +3,8 @@ from enum import Enum, unique -from indy.did import create_and_store_my_did, key_for_local_did +from indy.did import key_for_local_did +from indy_node.test.utils import create_and_store_did from plenum.common.constants import ( TRUSTEE, STEWARD, NYM, TXN_TYPE, TARGET_NYM, VERKEY, ROLE, @@ -117,7 +118,7 @@ def _add_did(role, did_name, with_verkey=True): if verkey: (sdk_did, sdk_verkey) = looper.loop.run_until_complete( - create_and_store_my_did( + create_and_store_did( trustee.wallet_handle, json.dumps({'seed': data['seeds'][did_name]})) ) diff --git a/indy_node/test/nym_txn/test_nym_blacklisting.py b/indy_node/test/nym_txn/test_nym_blacklisting.py index a5ef79315..a628b0903 100644 --- a/indy_node/test/nym_txn/test_nym_blacklisting.py +++ b/indy_node/test/nym_txn/test_nym_blacklisting.py @@ -1,6 +1,6 @@ import pytest -from indy import did +from indy_node.test.utils import create_and_store_did from indy_common.constants import ENDORSER_STRING from plenum.common.constants import TRUSTEE_STRING, STEWARD_STRING from plenum.common.exceptions import RequestRejectedException @@ -14,9 +14,9 @@ def test_steward_suspension_by_another_trustee(looper, sdk_wallet_handle, with_verkey): new_trustee_did, new_trustee_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) new_steward_did, new_steward_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) """Adding new steward""" sdk_add_new_nym(looper, sdk_pool_handle, @@ -45,11 +45,11 @@ def test_steward_cannot_create_endorsers_after_demote(looper, sdk_wallet_trustee, sdk_wallet_handle): new_steward_did, new_steward_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) new_ta_did, new_ta_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) new_ta_2_did, new_ta_2_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) """Adding new steward""" sdk_add_new_nym(looper, sdk_pool_handle, diff --git a/indy_node/test/nym_txn/test_nym_no_role.py b/indy_node/test/nym_txn/test_nym_no_role.py index b86c36c8d..fd88dd656 100644 --- a/indy_node/test/nym_txn/test_nym_no_role.py +++ b/indy_node/test/nym_txn/test_nym_no_role.py @@ -1,5 +1,5 @@ import pytest -from indy import did +from indy_node.test.utils import create_and_store_did from plenum.common.exceptions import RequestRejectedException from plenum.common.constants import TRUSTEE_STRING @@ -13,7 +13,7 @@ def test_new_DID_cannot_update_another_DID(looper, sdk_wallet_handle): """Create trustee""" trustee_did, trustee_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) """Add trustee to ledger""" sdk_add_new_nym(looper, sdk_pool_handle, @@ -21,7 +21,7 @@ def test_new_DID_cannot_update_another_DID(looper, """new DID (no role)""" new_no_role_did, new_no_role_verkey = looper.loop.run_until_complete( - did.create_and_store_my_did(sdk_wallet_trustee[0], "{}")) + create_and_store_did(sdk_wallet_trustee[0], "{}")) """Adding new DID (no role) to ledger""" sdk_add_new_nym(looper, sdk_pool_handle, diff --git a/indy_node/test/nym_txn/test_nym_resend.py b/indy_node/test/nym_txn/test_nym_resend.py index 89eb4586b..ec1f3f274 100644 --- a/indy_node/test/nym_txn/test_nym_resend.py +++ b/indy_node/test/nym_txn/test_nym_resend.py @@ -1,7 +1,8 @@ import json from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey -from indy.ledger import sign_request, submit_request, build_nym_request +from indy_node.test.utils import sign_request, submit_request +from indy_vdr import ledger from plenum.common.constants import REPLY, REJECT @@ -11,7 +12,7 @@ def test_nym_send_twice(looper, sdk_pool_handle, sdk_wallet_steward): wallet_handle, identifier = sdk_wallet_steward for i in range(2): - request = looper.loop.run_until_complete(build_nym_request(identifier, idr, verkey, None, None)) + request = looper.loop.run_until_complete(ledger.build_nym_request(identifier, idr, verkey, None, None)) req_signed = looper.loop.run_until_complete(sign_request(wallet_handle, identifier, request)) result = json.loads(looper.loop.run_until_complete(submit_request(sdk_pool_handle, req_signed))) @@ -26,7 +27,7 @@ def test_nym_resend(looper, sdk_pool_handle, sdk_wallet_steward): wallet_handle, identifier = sdk_wallet_steward - request = looper.loop.run_until_complete(build_nym_request(identifier, idr, verkey, None, None)) + request = looper.loop.run_until_complete(ledger.build_nym_request(identifier, idr, verkey, None, None)) req_signed = looper.loop.run_until_complete(sign_request(wallet_handle, identifier, request)) for i in range(2): diff --git a/indy_node/test/persistence/test_idr_cache_update_after_catchup.py b/indy_node/test/persistence/test_idr_cache_update_after_catchup.py index 9926c13a1..02bdcd0ef 100644 --- a/indy_node/test/persistence/test_idr_cache_update_after_catchup.py +++ b/indy_node/test/persistence/test_idr_cache_update_after_catchup.py @@ -1,6 +1,7 @@ import json -from indy.ledger import build_nym_request, sign_request, submit_request +from indy_node.test.utils import sign_request, submit_request +from indy_vdr import ledger from indy_common.state import domain from indy_node.test.helper import start_stopped_node, createHalfKeyIdentifierAndAbbrevVerkey @@ -26,7 +27,7 @@ def test_idr_cache_update_after_catchup(txnPoolNodeSet, looper.removeProdable(node_to_disconnect) idr, verkey = createHalfKeyIdentifierAndAbbrevVerkey() - request = looper.loop.run_until_complete(build_nym_request(identifier, idr, verkey, None, None)) + request = looper.loop.run_until_complete(ledger.build_nym_request(identifier, idr, verkey, None, None)) req_signed = looper.loop.run_until_complete(sign_request(wallet_handle, identifier, request)) result = json.loads(looper.loop.run_until_complete(submit_request(sdk_pool_handle, req_signed))) diff --git a/indy_node/test/pool_config/helper.py b/indy_node/test/pool_config/helper.py index 55dcce50e..b6983ea7e 100644 --- a/indy_node/test/pool_config/helper.py +++ b/indy_node/test/pool_config/helper.py @@ -1,11 +1,11 @@ -from indy.ledger import build_pool_config_request +from indy_vdr import ledger from plenum.test.helper import sdk_get_and_check_replies, sdk_sign_and_submit_req def sdk_pool_config_sent(looper, sdk_pool_handle, sdk_wallet_trustee, pool_config_data): _, did = sdk_wallet_trustee - req = looper.loop.run_until_complete(build_pool_config_request( + req = looper.loop.run_until_complete(ledger.build_pool_config_request( did, pool_config_data['writes'], pool_config_data['force'])) req = sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, req) return req @@ -14,7 +14,7 @@ def sdk_pool_config_sent(looper, sdk_pool_handle, sdk_wallet_trustee, pool_confi def sdk_ensure_pool_config_sent(looper, sdk_pool_handle, sdk_wallet_trustee, pool_config_data): _, did = sdk_wallet_trustee - req = looper.loop.run_until_complete(build_pool_config_request( + req = looper.loop.run_until_complete(ledger.build_pool_config_request( did, pool_config_data['writes'], pool_config_data['force'])) req = sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, req) rep = sdk_get_and_check_replies(looper, [req]) diff --git a/indy_node/test/pool_restart/helper.py b/indy_node/test/pool_restart/helper.py index a14c2c2ba..fd6c00fc3 100644 --- a/indy_node/test/pool_restart/helper.py +++ b/indy_node/test/pool_restart/helper.py @@ -1,9 +1,9 @@ import asyncio import json import socket -from indy.did import create_and_store_my_did -from indy.error import ErrorCode -from indy.ledger import build_pool_restart_request +from indy_node.test.utils import create_and_store_did +from indy_vdr.error import VdrError +from indy_vdr import ledger from plenum.common.util import randomString from plenum.test.helper import sdk_get_replies, sdk_check_reply @@ -81,12 +81,12 @@ def sdk_send_restart(looper, trusty_wallet, sdk_pool_handle, # waiting for replies return sdk_get_and_check_multiply_replies(looper, request_couple) - +# this will probably not return the right type of error since the sdk_get_replies is probably from indy-sdk def sdk_get_and_check_multiply_replies(looper, request_couple): rets = [] for req_res in sdk_get_replies(looper, [request_couple, ]): req, responses = req_res - if not isinstance(responses, ErrorCode) and "op" not in responses: + if not isinstance(responses, VdrError) and "op" not in responses: for node_resp in responses.values(): sdk_check_reply((req, json.loads(node_resp))) else: @@ -99,8 +99,8 @@ async def prepare_restart_request(wallet, named_seed, action="start", restart_time="0"): wh, submitter_did = wallet (named_did, named_verkey) = \ - await create_and_store_my_did(wh, json.dumps({'seed': named_seed})) - restart_request = await build_pool_restart_request(submitter_did, + await create_and_store_did(wh, json.dumps({'seed': named_seed})) + restart_request = await ledger.build_pool_restart_request(submitter_did, action, restart_time) return restart_request, named_did diff --git a/indy_node/test/replay/test_successive_batch_no_state_change.py b/indy_node/test/replay/test_successive_batch_no_state_change.py index 6fdaf46fe..d5dac0cb6 100644 --- a/indy_node/test/replay/test_successive_batch_no_state_change.py +++ b/indy_node/test/replay/test_successive_batch_no_state_change.py @@ -3,7 +3,7 @@ import pytest -from indy.did import create_and_store_my_did +from indy_node.test.utils import create_and_store_did from indy_node.persistence.idr_cache import IdrCache from plenum.common.constants import VERKEY, DOMAIN_LEDGER_ID from plenum.common.messages.node_messages import Commit @@ -86,7 +86,7 @@ def check_uncommitted(count): wh, did = sdk_wallet_trustee seed = randomString(32) (new_did, verkey) = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': seed}))) + create_and_store_did(wh, json.dumps({'seed': seed}))) sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=new_did, @@ -115,7 +115,7 @@ def check_uncommitted(count): seed = randomString(32) (new_client_did, verkey) = looper.loop.run_until_complete( - create_and_store_my_did(wh, json.dumps({'seed': seed}))) + create_and_store_did(wh, json.dumps({'seed': seed}))) sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=new_client_did, verkey=verkey) diff --git a/indy_node/test/request_propagates/test_request_propagates.py b/indy_node/test/request_propagates/test_request_propagates.py index 3ec8ee224..cb65ca323 100644 --- a/indy_node/test/request_propagates/test_request_propagates.py +++ b/indy_node/test/request_propagates/test_request_propagates.py @@ -1,9 +1,8 @@ import json import pytest -from indy.anoncreds import issuer_create_schema, issuer_create_and_store_credential_def -from indy.ledger import build_attrib_request, sign_request, build_schema_request, build_cred_def_request, \ - build_nym_request, build_get_schema_request, parse_get_schema_response +from indy_node.test.utils import create_schema, create_and_store_cred_def, sign_request, parse_get_schema_response +from indy_vdr import ledger from indy_node.test.helper import createHalfKeyIdentifierAndAbbrevVerkey from indy_common.types import Request @@ -31,11 +30,11 @@ def req(request, looper, sdk_pool_handle, sdk_wallet_steward): if request.param == "ATTRIB": raw = json.dumps({'answer': 42}) request_json = looper.loop.run_until_complete( - build_attrib_request(identifier, identifier, raw=raw, xhash=None, enc=None)) + ledger.build_attrib_request(identifier, identifier, raw=raw, xhash=None, enc=None)) elif request.param == "SCHEMA": _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, "name", "1.0", json.dumps(["first", "last"]))) - request_json = looper.loop.run_until_complete(build_schema_request(identifier, schema_json)) + create_schema(identifier, "name", "1.0", json.dumps(["first", "last"]))) + request_json = looper.loop.run_until_complete(ledger.build_schema_request(identifier, schema_json)) elif request.param == "RS_SCHEMA": rs_schema = {'@id': "fakeId234e", '@type': "0od"} request_json = build_rs_schema_request(identifier, rs_schema, "ISO18023_Drivers_License", "1.1") @@ -43,16 +42,16 @@ def req(request, looper, sdk_pool_handle, sdk_wallet_steward): schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_steward) schema_id = json.loads(schema_json)['id'] - request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id)) reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_steward, request))[1] _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply))) - _, definition_json = looper.loop.run_until_complete(issuer_create_and_store_credential_def( + _, definition_json = looper.loop.run_until_complete(create_and_store_cred_def( wallet_handle, identifier, schema_json, "some_tag", "CL", json.dumps({"support_revocation": True}))) - request_json = looper.loop.run_until_complete(build_cred_def_request(identifier, definition_json)) + request_json = looper.loop.run_until_complete(ledger.build_cred_def_request(identifier, definition_json)) elif request.param == "NYM": idr, verkey = createHalfKeyIdentifierAndAbbrevVerkey() - request_json = looper.loop.run_until_complete(build_nym_request(identifier, idr, verkey, None, None)) + request_json = looper.loop.run_until_complete(ledger.build_nym_request(identifier, idr, verkey, None, None)) req_signed = looper.loop.run_until_complete(sign_request(wallet_handle, identifier, request_json)) return Request(**json.loads(req_signed)) diff --git a/indy_node/test/schema/test_send_get_schema.py b/indy_node/test/schema/test_send_get_schema.py index f4f47c85b..1c57aab18 100644 --- a/indy_node/test/schema/test_send_get_schema.py +++ b/indy_node/test/schema/test_send_get_schema.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_get_schema_request +from indy_vdr import ledger from plenum.common.exceptions import RequestNackedException from plenum.common.constants import DATA, NAME, VERSION, TXN_METADATA, TXN_METADATA_SEQ_NO @@ -41,7 +41,7 @@ def test_send_get_schema_succeeds( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) assert rep[0][1]['result']['seqNo'] @@ -50,7 +50,7 @@ def test_send_get_schema_as_client( looper, sdk_pool_handle, nodeSet, sdk_wallet_client, send_schema): _, did = sdk_wallet_client - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, request)]) assert rep[0][1]['result']['seqNo'] @@ -59,7 +59,7 @@ def test_send_get_schema_fails_with_invalid_name( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = modify_field(request, 'name111', OPERATION, DATA, NAME) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) assert rep[0][1]['result']['seqNo'] is None @@ -70,7 +70,7 @@ def test_send_get_schema_fails_with_invalid_dest( uuid_identifier = createUuidIdentifier() _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = modify_field(request, uuid_identifier, OPERATION, 'dest') rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) assert rep[0][1]['result']['seqNo'] is None @@ -80,7 +80,7 @@ def test_send_get_schema_fails_with_invalid_version( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = modify_field(request, '2.0', OPERATION, DATA, VERSION) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) assert rep[0][1]['result']['seqNo'] is None @@ -90,7 +90,7 @@ def test_send_get_schema_fails_with_invalid_version_syntax( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = modify_field(request, 'asd', OPERATION, DATA, VERSION) with pytest.raises(RequestNackedException) as e: sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request)]) @@ -101,7 +101,7 @@ def test_send_get_schema_fails_without_version( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = json.loads(request) del request[OPERATION][DATA][VERSION] request = json.dumps(request) @@ -114,7 +114,7 @@ def test_send_get_schema_fails_without_name( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = json.loads(request) del request[OPERATION][DATA][NAME] request = json.dumps(request) @@ -127,7 +127,7 @@ def test_send_get_schema_fails_without_dest( looper, sdk_pool_handle, nodeSet, sdk_wallet_trustee, send_schema): _, did = sdk_wallet_trustee - request = looper.loop.run_until_complete(build_get_schema_request(did, send_schema)) + request = looper.loop.run_until_complete(ledger.build_get_schema_request(did, send_schema)) request = json.loads(request) del request[OPERATION]['dest'] request = json.dumps(request) diff --git a/indy_node/test/state_proof/test_state_proof_for_get_requests.py b/indy_node/test/state_proof/test_state_proof_for_get_requests.py index e865fcc88..51249e8ff 100644 --- a/indy_node/test/state_proof/test_state_proof_for_get_requests.py +++ b/indy_node/test/state_proof/test_state_proof_for_get_requests.py @@ -3,7 +3,7 @@ import time import pytest -from indy.ledger import build_get_revoc_reg_def_request, build_get_revoc_reg_request, build_get_revoc_reg_delta_request +from indy_vdr import ledger from common.serializers.serialization import domain_state_serializer from indy_common.authorize.auth_actions import ADD_PREFIX @@ -345,7 +345,7 @@ def test_state_proof_returned_for_get_revoc_reg_def(looper, send_revoc_reg_def): revoc_reg_def_data = send_revoc_reg_def[0]['operation'] - req = looper.loop.run_until_complete(build_get_revoc_reg_def_request( + req = looper.loop.run_until_complete(ledger.build_get_revoc_reg_def_request( sdk_wallet_client[1], get_revoc_reg_def_id(sdk_wallet_steward[1], send_revoc_reg_def[0]))) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, req)]) result = rep[0][1]['result'] @@ -370,7 +370,7 @@ def test_state_proof_returned_for_get_revoc_reg_entry(looper, revoc_reg_entry_data = send_revoc_reg_entry[1][0]['operation'] timestamp = int(time.time()) - req = looper.loop.run_until_complete(build_get_revoc_reg_request( + req = looper.loop.run_until_complete(ledger.build_get_revoc_reg_request( sdk_wallet_client[1], get_revoc_reg_def_id(sdk_wallet_steward[1], revoc_reg_def[0]), timestamp)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, req)]) result = rep[0][1]['result'] @@ -390,7 +390,7 @@ def test_state_proof_returned_for_get_revoc_reg_entry(looper, def check_get_delta(looper, sdk_wallet_client, sdk_wallet_steward, revoc_reg_def, timestamp_fr, timestamp_to, sdk_pool_handle, revoc_reg_entry_data, check_data=True): - req = looper.loop.run_until_complete(build_get_revoc_reg_delta_request( + req = looper.loop.run_until_complete(ledger.build_get_revoc_reg_delta_request( sdk_wallet_client[1], get_revoc_reg_def_id(sdk_wallet_steward[1], revoc_reg_def[0]), timestamp_fr, timestamp_to)) rep = sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, req)]) diff --git a/indy_node/test/txn_author_agreement/test_node_taa.py b/indy_node/test/txn_author_agreement/test_node_taa.py index c32ce20b1..4546ace2e 100644 --- a/indy_node/test/txn_author_agreement/test_node_taa.py +++ b/indy_node/test/txn_author_agreement/test_node_taa.py @@ -1,7 +1,7 @@ import json import pytest -from indy.ledger import build_acceptance_mechanisms_request +from indy_vdr.ledger import build_acceptance_mechanisms_request from plenum.test.helper import sdk_get_and_check_replies from plenum.test.pool_transactions.helper import sdk_sign_and_send_prepared_request diff --git a/indy_node/test/txn_validation/test_send_attrib_validation.py b/indy_node/test/txn_validation/test_send_attrib_validation.py index ca3097286..3b4157c12 100644 --- a/indy_node/test/txn_validation/test_send_attrib_validation.py +++ b/indy_node/test/txn_validation/test_send_attrib_validation.py @@ -4,7 +4,7 @@ from hashlib import sha256 import pytest -from indy.did import create_and_store_my_did +from indy_node.test.utils import create_and_store_did from libnacl import randombytes from libnacl.secret import SecretBox @@ -25,7 +25,7 @@ def testSendAttribFailsForNotExistingDest( looper, sdk_pool_handle, sdk_wallet_trustee): wh, _ = sdk_wallet_trustee seed = randomString(32) - did, _ = looper.loop.run_until_complete(create_and_store_my_did( + did, _ = looper.loop.run_until_complete(create_and_store_did( wh, json.dumps({'seed': seed}))) parameters = json.dumps({'name': 'Alice'}) diff --git a/indy_node/test/txn_validation/test_send_get_nym_validation.py b/indy_node/test/txn_validation/test_send_get_nym_validation.py index f57306832..20c563a72 100644 --- a/indy_node/test/txn_validation/test_send_get_nym_validation.py +++ b/indy_node/test/txn_validation/test_send_get_nym_validation.py @@ -1,7 +1,7 @@ from binascii import hexlify import pytest -from indy.ledger import build_get_nym_request +from indy_vdr import ledger from indy_common.constants import ENDORSER_STRING from indy_node.test.helper import check_str_is_base58_compatible, modify_field, \ createUuidIdentifier, createHalfKeyIdentifierAndAbbrevVerkey, createCryptonym @@ -56,7 +56,7 @@ def testSendGetNymFailsIfDestIsPassedInHexFormat( sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_trustee, dest=uuidIdentifier, verkey=abbrevVerkey) _, s_did = sdk_wallet_trustee - get_nym_req = looper.loop.run_until_complete(build_get_nym_request(s_did, uuidIdentifier)) + get_nym_req = looper.loop.run_until_complete(ledger.build_get_nym_request(s_did, uuidIdentifier)) get_nym_req = modify_field(get_nym_req, hexEncodedUuidIdentifier, IDENTIFIER) req = sdk_sign_and_send_prepared_request(looper, sdk_wallet_trustee, sdk_pool_handle, get_nym_req) @@ -70,7 +70,7 @@ def testSendGetNymFailsIfDestIsInvalid( uuidIdentifier = createUuidIdentifier() invalidIdentifier = uuidIdentifier[:-4] _, s_did = sdk_wallet_trustee - get_nym_req = looper.loop.run_until_complete(build_get_nym_request(s_did, uuidIdentifier)) + get_nym_req = looper.loop.run_until_complete(ledger.build_get_nym_request(s_did, uuidIdentifier)) get_nym_req = modify_field(get_nym_req, invalidIdentifier, IDENTIFIER) req = sdk_sign_and_send_prepared_request(looper, sdk_wallet_trustee, sdk_pool_handle, get_nym_req) @@ -83,7 +83,7 @@ def testSendGetNymHasInvalidSyntaxIfDestIsEmpty( looper, sdk_pool_handle, sdk_wallet_trustee): uuidIdentifier = createUuidIdentifier() _, s_did = sdk_wallet_trustee - get_nym_req = looper.loop.run_until_complete(build_get_nym_request(s_did, uuidIdentifier)) + get_nym_req = looper.loop.run_until_complete(ledger.build_get_nym_request(s_did, uuidIdentifier)) get_nym_req = modify_field(get_nym_req, '', IDENTIFIER) req = sdk_sign_and_send_prepared_request(looper, sdk_wallet_trustee, sdk_pool_handle, get_nym_req) diff --git a/indy_node/test/upgrade/helper.py b/indy_node/test/upgrade/helper.py index 2fbf5d4a7..8c0c0d8f3 100644 --- a/indy_node/test/upgrade/helper.py +++ b/indy_node/test/upgrade/helper.py @@ -14,7 +14,7 @@ from plenum.common.keygen_utils import init_bls_keys -from indy.ledger import build_pool_upgrade_request +from indy_vdr import ledger from plenum.common.constants import DATA, VERSION, FORCE from plenum.common.txn_util import get_type, get_payload_data, get_from from plenum.common.util import randomString, hexToFriendly @@ -60,7 +60,7 @@ def sdk_ensure_upgrade_sent(looper, sdk_pool_handle, def get_req_from_update(looper, did, nup): req = looper.loop.run_until_complete( - build_pool_upgrade_request(did, nup['name'], nup['version'], nup['action'], nup['sha256'], + ledger.build_pool_upgrade_request(did, nup['name'], nup['version'], nup['action'], nup['sha256'], nup['timeout'], json.dumps(nup['schedule']) if 'schedule' in nup else None, nup['justification'] if 'justification' in nup else 'null', diff --git a/indy_node/test/utils.py b/indy_node/test/utils.py index 70e9b415c..8cd3dd6f0 100644 --- a/indy_node/test/utils.py +++ b/indy_node/test/utils.py @@ -13,7 +13,6 @@ import random import itertools import functools -import testinfra import json from json import JSONDecodeError import hashlib @@ -100,4 +99,71 @@ async def sign_request(wallet_handle, submitter_did, req): if not key: raise Exception(f"Key for DID {submitter_did} is empty") req.set_signature(key.sign_message(req.signature_input)) - return req \ No newline at end of file + return req + + + +def parse_get_schema_response(response): + schema_seqno = response.get("seqNo") + schema_name = response["data"]["name"] + schema_version = response["data"]["version"] + schema_id = f"{response['dest']}:2:{schema_name}:{schema_version}" + return schema_id, { + "ver": "1.0", + "id": schema_id, + "name": schema_name, + "version": schema_version, + "attrNames": response["data"]["attr_names"], + "seqNo": schema_seqno, + } + +async def create_and_store_did(wallet_handle, seed=None): + keypair, did, verkey = key_helper(seed=seed) + await key_insert_helper(wallet_handle, keypair, did, verkey) + return did, verkey + +def key_helper(seed=None): + alg = KeyAlg.ED25519 + if seed: + keypair = Key.from_secret_bytes(alg, seed) + else: + keypair = Key.generate(alg) + verkey_bytes = keypair.get_public_bytes() + verkey = base58.b58encode(verkey_bytes).decode("ascii") + did = base58.b58encode(verkey_bytes[:16]).decode("ascii") + return keypair, did, verkey + +async def key_insert_helper(wallet_handle, keypair, did, verkey): + try: + await wallet_handle.insert_key(verkey, keypair, metadata=json.dumps({})) + except AskarError as err: + if err.code == AskarErrorCode.DUPLICATE: + pass + else: + raise err + item = await wallet_handle.fetch("did", did, for_update=True) + if item: + did_info = item.value_json + if did_info.get("verkey") != verkey: + raise Exception("DID already present in wallet") + did_info["metadata"] = {} + await wallet_handle.replace("did", did, value_json=did_info, tags=item.tags) + else: + await wallet_handle.insert("did", did, + value_json={ + "did": did, + "method": "sov", + "verkey": verkey, + "verkey_type": "ed25519", + "metadata": {}, + }, + tags={ + "method": "sov", + "verkey": verkey, + "verkey_type": "ed25519", + }, + ) + +async def submit_request(pool_handle, req): + request_result = await pool_handle.sumbit_request(req) + return request_result \ No newline at end of file diff --git a/indy_node/test/validator_info/helper.py b/indy_node/test/validator_info/helper.py index 26df92c21..c342ae624 100644 --- a/indy_node/test/validator_info/helper.py +++ b/indy_node/test/validator_info/helper.py @@ -1,7 +1,7 @@ import json -from indy.did import create_and_store_my_did -from indy.ledger import build_get_validator_info_request +from indy_node.test.utils import create_and_store_did +from indy_vdr import ledger from indy_node.test.pool_restart.helper import sdk_get_and_check_multiply_replies from plenum.common.util import randomString @@ -25,6 +25,6 @@ def sdk_get_validator_info(looper, steward_wallet, sdk_pool_handle, seed=None): async def prepare_validator_info_request(wallet, named_seed): wh, submitter_did = wallet (named_did, named_verkey) = \ - await create_and_store_my_did(wh, json.dumps({'seed': named_seed})) - restart_request = await build_get_validator_info_request(submitter_did) + await create_and_store_did(wh, json.dumps({'seed': named_seed})) + restart_request = await ledger.build_get_validator_info_request(submitter_did) return restart_request, named_did \ No newline at end of file diff --git a/indy_node/test/view_change/test_view_change_during_alternating_unstash.py b/indy_node/test/view_change/test_view_change_during_alternating_unstash.py index 68d5fbf1d..9905d9771 100644 --- a/indy_node/test/view_change/test_view_change_during_alternating_unstash.py +++ b/indy_node/test/view_change/test_view_change_during_alternating_unstash.py @@ -3,7 +3,7 @@ from typing import Iterable import pytest -from indy.ledger import build_pool_config_request, build_nym_request +from indy_vdr import ledger from plenum.common.messages.node_messages import PrePrepare, Prepare, Commit from plenum.common.request import Request @@ -93,13 +93,13 @@ def test_view_change_during_alternating_unstash(looper, txnPoolNodeSet, sdk_pool def sdk_gen_domain_request(looper, sdk_wallet): _, did = sdk_wallet target_did = SimpleSigner(seed=random_string(32).encode()).identifier - req = looper.loop.run_until_complete(build_nym_request(did, target_did, None, None, None)) + req = looper.loop.run_until_complete(ledger.build_nym_request(did, target_did, None, None, None)) return Request(**json.loads(req)) def sdk_gen_config_request(looper, sdk_wallet): _, did = sdk_wallet - req = looper.loop.run_until_complete(build_pool_config_request(did, True, False)) + req = looper.loop.run_until_complete(ledger.build_pool_config_request(did, True, False)) return Request(**json.loads(req)) diff --git a/indy_node/test/write_permission/test_send_write_permission_no_client.py b/indy_node/test/write_permission/test_send_write_permission_no_client.py index 4e191bf83..067d3ac43 100644 --- a/indy_node/test/write_permission/test_send_write_permission_no_client.py +++ b/indy_node/test/write_permission/test_send_write_permission_no_client.py @@ -14,8 +14,8 @@ from indy_node.test.schema.test_send_get_schema import send_schema_seq_no from indy_node.test.schema.test_send_get_schema import send_schema_req -from indy.anoncreds import issuer_create_schema -from indy.ledger import build_schema_request +from indy_node.test.utils import create_schema +from indy import ledger def test_client_cant_send_nym(looper, @@ -58,15 +58,15 @@ def test_client_cant_send_schema(looper, # Endorser can create schema _, identifier = sdk_wallet_endorser _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, "another_name", "2.0", json.dumps(["first", "last"]))) - request = looper.loop.run_until_complete(build_schema_request(identifier, schema_json)) + create_schema(identifier, "another_name", "2.0", json.dumps(["first", "last"]))) + request = looper.loop.run_until_complete(ledger.build_schema_request(identifier, schema_json)) sdk_get_and_check_replies(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_endorser, request)]) # Client cant create schema _, identifier = sdk_wallet_client _, schema_json = looper.loop.run_until_complete( - issuer_create_schema(identifier, "another_name", "2.0", json.dumps(["first", "last"]))) - request = looper.loop.run_until_complete(build_schema_request(identifier, schema_json)) + create_schema(identifier, "another_name", "2.0", json.dumps(["first", "last"]))) + request = looper.loop.run_until_complete(ledger.build_schema_request(identifier, schema_json)) sdk_get_bad_response(looper, [sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_client, request)], RequestRejectedException, 'Rule for this action is') diff --git a/scripts/performance/perf_load/perf_client.py b/scripts/performance/perf_load/perf_client.py index 0869add9a..165f1d70c 100644 --- a/scripts/performance/perf_load/perf_client.py +++ b/scripts/performance/perf_load/perf_client.py @@ -77,10 +77,10 @@ async def did_create_my_did(self, wallet_h, cfg): return await did.create_and_store_my_did(wallet_h, cfg) async def ledger_sign_req(self, wallet_h, did, req): - return await ledger.sign_request(wallet_h, did, req) + return await sign_request(wallet_h, did, req) async def ledger_submit(self, pool_h, req): - return await ledger.submit_request(pool_h, req) + return await submit_request(pool_h, req) async def pool_close_pool(self, pool_h): await pool.close_pool_ledger(pool_h) diff --git a/scripts/performance/perf_load/perf_client_fees.py b/scripts/performance/perf_load/perf_client_fees.py index 7ed572e77..94540b41a 100644 --- a/scripts/performance/perf_load/perf_client_fees.py +++ b/scripts/performance/perf_load/perf_client_fees.py @@ -41,7 +41,7 @@ async def __set_fees_once(cls, wallet_handle, set_fees, test_did, payment_method wallet_handle, test_did, payment_method, json.dumps(set_fees)) for d in trustee_dids: fees_req = await ledger.multi_sign_request(wallet_handle, d, fees_req) - fees_resp = await ledger.submit_request(pool_handle, fees_req) + fees_resp = await submit_request(pool_handle, fees_req) ensure_is_reply(fees_resp) get_fees_req = await payment.build_get_txn_fees_req(wallet_handle, test_did, payment_method) @@ -117,7 +117,7 @@ async def ledger_sign_req(self, wallet_h, did, req): addr, fees_req = await self._add_fees(wallet_h, did, req) if fees_req is None: return None - req = await ledger.sign_request(wallet_h, did, fees_req) + req = await sign_request(wallet_h, did, fees_req) if addr is not None: self._req_addrs[req] = addr return req @@ -153,7 +153,7 @@ async def _parse_fees_resp(self, req, resp_or_exp): async def ledger_submit(self, pool_h, req): try: - resp = await ledger.submit_request(pool_h, req) + resp = await submit_request(pool_h, req) except Exception as ex: resp = ex await self._parse_fees_resp(req, resp) @@ -183,7 +183,7 @@ async def __mint_sources(self, payment_addresses, amount, by_val): mint_req, _ = await payment.build_mint_req(self._wallet_handle, self._test_did, json.dumps(outputs), None) mint_req = await self.append_taa_acceptance(mint_req) mint_req = await self.multisig_req(mint_req) - mint_resp = await ledger.submit_request(self._pool_handle, mint_req) + mint_resp = await submit_request(self._pool_handle, mint_req) ensure_is_reply(mint_resp) async def _get_payment_sources(self, pmnt_addr): diff --git a/scripts/performance/perf_load/perf_req_gen_definition.py b/scripts/performance/perf_load/perf_req_gen_definition.py index 77ceeb607..38ad97ef4 100644 --- a/scripts/performance/perf_load/perf_req_gen_definition.py +++ b/scripts/performance/perf_load/perf_req_gen_definition.py @@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs): async def on_pool_create(self, pool_handle, wallet_handle, submitter_did, sign_req_f, send_req_f, *args, **kwargs): await super().on_pool_create(pool_handle, wallet_handle, submitter_did, sign_req_f, send_req_f, *args, **kwargs) self._wallet_handle = wallet_handle - _, self._default_schema_json = await anoncreds.issuer_create_schema( + _, self._default_schema_json = await create_schema( submitter_did, random_string(32), "1.0", json.dumps(["name", "age", "sex", "height"])) schema_request = await ledger.build_schema_request(submitter_did, self._default_schema_json) schema_request = await self._append_taa_acceptance(schema_request) diff --git a/scripts/performance/perf_load/perf_req_gen_demoted_node.py b/scripts/performance/perf_load/perf_req_gen_demoted_node.py index 08357ad34..f7b711dc0 100644 --- a/scripts/performance/perf_load/perf_req_gen_demoted_node.py +++ b/scripts/performance/perf_load/perf_req_gen_demoted_node.py @@ -21,9 +21,9 @@ def _rand_data(self): async def on_pool_create(self, pool_handle, wallet_handle, submitter_did, sign_req_f, send_req_f, *args, **kwargs): self._node_alias = random_string(7) - self._node_did, node_ver = await did.create_and_store_my_did(wallet_handle, + self._node_did, node_ver = await did.create_and_store_did(wallet_handle, json.dumps({'seed': random_string(32)})) - self._steward_did, verk = await did.create_and_store_my_did(wallet_handle, + self._steward_did, verk = await did.create_and_store_did(wallet_handle, json.dumps({'seed': random_string(32)})) nym_req = await ledger.build_nym_request(submitter_did, self._steward_did, verk, None, "STEWARD") diff --git a/scripts/performance/perf_load/perf_req_gen_schema.py b/scripts/performance/perf_load/perf_req_gen_schema.py index ace84c645..7ff911b8a 100644 --- a/scripts/performance/perf_load/perf_req_gen_schema.py +++ b/scripts/performance/perf_load/perf_req_gen_schema.py @@ -11,7 +11,7 @@ class RGSchema(RequestGenerator): _req_types = ["101", "107"] async def _gen_req(self, submit_did, req_data): - _, schema_json = await anoncreds.issuer_create_schema(submit_did, req_data, + _, schema_json = await create_schema(submit_did, req_data, "1.0", json.dumps(["name", "age", "sex", "height"])) schema_request = await ledger.build_schema_request(submit_did, schema_json) return schema_request diff --git a/setup.py b/setup.py index 2dfb5fa0a..56ce2510f 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ BASE_DIR = os.path.join(os.path.expanduser("~"), ".indy") tests_require = ['attrs>=20.3.0', 'pytest>=6.2.2', 'pytest-xdist>=2.2.1', 'pytest-forked>=1.3.0', - 'pytest-asyncio>=0.14.0', - 'indy_vdr==0.4.0.dev5', 'aries-askar==0.2.7', 'indy-credx==0.3.1'] + 'pytest-asyncio>=0.14.0', 'python3-indy==1.16.0.post236', + 'indy_vdr==0.4.2', 'aries-askar==0.4.3', 'indy-credx==1.1.1'] setup( name=metadata['__title__'], @@ -58,14 +58,15 @@ install_requires=[# Changed the import path for the plenum package to point to indy-plenum fork on AdamBurdett Repo for parallel dev change back to regular version once PR is complete 'indy-plenum @ git+https://github.com/burdettadam/indy-plenum.git@feature/indy-vdr-upgrade#egg=indy-plenum', - # 'indy-plenum==1.14.0-rc0', + #'indy-plenum==1.14.0-rc0', # importlib-metadata needs to be pinned to 3.10.1 because from v4.0.0 the package # name ends in python3-importlib-metadata_0.0.0_amd64.deb # see also build-scripts/ubuntu-2004/build-3rd-parties.sh # https://github.com/hyperledger/indy-plenum/blob/eac38674252b539216be2c40bb13e53c5b70dad2/build-scripts/ubuntu-2004/build-3rd-parties.sh#L104-L106 - 'indy_vdr==0.4.0.dev5', - 'aries-askar==0.2.7', - 'indy-credx==0.3.1', + 'indy_vdr==0.4.2', + 'aries-askar==0.4.3', + 'indy-credx==1.1.1', + 'python3-indy==1.16.0.post236', 'importlib-metadata==3.10.1', 'timeout-decorator>=0.5.0', 'distro==1.7.0'], From 35b35587a05e5e95f1dd98d372ccf300f1a777ff Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Wed, 9 Apr 2025 09:10:39 -0700 Subject: [PATCH 6/6] Update repository references for the indy-sdk and Ursa. - The indy-sdk packages have been migrated to the Hyperledger repository. The Sovrin repositories have been deprecated. - New location: https://hyperledger.jfrog.io/ui/native/indy/pool/bionic/ - Previous location: https://repo.sovrin.org/sdk/deb/pool/bionic/ - Only the `master` and `stable` channels were migrated over. - The Ursa package has been migrated to the Hyperledger repository. The Sovrin repositories have been deprecated. - New location: https://hyperledger.jfrog.io/ui/native/indy/pool/bionic/master/u/ursa/ - Previous location: https://repo.sovrin.org/deb/pool/bionic/master/u/ursa/ Signed-off-by: Wade Barnes --- .devcontainer/Dockerfile | 6 +----- .github/workflows/build/Dockerfile.ubuntu-2004 | 7 ++----- .github/workflows/build/Dockerfile.ubuntu-2204 | 6 +----- .gitpod.Dockerfile | 9 +++------ build-scripts/ubuntu-2004/Dockerfile | 10 ++-------- build-scripts/ubuntu-2204/Dockerfile | 8 ++------ dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh | 5 ++--- dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh | 5 ++--- dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt | 6 +++--- docs/source/ci-cd.md | 2 +- .../install-docs/validator-prep-20.04.md | 3 +-- docs/source/setup-dev.md | 6 +++--- docs/source/start-nodes.md | 18 +++++++++--------- .../sandbox/qa-pool_validator.json | 4 ++-- .../cloudformation/sandbox/validator.json | 4 ++-- .../training/GettingStartedGuideCluster.json | 6 +++--- .../cloudformation/training/IndyCluster.json | 6 +++--- environment/docker/baseimage/README.md | 6 +++--- .../baseimage/indy-baseci.ubuntu.dockerfile | 4 ++-- .../indy-core-baseci.ubuntu.dockerfile | 2 +- environment/docker/pool/core.ubuntu.dockerfile | 11 +++++------ environment/openshift/core.ubuntu.dockerfile | 8 ++++---- .../Virtualbox/Vagrantfile | 4 ++-- .../sandbox/SandboxAgents/scripts/agent.sh | 4 ++-- .../IndyCluster-master/scripts/agent.sh | 4 ++-- .../IndyCluster-master/scripts/validator.sh | 6 +++--- .../training/vb-multi-vm/scripts/agent.sh | 4 ++-- .../training/vb-multi-vm/scripts/lib_indy.sh | 5 ++--- .../training/vb-multi-vm/scripts/validator.sh | 4 ++-- .../test_node_control_util.py | 8 ++++---- indy_node/utils/node_control_utils.py | 10 +++++----- .../molecule/resources/tests/test_default.py | 4 ++-- pool_automation/roles/indy_repo/tasks/main.yml | 4 ++-- 33 files changed, 85 insertions(+), 114 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 70fd8fddf..13f0bcf8c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -26,9 +26,6 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # bionic key RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg -# sovrin key -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # Plenum @@ -38,8 +35,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger. # todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/hyperledger.list RUN apt update -y && apt install -y \ # Python diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004 index cf8a4583a..a6f891317 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2004 +++ b/.github/workflows/build/Dockerfile.ubuntu-2004 @@ -18,9 +18,7 @@ RUN apt-get update -y && apt-get install -y \ # Update repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 # ======================================================================================================== # Plenum @@ -28,8 +26,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && # - Needed to pick up rocksdb=5.8.8 RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev rc stable" >> /etc/apt/sources.list && \ echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list + echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list RUN apt-get update -y && apt-get install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index da867461e..db120e4f3 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -25,9 +25,6 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # bionic key RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg -# sovrin key -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # ToDo: @@ -40,8 +37,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger. # todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/hyperledger.list RUN apt update -y && apt install -y rubygems python3-pip && apt-get -y autoremove && rm -rf /var/lib/apt/lists/* diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 34b65dd5f..00f757171 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -18,9 +18,7 @@ RUN sudo apt-get update -y && sudo apt-get install -y \ # Update repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 # ======================================================================================================== # Plenum @@ -28,8 +26,7 @@ RUN sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE # - Needed to pick up rocksdb=5.8.8 RUN sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy focal dev' && \ sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security main' && \ - sudo add-apt-repository 'deb https://repo.sovrin.org/deb bionic master' && \ - sudo add-apt-repository 'deb https://repo.sovrin.org/sdk/deb bionic master' + sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy bionic master' @@ -68,4 +65,4 @@ RUN pip3 install -U \ # install fpm -RUN sudo gem install --no-document rake dotenv:2.8.1 fpm:1.14.2 \ No newline at end of file +RUN sudo gem install --no-document rake dotenv:2.8.1 fpm:1.14.2 diff --git a/build-scripts/ubuntu-2004/Dockerfile b/build-scripts/ubuntu-2004/Dockerfile index 5195c7b9d..fbee70e0a 100644 --- a/build-scripts/ubuntu-2004/Dockerfile +++ b/build-scripts/ubuntu-2004/Dockerfile @@ -16,9 +16,7 @@ RUN apt-get update -y && apt-get install -y \ # Update repository signing keys # -------------------------------------------------------------------------------------------------------- # Hyperledger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ - # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 # ======================================================================================================== # Plenum @@ -26,11 +24,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && # - Needed to pick up rocksdb=5.8.8 RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \ echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list - -# Sovrin -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 + echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list RUN apt-get update -y && apt-get install -y \ # Python diff --git a/build-scripts/ubuntu-2204/Dockerfile b/build-scripts/ubuntu-2204/Dockerfile index 6294ba227..ca48b429e 100644 --- a/build-scripts/ubuntu-2204/Dockerfile +++ b/build-scripts/ubuntu-2204/Dockerfile @@ -23,9 +23,6 @@ RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # bionic key RUN gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \ gpg --export 3B4FE6ACC0B21F32 > /etc/apt/keyrings/ubuntu-bionic.gpg -# sovrin key -RUN gpg --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - gpg --export CE7709D068DB5E88 > /etc/apt/keyrings/sovrin.gpg # ======================================================================================================== # Plenum @@ -35,8 +32,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger. # todo: Will be removed when libindy will have been replace by indy-vdr, askar, and indy-credx RUN echo "deb [signed-by=/etc/apt/keyrings/ubuntu-bionic.gpg] http://security.ubuntu.com/ubuntu bionic-security main" > /etc/apt/sources.list.d/ubuntu-bionic.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/deb bionic master" > /etc/apt/sources.list.d/sovrin.list -RUN echo "deb [signed-by=/etc/apt/keyrings/sovrin.gpg] https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list.d/sovrin.list +RUN echo "deb [signed-by=/etc/apt/keyrings/hyperledger.gpg] https://hyperledger.jfrog.io/artifactory/indy bionic master" > /etc/apt/sources.list.d/hyperledger.list RUN apt update -y && apt install -y \ @@ -60,7 +56,7 @@ RUN apt update -y && apt install -y \ gcc \ make \ # Indy Node and Plenum - libssl3 + libssl3 # Indy Node and Plenum # Indy SDK is not used anymore #libindy \ diff --git a/dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh b/dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh index b01f166ee..c9633c60c 100755 --- a/dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh +++ b/dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh @@ -12,9 +12,8 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B9316A7BC7917B12 echo "deb http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list echo "deb-src http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -echo "deb https://repo.sovrin.org/deb xenial stable" | sudo tee -a /etc/apt/sources.list -echo "deb https://repo.sovrin.org/sdk/deb xenial stable" | sudo tee -a /etc/apt/sources.list +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" | sudo tee -a /etc/apt/sources.list sudo apt-get update echo 'Added repositories and keys' diff --git a/dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh b/dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh index 1bc47b622..7e2294bc6 100755 --- a/dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh +++ b/dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh @@ -8,10 +8,9 @@ echo 'Set up https for apt' echo 'Adding repositories and keys...' sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu xenial main universe" -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 -sudo add-apt-repository "deb https://repo.sovrin.org/deb xenial master" -sudo add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" +sudo add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" sudo apt-get update echo 'Added repositories and keys' diff --git a/dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt b/dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt index d45ca3ab6..51d330101 100644 --- a/dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt +++ b/dev-setup/ubuntu/ubuntu-2004/SetupVMTest.txt @@ -3,9 +3,9 @@ ##Pre-Install sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88 - sudo echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list - sudo echo "deb https://repo.sovrin.org/deb bionic stable" >> /etc/apt/sources.list + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 9692C00E657DDE61 + sudo echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list + sudo echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" >> /etc/apt/sources.list sudo echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list sudo apt-get update && sudo apt-get install -y \ diff --git a/docs/source/ci-cd.md b/docs/source/ci-cd.md index 4fd17b0af..ec489fb7f 100644 --- a/docs/source/ci-cd.md +++ b/docs/source/ci-cd.md @@ -117,4 +117,4 @@ It starts with setting a tag in the form of `setRelease-v.. Hotfix release is quite similar except the following difference: - hotfix branches named `hotfix-X.Y.Z` created from last Release commit/tag; - `main` usually is not merged since hotfixes (as a rule) should include only fixes for released code. - - `setRelease`-Tag created on Hotfix branch. \ No newline at end of file + - `setRelease`-Tag created on Hotfix branch. diff --git a/docs/source/install-docs/validator-prep-20.04.md b/docs/source/install-docs/validator-prep-20.04.md index ba6bea4c5..2049d0905 100644 --- a/docs/source/install-docs/validator-prep-20.04.md +++ b/docs/source/install-docs/validator-prep-20.04.md @@ -289,12 +289,11 @@ NOTE: On Ubuntu 20.04, some of the above "tests" can fail when the networking is ``` sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3BC8C2DD662F1C45 sudo add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy focal stable" sudo printf '%s\n%s\n%s\n' 'Package: *' 'Pin: origin hyperledger.jfrog.io' 'Pin-Priority: 1001' >> /etc/apt/preferences sudo add-apt-repository "deb http://security.ubuntu.com/ubuntu bionic-security main" -sudo add-apt-repository "deb https://repo.sovrin.org/deb bionic master" +sudo add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/deb bionic master" sudo add-apt-repository "deb https://sovrin.jfrog.io/artifactory/deb focal stable" sudo apt-get update -y sudo apt-get upgrade -y diff --git a/docs/source/setup-dev.md b/docs/source/setup-dev.md index 0a23d1315..df62fae2b 100644 --- a/docs/source/setup-dev.md +++ b/docs/source/setup-dev.md @@ -135,8 +135,8 @@ can be used on Ubuntu 16.04: # Start of repository configuration steps sudo apt-get update sudo apt-get install apt-transport-https ca-certificates -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -sudo add-apt-repository "deb https://repo.sovrin.org/deb xenial master" +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +sudo add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" # End of repository configuration steps sudo apt-get update sudo apt-get install libbz2-dev \ @@ -156,7 +156,7 @@ It also relies on [ursa](https://github.com/hyperledger/ursa), a library that su There are deb packages of libindy and ursa that can be used on Ubuntu: ``` -sudo add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" +sudo add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" sudo apt-get update sudo apt-get install -y libindy ursa ``` diff --git a/docs/source/start-nodes.md b/docs/source/start-nodes.md index 24c85887a..2799faac9 100644 --- a/docs/source/start-nodes.md +++ b/docs/source/start-nodes.md @@ -6,8 +6,8 @@ In order to run your own Network, you need to do the following for each Node: 1. Install Indy Node - A recommended way for ubuntu is installing from deb packages ``` - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 - sudo bash -c 'echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list' + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 + sudo bash -c 'echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list' sudo apt-get update sudo apt-get install indy-node ``` @@ -67,11 +67,11 @@ There is a script that can generate keys and corresponding test genesis files to ``` - `--nodes` specifies a total number of nodes in the pool - `--clients` specifies a number of pre-configured clients in the pool (in `domain_transactions_file_{network_name}_genesis`) -- `--nodeNum` specifies a number of this particular node (from 1 to `-nodes` value), that is a number of the Node to create private keys locally for -- `--ip` specifies IP addresses for all nodes in the pool (if not specified, then `localhost` is used) -- `--network` specifies a Network generate transaction files and keys for. `sandbox` is used by default - -We can run the script multiple times for different networks. +- `--nodeNum` specifies a number of this particular node (from 1 to `-nodes` value), that is a number of the Node to create private keys locally for +- `--ip` specifies IP addresses for all nodes in the pool (if not specified, then `localhost` is used) +- `--network` specifies a Network generate transaction files and keys for. `sandbox` is used by default + +We can run the script multiple times for different networks. #### Setup iptables (recommended) @@ -94,7 +94,7 @@ The first IP/port pair is for the node-to-node communication channel and the sec IP addresses may be changed according to hardware configuration. Different IP addresses for node-to-node and node-to-client communication may be used. -## Local Test Network Example +## Local Test Network Example If you want to try out an Indy cluster of 4 nodes with the nodes running on your local machine, then you can do the following: @@ -121,7 +121,7 @@ start_indy_node Node3 0.0.0.0 9705 0.0.0.0 9706 start_indy_node Node4 0.0.0.0 9707 0.0.0.0 9708 ``` -## Remote Test Network Example +## Remote Test Network Example Now let's say you want to run 4 nodes on 4 different machines as 1. Node1 running on 191.177.76.26 diff --git a/environment/cloudformation/sandbox/qa-pool_validator.json b/environment/cloudformation/sandbox/qa-pool_validator.json index 570bf6fbc..e001ca19d 100644 --- a/environment/cloudformation/sandbox/qa-pool_validator.json +++ b/environment/cloudformation/sandbox/qa-pool_validator.json @@ -969,8 +969,8 @@ "repo": "deb https://repo.evernym.com/deb xenial stable" }, "indy": { - "key": "CE7709D068DB5E88", - "repo": "deb https://repo.sovrin.org/deb xenial stable" + "key": "9692C00E657DDE61", + "repo": "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" } } } diff --git a/environment/cloudformation/sandbox/validator.json b/environment/cloudformation/sandbox/validator.json index 68da2724d..089dc77b3 100644 --- a/environment/cloudformation/sandbox/validator.json +++ b/environment/cloudformation/sandbox/validator.json @@ -997,8 +997,8 @@ "repo": "deb https://repo.evernym.com/deb xenial stable" }, "indy": { - "key": "CE7709D068DB5E88", - "repo": "deb https://repo.sovrin.org/deb xenial stable" + "key": "9692C00E657DDE61", + "repo": "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" } } } diff --git a/environment/cloudformation/training/GettingStartedGuideCluster.json b/environment/cloudformation/training/GettingStartedGuideCluster.json index 25211825d..042abd1c9 100644 --- a/environment/cloudformation/training/GettingStartedGuideCluster.json +++ b/environment/cloudformation/training/GettingStartedGuideCluster.json @@ -3282,7 +3282,7 @@ "RepositoryKeys": { "Ubuntu1604": { "evernym": "BD33704C", - "indy": "CE7709D068DB5E88" + "indy": "9692C00E657DDE61" } }, "RepositoryEvernym": { @@ -3293,8 +3293,8 @@ }, "RepositoryIndy": { "Ubuntu1604": { - "stable": "deb https://repo.sovrin.org/deb xenial stable", - "master": "deb https://repo.sovrin.org/deb xenial master" + "stable": "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable", + "master": "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" } }, "ValidatorData": { diff --git a/environment/cloudformation/training/IndyCluster.json b/environment/cloudformation/training/IndyCluster.json index d853a342b..f349dd16a 100644 --- a/environment/cloudformation/training/IndyCluster.json +++ b/environment/cloudformation/training/IndyCluster.json @@ -5094,7 +5094,7 @@ "RepositoryKeys": { "Ubuntu1604": { "evernym": "BD33704C", - "indy": "CE7709D068DB5E88" + "indy": "9692C00E657DDE61" } }, "RepositoryEvernym": { @@ -5105,8 +5105,8 @@ }, "RepositoryIndy": { "Ubuntu1604": { - "stable": "deb https://repo.sovrin.org/deb xenial stable", - "master": "deb https://repo.sovrin.org/deb xenial master" + "stable": "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable", + "master": "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" } }, "ValidatorData": { diff --git a/environment/docker/baseimage/README.md b/environment/docker/baseimage/README.md index 80baf3d9f..23d615403 100644 --- a/environment/docker/baseimage/README.md +++ b/environment/docker/baseimage/README.md @@ -21,9 +21,9 @@ Based on **ubuntu:16.04**. Configures apt for https and installs some common tools (git, wget, vim) and python3.5 with pip, setuptools and virtualenv. ### indy-baseci -Base image for any kind of CI testing images that need [Indy Core apt repository](https://repo.sovrin.org/deb). +Base image for any kind of CI testing images that need [Indy Core apt repository](https://hyperledger.jfrog.io/artifactory/indy). Based on [indy-baseimage](#indy-baseimage). -Adds [Indy Core apt repository](https://repo.sovrin.org/deb) to apt sources.list. Also it adds two scripts into system $PATH available directory that could be run by child images to perform common setup routine: +Adds [Indy Core apt repository](https://hyperledger.jfrog.io/artifactory/indy) to apt sources.list. Also it adds two scripts into system $PATH available directory that could be run by child images to perform common setup routine: - `indy_ci_add_user` creates user with python virtualenv configured @@ -32,7 +32,7 @@ Base image for images that provide CI testing environment for Indy core projects [indy-plenum](https://github.com/hyperledger/indy-plenum), [indy-node](https://github.com/hyperledger/indy-node)). Based on [indy-baseci](#indy-baseci). -Adds [Indy SDK apt repository](https://repo.sovrin.org/sdk/deb) to apt sources.list and configures apt preferences to make indy sdk packages from Indy Core apt repo more prioritized than from Indy SDK repo. +Adds [Indy SDK apt repository](https://hyperledger.jfrog.io/artifactory/indy) to apt sources.list and configures apt preferences to make indy sdk packages from Indy Core apt repo more prioritized than from Indy SDK repo. ## Usage diff --git a/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile b/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile index fe2865344..4277a0a0a 100644 --- a/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile +++ b/environment/docker/baseimage/indy-baseci.ubuntu.dockerfile @@ -2,8 +2,8 @@ FROM __NS__/indy-baseimage:0.0.3-master LABEL maintainer="Hyperledger " # indy repos -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list && \ +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ + echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list && \ apt-get update COPY scripts/user.sh /usr/local/bin/indy_ci_add_user diff --git a/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile b/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile index 6b67e0d9d..8b9dcd0f8 100644 --- a/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile +++ b/environment/docker/baseimage/indy-core-baseci.ubuntu.dockerfile @@ -2,7 +2,7 @@ FROM __NS__/indy-baseci:0.0.3-master LABEL maintainer="Hyperledger " # indy repos -RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list && \ +RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list && \ apt-get update # set highest priority for indy sdk packages in core repo diff --git a/environment/docker/pool/core.ubuntu.dockerfile b/environment/docker/pool/core.ubuntu.dockerfile index b855d424c..ba08b734a 100644 --- a/environment/docker/pool/core.ubuntu.dockerfile +++ b/environment/docker/pool/core.ubuntu.dockerfile @@ -3,7 +3,7 @@ FROM indybase ARG uid=1000 # Install environment -RUN apt-get update -y && apt-get install -y \ +RUN apt-get update -y && apt-get install -y \ git \ wget \ python3.5 \ @@ -11,14 +11,13 @@ RUN apt-get update -y && apt-get install -y \ python-setuptools \ python3-nacl \ apt-transport-https \ - ca-certificates -RUN pip3 install -U \ + ca-certificates +RUN pip3 install -U \ 'pip<10.0.0' \ setuptools -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C -RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list -RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list +RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" >> /etc/apt/sources.list RUN useradd -ms /bin/bash -l -u $uid indy RUN apt-get update -y && apt-get install -y indy-node libindy RUN pip3 install python3-indy diff --git a/environment/openshift/core.ubuntu.dockerfile b/environment/openshift/core.ubuntu.dockerfile index 1b1720b93..c1ec819d1 100644 --- a/environment/openshift/core.ubuntu.dockerfile +++ b/environment/openshift/core.ubuntu.dockerfile @@ -5,7 +5,7 @@ ARG uid=1000 ARG gid=0 # Install environment -RUN apt-get update -y && apt-get install -y \ +RUN apt-get update -y && apt-get install -y \ git \ wget \ python3.5 \ @@ -15,15 +15,15 @@ RUN apt-get update -y && apt-get install -y \ apt-transport-https \ ca-certificates -RUN pip3 install -U \ +RUN pip3 install -U \ 'pip<10.0.0' \ setuptools -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C RUN echo "deb https://repo.evernym.com/deb xenial stable" >> /etc/apt/sources.list -RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list +RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" >> /etc/apt/sources.list RUN useradd -ms /bin/bash -l -u $uid -G $gid indy RUN apt-get update -y && apt-get install -y indy-node diff --git a/environment/vagrant/sandbox/DevelopmentEnvironment/Virtualbox/Vagrantfile b/environment/vagrant/sandbox/DevelopmentEnvironment/Virtualbox/Vagrantfile index 7d5db2543..8f224383e 100644 --- a/environment/vagrant/sandbox/DevelopmentEnvironment/Virtualbox/Vagrantfile +++ b/environment/vagrant/sandbox/DevelopmentEnvironment/Virtualbox/Vagrantfile @@ -300,8 +300,8 @@ echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties # The following two lines are required to install a indy cli -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -add-apt-repository "deb https://repo.sovrin.org/deb xenial stable" +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" # Download the package lists from added repos apt-get update diff --git a/environment/vagrant/sandbox/SandboxAgents/scripts/agent.sh b/environment/vagrant/sandbox/SandboxAgents/scripts/agent.sh index d04a112d1..baacf92de 100755 --- a/environment/vagrant/sandbox/SandboxAgents/scripts/agent.sh +++ b/environment/vagrant/sandbox/SandboxAgents/scripts/agent.sh @@ -13,9 +13,9 @@ echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 add-apt-repository "deb https://repo.evernym.com/deb xenial $BRANCH" -add-apt-repository "deb https://repo.sovrin.org/deb xenial $BRANCH" +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic $BRANCH" apt-get update #DEBIAN_FRONTEND=noninteractive apt-get upgrade -y DEBIAN_FRONTEND=noninteractive apt-get install -y dialog figlet python-pip python3-pip python3.5-dev unzip make screen indy-node tmux vim wget diff --git a/environment/vagrant/training/IndyCluster-master/scripts/agent.sh b/environment/vagrant/training/IndyCluster-master/scripts/agent.sh index 72ec1cd62..8c4ed68f3 100755 --- a/environment/vagrant/training/IndyCluster-master/scripts/agent.sh +++ b/environment/vagrant/training/IndyCluster-master/scripts/agent.sh @@ -11,9 +11,9 @@ echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 add-apt-repository "deb https://repo.evernym.com/deb xenial master" -add-apt-repository "deb https://repo.sovrin.org/deb xenial master" +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" apt-get update #DEBIAN_FRONTEND=noninteractive apt-get upgrade -y DEBIAN_FRONTEND=noninteractive apt-get install -y dialog figlet python-pip python3-pip python3.5-dev unzip make screen indy-node tmux vim wget diff --git a/environment/vagrant/training/IndyCluster-master/scripts/validator.sh b/environment/vagrant/training/IndyCluster-master/scripts/validator.sh index 385f75eb2..bcada59bb 100755 --- a/environment/vagrant/training/IndyCluster-master/scripts/validator.sh +++ b/environment/vagrant/training/IndyCluster-master/scripts/validator.sh @@ -17,9 +17,9 @@ echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BD33704C -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 add-apt-repository "deb https://repo.evernym.com/deb xenial master" -add-apt-repository "deb https://repo.sovrin.org/deb xenial master" +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" apt-get update #DEBIAN_FRONTEND=noninteractive apt-get upgrade -y DEBIAN_FRONTEND=noninteractive apt-get install -y dialog figlet python-pip python3-pip python3.5-dev unzip make screen indy-node tmux vim wget @@ -37,7 +37,7 @@ echo 'Fixing Bugs' if grep -Fxq '[Install]' /etc/systemd/system/indy-node.service then echo '[Install] section is present in indy-node target' -else +else perl -p -i -e 's/\\n\\n/[Install]\\nWantedBy=multi-user.target\\n/' /etc/systemd/system/indy-node.service fi chmod -x /etc/systemd/system/orientdb.service diff --git a/environment/vagrant/training/vb-multi-vm/scripts/agent.sh b/environment/vagrant/training/vb-multi-vm/scripts/agent.sh index b6224d539..5e4a2267c 100755 --- a/environment/vagrant/training/vb-multi-vm/scripts/agent.sh +++ b/environment/vagrant/training/vb-multi-vm/scripts/agent.sh @@ -29,8 +29,8 @@ cp $TIMEZONE /etc/localtime echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -add-apt-repository "deb https://repo.sovrin.org/deb xenial master" +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" apt-get update #DEBIAN_FRONTEND=noninteractive apt-get upgrade -y DEBIAN_FRONTEND=noninteractive apt-get install -y unzip make screen indy-node tmux vim wget diff --git a/environment/vagrant/training/vb-multi-vm/scripts/lib_indy.sh b/environment/vagrant/training/vb-multi-vm/scripts/lib_indy.sh index edfbf2d2d..a220b492d 100755 --- a/environment/vagrant/training/vb-multi-vm/scripts/lib_indy.sh +++ b/environment/vagrant/training/vb-multi-vm/scripts/lib_indy.sh @@ -29,9 +29,8 @@ cp $TIMEZONE /etc/localtime echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties libsodium18 -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -add-apt-repository "deb https://repo.sovrin.org/deb xenial stable" -add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic stable" add-apt-repository ppa:jonathonf/python-3.6 apt-get update apt-get install python3.6 -y diff --git a/environment/vagrant/training/vb-multi-vm/scripts/validator.sh b/environment/vagrant/training/vb-multi-vm/scripts/validator.sh index e67d3b378..d42e0a98f 100755 --- a/environment/vagrant/training/vb-multi-vm/scripts/validator.sh +++ b/environment/vagrant/training/vb-multi-vm/scripts/validator.sh @@ -34,8 +34,8 @@ cp $TIMEZONE /etc/localtime echo "Installing Required Packages" apt-get update apt-get install -y software-properties-common python-software-properties -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 -add-apt-repository "deb https://repo.sovrin.org/deb xenial master" +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 +add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy bionic master" apt-get update #DEBIAN_FRONTEND=noninteractive apt-get upgrade -y DEBIAN_FRONTEND=noninteractive apt-get install -y unzip make screen indy-node tmux vim wget diff --git a/indy_node/test/node_control_utils/test_node_control_util.py b/indy_node/test/node_control_utils/test_node_control_util.py index bb3e35e1d..84db501fc 100644 --- a/indy_node/test/node_control_utils/test_node_control_util.py +++ b/indy_node/test/node_control_utils/test_node_control_util.py @@ -195,7 +195,7 @@ def _f(command, *args, **kwargs): NodeControlUtil.update_package_cache() assert len(commands) == 4 assert commands[0] == "apt update" - assert commands[1] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88" + assert commands[1] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61" assert commands[2] == "apt list --upgradable" assert commands[3] == "apt update" @@ -233,7 +233,7 @@ def _f(command, *args, **kwargs): NodeControlUtil.update_package_cache() assert len(commands) == 5 assert commands[0] == "apt update" - assert commands[1] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88" + assert commands[1] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61" assert commands[2] == "apt list --upgradable" assert commands[3] == "apt --only-upgrade install -y libgnutls30" assert commands[4] == "apt update" @@ -242,7 +242,7 @@ def _f(command, *args, **kwargs): def test_generated_cmd_update_repo_keys(catch_generated_commands): NodeControlUtil.update_repo_keys() assert len(generated_commands) == 1 - assert generated_commands[0] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88" + assert generated_commands[0] == "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61" # apt update dependencies don't need to be upgraded @@ -406,4 +406,4 @@ def test_curr_pkg_info_with_command_concat(patch_run_shell_command, pkg_name): assert expected_version == pkg_info[0] assert isinstance(expected_version, type(pkg_info[0])) assert isinstance(expected_version.upstream, type(pkg_info[0].upstream)) - assert expected_deps == pkg_info[1] \ No newline at end of file + assert expected_deps == pkg_info[1] diff --git a/indy_node/utils/node_control_utils.py b/indy_node/utils/node_control_utils.py index 84385ed76..17cff0c0e 100644 --- a/indy_node/utils/node_control_utils.py +++ b/indy_node/utils/node_control_utils.py @@ -363,13 +363,13 @@ def update_package_cache(cls): cls.run_shell_script(cmd) except Exception as e: # Currently two issues can stop this from working. - # 1) The Sovrin Repo key needs to be updated - # apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 + # 1) The Indy Repo key needs to be updated + # apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 # 2) The following certificate validation error occurs: - # Err:6 https://repo.sovrin.org/deb xenial Release + # Err:6 https://hyperledger.jfrog.io/artifactory/indy bionic Release # server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none # Reading package lists... Done - # E: The repository 'https://repo.sovrin.org/deb xenial Release' does not have a Release file. + # E: The repository 'https://hyperledger.jfrog.io/artifactory/indy bionic Release' does not have a Release file. # N: Updating from such a repository can't be done securely, and is therefore disabled by default. # N: See apt-secure(8) manpage for repository creation and user configuration details. # This can be fixed by updating libgnutls30: @@ -385,7 +385,7 @@ def update_package_cache(cls): @classmethod def update_repo_keys(cls): logger.info("Updating signing keys for the artifact repository ...") - cmd = compose_cmd(['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com', '--recv-keys', 'CE7709D068DB5E88']) + cmd = compose_cmd(['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com', '--recv-keys', '9692C00E657DDE61']) cls.run_shell_script(cmd) @classmethod diff --git a/pool_automation/roles/indy_repo/molecule/resources/tests/test_default.py b/pool_automation/roles/indy_repo/molecule/resources/tests/test_default.py index b7b348781..38fa5de2d 100644 --- a/pool_automation/roles/indy_repo/molecule/resources/tests/test_default.py +++ b/pool_automation/roles/indy_repo/molecule/resources/tests/test_default.py @@ -21,11 +21,11 @@ def test_node_repos_are_added(host, ansible_vars): for comp in ansible_vars['indy_repo_node_channels'].split(): assert host.run( "apt-cache policy | grep '{} xenial/{}'" - .format('https://repo.sovrin.org/deb', comp)).rc == 0 + .format('https://hyperledger.jfrog.io/artifactory/indy', comp)).rc == 0 def test_sdk_repos_are_added(host, ansible_vars): for comp in ansible_vars['indy_repo_sdk_channels'].split(): assert host.run( "apt-cache policy | grep '{} xenial/{}'" - .format('https://repo.sovrin.org/sdk/deb', comp)).rc == 0 + .format('https://hyperledger.jfrog.io/artifactory/indy', comp)).rc == 0 diff --git a/pool_automation/roles/indy_repo/tasks/main.yml b/pool_automation/roles/indy_repo/tasks/main.yml index a1523ad25..6e5f67a79 100644 --- a/pool_automation/roles/indy_repo/tasks/main.yml +++ b/pool_automation/roles/indy_repo/tasks/main.yml @@ -20,14 +20,14 @@ - name: Add repository for indy node apt_repository: - repo: "deb https://repo.sovrin.org/deb xenial {{ indy_repo_node_channels }}" + repo: "deb https://hyperledger.jfrog.io/artifactory/indy bionic {{ indy_repo_node_channels }}" state: present become: true when: indy_repo_node_channels|d(False, True) - name: Add repository for indy sdk apt_repository: - repo: "deb https://repo.sovrin.org/sdk/deb xenial {{ indy_repo_sdk_channels }}" + repo: "deb bionic {{ indy_repo_sdk_channels }}" state: present become: true when: indy_repo_sdk_channels|d(False, True)