Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@ 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
# ========================================================================================================

# Plenum
# - https://github.com/hyperledger/indy-plenum/issues/1546
# - 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/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
python3-pip \
Expand All @@ -50,15 +59,22 @@ 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
setuptools==75.8.0 \
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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/build/Dockerfile.ubuntu-2004
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,15 @@ 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
# - https://github.com/hyperledger/indy-plenum/issues/1546
# - 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/*

Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build/Dockerfile.ubuntu-2204
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ 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
# ========================================================================================================

# ToDo:
Expand All @@ -30,6 +35,10 @@ 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/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/*

# install fpm
Expand Down
9 changes: 3 additions & 6 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,15 @@ 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
# - https://github.com/hyperledger/indy-plenum/issues/1546
# - 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'



Expand Down Expand Up @@ -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
RUN sudo gem install --no-document rake dotenv:2.8.1 fpm:1.14.2
50 changes: 25 additions & 25 deletions acceptance/tests/test_ledger.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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))
Expand All @@ -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:
Expand All @@ -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)
Expand All @@ -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')
Expand All @@ -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)
Expand Down Expand Up @@ -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')
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion acceptance/tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 2 additions & 8 deletions build-scripts/ubuntu-2004/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,15 @@ 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
# - https://github.com/hyperledger/indy-plenum/issues/1546
# - 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
Expand Down
28 changes: 19 additions & 9 deletions build-scripts/ubuntu-2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,23 @@ 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
# ========================================================================================================

# Plenum
# - https://github.com/hyperledger/indy-plenum/issues/1546
# - 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/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
python3-pip \
Expand All @@ -46,15 +56,15 @@ RUN apt update -y && apt install -y \
gcc \
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
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

RUN pip3 install -U \
# Required by setup.py
Expand Down
5 changes: 2 additions & 3 deletions dev-setup/ubuntu/setup-dev-depend-ubuntu14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 2 additions & 3 deletions dev-setup/ubuntu/setup-dev-depend-ubuntu16.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Loading
Loading