diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index 90527757..f5ee90b3 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -10,7 +10,7 @@ version = ( 0, 12, 4, - 'alpha.13', + 'alpha.14', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/doc/texinfo/accounts.texi b/apps/cic-eth/doc/texinfo/accounts.texi index a1a3ac19..6fc282f2 100644 --- a/apps/cic-eth/doc/texinfo/accounts.texi +++ b/apps/cic-eth/doc/texinfo/accounts.texi @@ -1,4 +1,3 @@ -@node cic-eth-accounts @section Accounts Accounts are private keys in the signer component keyed by "addresses," a one-way transformation of a public key. Data can be signed by using the account as identifier for corresponding RPC requests. diff --git a/apps/cic-eth/doc/texinfo/admin.texi b/apps/cic-eth/doc/texinfo/admin.texi index 1b115e27..8e7b8e44 100644 --- a/apps/cic-eth/doc/texinfo/admin.texi +++ b/apps/cic-eth/doc/texinfo/admin.texi @@ -1,4 +1,4 @@ -@node cic-eth system maintenance +@anchor{cic-eth-appendix-system-maintenance} @appendix Admin API The admin API is still in an early stage of refinement. User friendliness can be considerably improved. @@ -33,7 +33,7 @@ Get the current state of a lock @appendixsection tag_account -Associate an identifier with an account address (@xref{cic-eth system accounts}) +Associate an identifier with an account address (@xref{cic-eth-system-accounts}) @appendixsection have_account diff --git a/apps/cic-eth/doc/texinfo/all.texi b/apps/cic-eth/doc/texinfo/all.texi index b91636fe..30adeb85 100644 --- a/apps/cic-eth/doc/texinfo/all.texi +++ b/apps/cic-eth/doc/texinfo/all.texi @@ -14,5 +14,6 @@ Released 2021 under GPL3 @c @contents -@include index.texi +@include content.texi +@include appendix.texi diff --git a/apps/cic-eth/doc/texinfo/appendix.texi b/apps/cic-eth/doc/texinfo/appendix.texi new file mode 100644 index 00000000..e691cea0 --- /dev/null +++ b/apps/cic-eth/doc/texinfo/appendix.texi @@ -0,0 +1,3 @@ +@include admin.texi +@include chains.texi +@include transfertypes.texi diff --git a/apps/cic-eth/doc/texinfo/chains.texi b/apps/cic-eth/doc/texinfo/chains.texi index ba0ebb45..ceef36d0 100644 --- a/apps/cic-eth/doc/texinfo/chains.texi +++ b/apps/cic-eth/doc/texinfo/chains.texi @@ -1,4 +1,4 @@ -@node cic-eth Appendix Task chains +@anchor{cic-eth-appendix-task-chains} @appendix Task chains TBC - explain here how to generate these chain diagrams diff --git a/apps/cic-eth/doc/texinfo/configuration.texi b/apps/cic-eth/doc/texinfo/configuration.texi index 9b4e93c2..349d9053 100644 --- a/apps/cic-eth/doc/texinfo/configuration.texi +++ b/apps/cic-eth/doc/texinfo/configuration.texi @@ -1,4 +1,3 @@ -@node cic-eth configuration @section Configuration Configuration parameters are grouped by configuration filename. diff --git a/apps/cic-eth/doc/texinfo/index.texi b/apps/cic-eth/doc/texinfo/content.texi similarity index 69% rename from apps/cic-eth/doc/texinfo/index.texi rename to apps/cic-eth/doc/texinfo/content.texi index 0e242efd..01df3c5d 100644 --- a/apps/cic-eth/doc/texinfo/index.texi +++ b/apps/cic-eth/doc/texinfo/content.texi @@ -1,6 +1,6 @@ +@node cic-eth @top cic-eth -@include intro.texi @include dependencies.texi @include configuration.texi @include system.texi @@ -9,6 +9,3 @@ @include incoming.texi @include services.texi @include tools.texi -@include admin.texi -@include chains.texi -@include transfertypes.texi diff --git a/apps/cic-eth/doc/texinfo/dependencies.texi b/apps/cic-eth/doc/texinfo/dependencies.texi index 6e57bc2a..75ca9011 100644 --- a/apps/cic-eth/doc/texinfo/dependencies.texi +++ b/apps/cic-eth/doc/texinfo/dependencies.texi @@ -1,4 +1,3 @@ -@node cic-eth-dependencies @section Dependencies This application is written in Python 3.8. It is tightly coupled with @code{python-celery}, which provides the task worker ecosystem. It also uses @code{SQLAlchemy} which provides useful abstractions for persistent storage though SQL, and @code{alembic} for database schema migrations. diff --git a/apps/cic-eth/doc/texinfo/incoming.texi b/apps/cic-eth/doc/texinfo/incoming.texi index c9188d74..d7ea21fa 100644 --- a/apps/cic-eth/doc/texinfo/incoming.texi +++ b/apps/cic-eth/doc/texinfo/incoming.texi @@ -1,4 +1,4 @@ -@node cic-eth-incoming +@anchor{cic-eth-incoming} @section Incoming transactions All transactions in mined blocks will be passed to a selection of plugin filters to the @code{chainsyncer} component. Each of these filters are individual python module files in @code{cic_eth.runnable.daemons.filters}. This section describes their function. diff --git a/apps/cic-eth/doc/texinfo/interacting.texi b/apps/cic-eth/doc/texinfo/interacting.texi index fb82991b..952697e9 100644 --- a/apps/cic-eth/doc/texinfo/interacting.texi +++ b/apps/cic-eth/doc/texinfo/interacting.texi @@ -1,9 +1,8 @@ -@node cic-eth-interacting @section Interacting with the system -The API to the @var{cic-eth} component is a proxy for executing @emph{chains of Celery tasks}. The tasks that compose individual chains are documented in @ref{cic-eth Appendix Task chains,the Task Chain appendix}, which also describes a CLI tool that can generate graph representationso of them. +The API to the @var{cic-eth} component is a proxy for executing @emph{chains of Celery tasks}. The tasks that compose individual chains are documented in @ref{cic-eth-appendix-task-chains,the Task Chain appendix}, which also describes a CLI tool that can generate graph representationso of them. -There are two API classes, @var{Api} and @var{AdminApi}. The former is described later in this section, the latter described in @ref{cic-eth system maintenance,the Admin API appendix}. +There are two API classes, @var{Api} and @var{AdminApi}. The former is described later in this section, the latter described in @ref{cic-eth-appendix-system-maintenance,the Admin API appendix}. @subsection Interface diff --git a/apps/cic-eth/doc/texinfo/outgoing.texi b/apps/cic-eth/doc/texinfo/outgoing.texi index 679a9327..9983a70c 100644 --- a/apps/cic-eth/doc/texinfo/outgoing.texi +++ b/apps/cic-eth/doc/texinfo/outgoing.texi @@ -1,4 +1,3 @@ -@node cic-eth-outgoing @section Outgoing transactions @strong{Important! A pre-requisite for proper functioning of the component is that no other agent is sending transactions to the network for any of the keys in the keystore.} diff --git a/apps/cic-eth/doc/texinfo/services.texi b/apps/cic-eth/doc/texinfo/services.texi index 495baf67..959ae0c2 100644 --- a/apps/cic-eth/doc/texinfo/services.texi +++ b/apps/cic-eth/doc/texinfo/services.texi @@ -1,4 +1,3 @@ -@node cic-eth-services @section Services There are four daemons that together orchestrate all of the aforementioned recipes. This section will provide a high level description of them. diff --git a/apps/cic-eth/doc/texinfo/system.texi b/apps/cic-eth/doc/texinfo/system.texi index c5621323..fb5c0ab9 100644 --- a/apps/cic-eth/doc/texinfo/system.texi +++ b/apps/cic-eth/doc/texinfo/system.texi @@ -1,10 +1,10 @@ -@node cic-eth system accounts @section System initialization When the system starts for the first time, it is locked for any state change request other than account creation@footnote{Specifically, the @code{INIT}, @code{SEND} and @code{QUEUE} lock bits are set.}. These locks should be @emph{reset} once system initialization has been completed. Currently, system initialization only involves creating and tagging required system accounts, as specified below. See @ref{cic-eth-locking,Locking} and @ref{cic-eth-tools-ctrl,ctrl in Tools} for details on locking. +@anchor{cic-eth-system-accounts} @subsection System accounts Certain accounts in the system have special roles. These are defined by @emph{tagging} certain accounts addresses with well-known identifiers. diff --git a/apps/cic-eth/doc/texinfo/tools.texi b/apps/cic-eth/doc/texinfo/tools.texi index 0e705fde..024dcc18 100644 --- a/apps/cic-eth/doc/texinfo/tools.texi +++ b/apps/cic-eth/doc/texinfo/tools.texi @@ -1,4 +1,3 @@ -@node cic-eth-tools @section Tools A collection of CLI tools have been provided to help with diagnostics and other administrative tasks. These use the same configuration infrastructure as the daemons. @@ -37,7 +36,7 @@ Execute a token transfer on behalf of a custodial account. @subsection tag (cic-eth-tag) -Associate an account address with a string identifier. @xref{cic-eth system accounts} +Associate an account address with a string identifier. @xref{cic-eth-system-accounts} @anchor{cic-eth-tools-ctrl} diff --git a/apps/cic-eth/doc/texinfo/transfertypes.texi b/apps/cic-eth/doc/texinfo/transfertypes.texi index 6eb08c14..6e6a4c7e 100644 --- a/apps/cic-eth/doc/texinfo/transfertypes.texi +++ b/apps/cic-eth/doc/texinfo/transfertypes.texi @@ -1,4 +1,3 @@ -@node cic-eth Appendix Transaction types @appendix Transfer types @table @var diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index af68d8c6..7a996c44 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,4 +1,4 @@ celery==4.4.7 -chainlib-eth>=0.0.10a15,<0.1.0 +chainlib-eth>=0.0.10a16,<0.1.0 semver==2.13.0 crypto-dev-signer>=0.4.15rc2,<0.5.0 diff --git a/apps/cic-ussd/cic_ussd/version.py b/apps/cic-ussd/cic_ussd/version.py index 3c7d24bf..c12829b9 100644 --- a/apps/cic-ussd/cic_ussd/version.py +++ b/apps/cic-ussd/cic_ussd/version.py @@ -1,7 +1,7 @@ # standard imports import semver -version = (0, 3, 1, 'alpha.5') +version = (0, 3, 1, 'alpha.6') version_object = semver.VersionInfo( major=version[0], diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index e4339004..a519ed96 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -6,7 +6,7 @@ celery==4.4.7 cffi==1.14.6 cic-eth~=0.12.5a1 cic-notify~=0.4.0a11 -cic-types~=0.2.0a6 +cic-types~=0.2.1a2 confini>=0.3.6rc4,<0.5.0 phonenumbers==8.12.12 psycopg2==2.8.6