Add anchors for nodes

.gitlab-ci.yml

@@ -10,7 +10,6 @@ include:
     #- local: 'apps/data-seeding/.gitlab-ci.yml'
 
 stages:
-  - version
   - build
   - test
   - deploy
@@ -21,41 +20,9 @@ variables:
   DOCKER_BUILDKIT: "1"
   COMPOSE_DOCKER_CLI_BUILD: "1"
   CI_DEBUG_TRACE: "true"
-  SEMVERBOT_VERSION: "0.2.0"
 
-  #before_script:
-  #  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
-version:
-  #image: python:3.7-stretch
-  image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-version:b01318ae 
-  stage: version
-  tags:
-    - integration
-  script:
-    - mkdir -p ~/.ssh && chmod 700 ~/.ssh
-    - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
-    - eval $(ssh-agent -s)
-    - ssh-add <(echo "$SSH_PRIVATE_KEY")
-    - git remote set-url origin git@gitlab.com:grassrootseconomics/cic-internal-integration.git
-    - export TAG=$(sbot predict version -m auto)
-    - |
-      if [[ -z $TAG ]]
-      then
-        echo "tag could not be set $@"
-        exit 1
-      fi
-    - echo $TAG > version
-    - git tag -a v$TAG -m "ci tagged"
-    - git push origin v$TAG
-  artifacts:
-    paths:
-      - version
-  rules:
-  - if: $CI_COMMIT_REF_PROTECTED == "true"
-    when: always
-  - if: $CI_COMMIT_REF_NAME == "master"
-    when: always
+before_script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
 # runs on protected branches and pushes to repo
 build-push:
@@ -63,17 +30,12 @@ build-push:
   tags:
     - integration
   #script:
-  #  - TAG=$CI_Cbefore_script:
-  before_script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  #  - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
   script:
-    - TAG=latest ./scripts/build-push.sh
-    - TAG=$(cat ./version) ./scripts/build-push.sh
+    - TAG=latest sh ./scripts/build-push.sh
   rules:
   - if: $CI_COMMIT_REF_PROTECTED == "true"
     when: always
-  - if: $CI_COMMIT_REF_NAME == "master"
-    when: always
 
 deploy-dev:
   stage: deploy

.gitlab/issue_templates/bug.md

@@ -1,44 +0,0 @@
-<!---
-Please read this!
-
-Before opening a new issue, make sure to search for keywords in the issues
-filtered by the "bug" label:
-
-- https://gitlab.com/groups/grassrootseconomics/-/issues?scope=all&state=all&label_name[]=bug
-
-and verify the issue you're about to submit isn't a duplicate.
---->
-
-### Summary
-
-<!-- Summarize the bug encountered concisely. -->
-
-### Steps to reproduce
-
-<!-- Describe how one can reproduce the issue - this is very important. Please use an ordered list. -->
-
-### Example Project
-
-<!-- If possible, please create an example project here on GitLab.com that exhibits the problematic 
-behavior, and link to it here in the bug report. If you are using an older version of GitLab, this 
-will also determine whether the bug is fixed in a more recent version. -->
-
-### What is the current *bug* behavior?
-
-<!-- Describe what actually happens. -->
-
-### What is the expected *correct* behavior?
-
-<!-- Describe what you should see instead. -->
-
-### Relevant logs and/or screenshots
-
-<!-- Paste any relevant logs - please use code blocks (```) to format console output, logs, and code
- as it's tough to read otherwise. -->
-
-
-### Possible fixes
-
-<!-- If you can, link to the line of code that might be responsible for the problem. -->
-
-/label ~"bug"

.semverbot.toml

@@ -1,16 +0,0 @@
-[git]
-
-[git.config]
-email = "semverbot@grassroots.org"
-name = "semvervot"
-
-[git.tags]
-prefix = "v"
-
-[semver]
-mode = "git-commit"
-
-[semver.detection]
-patch = ["fix", "[fix]", "patch", "[patch]"]
-minor = ["minor", "[minor]", "feat", "[feat]", "release", "[release]", "bump", "[bump]"]
-major = ["BREAKING CHANGE"]

CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Code of Conduct
-
-By contributing toward this project you agree to the following code of conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-- Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
-- Focusing on what is best for the community
-- Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-- The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at info@grassecon.org . All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
-
-...Try to keep in mind the immortal
-words of Bill and Ted, "Be excellent to each other."
-
-These documents are licensed under Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) https://creativecommons.org/licenses/by-sa/4.0/
-And further any software Grassrotos Economics supports is under licenced under GNU GENERAL PUBLIC LICENSE Version 3 https://www.gnu.org/licenses/

CONTRIBUTING.md

@@ -1,66 +0,0 @@
-# Contribution Guidelines
-
-**Karibu sana!** Hello and welcome to the Grassroots Economics [project](https://gitlab.com/grassrootseconomics). This guide will help you understand the overall
-organization of the CIC project to get you started with contributing to the project. You'll be able to pick up issues, write code to fix them, and get your work reviewed and merged.
-
-## Table of Contents
-
-- [Prerequisites](#Prerequisites)
-- [Scope of contributions](#Scope-of-contributions)
-- [Issues](#Issues)
-  - [Bugs](#Bugs)
-  - [Good first issues](#Good-first-issues)
-- [Git guidelines](#Git-guidelines)
-- [Merge request processs](#Merge-request-processs)
-- [Environment setup](#Environment-setup)
-- [Code style](#Code-style)
-- [Building-and-testing](#Building-and-testing)
-
-## Prerequisites
-
-Before contributing to the CIC Stack, ensure you have:
-
-- Read and accepted to abide by the Code of Conduct
-<!-- TODO: Add link to CoC -->
-- Read and accepted the Developers Certificate of Origin
-<!-- TODO: Add link to DCO -->
-
-## Scope of contributions
-
-We generally welcome all sorts or contributions. No contribution is too small. We gladly accept contributions such as:
-
-- Documentation improvements including inline documentation or even minor typos
-- Answering questions in issue discussions and pull requests
-- Fixing known bugs on our issue tracker
-- Reporting unknown bugs
-<!-- TODO: Add resposible disclosure guidelines -->
-- Securty issues through responsible disclosure
-
-## Issues
-
-Use the existing issue template and issue tags to correctly catagorize and issue when creating issues. Make sure to search for duplicated before creating a new issue.
-
-### Bugs
-
-If a bug is encountered and you can reproduce it:
-
-- Define its priority with an issue tag
-- Describe the steps to reproduce it while providing the version of the bugged service/library and your environment setup
-
-### Good first issues
-
-These are pre-tagged issues which are friendly (low barrier to entry and clearly defined tasks) for new contributors to get aquinted to the project.
-
-## Git guideleines
-
-<!-- TODO: Review after finalzing branching or forking model -->
-
-## Merge request process
-
-<!-- TODO: Review after core_contrib -->
-
-## Environment setup
-
-## Code style
-
-## Building and testing

LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    cic-internal-integration
-    Copyright (C) 2021  Grassroots Economics
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

README.md

@@ -1,24 +1,40 @@
-## Community Inclusion Currency Stack (CIC Stack)
+# cic-internal-integration
 
-A custodial wallet and blockchain bidirectional interface engine for community inclusion currencies. Check the [CIC Stack summary](https://docs.grassecon.org/software) page for more information.
+## Getting started 
 
-### Contributing
+This repo uses docker-compose and docker buildkit. Set the following environment variables to get started:
 
-See our [contribution guidelines](https://docs.grassecon.org/community/contrib/) for more details on:
+```
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
+```
 
-- Environment setup
-- Source Code Management (SCM) guidelines
-- Filing issues
+start services, database, redis and local ethereum node
+```
+docker-compose up -d
+```
 
-#### Code of Conduct
+Run app/contract-migration to deploy contracts
+```
+RUN_MASK=3 docker-compose up contract-migration
+```
 
-This project is released with a [Code of Conduct](https://docs.grassecon.org/community/conduct/). By participating in this project you agree to abide by its terms.
+stop cluster
+```
+docker-compose down
+```
 
-### Community
+stop cluster and delete data
+```
+docker-compose down -v --remove-orphans
+```
 
-- [Mattermost](https://chat.grassrootseconomics.net/cic/channels/dev)
-- [Discord](https://discord.gg/ud32KMgH76)
+rebuild an images
+```
+docker-compose up --build <service_name>
+```
 
-### License
-
-Licensed under [GNU AGPLv3](https://gitlab.com/grassrootseconomics/cic-internal-integration/-/blob/master/LICENSE).
+to delete the buildkit cache
+```
+docker builder prune --filter type=exec.cachemount
+```

apps/cic-cache/cic_cache/cli/arg.py

@@ -14,7 +14,7 @@ class ArgumentParser(BaseArgumentParser):
         if local_arg_flags & CICFlag.CELERY:
             self.add_argument('-q', '--celery-queue', dest='celery_queue', type=str, default='cic-cache', help='Task queue')
         if local_arg_flags & CICFlag.SYNCER:
-            self.add_argument('--offset', type=int, help='Start block height for initial history sync')
+            self.add_argument('--offset', type=int, default=0, help='Start block height for initial history sync')
             self.add_argument('--no-history', action='store_true', dest='no_history', help='Skip initial history sync')
         if local_arg_flags & CICFlag.CHAIN:
             self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')

apps/cic-cache/cic_cache/runnable/daemons/tracker.py

@@ -95,10 +95,10 @@ def main():
     syncer_backends = SQLBackend.resume(chain_spec, block_offset)
 
     if len(syncer_backends) == 0:
-        initial_block_start = int(config.get('SYNCER_OFFSET'))
-        initial_block_offset = int(block_offset)
+        initial_block_start = config.get('SYNCER_OFFSET')
+        initial_block_offset = block_offset
         if config.get('SYNCER_NO_HISTORY'):
-            initial_block_start = initial_block_offset
+            initial_block_start = block_offset
             initial_block_offset += 1
         syncer_backends.append(SQLBackend.initial(chain_spec, initial_block_offset, start_block_height=initial_block_start))
         logg.info('found no backends to resume, adding initial sync from history start {} end {}'.format(initial_block_start, initial_block_offset))

apps/cic-cache/docker/Dockerfile

@@ -1,16 +1,19 @@
-ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
+ARG DOCKER_REGISTRY=registry.gitlab.com/grassrootseconomics
 
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
+FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
 
 COPY requirements.txt .
 
-ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net"
+RUN apt-get install libffi-dev -y
+
+ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL="https://pypi.org/simple"
 
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
+RUN    pip install --index-url $PIP_INDEX_URL \
     --pre \
+    --force-reinstall \
+    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt
 

apps/cic-cache/docker/db.sh

@@ -2,5 +2,5 @@
 
 set -e
 >&2 echo executing database migration
-python scripts/migrate.py --migrations-dir /usr/local/share/cic-cache/alembic -vv
+python scripts/migrate.py -c /usr/local/etc/cic-cache --migrations-dir /usr/local/share/cic-cache/alembic -vv
 set +e

apps/cic-cache/docker/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pip install --extra-index-url https://pip.grassrootseconomics.net \
+pip install --extra-index-url https://pip.grassrootseconomics.net:8433 \
 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
 -r test_requirements.txt 
 

apps/cic-cache/scripts/migrate.py

@@ -17,12 +17,11 @@ logg = logging.getLogger()
 rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 dbdir = os.path.join(rootdir, 'cic_cache', 'db')
 migrationsdir = os.path.join(dbdir, 'migrations')
-configdir = os.path.join(rootdir, 'cic_cache', 'data', 'config')
 
-#config_dir = os.path.join('/usr/local/etc/cic-cache')
+config_dir = os.path.join('/usr/local/etc/cic-cache')
 
 argparser = argparse.ArgumentParser()
-argparser.add_argument('-c', type=str, help='config file')
+argparser.add_argument('-c', type=str, default=config_dir, help='config file')
 argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
 argparser.add_argument('--migrations-dir', dest='migrations_dir', default=migrationsdir, type=str, help='path to alembic migrations directory')
 argparser.add_argument('--reset', action='store_true', help='downgrade before upgrading')
@@ -36,7 +35,7 @@ if args.vv:
 elif args.v:
     logging.getLogger().setLevel(logging.INFO)
 
-config = confini.Config(configdir, args.env_prefix)
+config = confini.Config(args.c, args.env_prefix)
 config.process()
 config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')

apps/cic-eth/cic_eth/api/admin.py

@@ -123,7 +123,7 @@ class AdminApi:
         return s_lock.apply_async()
 
 
-    def tag_account(self, chain_spec, tag, address):
+    def tag_account(self, tag, address_hex, chain_spec):
         """Persistently associate an address with a plaintext tag.
 
         Some tags are known by the system and is used to resolve addresses to use for certain transactions. 
@@ -138,7 +138,7 @@ class AdminApi:
             'cic_eth.eth.account.set_role',
             [
                 tag,
-                address,
+                address_hex,
                 chain_spec.asdict(),
                 ],
             queue=self.queue,
@@ -146,30 +146,6 @@ class AdminApi:
         return s_tag.apply_async()
 
 
-    def get_tag_account(self, chain_spec, tag=None, address=None):
-        if address != None:
-            s_tag = celery.signature(
-                'cic_eth.eth.account.role',
-                [
-                    address,
-                    chain_spec.asdict(),
-                    ],
-                queue=self.queue,
-                )
-
-        else:
-            s_tag = celery.signature(
-                'cic_eth.eth.account.role_account',
-                [
-                    tag,
-                    chain_spec.asdict(),
-                ],
-                queue=self.queue,
-                )
-
-        return s_tag.apply_async()
-
-
     def have_account(self, address_hex, chain_spec):
         s_have = celery.signature(
             'cic_eth.eth.account.have',
@@ -527,7 +503,7 @@ class AdminApi:
                     queue=self.queue,
                     )
                 t = s.apply_async()
-                role = t.get()[0][1]
+                role = t.get()
                 if role != None:
                     tx['sender_description'] = role
 
@@ -580,7 +556,7 @@ class AdminApi:
                     queue=self.queue,
                     )
                 t = s.apply_async()
-                role = t.get()[0][1]
+                role = t.get()
                 if role != None:
                     tx['recipient_description'] = role
 

apps/cic-eth/cic_eth/api/api_task.py

@@ -515,7 +515,7 @@ class Api(ApiBase):
         :param password: Password to encode the password with in the backend (careful, you will have to remember it)
         :type password: str
         :param register: Register the new account in accounts index backend
-        :type register: bool
+        :type password: bool
         :returns: uuid of root task
         :rtype: celery.Task
         """
@@ -683,4 +683,3 @@ class Api(ApiBase):
 
         t = self.callback_success.apply_async([r])
         return t
-

apps/cic-eth/cic_eth/check/gas.py

@@ -12,9 +12,8 @@ from cic_eth.db.models.base import SessionBase
 from cic_eth.db.enum import LockEnum
 from cic_eth.error import LockedError
 from cic_eth.admin.ctrl import check_lock
-from cic_eth.eth.gas import have_gas_minimum
 
-logg = logging.getLogger(__name__)
+logg = logging.getLogger().getChild(__name__)
 
 
 def health(*args, **kwargs):
@@ -32,15 +31,18 @@ def health(*args, **kwargs):
         return True
 
     gas_provider = AccountRole.get_address('GAS_GIFTER', session=session)
-    min_gas = int(config.get('ETH_GAS_HOLDER_MINIMUM_UNITS')) * int(config.get('ETH_GAS_GIFTER_REFILL_BUFFER'))
-    if config.get('ETH_MIN_FEE_PRICE'):
-        min_gas *= int(config.get('ETH_MIN_FEE_PRICE'))
-
-    r = have_gas_minimum(chain_spec, gas_provider, min_gas, session=session)
-
     session.close()
-    
-    if not r:
-        logg.error('EEK! gas gifter has balance {}, below minimum {}'.format(r, min_gas))
 
-    return r
+    rpc = RPCConnection.connect(chain_spec, 'default')
+    o = balance(gas_provider)
+    r = rpc.do(o)
+    try: 
+        r = int(r, 16)
+    except TypeError:
+        r = int(r)
+    gas_min = int(config.get('ETH_GAS_GIFTER_MINIMUM_BALANCE'))
+    if r < gas_min:
+        logg.error('EEK! gas gifter has balance {}, below minimum {}'.format(r, gas_min))
+        return False
+
+    return True

apps/cic-eth/cic_eth/check/start.py

@@ -1,18 +0,0 @@
-# external imports
-from chainlib.chain import ChainSpec
-
-# local imports
-from cic_eth.admin.ctrl import check_lock
-from cic_eth.enum import LockEnum
-from cic_eth.error import LockedError
-
-
-def health(*args, **kwargs):
-    config = kwargs['config']
-    chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-    try:
-        check_lock(None, chain_spec.asdict(), LockEnum.START)
-    except LockedError as e:
-        return False
-    return True

apps/cic-eth/cic_eth/cli/arg.py

@@ -16,22 +16,16 @@ class ArgumentParser(BaseArgumentParser):
             self.add_argument('--redis-port', dest='redis_port', type=int, help='redis host to use for task submission')
             self.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use')
         if local_arg_flags & CICFlag.REDIS_CALLBACK:
-            self.add_argument('--redis-host-callback', dest='redis_host_callback', type=str, help='redis host to use for callback (defaults to redis host)')
-            self.add_argument('--redis-port-callback', dest='redis_port_callback', type=int, help='redis port to use for callback (defaults to redis port)')
+            self.add_argument('--redis-host-callback', dest='redis_host_callback', default='localhost', type=str, help='redis host to use for callback')
+            self.add_argument('--redis-port-callback', dest='redis_port_callback', default=6379, type=int, help='redis port to use for callback')
             self.add_argument('--redis-timeout', default=20.0, type=float, help='Redis callback timeout')
         if local_arg_flags & CICFlag.CELERY:
-            self.add_argument('--celery-scheme', type=str, help='Celery broker scheme (defaults to "redis")')
-            self.add_argument('--celery-host', type=str, help='Celery broker host (defaults to redis host)')
-            self.add_argument('--celery-port', type=str, help='Celery broker port (defaults to redis port)')
-            self.add_argument('--celery-db', type=int, help='Celery broker db (defaults to redis db)')
-            self.add_argument('--celery-result-scheme', type=str, help='Celery result backend scheme (defaults to celery broker scheme)')
-            self.add_argument('--celery-result-host', type=str, help='Celery result backend host (defaults to celery broker host)')
-            self.add_argument('--celery-result-port', type=str, help='Celery result backend port (defaults to celery broker port)')
-            self.add_argument('--celery-result-db', type=int, help='Celery result backend db (defaults to celery broker db)')
-            self.add_argument('--celery-no-result', action='store_true', help='Disable the Celery results backend')
             self.add_argument('-q', '--celery-queue', dest='celery_queue', type=str, default='cic-eth', help='Task queue')
         if local_arg_flags & CICFlag.SYNCER:
-            self.add_argument('--offset', type=int, help='Start block height for initial history sync')
+            self.add_argument('--offset', type=int, default=0, help='Start block height for initial history sync')
             self.add_argument('--no-history', action='store_true', dest='no_history', help='Skip initial history sync')
         if local_arg_flags & CICFlag.CHAIN:
             self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')
+
+
+

apps/cic-eth/cic_eth/cli/base.py

@@ -24,8 +24,8 @@ class CICFlag(enum.IntEnum):
     # sync - nibble 4
     SYNCER = 4096
 
-argflag_local_base = argflag_std_base | Flag.CHAIN_SPEC
-argflag_local_task = CICFlag.CELERY
+
+argflag_local_task = CICFlag.CELERY 
 argflag_local_taskcallback = argflag_local_task | CICFlag.REDIS | CICFlag.REDIS_CALLBACK
 argflag_local_chain = CICFlag.CHAIN
 argflag_local_sync = CICFlag.SYNCER | CICFlag.CHAIN

apps/cic-eth/cic_eth/cli/config.py

@@ -1,18 +1,12 @@
 # standard imports
 import os
 import logging
-import urllib.parse
-import copy
 
 # external imports
 from chainlib.eth.cli import (
         Config as BaseConfig,
         Flag,
         )
-from urlybird.merge import (
-        urlhostmerge,
-        urlmerge,
-        )
 
 # local imports
 from .base import CICFlag
@@ -46,7 +40,6 @@ class Config(BaseConfig):
         if local_arg_flags & CICFlag.CHAIN:
             local_args_override['CIC_REGISTRY_ADDRESS'] = getattr(args, 'registry_address')
 
-        
         if local_arg_flags & CICFlag.CELERY:
             local_args_override['CELERY_QUEUE'] = getattr(args, 'celery_queue')
 
@@ -56,61 +49,15 @@ class Config(BaseConfig):
 
         config.dict_override(local_args_override, 'local cli args')
 
-        local_celery_args_override = {}
-        if local_arg_flags & CICFlag.CELERY:
-            hostport = urlhostmerge(
-                    None,
-                    config.get('REDIS_HOST'),
-                    config.get('REDIS_PORT'),
-                    )
-            redis_url = (
-                    'redis',
-                    hostport,
-                    getattr(args, 'redis_db', None),
-                    )
-            celery_config_url = urllib.parse.urlsplit(config.get('CELERY_BROKER_URL'))
-            hostport = urlhostmerge(
-                    celery_config_url[1],
-                    getattr(args, 'celery_host', None),
-                    getattr(args, 'celery_port', None),
-                    )
-            celery_arg_url = (
-                    getattr(args, 'celery_scheme', None),
-                    hostport,
-                    getattr(args, 'celery_db', None),
-                    )
-            celery_url = urlmerge(redis_url, celery_config_url, celery_arg_url)
-            celery_url_string = urllib.parse.urlunsplit(celery_url)
-            local_celery_args_override['CELERY_BROKER_URL'] = celery_url_string
-            if not getattr(args, 'celery_no_result'):
-                local_celery_args_override['CELERY_RESULT_URL'] = config.get('CELERY_RESULT_URL')
-                if local_celery_args_override['CELERY_RESULT_URL'] == None:
-                    local_celery_args_override['CELERY_RESULT_URL'] = local_celery_args_override['CELERY_BROKER_URL']
-                celery_config_url = urllib.parse.urlsplit(local_celery_args_override['CELERY_RESULT_URL'])
-                hostport = urlhostmerge(
-                        celery_config_url[1],
-                        getattr(args, 'celery_result_host', None),
-                        getattr(args, 'celery_result_port', None),
-                        )
-                celery_arg_url = (
-                        getattr(args, 'celery_result_scheme', None),
-                        hostport,
-                        getattr(args, 'celery_result_db', None),
-                        )
-                celery_url = urlmerge(celery_config_url, celery_arg_url)
-                logg.debug('celery url {} {}'.format(celery_config_url, celery_url))
-                celery_url_string = urllib.parse.urlunsplit(celery_url)
-                local_celery_args_override['CELERY_RESULT_URL'] = celery_url_string
-            config.add(config.true('CELERY_DEBUG'), 'CELERY_DEBUG', exists_ok=True)
-
-        config.dict_override(local_celery_args_override, 'local celery cli args')
-
         if local_arg_flags & CICFlag.REDIS_CALLBACK:
-            redis_host_callback = getattr(args, 'redis_host_callback', config.get('REDIS_HOST'))
-            redis_port_callback = getattr(args, 'redis_port_callback', config.get('REDIS_PORT'))
-            config.add(redis_host_callback, '_REDIS_HOST_CALLBACK')
-            config.add(redis_port_callback, '_REDIS_PORT_CALLBACK')
+            config.add(getattr(args, 'redis_host_callback'), '_REDIS_HOST_CALLBACK')
+            config.add(getattr(args, 'redis_port_callback'), '_REDIS_PORT_CALLBACK')
+
+        if local_arg_flags & CICFlag.CELERY:
+            config.add(config.true('CELERY_DEBUG'), 'CELERY_DEBUG', exists_ok=True)
 
         logg.debug('config loaded:\n{}'.format(config))
 
         return config
+
+

apps/cic-eth/cic_eth/data/config/celery.ini

@@ -1,5 +1,5 @@
 [celery]
-broker_url = 
+broker_url = redis://localhost:6379
 result_url = 
 queue = cic-eth
 debug = 0

apps/cic-eth/cic_eth/data/config/cic.ini

@@ -2,5 +2,5 @@
 registry_address = 
 trust_address =
 default_token_symbol =
-health_modules = cic_eth.check.db,cic_eth.check.redis,cic_eth.check.signer,cic_eth.check.gas,cic_eth.check.start
+health_modules = cic_eth.check.db,cic_eth.check.redis,cic_eth.check.signer,cic_eth.check.gas
 run_dir = /run

apps/cic-eth/cic_eth/data/config/eth.ini

@@ -1,6 +1,2 @@
 [eth]
-gas_holder_minimum_units = 180000
-gas_holder_refill_units = 15
-gas_holder_refill_threshold = 3
-gas_gifter_refill_buffer = 3
-min_fee_price = 1
+gas_gifter_minimum_balance = 10000000000000000000000

apps/cic-eth/cic_eth/db/migrations/default/versions/75d4767b3031_lock.py

@@ -23,7 +23,7 @@ def upgrade():
     op.create_table(
             'lock',
             sa.Column('id', sa.Integer, primary_key=True),
-            sa.Column("address", sa.String, nullable=True),
+            sa.Column("address", sa.String(42), nullable=True),
             sa.Column('blockchain', sa.String),
             sa.Column("flags", sa.BIGINT(), nullable=False, default=0),
             sa.Column("date_created", sa.DateTime, nullable=False, default=datetime.datetime.utcnow),

apps/cic-eth/cic_eth/db/migrations/default/versions/c91cafc3e0c1_add_gas_cache.py

@@ -1,31 +0,0 @@
-"""Add gas cache
-
-Revision ID: c91cafc3e0c1
-Revises: aee12aeb47ec
-Create Date: 2021-10-28 20:45:34.239865
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'c91cafc3e0c1'
-down_revision = 'aee12aeb47ec'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    op.create_table(
-            'gas_cache',
-            sa.Column('id', sa.Integer, primary_key=True),
-            sa.Column("address", sa.String, nullable=False),
-            sa.Column("tx_hash", sa.String, nullable=True),
-            sa.Column("method", sa.String, nullable=True),
-            sa.Column("value", sa.BIGINT(), nullable=False),
-            )
-
-
-def downgrade():
-    op.drop_table('gas_cache')

apps/cic-eth/cic_eth/db/models/gas_cache.py

@@ -1,27 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-from sqlalchemy import Column, String, NUMERIC
-
-# local imports
-from .base import SessionBase
-
-logg = logging.getLogger(__name__)
-
-
-class GasCache(SessionBase):
-    """Provides gas budget cache for token operations
-    """
-    __tablename__ = 'gas_cache'
-
-    address = Column(String())
-    tx_hash = Column(String())
-    method = Column(String())
-    value = Column(NUMERIC())
-
-    def __init__(self, address, method, value, tx_hash):
-        self.address = address
-        self.tx_hash = tx_hash
-        self.method = method
-        self.value = value

apps/cic-eth/cic_eth/db/models/nonce.py

@@ -12,7 +12,7 @@ from cic_eth.error import (
         IntegrityError,
         )
 
-logg = logging.getLogger(__name__)
+logg = logging.getLogger()
 
 
 class Nonce(SessionBase):
@@ -21,7 +21,7 @@ class Nonce(SessionBase):
     __tablename__ = 'nonce'
 
     nonce = Column(Integer)
-    address_hex = Column(String(40))
+    address_hex = Column(String(42))
 
 
     @staticmethod

apps/cic-eth/cic_eth/db/models/role.py

@@ -24,22 +24,8 @@ class AccountRole(SessionBase):
     tag = Column(Text)
     address_hex = Column(String(42))
 
-
-    @staticmethod
-    def all(session=None):
-        session = SessionBase.bind_session(session)
-
-        pairs = []
-
-        q = session.query(AccountRole.tag, AccountRole.address_hex)
-        for r in q.all():
-            pairs.append((r[1], r[0]),)
-
-        SessionBase.release_session(session)
-        
-        return pairs
-
-
+    
+    # TODO: 
     @staticmethod
     def get_address(tag, session):
         """Get Ethereum address matching the given tag

apps/cic-eth/cic_eth/enum.py

@@ -69,12 +69,9 @@ class StatusEnum(enum.IntEnum):
 class LockEnum(enum.IntEnum):
     """
     STICKY: When set, reset is not possible
-    INIT: When set, startup is possible without second level sanity checks (e.g. gas gifter balance)
-    START: When set, startup is not possible, regardless of state
     CREATE: Disable creation of accounts
     SEND: Disable sending to network
     QUEUE: Disable queueing new or modified transactions
-    QUERY: Disable all queue state and transaction queries
     """
     STICKY=1
     INIT=2
@@ -82,8 +79,7 @@ class LockEnum(enum.IntEnum):
     SEND=8
     QUEUE=16
     QUERY=32
-    START=int(0x80000000)
-    ALL=int(0x7ffffffe)
+    ALL=int(0xfffffffffffffffe)
 
 
 def status_str(v, bits_only=False):

apps/cic-eth/cic_eth/error.py

@@ -64,10 +64,8 @@ class LockedError(Exception):
 
 class SeppukuError(Exception):
     """Exception base class for all errors that should cause system shutdown
+
     """
-    def __init__(self, message, lockdown=False):
-        self.message = message
-        self.lockdown = lockdown
 
 
 class SignerError(SeppukuError):

apps/cic-eth/cic_eth/eth/account.py

@@ -136,7 +136,7 @@ def register(self, account_address, chain_spec_dict, writer_address=None):
     # Generate and sign transaction
     rpc_signer = RPCConnection.connect(chain_spec, 'signer')
     nonce_oracle = CustodialTaskNonceOracle(writer_address, self.request.root_id, session=session) #, default_nonce)
-    gas_oracle = self.create_gas_oracle(rpc, code_callback=AccountRegistry.gas)
+    gas_oracle = self.create_gas_oracle(rpc, AccountRegistry.gas)
     account_registry = AccountsIndex(chain_spec, signer=rpc_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
     (tx_hash_hex, tx_signed_raw_hex) = account_registry.add(account_registry_address, writer_address, account_address, tx_format=TxFormat.RLP_SIGNED)
     rpc_signer.disconnect()
@@ -192,7 +192,7 @@ def gift(self, account_address, chain_spec_dict):
     # Generate and sign transaction
     rpc_signer = RPCConnection.connect(chain_spec, 'signer')
     nonce_oracle = CustodialTaskNonceOracle(account_address, self.request.root_id, session=session) #, default_nonce)
-    gas_oracle = self.create_gas_oracle(rpc, code_callback=MinterFaucet.gas)
+    gas_oracle = self.create_gas_oracle(rpc, MinterFaucet.gas)
     faucet = Faucet(chain_spec, signer=rpc_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
     (tx_hash_hex, tx_signed_raw_hex) = faucet.give_to(faucet_address, account_address, account_address, tx_format=TxFormat.RLP_SIGNED)
     rpc_signer.disconnect()
@@ -266,46 +266,19 @@ def set_role(self, tag, address, chain_spec_dict):
 
 @celery_app.task(bind=True, base=BaseTask)
 def role(self, address, chain_spec_dict):
-    """Return account role for address and/or role
+    """Return account role for address
 
     :param account: Account to check
     :type account: str, 0x-hex
-    :param chain_spec_dict: Chain spec dict representation
-    :type chain_spec_dict: dict
+    :param chain_str: Chain spec string representation
+    :type chain_str: str
     :returns: Account, or None if not exists
     :rtype: Varies
     """
     session = self.create_session()
     role_tag =  AccountRole.role_for(address, session=session)
     session.close()
-    return [(address, role_tag,)]
-
-
-@celery_app.task(bind=True, base=BaseTask)
-def role_account(self, role_tag, chain_spec_dict):
-    """Return address for role.
-
-    If the role parameter is None, will return addresses for all roles.
-
-    :param role_tag: Role to match
-    :type role_tag: str
-    :param chain_spec_dict: Chain spec dict representation
-    :type chain_spec_dict: dict
-    :returns: List with a single account/tag pair for a single tag, or a list of account and tag pairs for all tags
-    :rtype: list
-    """
-    session = self.create_session()
-
-    pairs = None
-    if role_tag != None:
-        addr = AccountRole.get_address(role_tag, session=session)
-        pairs = [(addr, role_tag,)]
-    else:
-        pairs = AccountRole.all(session=session)
-
-    session.close()
-
-    return pairs
+    return role_tag
 
 
 @celery_app.task(bind=True, base=CriticalSQLAlchemyTask)

apps/cic-eth/cic_eth/eth/erc20.py

@@ -10,9 +10,6 @@ from chainlib.eth.tx import (
         TxFormat,
         unpack,
         )
-from chainlib.eth.contract import (
-        ABIContractEncoder,
-        )
 from cic_eth_registry import CICRegistry
 from cic_eth_registry.erc20 import ERC20Token
 from hexathon import (
@@ -34,8 +31,10 @@ from cic_eth.error import (
         YouAreBrokeError,
         )
 from cic_eth.queue.tx import register_tx
-from cic_eth.eth.gas import create_check_gas_task
-from cic_eth.eth.util import CacheGasOracle
+from cic_eth.eth.gas import (
+        create_check_gas_task,
+        MaxGasOracle,
+        )
 from cic_eth.ext.address import translate_address
 from cic_eth.task import (
         CriticalSQLAlchemyTask,
@@ -155,12 +154,8 @@ def transfer_from(self, tokens, holder_address, receiver_address, value, chain_s
     rpc_signer = RPCConnection.connect(chain_spec, 'signer')
 
     session = self.create_session()
-
     nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
-    enc = ABIContractEncoder()
-    enc.method('transferFrom')
-    method = enc.get()
-    gas_oracle = self.create_gas_oracle(rpc, t['address'], method=method, session=session, min_price=self.min_fee_price)
+    gas_oracle = self.create_gas_oracle(rpc, MaxGasOracle.gas)
     c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
     try:
         (tx_hash_hex, tx_signed_raw_hex) = c.transfer_from(t['address'], spender_address, holder_address, receiver_address, value, tx_format=TxFormat.RLP_SIGNED)
@@ -230,12 +225,8 @@ def transfer(self, tokens, holder_address, receiver_address, value, chain_spec_d
     rpc_signer = RPCConnection.connect(chain_spec, 'signer')
 
     session = self.create_session()
-
-    enc = ABIContractEncoder()
-    enc.method('transfer')
-    method = enc.get()
-    gas_oracle = self.create_gas_oracle(rpc, t['address'], method=method, session=session, min_price=self.min_fee_price)
     nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
+    gas_oracle = self.create_gas_oracle(rpc, MaxGasOracle.gas)
     c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
     try:
         (tx_hash_hex, tx_signed_raw_hex) = c.transfer(t['address'], holder_address, receiver_address, value, tx_format=TxFormat.RLP_SIGNED)
@@ -303,12 +294,8 @@ def approve(self, tokens, holder_address, spender_address, value, chain_spec_dic
     rpc_signer = RPCConnection.connect(chain_spec, 'signer')
 
     session = self.create_session()
-
     nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
-    enc = ABIContractEncoder()
-    enc.method('approve')
-    method = enc.get()
-    gas_oracle = self.create_gas_oracle(rpc, t['address'], method=method, session=session)
+    gas_oracle = self.create_gas_oracle(rpc, MaxGasOracle.gas)
     c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
     try:
         (tx_hash_hex, tx_signed_raw_hex) = c.approve(t['address'], holder_address, spender_address, value, tx_format=TxFormat.RLP_SIGNED)
@@ -395,8 +382,6 @@ def cache_transfer_data(
     sender_address = tx_normalize.wallet_address(tx['from'])
     recipient_address = tx_normalize.wallet_address(tx_data[0])
     token_value = tx_data[1]
-    source_token_address = tx_normalize.executable_address(tx['to'])
-    destination_token_address = source_token_address
 
 
     session = SessionBase.create_session()
@@ -404,8 +389,8 @@ def cache_transfer_data(
             'hash': tx_hash_hex,
             'from': sender_address,
             'to': recipient_address,
-            'source_token': source_token_address,
-            'destination_token': destination_token_address,
+            'source_token': tx['to'],
+            'destination_token': tx['to'],
             'from_value': token_value,
             'to_value': token_value,
             }
@@ -437,16 +422,14 @@ def cache_transfer_from_data(
     spender_address = tx_data[0]
     recipient_address = tx_data[1]
     token_value = tx_data[2]
-    source_token_address = tx_normalize.executable_address(tx['to'])
-    destination_token_address = source_token_address
 
     session = SessionBase.create_session()
     tx_dict = {
             'hash': tx_hash_hex,
             'from': tx['from'],
             'to': recipient_address,
-            'source_token': source_token_address,
-            'destination_token': destination_token_address,
+            'source_token': tx['to'],
+            'destination_token': tx['to'],
             'from_value': token_value,
             'to_value': token_value,
             }
@@ -478,16 +461,14 @@ def cache_approve_data(
     sender_address = tx_normalize.wallet_address(tx['from'])
     recipient_address = tx_normalize.wallet_address(tx_data[0])
     token_value = tx_data[1]
-    source_token_address = tx_normalize.executable_address(tx['to'])
-    destination_token_address = source_token_address
 
     session = SessionBase.create_session()
     tx_dict = {
             'hash': tx_hash_hex,
             'from': sender_address,
             'to': recipient_address,
-            'source_token': source_token_address,
-            'destination_token': destination_token_address,
+            'source_token': tx['to'],
+            'destination_token': tx['to'],
             'from_value': token_value,
             'to_value': token_value,
             }

apps/cic-eth/cic_eth/eth/gas.py

@@ -41,7 +41,6 @@ from chainqueue.db.models.tx import TxCache
 from chainqueue.db.models.otx import Otx
 
 # local imports
-from cic_eth.db.models.gas_cache import GasCache
 from cic_eth.db.models.role import AccountRole
 from cic_eth.db.models.base import SessionBase
 from cic_eth.error import (
@@ -66,56 +65,17 @@ from cic_eth.encode import (
         ZERO_ADDRESS_NORMAL,
         unpack_normal,
         )
-from cic_eth.error import SeppukuError
-from cic_eth.eth.util import MAXIMUM_FEE_UNITS
 
 celery_app = celery.current_app
 logg = logging.getLogger()
 
 
+MAXIMUM_FEE_UNITS = 8000000
 
-@celery_app.task(base=CriticalSQLAlchemyTask)
-def apply_gas_value_cache(address, method, value, tx_hash):
-    return apply_gas_value_cache_local(address, method, value, tx_hash)
+class MaxGasOracle:
 
-
-def apply_gas_value_cache_local(address, method, value, tx_hash, session=None):
-    address = tx_normalize.executable_address(address)
-    tx_hash = tx_normalize.tx_hash(tx_hash)
-    value = int(value)
-
-    session = SessionBase.bind_session(session)
-    q = session.query(GasCache)
-    q = q.filter(GasCache.address==address)
-    q = q.filter(GasCache.method==method)
-    o = q.first()
-
-    if o == None:
-        o = GasCache(address, method, value, tx_hash)
-    elif tx.gas_used > o.value:
-        o.value = value
-        o.tx_hash = strip_0x(tx_hash)
-
-    session.add(o)
-    session.commit()
-
-    SessionBase.release_session(session)
-
-
-def have_gas_minimum(chain_spec, address, min_gas, session=None, rpc=None):
-    if rpc == None:
-        rpc = RPCConnection.connect(chain_spec, 'default')
-    o = balance(add_0x(address))
-    r = rpc.do(o)
-    try: 
-        r = int(r)
-    except ValueError:
-        r = strip_0x(r)
-        r = int(r, 16)
-    logg.debug('have gas minimum {} have gas {} minimum is {}'.format(address, r, min_gas))
-    if r < min_gas:
-        return False
-    return True
+    def gas(code=None):
+        return MAXIMUM_FEE_UNITS
 
 
 def create_check_gas_task(tx_signed_raws_hex, chain_spec, holder_address, gas=None, tx_hashes_hex=None, queue=None):
@@ -397,13 +357,6 @@ def refill_gas(self, recipient_address, chain_spec_dict):
     # set up evm RPC connection
     rpc = RPCConnection.connect(chain_spec, 'default')
 
-    # check the gas balance of the gifter
-    if not have_gas_minimum(chain_spec, gas_provider, self.safe_gas_refill_amount):
-        raise SeppukuError('Noooooooooooo; gas gifter {} is broke!'.format(gas_provider))
-
-    if not have_gas_minimum(chain_spec, gas_provider, self.safe_gas_gifter_balance):
-        logg.error('Gas gifter {} gas balance is below the safe level to operate!'.format(gas_provider))
-    
     # set up transaction builder
     nonce_oracle = CustodialTaskNonceOracle(gas_provider, self.request.root_id, session=session)
     gas_oracle = self.create_gas_oracle(rpc)

apps/cic-eth/cic_eth/eth/util.py

@@ -1,54 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-from chainlib.eth.gas import RPCGasOracle
-from hexathon import strip_0x
-
-# local imports
-from cic_eth.db.models.gas_cache import GasCache
-from cic_eth.encode import tx_normalize
-from cic_eth.db.models.base import SessionBase
-
-MAXIMUM_FEE_UNITS = 8000000
-
-logg = logging.getLogger(__name__)
-
-
-class MaxGasOracle(RPCGasOracle):
-
-    def get_fee_units(self, code=None):
-        return MAXIMUM_FEE_UNITS
-
-
-class CacheGasOracle(MaxGasOracle):
-    """Returns a previously recorded value for fee unit expenditure for a contract call, if it exists. Otherwise returns max units.
-
-    :todo: instead of max units, connect a pluggable gas heuristics engine.
-    """
-
-    def __init__(self, conn, address, method=None, session=None, min_price=None, id_generator=None):
-        super(CacheGasOracle, self).__init__(conn, code_callback=self.get_fee_units, min_price=min_price, id_generator=id_generator)
-        self.value = None
-        self.address = address
-        self.method = method
-
-        address = tx_normalize.executable_address(address)
-        session = SessionBase.bind_session(session)
-        q = session.query(GasCache)
-        q = q.filter(GasCache.address==address)
-        if method != None:
-            method = strip_0x(method)
-            q = q.filter(GasCache.method==method)
-        o = q.first()
-        if o != None:
-            self.value = int(o.value)
-
-        SessionBase.release_session(session)
-
-
-    def get_fee_units(self, code=None):
-        if self.value != None:
-            logg.debug('found stored gas unit value {} for address {} method {}'.format(self.value, self.address, self.method))
-            return self.value
-        return super(CacheGasOracle, self).get_fee_units(code=code)

apps/cic-eth/cic_eth/pytest/fixtures_config.py

@@ -8,14 +8,15 @@ import confini
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = os.path.dirname(os.path.dirname(script_dir))
-config_dir = os.path.join(root_dir, 'cic_eth', 'data', 'config')
 logg = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope='session')
 def load_config():
-    override_config_dir = os.path.join(root_dir, 'config', 'test')
-    conf = confini.Config(config_dir, 'CICTEST', override_dirs=[override_config_dir])
+    config_dir = os.environ.get('CONFINI_DIR')
+    if config_dir == None:
+        config_dir = os.path.join(root_dir, 'config/test')
+    conf = confini.Config(config_dir, 'CICTEST')
     conf.process()
     logg.debug('config {}'.format(conf))
     return conf

apps/cic-eth/cic_eth/queue/balance.py

@@ -72,7 +72,7 @@ def __balance_incoming_compatible(token_address, receiver_address):
     status_compare = dead()
     q = q.filter(Otx.status.op('&')(status_compare)==0)
     # TODO: this can change the result for the recipient if tx is later obsoleted and resubmission is delayed. 
-    #q = q.filter(Otx.status.op('&')(StatusBits.IN_NETWORK)==StatusBits.IN_NETWORK)
+    q = q.filter(Otx.status.op('&')(StatusBits.IN_NETWORK)==StatusBits.IN_NETWORK)
     q = q.filter(TxCache.destination_token_address==token_address)
     delta = 0
     for r in q.all():

apps/cic-eth/cic_eth/runnable/daemons/filters/__init__.py

@@ -3,4 +3,3 @@ from .tx import TxFilter
 from .gas import GasFilter
 from .register import RegistrationFilter
 from .transferauth import TransferAuthFilter
-from .token import TokenFilter

apps/cic-eth/cic_eth/runnable/daemons/filters/token.py

@@ -1,63 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-from eth_erc20 import ERC20
-from chainlib.eth.contract import (
-        ABIContractEncoder,
-        ABIContractType,
-        )
-from chainlib.eth.constant import ZERO_ADDRESS
-from chainlib.eth.address import is_same_address
-from chainlib.eth.error import RequestMismatchException
-from cic_eth_registry import CICRegistry
-from cic_eth_registry.erc20 import ERC20Token
-from eth_token_index import TokenUniqueSymbolIndex
-import celery
-
-# local imports
-from .base import SyncFilter
-
-logg = logging.getLogger(__name__)
-
-
-class TokenFilter(SyncFilter):
-
-    def __init__(self, chain_spec, queue, call_address=ZERO_ADDRESS):
-        self.queue = queue
-        self.chain_spec = chain_spec
-        self.caller_address = call_address
-
-
-    def filter(self, conn, block, tx, db_session=None):
-        if not tx.payload:
-            return (None, None)
-
-        try:
-            r = ERC20.parse_transfer_request(tx.payload)
-        except RequestMismatchException:
-            return (None, None)
-
-        token_address = tx.inputs[0]
-        token = ERC20Token(self.chain_spec, conn, token_address)
-
-        registry = CICRegistry(self.chain_spec, conn)
-        r = registry.by_name(token.symbol, sender_address=self.caller_address)
-        if is_same_address(r, ZERO_ADDRESS):
-            return None
-
-        enc = ABIContractEncoder()
-        enc.method('transfer')
-        method = enc.get()
-
-        s = celery.signature(
-                'cic_eth.eth.gas.apply_gas_value_cache',
-                [
-                    token_address,
-                    method,
-                    tx.gas_used,
-                    tx.hash,
-                    ],
-                queue=self.queue,
-                )
-        return s.apply_async()

apps/cic-eth/cic_eth/runnable/daemons/tasker.py

@@ -67,10 +67,7 @@ from cic_eth.registry import (
         connect_declarator,
         connect_token_registry,
         )
-from cic_eth.task import (
-        BaseTask,
-        CriticalWeb3Task,
-        )
+from cic_eth.task import BaseTask
 
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -79,18 +76,18 @@ arg_flags = cic_eth.cli.argflag_std_read
 local_arg_flags = cic_eth.cli.argflag_local_task
 argparser = cic_eth.cli.ArgumentParser(arg_flags)
 argparser.process_local_flags(local_arg_flags)
+#argparser.add_argument('--default-token-symbol', dest='default_token_symbol', type=str, help='Symbol of default token to use')
 argparser.add_argument('--trace-queue-status', default=None, dest='trace_queue_status', action='store_true', help='set to perist all queue entry status changes to storage')
 argparser.add_argument('--aux-all', action='store_true', help='include tasks from all submodules from the aux module path')
-argparser.add_argument('--min-fee-price', dest='min_fee_price', type=int, help='set minimum fee price for transactions, in wei')
 argparser.add_argument('--aux', action='append', type=str, default=[], help='add single submodule from the aux module path')
 args = argparser.parse_args()
 
 # process config
 extra_args = {
+#    'default_token_symbol': 'CIC_DEFAULT_TOKEN_SYMBOL',
     'aux_all': None,
     'aux': None,
     'trace_queue_status': 'TASKS_TRACE_QUEUE_STATUS',
-    'min_fee_price': 'ETH_MIN_FEE_PRICE',
         }
 config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags)
 
@@ -218,7 +215,6 @@ def main():
     argv.append('-n')
     argv.append(config.get('CELERY_QUEUE'))
 
-    # TODO: More elegant way of setting queue-wide settings
     BaseTask.default_token_symbol = default_token_symbol
     BaseTask.default_token_address = default_token_address
     default_token = ERC20Token(chain_spec, conn, add_0x(BaseTask.default_token_address))
@@ -226,14 +222,6 @@ def main():
     BaseTask.default_token_decimals = default_token.decimals
     BaseTask.default_token_name = default_token.name
     BaseTask.trusted_addresses = trusted_addresses
-    CriticalWeb3Task.safe_gas_refill_amount = int(config.get('ETH_GAS_HOLDER_MINIMUM_UNITS')) * int(config.get('ETH_GAS_HOLDER_REFILL_UNITS'))
-    CriticalWeb3Task.safe_gas_threshold_amount = int(config.get('ETH_GAS_HOLDER_MINIMUM_UNITS')) * int(config.get('ETH_GAS_HOLDER_REFILL_THRESHOLD'))
-    CriticalWeb3Task.safe_gas_gifter_balance = int(config.get('ETH_GAS_HOLDER_MINIMUM_UNITS')) * int(config.get('ETH_GAS_GIFTER_REFILL_BUFFER'))
-    if config.get('ETH_MIN_FEE_PRICE'):
-        BaseTask.min_fee_price = int(config.get('ETH_MIN_FEE_PRICE'))
-        CriticalWeb3Task.safe_gas_threshold_amount *= BaseTask.min_fee_price
-        CriticalWeb3Task.safe_gas_refill_amount *= BaseTask.min_fee_price
-        CriticalWeb3Task.safe_gas_gifter_balance *= BaseTask.min_fee_price
 
     BaseTask.run_dir = config.get('CIC_RUN_DIR')
     logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))

apps/cic-eth/cic_eth/runnable/daemons/tracker.py

@@ -36,7 +36,6 @@ from cic_eth.runnable.daemons.filters import (
         TxFilter,
         RegistrationFilter,
         TransferAuthFilter,
-        TokenFilter,
         )
 from cic_eth.stat import init_chain_stat
 from cic_eth.registry import (
@@ -100,10 +99,10 @@ def main():
     syncer_backends = SQLBackend.resume(chain_spec, block_offset)
 
     if len(syncer_backends) == 0:
-        initial_block_start = int(config.get('SYNCER_OFFSET'))
-        initial_block_offset = int(block_offset)
+        initial_block_start = config.get('SYNCER_OFFSET')
+        initial_block_offset = block_offset
         if config.true('SYNCER_NO_HISTORY'):
-            initial_block_start = initial_block_offset
+            initial_block_start = block_offset
             initial_block_offset += 1
         syncer_backends.append(SQLBackend.initial(chain_spec, initial_block_offset, start_block_height=initial_block_start))
         logg.info('found no backends to resume, adding initial sync from history start {} end {}'.format(initial_block_start, initial_block_offset))
@@ -155,8 +154,6 @@ def main():
 
     gas_filter = GasFilter(chain_spec, config.get('CELERY_QUEUE'))
 
-    token_gas_cache_filter = TokenFilter(chain_spec, config.get('CELERY_QUEUE'))
-
     #transfer_auth_filter = TransferAuthFilter(registry, chain_spec, config.get('_CELERY_QUEUE'))
 
     i = 0
@@ -166,7 +163,6 @@ def main():
         syncer.add_filter(registration_filter)
         # TODO: the two following filter functions break the filter loop if return uuid. Pro: less code executed. Con: Possibly unintuitive flow break
         syncer.add_filter(tx_filter)
-        syncer.add_filter(token_gas_cache_filter)
         #syncer.add_filter(transfer_auth_filter)
         for cf in callback_filters:
             syncer.add_filter(cf)

apps/cic-eth/cic_eth/runnable/tag.py

@@ -8,7 +8,6 @@ import re
 # external imports
 import cic_eth.cli
 from chainlib.chain import ChainSpec
-from chainlib.eth.address import is_address
 from xdg.BaseDirectory import xdg_config_home
 
 # local imports
@@ -22,18 +21,12 @@ logg = logging.getLogger()
 arg_flags = cic_eth.cli.argflag_std_base | cic_eth.cli.Flag.UNSAFE | cic_eth.cli.Flag.CHAIN_SPEC
 local_arg_flags = cic_eth.cli.argflag_local_taskcallback
 argparser = cic_eth.cli.ArgumentParser(arg_flags)
-argparser.add_argument('--set', action='store_true', help='sets the given tag')
-argparser.add_argument('--tag', type=str, help='operate on the given tag')
-argparser.add_positional('address', required=False, type=str, help='address associated with tag')
+argparser.add_positional('tag', type=str, help='address tag')
+argparser.add_positional('address', type=str, help='address')
 argparser.process_local_flags(local_arg_flags)
 args = argparser.parse_args()
 
-extra_args = {
-        'set': None,
-        'tag': None,
-        'address': None,
-        }
-config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags, extra_args=extra_args)
+config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags)
 
 celery_app = cic_eth.cli.CeleryApp.from_config(config)
 
@@ -46,17 +39,7 @@ api = AdminApi(None)
 
 
 def main():
-    if config.get('_ADDRESS') != None and not is_address(config.get('_ADDRESS')):
-        sys.stderr.write('Invalid address {}'.format(config.get('_ADDRESS')))
-        sys.exit(1)
-
-    if config.get('_SET'):
-        admin_api.tag_account(chain_spec, config.get('_TAG'), config.get('_ADDRESS'))
-    else:
-        t = admin_api.get_tag_account(chain_spec, tag=config.get('_TAG'), address=config.get('_ADDRESS'))
-        r = t.get()
-        for v in r:
-            sys.stdout.write('{}\t{}\n'.format(v[1], v[0]))
+    admin_api.tag_account(args.tag, args.address, chain_spec)
 
 
 if __name__ == '__main__':

apps/cic-eth/cic_eth/runnable/transfer.py

@@ -18,7 +18,7 @@ from cic_eth.api import Api
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger('create_account_script')
 
-arg_flags = cic_eth.cli.argflag_local_base
+arg_flags = cic_eth.cli.argflag_std_base
 local_arg_flags = cic_eth.cli.argflag_local_taskcallback
 argparser = cic_eth.cli.ArgumentParser(arg_flags)
 argparser.add_argument('--token-symbol', dest='token_symbol', type=str, help='Token symbol')

apps/cic-eth/cic_eth/runnable/view.py

@@ -16,14 +16,9 @@ import confini
 import celery
 from chainlib.chain import ChainSpec
 from chainlib.eth.connection import EthHTTPConnection
-from hexathon import (
-        add_0x,
-        strip_0x,
-        uniform as hex_uniform,
-        )
+from hexathon import add_0x
 
 # local imports
-import cic_eth.cli
 from cic_eth.api.admin import AdminApi
 from cic_eth.db.enum import (
     StatusEnum,
@@ -36,35 +31,59 @@ logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
 default_format = 'terminal'
+default_config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
 
-arg_flags = cic_eth.cli.argflag_std_base
-local_arg_flags = cic_eth.cli.argflag_local_taskcallback
-argparser = cic_eth.cli.ArgumentParser(arg_flags)
+argparser = argparse.ArgumentParser()
+argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
+argparser.add_argument('-r', '--registry-address', dest='r', type=str, help='CIC registry address')
 argparser.add_argument('-f', '--format', dest='f', default=default_format, type=str, help='Output format')
+argparser.add_argument('--status-raw', dest='status_raw', action='store_true', help='Output status bit enum names only')
+argparser.add_argument('-c', type=str, default=default_config_dir, help='config root to use')
+argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='chain spec')
+argparser.add_argument('-q', type=str, default='cic-eth', help='celery queue to submit transaction tasks to')
+argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
+argparser.add_argument('-v', action='store_true', help='Be verbose')
+argparser.add_argument('-vv', help='be more verbose', action='store_true')
 argparser.add_argument('query', type=str, help='Transaction, transaction hash, account or "lock"')
-argparser.process_local_flags(local_arg_flags)
 args = argparser.parse_args()
 
+if args.v == True:
+    logging.getLogger().setLevel(logging.INFO)
+elif args.vv == True:
+    logging.getLogger().setLevel(logging.DEBUG)
 
-extra_args = {
-    'f': '_FORMAT',
-    'query': '_QUERY',
+
+config_dir = os.path.join(args.c)
+os.makedirs(config_dir, 0o777, True)
+config = confini.Config(config_dir, args.env_prefix)
+config.process()
+args_override = {
+        'ETH_PROVIDER': getattr(args, 'p'),
+        'CIC_CHAIN_SPEC': getattr(args, 'i'),
+        'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
         }
-config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags, extra_args=extra_args)
+# override args
+config.dict_override(args_override, 'cli args')
+config.censor('PASSWORD', 'DATABASE')
+config.censor('PASSWORD', 'SSL')
+logg.debug('config loaded from {}:\n{}'.format(config_dir, config))
 
-celery_app = cic_eth.cli.CeleryApp.from_config(config)
-queue = config.get('CELERY_QUEUE')
+try:
+    config.add(add_0x(args.query), '_QUERY', True)
+except:
+    config.add(args.query, '_QUERY', True)
 
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+celery_app = celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))
 
-# connect to celery
-celery_app = cic_eth.cli.CeleryApp.from_config(config)
+queue = args.q
 
-# set up rpc
-rpc = cic_eth.cli.RPC.from_config(config) #, use_signer=True)
-conn = rpc.get_default()
+chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
 
-admin_api = AdminApi(conn)
+rpc = EthHTTPConnection(args.p)
+
+#registry_address = config.get('CIC_REGISTRY_ADDRESS')
+
+admin_api = AdminApi(rpc)
 
 t = admin_api.registry()
 registry_address = t.get()
@@ -94,7 +113,7 @@ def render_tx(o, **kwargs):
     
     for v in o.get('status_log', []):
         d = datetime.datetime.fromisoformat(v[0])
-        e = status_str(v[1], config.get('_RAW'))
+        e = status_str(v[1], args.status_raw)
         content += '{}: {}\n'.format(d, e)
 
     return content
@@ -135,24 +154,20 @@ def render_lock(o, **kwargs):
 def main():
     txs  = []
     renderer = render_tx
+    if len(config.get('_QUERY')) > 66:
+        #registry = connect_registry(rpc, chain_spec, registry_address)
+        #admin_api.tx(chain_spec, tx_raw=config.get('_QUERY'), registry=registry, renderer=renderer)
+        admin_api.tx(chain_spec, tx_raw=config.get('_QUERY'), renderer=renderer)
+    elif len(config.get('_QUERY')) > 42:
+        #registry = connect_registry(rpc, chain_spec, registry_address)
+        #admin_api.tx(chain_spec, tx_hash=config.get('_QUERY'), registry=registry, renderer=renderer)
+        admin_api.tx(chain_spec, tx_hash=config.get('_QUERY'), renderer=renderer)
 
-    query = config.get('_QUERY')
-    try:
-        query = hex_uniform(strip_0x(query))
-    except TypeError:
-        pass
-    except ValueError:
-        pass
-
-    if len(query) > 64:
-        admin_api.tx(chain_spec, tx_raw=query, renderer=renderer)
-    elif len(query) > 40:
-        admin_api.tx(chain_spec, tx_hash=query, renderer=renderer)
-
-    elif len(query) == 40:
-        txs = admin_api.account(chain_spec, query, include_recipient=False, renderer=render_account)
+    elif len(config.get('_QUERY')) == 42:
+        #registry = connect_registry(rpc, chain_spec, registry_address)
+        txs = admin_api.account(chain_spec, config.get('_QUERY'), include_recipient=False, renderer=render_account)
         renderer = render_account
-    elif len(query) >= 4 and query[:4] == 'lock':
+    elif len(config.get('_QUERY')) >= 4 and config.get('_QUERY')[:4] == 'lock':
         t = admin_api.get_lock()
         txs = t.get()
         renderer = render_lock
@@ -160,7 +175,7 @@ def main():
             r = renderer(txs)
             sys.stdout.write(r + '\n')
     else:
-        raise ValueError('cannot parse argument {}'.format(query))
+        raise ValueError('cannot parse argument {}'.format(config.get('_QUERY')))
                    
 
 if __name__ == '__main__':

apps/cic-eth/cic_eth/task.py

@@ -17,7 +17,6 @@ from cic_eth_registry.error import UnknownContractError
 # local imports
 from cic_eth.error import SeppukuError
 from cic_eth.db.models.base import SessionBase
-from cic_eth.eth.util import CacheGasOracle
 
 #logg = logging.getLogger().getChild(__name__)
 logg = logging.getLogger()
@@ -30,32 +29,14 @@ class BaseTask(celery.Task):
     session_func = SessionBase.create_session
     call_address = ZERO_ADDRESS
     trusted_addresses = []
-    min_fee_price = 1
+    create_nonce_oracle = RPCNonceOracle
+    create_gas_oracle = RPCGasOracle
     default_token_address = None
     default_token_symbol = None
     default_token_name = None
     default_token_decimals = None
     run_dir = '/run'
 
-
-    def create_gas_oracle(self, conn, address=None, *args, **kwargs):
-        if address == None:
-            return RPCGasOracle(
-                conn,
-                code_callback=kwargs.get('code_callback'),
-                min_price=self.min_fee_price,
-                id_generator=kwargs.get('id_generator'),
-                )
-
-        return CacheGasOracle(
-                conn,
-                address,
-                method=kwargs.get('method'),
-                min_price=self.min_fee_price,
-                id_generator=kwargs.get('id_generator'),
-                )
-
-
     def create_session(self):
         return BaseTask.session_func()
 
@@ -97,18 +78,19 @@ class CriticalWeb3Task(CriticalTask):
     autoretry_for = (
         ConnectionError,
         )
-    safe_gas_threshold_amount = 60000 * 3
+    safe_gas_threshold_amount = 2000000000 * 60000 * 3
     safe_gas_refill_amount = safe_gas_threshold_amount * 5 
-    safe_gas_gifter_balance = safe_gas_threshold_amount * 5 * 100
 
 
-class CriticalSQLAlchemyAndWeb3Task(CriticalWeb3Task):
+class CriticalSQLAlchemyAndWeb3Task(CriticalTask):
     autoretry_for = (
         sqlalchemy.exc.DatabaseError,
         sqlalchemy.exc.TimeoutError,
         ConnectionError,
         sqlalchemy.exc.ResourceClosedError,
         )
+    safe_gas_threshold_amount = 2000000000 * 60000 * 3
+    safe_gas_refill_amount = safe_gas_threshold_amount * 5 
 
 
 class CriticalSQLAlchemyAndSignerTask(CriticalTask):
@@ -118,11 +100,14 @@ class CriticalSQLAlchemyAndSignerTask(CriticalTask):
         sqlalchemy.exc.ResourceClosedError,
         ) 
 
-class CriticalWeb3AndSignerTask(CriticalWeb3Task):
+class CriticalWeb3AndSignerTask(CriticalTask):
     autoretry_for = (
         ConnectionError,
         )
-    
+    safe_gas_threshold_amount = 2000000000 * 60000 * 3
+    safe_gas_refill_amount = safe_gas_threshold_amount * 5 
+
+
 @celery_app.task()
 def check_health(self):
     pass

apps/cic-eth/cic_eth/version.py

@@ -10,7 +10,7 @@ version = (
         0,
         12,
         4,
-        'alpha.14',
+        'alpha.13',
         )
 
 version_object = semver.VersionInfo(

apps/cic-eth/config/test/accounts.ini

@@ -0,0 +1,2 @@
+[accounts]
+writer_address = 

apps/cic-eth/config/test/bancor.ini

@@ -0,0 +1,2 @@
+[bancor]
+dir = tests/testdata/bancor

apps/cic-eth/config/test/celery.ini

@@ -1,3 +1,5 @@
 [celery]
 broker_url = filesystem://
 result_url = filesystem://
+#broker_url = redis://
+#result_url = redis://

apps/cic-eth/config/test/chain.ini

@@ -0,0 +1,2 @@
+[chain]
+spec =

apps/cic-eth/config/test/cic.ini

@@ -0,0 +1,4 @@
+[cic]
+registry_address = 
+chain_spec = 
+trust_address =

apps/cic-eth/config/test/dispatcher.ini

@@ -0,0 +1,2 @@
+[dispatcher]
+loop_interval = 0.1

apps/cic-eth/config/test/eth.ini

@@ -0,0 +1,8 @@
+[eth]
+#ws_provider = ws://localhost:8546
+#ttp_provider = http://localhost:8545
+provider = http://localhost:8545
+gas_provider_address = 
+#chain_id = 
+abi_dir = 
+faucet_giver_address = 

apps/cic-eth/config/test/signer.ini

@@ -1,2 +1,5 @@
 [signer]
-provider = /run/crypto-dev-signer/jsonrpc.ipc
+socket_path = /run/crypto-dev-signer/jsonrpc.ipc
+secret = deedbeef
+database_name = signer_test
+dev_keys_path = 

apps/cic-eth/config/test/ssl.ini

@@ -0,0 +1,6 @@
+[SSL]
+enable_client = false
+cert_file = 
+key_file =
+password = 
+ca_file =

apps/cic-eth/config/test/syncer.ini

@@ -0,0 +1,2 @@
+[SYNCER]
+loop_interval = 1

apps/cic-eth/docker/Dockerfile

@@ -1,32 +1,36 @@
 ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
 
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
+FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
 
 # Copy just the requirements and install....this _might_ give docker a hint on caching but we 
 # do load these all into setup.py later
 # TODO can we take all the requirements out of setup.py and just do a pip install -r requirements.txt && python setup.py
 #COPY cic-eth/requirements.txt .
 
-ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net
+ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL=https://pypi.org/simple
 
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
+RUN apt-get install libffi-dev
+
+RUN    pip install --index-url $PIP_INDEX_URL \
     --pre \
+    --force-reinstall \
+    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
-    cic-eth-aux-erc20-demurrage-token~=0.0.2a7
+        cic-eth-aux-erc20-demurrage-token~=0.0.2a7
 
 
 COPY *requirements.txt ./
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
+RUN    pip install --index-url $PIP_INDEX_URL \
     --pre \
+    --force-reinstall \
+    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt \
     -r services_requirements.txt \
     -r admin_requirements.txt 
-
+  
 COPY . .
 RUN python setup.py install
 

apps/cic-eth/docker/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pip install --extra-index-url https://pip.grassrootseconomics.net --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
+pip install --extra-index-url https://pip.grassrootseconomics.net:8433 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
 -r admin_requirements.txt \
 -r services_requirements.txt \
 -r test_requirements.txt  

apps/cic-eth/requirements.txt

@@ -1,4 +1,4 @@
 celery==4.4.7
-chainlib-eth>=0.0.10a20,<0.1.0
+chainlib-eth>=0.0.10a4,<0.1.0
 semver==2.13.0
-urlybird~=0.0.1a2
+crypto-dev-signer>=0.4.15rc2,<0.5.0

apps/cic-eth/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = cic-eth
 #version = attr: cic_eth.version.__version_string__
-version = 0.12.5a2
+version = 0.12.4a13
 description = CIC Network Ethereum interaction 
 author = Louis Holbrook
 author_email = dev@holbrook.no

apps/cic-eth/tests/filters/test_token_filter.py

@@ -1,97 +0,0 @@
-# external imports
-from eth_erc20 import ERC20
-from chainlib.connection import RPCConnection
-from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.gas import (
-        Gas,
-        OverrideGasOracle,
-        )
-from chainlib.eth.tx import (
-        TxFormat,
-        receipt,
-        raw,
-        unpack,
-        Tx,
-        )
-from chainlib.eth.block import (
-        Block,
-        block_latest,
-        block_by_number,
-        )
-from chainlib.eth.address import is_same_address
-from chainlib.eth.contract import ABIContractEncoder
-from hexathon import strip_0x
-from eth_token_index import TokenUniqueSymbolIndex
-
-# local imports
-from cic_eth.runnable.daemons.filters.token import TokenFilter
-from cic_eth.db.models.gas_cache import GasCache
-from cic_eth.db.models.base import SessionBase
-
-
-def test_filter_gas(
-        default_chain_spec,
-        init_database,
-        eth_rpc,
-        eth_signer,
-        contract_roles,
-        agent_roles,
-        token_roles,
-        foo_token,
-        token_registry,
-        register_lookups,
-        celery_session_worker,
-        cic_registry,
-    ):
-
-    rpc = RPCConnection.connect(default_chain_spec, 'default')
-    nonce_oracle = RPCNonceOracle(token_roles['FOO_TOKEN_OWNER'], eth_rpc)
-    gas_oracle = OverrideGasOracle(price=1000000000, limit=1000000)
-    c = ERC20(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)
-    (tx_hash_hex, tx_signed_raw_hex) = c.transfer(foo_token, token_roles['FOO_TOKEN_OWNER'], agent_roles['ALICE'], 100, tx_format=TxFormat.RLP_SIGNED)
-    o = raw(tx_signed_raw_hex)
-    eth_rpc.do(o)
-    o = receipt(tx_hash_hex)
-    rcpt = eth_rpc.do(o)
-    assert rcpt['status'] == 1
-
-    fltr = TokenFilter(default_chain_spec, queue=None, call_address=agent_roles['ALICE'])
-
-    o = block_latest()
-    r = eth_rpc.do(o)
-    o = block_by_number(r, include_tx=False)
-    r = eth_rpc.do(o)
-    block = Block(r)
-    block.txs = [tx_hash_hex]
-
-    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
-    tx_src = unpack(tx_signed_raw_bytes, default_chain_spec)
-    tx = Tx(tx_src, block=block)
-    tx.apply_receipt(rcpt)
-    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
-    assert t == None
-
-    nonce_oracle = RPCNonceOracle(contract_roles['CONTRACT_DEPLOYER'], eth_rpc)
-    c = TokenUniqueSymbolIndex(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle)
-    (tx_hash_hex_register, o) = c.register(token_registry, contract_roles['CONTRACT_DEPLOYER'], foo_token)
-    eth_rpc.do(o)
-    o = receipt(tx_hash_hex)
-    r = eth_rpc.do(o)
-    assert r['status'] == 1
-
-    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
-    r = t.get_leaf()
-    assert t.successful()
-
-    q = init_database.query(GasCache)
-    q = q.filter(GasCache.tx_hash==strip_0x(tx_hash_hex))
-    o = q.first()
-
-    assert is_same_address(o.address, strip_0x(foo_token))
-    assert o.value > 0
-
-    enc = ABIContractEncoder()
-    enc.method('transfer')
-    method = enc.get()
-
-    assert o.method == method

apps/cic-eth/tests/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pip install --extra-index-url https://pip.grassrootseconomics.net --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
+pip install --extra-index-url https://pip.grassrootseconomics.net:8433 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
 -r admin_requirements.txt
 -r services_requirements.txt
 -r test_requirements.txt 

apps/cic-eth/tests/task/api/test_admin.py

@@ -103,11 +103,11 @@ def test_tag_account(
 
     api = AdminApi(eth_rpc, queue=None)
 
-    t = api.tag_account(default_chain_spec, 'foo', agent_roles['ALICE'])
+    t = api.tag_account('foo', agent_roles['ALICE'], default_chain_spec)
     t.get()
-    t = api.tag_account(default_chain_spec, 'bar', agent_roles['BOB'])
+    t = api.tag_account('bar', agent_roles['BOB'], default_chain_spec)
     t.get()
-    t = api.tag_account(default_chain_spec, 'bar', agent_roles['CAROL'])
+    t = api.tag_account('bar', agent_roles['CAROL'], default_chain_spec)
     t.get()
 
     assert AccountRole.get_address('foo', init_database) == tx_normalize.wallet_address(agent_roles['ALICE'])

apps/cic-eth/tests/task/test_task_account.py

@@ -141,57 +141,9 @@ def test_role_task(
             )
     t = s.apply_async()
     r = t.get()
-    assert r[0][0] == address
-    assert r[0][1] == 'foo'
+    assert r == 'foo'
 
 
-def test_get_role_task(
-        init_database,
-        celery_session_worker,
-        default_chain_spec,
-        ):
-    address_foo = '0x' + os.urandom(20).hex()
-    role_foo = AccountRole.set('foo', address_foo)
-    init_database.add(role_foo)
-
-    address_bar = '0x' + os.urandom(20).hex()
-    role_bar = AccountRole.set('bar', address_bar)
-    init_database.add(role_bar)
-
-    init_database.commit()
-
-    s = celery.signature(
-            'cic_eth.eth.account.role_account',
-            [
-                'bar',
-                default_chain_spec.asdict(),
-                ],
-            queue=None,
-            )
-    t = s.apply_async()
-    r = t.get()
-    assert r[0][0] == address_bar
-    assert r[0][1] == 'bar'
-
-    s = celery.signature(
-            'cic_eth.eth.account.role_account',
-            [
-                None,
-                default_chain_spec.asdict(),
-                ],
-            queue=None,
-            )
-    t = s.apply_async()
-    r = t.get()
-    x_tags = ['foo', 'bar']
-    x_addrs = [address_foo, address_bar]
-
-    for v in r:
-        x_addrs.remove(v[0])
-        x_tags.remove(v[1])
-    
-    assert len(x_tags) == 0
-    assert len(x_addrs) == 0
 
 def test_gift(
     init_database,

apps/cic-meta/docker/Dockerfile

@@ -1,4 +1,5 @@
 FROM node:15.3.0-alpine3.10
+#FROM node:lts-alpine3.14
 
 WORKDIR /root
 
@@ -13,7 +14,6 @@ RUN npm config set registry=${NPM_REPOSITORY}
 COPY package.json package-lock.json ./
 RUN --mount=type=cache,mode=0755,target=/root/.npm \
     npm set cache /root/.npm && \
-    npm cache verify && \
     npm ci --verbose
 
 COPY webpack.config.js ./

apps/cic-meta/scripts/server/server.ts

@@ -193,7 +193,6 @@ async function processRequest(req, res) {
 						res.end();
 						return;
 					}
-					content = '';
 					break;
 
 				case 'get:automerge:client':
@@ -252,7 +251,7 @@ async function processRequest(req, res) {
 		}
 
 		if (content === undefined) {
-			console.error('empty content', mod, digest, data);
+			console.error('empty content', data);
 			res.writeHead(404, {"Content-Type": "text/plain"});
 			res.end();
 			return;

apps/cic-notify/cic_notify/version.py

@@ -9,7 +9,7 @@ import semver
 
 logg = logging.getLogger()
 
-version = (0, 4, 0, 'alpha.11')
+version = (0, 4, 0, 'alpha.10')
 
 version_object = semver.VersionInfo(
         major=version[0],

apps/cic-notify/docker/Dockerfile

@@ -1,21 +1,18 @@
-ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
-
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
+# syntax = docker/dockerfile:1.2
+FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
 
 #RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62
 RUN apt-get install libffi-dev -y
 
 
-ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net
+ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL=https://pypi.org/simple
 
 COPY requirements.txt .
 
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
-    --pre \
-    --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
+RUN  pip install --index-url $PIP_INDEX_URL  \
+	  --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt
 
 COPY . .

apps/cic-notify/docker/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-pip install --extra-index-url https://pip.grassrootseconomics.net \
+pip install --extra-index-url https://pip.grassrootseconomics.net:8433 \
 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
 -r test_requirements.txt 
 

apps/cic-notify/requirements.txt

@@ -1,8 +1,7 @@
-confini>=0.3.6rc4,<0.5.0
+confini~=0.4.1a1
 africastalking==1.2.3
 SQLAlchemy==1.3.20
 alembic==1.4.2
 psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
-semver==2.13.0

apps/cic-signer/Dockerfile

@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY=registry.gitlab.com/grassrootseconomics
 
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2 as dev
+FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e as dev
 
 WORKDIR /root
 
@@ -8,12 +8,13 @@ RUN apt-get install libffi-dev -y
 
 COPY requirements.txt . 
 
-ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net"
+ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL="https://pypi.org/simple"
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
+RUN    pip install --index-url $PIP_INDEX_URL \
     --pre \
+    --force-reinstall \
+    --no-cache \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt
 

apps/cic-signer/cic_signer/data/config/database.ini

@@ -1,10 +0,0 @@
-[database]
-engine = postgres
-driver = psycopg2
-host = localhost
-port = 5432
-name = cic_signer
-user =
-password =
-debug = 0
-pool_size = 0

apps/cic-signer/cic_signer/data/config/signer.ini

@@ -1,3 +0,0 @@
-[signer]
-provider =
-secret =

apps/cic-signer/requirements.txt

@@ -1,2 +1 @@
 funga-eth[sql]>=0.5.1a1,<0.6.0
-chainlib-eth>=0.0.10a18

apps/cic-signer/scripts/sweep.py

@@ -1,128 +0,0 @@
-# standard imports
-import os
-import logging
-import uuid
-import random
-import sys
-
-# external imports
-from chainlib.chain import ChainSpec
-from chainlib.eth.constant import ZERO_ADDRESS
-from chainlib.eth.gas import (
-        balance,
-        Gas,
-        )
-from hexathon import (
-        add_0x,
-        strip_0x,
-        )
-from chainlib.eth.connection import EthHTTPSignerConnection
-from funga.eth.signer import EIP155Signer
-from funga.eth.keystore.sql import SQLKeystore
-from chainlib.cli.wallet import Wallet
-from chainlib.eth.address import AddressChecksum
-from chainlib.eth.nonce import RPCNonceOracle
-from chainlib.eth.gas import OverrideGasOracle
-from chainlib.eth.address import (
-        is_checksum_address,
-        to_checksum_address,
-        )
-from chainlib.eth.tx import (
-        TxFormat,
-        )
-import chainlib.eth.cli
-
-       
-script_dir = os.path.dirname(os.path.realpath(__file__))
-config_dir = os.path.join(script_dir, '..', 'cic_signer', 'data', 'config')
-
-logging.basicConfig(level=logging.WARNING)
-logg = logging.getLogger()
-
-arg_flags = chainlib.eth.cli.argflag_std_write | chainlib.eth.cli.Flag.WALLET
-argparser = chainlib.eth.cli.ArgumentParser(arg_flags)
-args = argparser.parse_args()
-
-config = chainlib.eth.cli.Config.from_args(args, arg_flags, base_config_dir=config_dir)
-
-# set up rpc
-chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-
-
-# connect to database
-dsn = 'postgresql://{}:{}@{}:{}/{}'.format(
-        config.get('DATABASE_USER'),
-        config.get('DATABASE_PASSWORD'),
-        config.get('DATABASE_HOST'),
-        config.get('DATABASE_PORT'),
-        config.get('DATABASE_NAME'),    
-    )
-logg.info('using dsn {}'.format(dsn))
-
-keystore = SQLKeystore(dsn, symmetric_key=bytes.fromhex(config.get('SIGNER_SECRET')))
-wallet = Wallet(EIP155Signer, keystore=keystore, checksummer=AddressChecksum)
-
-rpc = chainlib.eth.cli.Rpc(wallet=wallet)
-conn = rpc.connect_by_config(config)
-
-wallet.init()
-
-def main():
-    if config.get('_RECIPIENT') == None:
-        sys.stderr.write('Missing sink address\n')
-        sys.exit(1)
-
-    sink_address = config.get('_RECIPIENT')
-    if config.get('_UNSAFE'):
-        sink_address = to_checksum_address(sink_address)
-    if not is_checksum_address(sink_address):
-        sys.stderr.write('Invalid sink address {}\n'.format(sink_address))
-        sys.exit(1)
-
-    if (config.get('_RPC_SEND')):
-        verify_string = random.randbytes(4).hex()
-        verify_string_check = input("\033[;31m*** WARNING! WARNING! WARNING! ***\033[;39m\nThis action will transfer all remaining gas from all accounts in custodial care to account {}. To confirm, please enter the string: {}\n".format(config.get('_RECIPIENT'), verify_string))
-        if verify_string != verify_string_check:
-            sys.stderr.write('Verify string mismatch. Aborting!\n')
-            sys.exit(1)
-
-    signer = rpc.get_signer()
-
-    gas_oracle = rpc.get_gas_oracle()
-    gas_pair = gas_oracle.get_fee()
-    gas_price = gas_pair[0]
-    gas_limit = 21000
-    gas_cost = gas_price * gas_limit
-    gas_oracle = OverrideGasOracle(price=gas_price, limit=gas_limit)
-    logg.info('using gas price {}'.format(gas_price))
-
-    for r in keystore.list():
-        account = r[0]
-
-        o = balance(add_0x(account))
-        r = conn.do(o)
-        account_balance = 0
-        try:
-            r = strip_0x(r)
-            account_balance = int(r, 16)
-        except ValueError:
-            account_balance = int(r)
-
-        transfer_amount = account_balance - gas_cost
-        if transfer_amount <= 0:
-            logg.warning('address {} has balance {} which is less than gas cost {}, skipping'.format(account, account_balance, gas_cost))
-            continue
-
-        nonce_oracle = RPCNonceOracle(account, conn)
-        c = Gas(chain_spec, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle, signer=signer)
-        tx_hash_hex = None
-        if (config.get('_RPC_SEND')):
-            (tx_hash_hex, o) = c.create(account, config.get('_RECIPIENT'), transfer_amount)
-            r = conn.do(o)
-        else:
-            (tx_hash_hex, o) = c.create(account, config.get('_RECIPIENT'), transfer_amount, tx_format=TxFormat.RLP_SIGNED)
-
-        logg.info('address {} balance {} net transfer {} tx {}'.format(account, account_balance, transfer_amount, tx_hash_hex))
-
-if __name__ == '__main__':
-    main()

apps/cic-ussd/cic_ussd/account/balance.py

@@ -2,7 +2,7 @@
 
 import json
 import logging
-from typing import Union, Optional
+from typing import Optional
 
 # third-party imports
 from cic_eth.api import Api
@@ -14,7 +14,7 @@ from cic_ussd.account.transaction import from_wei
 from cic_ussd.cache import cache_data_key, get_cached_data
 from cic_ussd.error import CachedDataNotFoundError
 
-logg = logging.getLogger(__file__)
+logg = logging.getLogger()
 
 
 def get_balances(address: str,
@@ -43,7 +43,7 @@ def get_balances(address: str,
     :return: A list containing balance data if called synchronously. | None
     :rtype: list | None
     """
-    logg.debug(f'retrieving {token_symbol} balance for address: {address}')
+    logg.debug(f'retrieving balance for address: {address}')
     if asynchronous:
         cic_eth_api = Api(
             chain_str=chain_str,
@@ -60,13 +60,11 @@ def get_balances(address: str,
         return balance_request_task.get()
 
 
-def calculate_available_balance(balances: dict, decimals: int) -> float:
+def calculate_available_balance(balances: dict) -> float:
     """This function calculates an account's balance at a specific point in time by computing the difference from the
     outgoing balance and the sum of the incoming and network balances.
     :param balances: incoming, network and outgoing balances.
     :type balances: dict
-    :param decimals:
-    :type decimals: int
     :return: Token value of the available balance.
     :rtype: float
     """
@@ -75,7 +73,7 @@ def calculate_available_balance(balances: dict, decimals: int) -> float:
     network_balance = balances.get('balance_network')
 
     available_balance = (network_balance + incoming_balance) - outgoing_balance
-    return from_wei(decimals=decimals, value=available_balance)
+    return from_wei(value=available_balance)
 
 
 def get_adjusted_balance(balance: int, chain_str: str, timestamp: int, token_symbol: str):
@@ -96,25 +94,24 @@ def get_adjusted_balance(balance: int, chain_str: str, timestamp: int, token_sym
     return demurrage_api.get_adjusted_balance(token_symbol, balance, timestamp).result
 
 
-def get_cached_available_balance(decimals: int, identifier: Union[list, bytes]) -> float:
+def get_cached_available_balance(blockchain_address: str) -> float:
     """This function attempts to retrieve balance data from the redis cache.
-    :param decimals:
-    :type decimals: int
-    :param identifier: An identifier needed to create a unique pointer to a balances resource.
-    :type identifier: bytes | list
+    :param blockchain_address: Ethereum address of an account.
+    :type blockchain_address: str
     :raises CachedDataNotFoundError: No cached balance data could be found.
     :return: Operational balance of an account.
     :rtype: float
     """
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.BALANCES)
+    identifier = bytes.fromhex(blockchain_address)
+    key = cache_data_key(identifier, salt=MetadataPointer.BALANCES)
     cached_balances = get_cached_data(key=key)
     if cached_balances:
-        return calculate_available_balance(balances=json.loads(cached_balances), decimals=decimals)
+        return calculate_available_balance(json.loads(cached_balances))
     else:
-        raise CachedDataNotFoundError(f'No cached available balance at {key}')
+        raise CachedDataNotFoundError(f'No cached available balance for address: {blockchain_address}')
 
 
-def get_cached_adjusted_balance(identifier: Union[list, bytes]):
+def get_cached_adjusted_balance(identifier: bytes):
     """
     :param identifier:
     :type identifier:
@@ -123,22 +120,3 @@ def get_cached_adjusted_balance(identifier: Union[list, bytes]):
     """
     key = cache_data_key(identifier, MetadataPointer.BALANCES_ADJUSTED)
     return get_cached_data(key)
-
-
-def get_account_tokens_balance(blockchain_address: str, chain_str: str, token_symbols_list: list):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :param chain_str:
-    :type chain_str:
-    :param token_symbols_list:
-    :type token_symbols_list:
-    :return:
-    :rtype:
-    """
-    for token_symbol in token_symbols_list:
-        get_balances(address=blockchain_address,
-                     chain_str=chain_str,
-                     token_symbol=token_symbol,
-                     asynchronous=True,
-                     callback_param=f'{blockchain_address},{token_symbol}')

apps/cic-ussd/cic_ussd/account/statement.py

@@ -69,8 +69,7 @@ def parse_statement_transactions(statement: list):
     parsed_transactions = []
     for transaction in statement:
         action_tag = transaction.get('action_tag')
-        decimals = transaction.get('token_decimals')
-        amount = from_wei(decimals, transaction.get('token_value'))
+        amount = from_wei(transaction.get('token_value'))
         direction_tag = transaction.get('direction_tag')
         token_symbol = transaction.get('token_symbol')
         metadata_id = transaction.get('metadata_id')

apps/cic-ussd/cic_ussd/account/tokens.py

@@ -1,115 +1,19 @@
 # standard imports
-import hashlib
 import json
 import logging
-from typing import Optional, Union
+from typing import Dict, Optional
 
 # external imports
 from cic_eth.api import Api
 from cic_types.condiments import MetadataPointer
 
 # local imports
-from cic_ussd.account.balance import get_cached_available_balance
 from cic_ussd.account.chain import Chain
-from cic_ussd.cache import cache_data, cache_data_key, get_cached_data
-from cic_ussd.error import CachedDataNotFoundError, SeppukuError
-from cic_ussd.metadata.tokens import query_token_info, query_token_metadata
-from cic_ussd.processor.util import wait_for_cache
-from cic_ussd.translation import translation_for
-
-logg = logging.getLogger(__file__)
+from cic_ussd.cache import cache_data_key, get_cached_data
+from cic_ussd.error import SeppukuError
 
 
-def collate_token_metadata(token_info: dict, token_metadata: dict) -> dict:
-    """
-    :param token_info:
-    :type token_info:
-    :param token_metadata:
-    :type token_metadata:
-    :return:
-    :rtype:
-    """
-    logg.debug(f'Collating token info: {token_info} and token metadata: {token_metadata}')
-    description = token_info.get('description')
-    issuer = token_info.get('issuer')
-    location = token_metadata.get('location')
-    contact = token_metadata.get('contact')
-    return {
-        'description': description,
-        'issuer': issuer,
-        'location': location,
-        'contact': contact
-    }
-
-
-def create_account_tokens_list(blockchain_address: str):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :return:
-    :rtype:
-    """
-    token_symbols_list = get_cached_token_symbol_list(blockchain_address=blockchain_address)
-    token_list_entries = []
-    if token_symbols_list:
-        logg.debug(f'Token symbols: {token_symbols_list} for account: {blockchain_address}')
-        for token_symbol in token_symbols_list:
-            entry = {}
-            logg.debug(f'Processing token data for: {token_symbol}')
-            key = cache_data_key([bytes.fromhex(blockchain_address), token_symbol.encode('utf-8')], MetadataPointer.TOKEN_DATA)
-            token_data = get_cached_data(key)
-            token_data = json.loads(token_data)
-            logg.debug(f'Retrieved token data: {token_data} for: {token_symbol}')
-            token_name = token_data.get('name')
-            entry['name'] = token_name
-            token_symbol = token_data.get('symbol')
-            entry['symbol'] = token_symbol
-            token_issuer = token_data.get('issuer')
-            entry['issuer'] = token_issuer
-            token_contact = token_data['contact'].get('phone')
-            entry['contact'] = token_contact
-            token_location = token_data.get('location')
-            entry['location'] = token_location
-            decimals = token_data.get('decimals')
-            identifier = [bytes.fromhex(blockchain_address), token_symbol.encode('utf-8')]
-            wait_for_cache(identifier, f'Cached available balance for token: {token_symbol}', MetadataPointer.BALANCES)
-            token_balance = get_cached_available_balance(decimals=decimals, identifier=identifier)
-            entry['balance'] = token_balance
-            token_list_entries.append(entry)
-    account_tokens_list = order_account_tokens_list(token_list_entries, bytes.fromhex(blockchain_address))
-    key = cache_data_key(bytes.fromhex(blockchain_address), MetadataPointer.TOKEN_DATA_LIST)
-    cache_data(key, json.dumps(account_tokens_list))
-
-
-def get_active_token_symbol(blockchain_address: str):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :return:
-    :rtype:
-    """
-    identifier = bytes.fromhex(blockchain_address)
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_ACTIVE)
-    active_token_symbol = get_cached_data(key)
-    if not active_token_symbol:
-        raise CachedDataNotFoundError('No active token set.')
-    return active_token_symbol
-
-
-def get_cached_token_data(blockchain_address: str, token_symbol: str):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    identifier = [bytes.fromhex(blockchain_address), token_symbol.encode('utf-8')]
-    key = cache_data_key(identifier, MetadataPointer.TOKEN_DATA)
-    logg.debug(f'Retrieving token data for: {token_symbol} at: {key}')
-    token_data = get_cached_data(key)
-    return json.loads(token_data)
+logg = logging.getLogger(__name__)
 
 
 def get_cached_default_token(chain_str: str) -> Optional[str]:
@@ -145,132 +49,6 @@ def get_default_token_symbol():
             raise SeppukuError(f'Could not retrieve default token for: {chain_str}')
 
 
-def get_cached_token_symbol_list(blockchain_address: str) -> Optional[list]:
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :return:
-    :rtype:
-    """
-    key = cache_data_key(identifier=bytes.fromhex(blockchain_address), salt=MetadataPointer.TOKEN_SYMBOLS_LIST)
-    token_symbols_list = get_cached_data(key)
-    if token_symbols_list:
-        return json.loads(token_symbols_list)
-    return token_symbols_list
-
-
-def get_cached_token_data_list(blockchain_address: str) -> Optional[list]:
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :return:
-    :rtype:
-    """
-    key = cache_data_key(bytes.fromhex(blockchain_address), MetadataPointer.TOKEN_DATA_LIST)
-    token_data_list = get_cached_data(key)
-    if token_data_list:
-        return json.loads(token_data_list)
-    return token_data_list
-
-
-def handle_token_symbol_list(blockchain_address: str, token_symbol: str):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    token_symbol_list = get_cached_token_symbol_list(blockchain_address)
-    if token_symbol_list:
-        if token_symbol not in token_symbol_list:
-            token_symbol_list.append(token_symbol)
-    else:
-        token_symbol_list = [token_symbol]
-
-    identifier = bytes.fromhex(blockchain_address)
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_SYMBOLS_LIST)
-    data = json.dumps(token_symbol_list)
-    cache_data(key, data)
-
-
-def hashed_token_proof(token_proof: Union[dict, str]) -> str:
-    """
-    :param token_proof:
-    :type token_proof:
-    :return:
-    :rtype:
-    """
-    if isinstance(token_proof, dict):
-        token_proof = json.dumps(token_proof)
-    logg.debug(f'Hashing token proof: {token_proof}')
-    hash_object = hashlib.new("sha256")
-    hash_object.update(token_proof.encode('utf-8'))
-    return hash_object.digest().hex()
-
-
-def order_account_tokens_list(account_tokens_list: list, identifier: bytes) -> list:
-    """
-    :param account_tokens_list:
-    :type account_tokens_list:
-    :param identifier:
-    :type identifier:
-    :return:
-    :rtype:
-    """
-    ordered_tokens_list = []
-    # get last sent token
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_LAST_SENT)
-    last_sent_token_symbol = get_cached_data(key)
-
-    # get last received token
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_LAST_RECEIVED)
-    last_received_token_symbol = get_cached_data(key)
-
-    last_sent_token_data, remaining_accounts_token_list = remove_from_account_tokens_list(account_tokens_list, last_sent_token_symbol)
-    if last_sent_token_data:
-        ordered_tokens_list.append(last_sent_token_data[0])
-
-    last_received_token_data, remaining_accounts_token_list = remove_from_account_tokens_list(remaining_accounts_token_list, last_received_token_symbol)
-    if last_received_token_data:
-        ordered_tokens_list.append(last_received_token_data[0])
-
-    # order the by balance
-    ordered_by_balance = sorted(remaining_accounts_token_list, key=lambda d: d['balance'], reverse=True)
-    return ordered_tokens_list + ordered_by_balance
-
-
-def parse_token_list(account_token_list: list):
-    parsed_token_list = []
-    for i in range(len(account_token_list)):
-        token_symbol = account_token_list[i].get('symbol')
-        token_balance = account_token_list[i].get('balance')
-        token_data_repr = f'{i+1}. {token_symbol} {token_balance}'
-        parsed_token_list.append(token_data_repr)
-    return parsed_token_list
-
-
-def process_token_data(blockchain_address: str, token_symbol: str):
-    """
-
-    :param blockchain_address:
-    :type blockchain_address:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    logg.debug(f'Processing token data for token: {token_symbol}')
-    identifier = token_symbol.encode('utf-8')
-    query_token_metadata(identifier=identifier)
-    token_info = query_token_info(identifier=identifier)
-    hashed_token_info = hashed_token_proof(token_proof=token_info)
-    query_token_data(blockchain_address=blockchain_address,
-                     hashed_proofs=[hashed_token_info],
-                     token_symbols=[token_symbol])
-
-
 def query_default_token(chain_str: str):
     """This function synchronously queries cic-eth for the deployed system's default token.
     :param chain_str: Chain name and network id.
@@ -282,60 +60,3 @@ def query_default_token(chain_str: str):
     cic_eth_api = Api(chain_str=chain_str)
     default_token_request_task = cic_eth_api.default_token()
     return default_token_request_task.get()
-
-
-def query_token_data(blockchain_address: str, hashed_proofs: list, token_symbols: list):
-    """"""
-    logg.debug(f'Retrieving token metadata for tokens: {", ".join(token_symbols)}')
-    api = Api(callback_param=blockchain_address,
-              callback_queue='cic-ussd',
-              chain_str=Chain.spec.__str__(),
-              callback_task='cic_ussd.tasks.callback_handler.token_data_callback')
-    api.tokens(token_symbols=token_symbols, proof=hashed_proofs)
-
-
-def remove_from_account_tokens_list(account_tokens_list: list, token_symbol: str):
-    """
-    :param account_tokens_list:
-    :type account_tokens_list:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    removed_token_data = []
-    for i in range(len(account_tokens_list)):
-        if account_tokens_list[i]['symbol'] == token_symbol:
-            removed_token_data.append(account_tokens_list[i])
-            del account_tokens_list[i]
-            break
-    return removed_token_data, account_tokens_list
-
-
-def set_active_token(blockchain_address: str, token_symbol: str):
-    """
-    :param blockchain_address:
-    :type blockchain_address:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    logg.info(f'Active token set to: {token_symbol}')
-    key = cache_data_key(identifier=bytes.fromhex(blockchain_address), salt=MetadataPointer.TOKEN_ACTIVE)
-    cache_data(key=key, data=token_symbol)
-
-
-def token_list_set(preferred_language: str, token_data_reprs: list):
-    """
-    :param preferred_language:
-    :type preferred_language:
-    :param token_data_reprs:
-    :type token_data_reprs:
-    :return:
-    :rtype:
-    """
-    if not token_data_reprs:
-        return translation_for('helpers.no_tokens_list', preferred_language)
-    return ''.join(f'{token_data_repr}\n' for token_data_repr in token_data_reprs)
-

apps/cic-ussd/cic_ussd/account/transaction.py

@@ -1,6 +1,7 @@
 # standard import
+import decimal
+import json
 import logging
-from math import trunc
 from typing import Dict, Tuple
 
 # external import
@@ -8,6 +9,8 @@ from cic_eth.api import Api
 from sqlalchemy.orm.session import Session
 
 # local import
+from cic_ussd.account.chain import Chain
+from cic_ussd.account.tokens import get_cached_default_token
 from cic_ussd.db.models.account import Account
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.error import UnknownUssdRecipient
@@ -52,32 +55,32 @@ def aux_transaction_data(preferred_language: str, transaction: dict) -> dict:
     return transaction
 
 
-def from_wei(decimals: int, value: int) -> float:
+def from_wei(value: int) -> float:
     """This function converts values in Wei to a token in the cic network.
-    :param decimals: The decimals required for wei values.
-    :type decimals: int
     :param value: Value in Wei
     :type value: int
     :return: SRF equivalent of value in Wei
     :rtype: float
     """
-    value = float(value) / (10**decimals)
+    cached_token_data = json.loads(get_cached_default_token(Chain.spec.__str__()))
+    token_decimals: int = cached_token_data.get('decimals')
+    value = float(value) / (10**token_decimals)
     return truncate(value=value, decimals=2)
 
 
-def to_wei(decimals: int, value: int) -> int:
+def to_wei(value: int) -> int:
     """This functions converts values from a token in the cic network to Wei.
-    :param decimals: The decimals required for wei values.
-    :type decimals: int
     :param value: Value in SRF
     :type value: int
     :return: Wei equivalent of value in SRF
     :rtype: int
     """
-    return int(value * (10**decimals))
+    cached_token_data = json.loads(get_cached_default_token(Chain.spec.__str__()))
+    token_decimals: int = cached_token_data.get('decimals')
+    return int(value * (10**token_decimals))
 
 
-def truncate(value: float, decimals: int) -> float:
+def truncate(value: float, decimals: int):
     """This function truncates a value to a specified number of decimals places.
     :param value: The value to be truncated.
     :type value: float
@@ -86,8 +89,9 @@ def truncate(value: float, decimals: int) -> float:
     :return: The truncated value.
     :rtype: int
     """
-    stepper = 10.0**decimals
-    return trunc(stepper*value) / stepper
+    decimal.getcontext().rounding = decimal.ROUND_DOWN
+    contextualized_value = decimal.Decimal(value)
+    return round(contextualized_value, decimals)
 
 
 def transaction_actors(transaction: dict) -> Tuple[Dict, Dict]:
@@ -100,17 +104,14 @@ def transaction_actors(transaction: dict) -> Tuple[Dict, Dict]:
     """
     destination_token_symbol = transaction.get('destination_token_symbol')
     destination_token_value = transaction.get('destination_token_value') or transaction.get('to_value')
-    destination_token_decimals = transaction.get('destination_token_decimals')
     recipient_blockchain_address = transaction.get('recipient')
     sender_blockchain_address = transaction.get('sender')
     source_token_symbol = transaction.get('source_token_symbol')
     source_token_value = transaction.get('source_token_value') or transaction.get('from_value')
-    source_token_decimals = transaction.get('source_token_decimals')
 
     recipient_transaction_data = {
         "token_symbol": destination_token_symbol,
         "token_value": destination_token_value,
-        "token_decimals": destination_token_decimals,
         "blockchain_address": recipient_blockchain_address,
         "role": "recipient",
     }
@@ -118,7 +119,6 @@ def transaction_actors(transaction: dict) -> Tuple[Dict, Dict]:
         "blockchain_address": sender_blockchain_address,
         "token_symbol": source_token_symbol,
         "token_value": source_token_value,
-        "token_decimals": source_token_decimals,
         "role": "sender",
     }
     return recipient_transaction_data, sender_transaction_data
@@ -166,16 +166,14 @@ class OutgoingTransaction:
         self.from_address = from_address
         self.to_address = to_address
 
-    def transfer(self, amount: int, decimals: int, token_symbol: str):
+    def transfer(self, amount: int, token_symbol: str):
         """This function initiates standard transfers between one account to another
         :param amount: The amount of tokens to be sent
         :type amount: int
-        :param decimals: The decimals for the token being transferred.
-        :type decimals: int
         :param token_symbol: ERC20 token symbol of token to send
         :type token_symbol: str
         """
         self.cic_eth_api.transfer(from_address=self.from_address,
                                   to_address=self.to_address,
-                                  value=to_wei(decimals=decimals, value=amount),
+                                  value=to_wei(value=amount),
                                   token_symbol=token_symbol)

apps/cic-ussd/cic_ussd/cache.py

@@ -1,13 +1,12 @@
 # standard imports
 import hashlib
 import logging
-from typing import Union
 
 # external imports
 from cic_types.condiments import MetadataPointer
 from redis import Redis
 
-logg = logging.getLogger(__file__)
+logg = logging.getLogger()
 
 
 class Cache:
@@ -40,7 +39,7 @@ def get_cached_data(key: str):
     return cache.get(name=key)
 
 
-def cache_data_key(identifier: Union[list, bytes], salt: MetadataPointer):
+def cache_data_key(identifier: bytes, salt: MetadataPointer):
     """
     :param identifier:
     :type identifier:
@@ -50,10 +49,6 @@ def cache_data_key(identifier: Union[list, bytes], salt: MetadataPointer):
     :rtype:
     """
     hash_object = hashlib.new("sha256")
-    if isinstance(identifier, list):
-        for identity in identifier:
-            hash_object.update(identity)
-    else:
-        hash_object.update(identifier)
+    hash_object.update(identifier)
     hash_object.update(salt.value.encode(encoding="utf-8"))
     return hash_object.digest().hex()

apps/cic-ussd/cic_ussd/db/migrations/default/versions/f289e8510444_.py

@@ -24,8 +24,6 @@ def upgrade():
                     sa.Column('preferred_language', sa.String(), nullable=True),
                     sa.Column('password_hash', sa.String(), nullable=True),
                     sa.Column('failed_pin_attempts', sa.Integer(), nullable=False),
-                    sa.Column('guardians', sa.String(), nullable=True),
-                    sa.Column('guardian_quora', sa.Integer(), nullable=False),
                     sa.Column('status', sa.Integer(), nullable=False),
                     sa.Column('created', sa.DateTime(), nullable=False),
                     sa.Column('updated', sa.DateTime(), nullable=False),

apps/cic-ussd/cic_ussd/db/models/account.py

@@ -4,8 +4,6 @@ import json
 # external imports
 from cic_eth.api import Api
 from cic_types.condiments import MetadataPointer
-from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm.session import Session
 
 # local imports
 from cic_ussd.account.metadata import get_cached_preferred_language, parse_account_metadata
@@ -14,9 +12,8 @@ from cic_ussd.db.enum import AccountStatus
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.models.task_tracker import TaskTracker
 from cic_ussd.encoder import check_password_hash, create_password_hash
-from cic_ussd.phone_number import Support
-
-support_phone = Support.phone_number
+from sqlalchemy import Column, Integer, String
+from sqlalchemy.orm.session import Session
 
 
 class Account(SessionBase):
@@ -32,16 +29,12 @@ class Account(SessionBase):
     failed_pin_attempts = Column(Integer)
     status = Column(Integer)
     preferred_language = Column(String)
-    guardians = Column(String)
-    guardian_quora = Column(Integer)
 
     def __init__(self, blockchain_address, phone_number):
         self.blockchain_address = blockchain_address
         self.phone_number = phone_number
         self.password_hash = None
         self.failed_pin_attempts = 0
-        # self.guardians = f'{support_phone}' if support_phone else None
-        self.guardian_quora = 1
         self.status = AccountStatus.PENDING.value
 
     def __repr__(self):
@@ -52,28 +45,6 @@ class Account(SessionBase):
         self.failed_pin_attempts = 0
         self.status = AccountStatus.ACTIVE.value
 
-    def add_guardian(self, phone_number: str):
-        set_guardians = phone_number
-        if self.guardians:
-            set_guardians = self.guardians.split(',')
-            set_guardians.append(phone_number)
-            ','.join(set_guardians)
-        self.guardians = set_guardians
-
-    def remove_guardian(self, phone_number: str):
-        set_guardians = self.guardians.split(',')
-        set_guardians.remove(phone_number)
-        if len(set_guardians) > 1:
-            self.guardians = ','.join(set_guardians)
-        else:
-            self.guardians = set_guardians[0]
-
-    def get_guardians(self) -> list:
-        return self.guardians.split(',') if self.guardians else []
-
-    def set_guardian_quora(self, quora: int):
-        self.guardian_quora = quora
-
     def create_password(self, password):
         """This method takes a password value and hashes the value before assigning it to the corresponding
         `hashed_password` attribute in the user record.

apps/cic-ussd/cic_ussd/db/ussd_menu.json

@@ -287,132 +287,7 @@
             "display_key": "ussd.kenya.dob_edit_pin_authorization",
             "name": "dob_edit_pin_authorization",
             "parent": "metadata_management"
-        },
-        "49": {
-            "description": "Menu to display first set of tokens in the account's token list.",
-            "display_key": "ussd.kenya.first_account_tokens_set",
-            "name": "first_account_tokens_set",
-            "parent": null
-        },
-        "50": {
-            "description": "Menu to display middle set of tokens in the account's token list.",
-            "display_key": "ussd.kenya.middle_account_tokens_set",
-            "name": "middle_account_tokens_set",
-            "parent": null
-        },
-        "51": {
-            "description": "Menu to display last set of tokens in the account's token list.",
-            "display_key": "ussd.kenya.last_account_tokens_set",
-            "name": "last_account_tokens_set",
-            "parent": null
-        },
-        "52": {
-            "description": "Pin entry menu for setting an active token.",
-            "display_key": "ussd.kenya.token_selection_pin_authorization",
-            "name": "token_selection_pin_authorization",
-            "parent": null
-        },
-        "53": {
-            "description": "Exit following a successful active token setting.",
-            "display_key": "ussd.kenya.exit_successful_token_selection",
-            "name": "exit_successful_token_selection",
-            "parent": null
-        },
-        "54": {
-            "description": "Pin management menu for operations related to an account's pin.",
-            "display_key": "ussd.kenya.pin_management",
-            "name": "pin_management",
-            "parent": "start"
-        },
-        "55": {
-            "description": "Phone number entry for account whose pin is being reset.",
-            "display_key": "ussd.kenya.reset_guarded_pin",
-            "name": "reset_guarded_pin",
-            "parent": "pin_management"
-        },
-        "56": {
-            "description": "Pin entry for initiating request to reset an account's pin.",
-            "display_key": "ussd.kenya.reset_guarded_pin_authorization",
-            "name": "reset_guarded_pin_authorization",
-            "parent": "pin_management"
-        },
-        "57": {
-            "description": "Exit menu following successful pin reset initiation.",
-            "display_key": "ussd.kenya.exit_pin_reset_initiated_success",
-            "name": "exit_pin_reset_initiated_success",
-            "parent": "pin_management"
-        },
-        "58": {
-            "description": "Exit menu in the event that an account is not a set guardian.",
-            "display_key": "ussd.kenya.exit_not_authorized_for_pin_reset",
-            "name": "exit_not_authorized_for_pin_reset",
-            "parent": "pin_management"
-        },
-        "59": {
-            "description": "Pin guard menu for handling guardianship operations.",
-            "display_key": "ussd.kenya.guard_pin",
-            "name": "guard_pin",
-            "parent": "pin_management"
-        },
-        "60": {
-            "description": "Pin entry to display a list of set guardians.",
-            "display_key": "ussd.kenya.guardian_list_pin_authorization",
-            "name": "guardian_list_pin_authorization",
-            "parent": "guard_pin"
-        },
-        "61": {
-            "description": "Menu to display list of set guardians.",
-            "display_key": "ussd.kenya.guardian_list",
-            "name": "guardian_list",
-            "parent": "guard_pin"
-        },
-        "62": {
-            "description": "Phone number entry to add an account as a guardian to reset pin.",
-            "display_key": "ussd.kenya.add_guardian",
-            "name": "add_guardian",
-            "parent": "guard_pin"
-        },
-        "63": {
-            "description": "Pin entry to confirm addition of an account as a guardian.",
-            "display_key": "ussd.kenya.add_guardian_pin_authorization",
-            "name": "add_guardian_pin_authorization",
-            "parent": "guard_pin"
-        },
-        "64": {
-            "description": "Exit menu when an account is successfully added as pin reset guardian.",
-            "display_key": "ussd.kenya.exit_guardian_addition_success",
-            "name": "exit_guardian_addition_success",
-            "parent": "guard_pin"
-        },
-        "65": {
-            "description": "Phone number entry to remove an account as a guardian to reset pin.",
-            "display_key": "ussd.kenya.remove_guardian",
-            "name": "remove_guardian",
-            "parent": "guard_pin"
-        },
-        "66": {
-            "description": "Pin entry to confirm removal of an account as a guardian.",
-            "display_key": "ussd.kenya.remove_guardian_pin_authorization",
-            "name": "remove_guardian_pin_authorization",
-            "parent": "guard_pin"
-        },
-        "67": {
-            "description": "Exit menu when an account is successfully removed as pin reset guardian.",
-            "display_key": "ussd.kenya.exit_guardian_removal_success",
-            "name": "exit_guardian_removal_success",
-            "parent": "guard_pin"
-        },
-        "68": {
-            "description": "Exit menu when invalid phone number entry for guardian addition. ",
-            "display_key": "ussd.kenya.exit_invalid_guardian_addition",
-            "name": "exit_invalid_guardian_addition",
-            "parent": "guard_pin"
-        },
-        "69": {
-            "description": "Exit menu when invalid phone number entry for guardian removal. ",
-            "display_key": "ussd.kenya.exit_invalid_guardian_removal",
-            "name": "exit_invalid_guardian_removal",
-            "parent": "guard_pin"
         }
+
     }
 }

apps/cic-ussd/cic_ussd/metadata/base.py

@@ -13,7 +13,7 @@ logg = logging.getLogger(__file__)
 
 
 class UssdMetadataHandler(MetadataRequestsHandler):
-    def __init__(self, identifier: bytes, cic_type: MetadataPointer = None):
+    def __init__(self, cic_type: MetadataPointer, identifier: bytes):
         super().__init__(cic_type, identifier)
 
     def cache_metadata(self, data: str):

apps/cic-ussd/cic_ussd/metadata/tokens.py

@@ -1,54 +0,0 @@
-# standard imports
-from typing import Dict, Optional
-
-# external imports
-import json
-
-from cic_types.condiments import MetadataPointer
-
-# local imports
-from .base import UssdMetadataHandler
-from cic_ussd.cache import cache_data
-from cic_ussd.error import MetadataNotFoundError
-
-
-class TokenMetadata(UssdMetadataHandler):
-    def __init__(self, identifier: bytes, **kwargs):
-        super(TokenMetadata, self).__init__(identifier=identifier, **kwargs)
-
-
-def token_metadata_handler(metadata_client: TokenMetadata) -> Optional[Dict]:
-    """
-    :param metadata_client:
-    :type metadata_client:
-    :return:
-    :rtype:
-    """
-    result = metadata_client.query()
-    token_metadata = result.json()
-    if not token_metadata:
-        raise MetadataNotFoundError(f'No metadata found at: {metadata_client.metadata_pointer} for: {metadata_client.identifier.decode("utf-8")}')
-    cache_data(metadata_client.metadata_pointer, json.dumps(token_metadata))
-    return token_metadata
-
-
-def query_token_metadata(identifier: bytes):
-    """
-    :param identifier:
-    :type identifier:
-    :return:
-    :rtype:
-    """
-    token_metadata_client = TokenMetadata(identifier=identifier, cic_type=MetadataPointer.TOKEN_META_SYMBOL)
-    return token_metadata_handler(token_metadata_client)
-
-
-def query_token_info(identifier: bytes):
-    """
-    :param identifier:
-    :type identifier:
-    :return:
-    :rtype:
-    """
-    token_info_client = TokenMetadata(identifier=identifier, cic_type=MetadataPointer.TOKEN_PROOF_SYMBOL)
-    return token_metadata_handler(token_info_client)

apps/cic-ussd/cic_ussd/phone_number.py

@@ -5,6 +5,7 @@ from typing import Optional
 import phonenumbers
 
 # local imports
+from cic_ussd.db.models.account import Account
 
 
 class E164Format:

apps/cic-ussd/cic_ussd/processor/menu.py

@@ -9,7 +9,6 @@ from cic_types.condiments import MetadataPointer
 
 # local imports
 from cic_ussd.account.balance import (calculate_available_balance,
-                                      get_account_tokens_balance,
                                       get_adjusted_balance,
                                       get_balances,
                                       get_cached_adjusted_balance,
@@ -22,20 +21,13 @@ from cic_ussd.account.statement import (
     query_statement,
     statement_transaction_set
 )
-from cic_ussd.account.tokens import (create_account_tokens_list,
-                                     get_active_token_symbol,
-                                     get_cached_token_data,
-                                     get_cached_token_symbol_list,
-                                     get_cached_token_data_list,
-                                     parse_token_list,
-                                     token_list_set)
+from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import from_wei, to_wei
 from cic_ussd.cache import cache_data_key, cache_data
 from cic_ussd.db.models.account import Account
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
 from cic_ussd.processor.util import parse_person_metadata
-from cic_ussd.session.ussd_session import save_session_data
 from cic_ussd.translation import translation_for
 from sqlalchemy.orm.session import Session
 
@@ -56,27 +48,22 @@ class MenuProcessor:
         :return:
         :rtype:
         """
-
+        available_balance = get_cached_available_balance(self.account.blockchain_address)
         adjusted_balance = get_cached_adjusted_balance(self.identifier)
-        token_symbol = get_active_token_symbol(self.account.blockchain_address)
-        token_data = get_cached_token_data(self.account.blockchain_address, token_symbol)
+        token_symbol = get_default_token_symbol()
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
         with_available_balance = f'{self.display_key}.available_balance'
         with_fees = f'{self.display_key}.with_fees'
-        decimals = token_data.get('decimals')
-        available_balance = get_cached_available_balance(decimals, [self.identifier, token_symbol.encode('utf-8')])
         if not adjusted_balance:
             return translation_for(key=with_available_balance,
                                    preferred_language=preferred_language,
                                    available_balance=available_balance,
                                    token_symbol=token_symbol)
-
         adjusted_balance = json.loads(adjusted_balance)
-
-        tax_wei = to_wei(decimals, int(available_balance)) - int(adjusted_balance)
-        tax = from_wei(decimals, int(tax_wei))
+        tax_wei = to_wei(int(available_balance)) - int(adjusted_balance)
+        tax = from_wei(int(tax_wei))
         return translation_for(key=with_fees,
                                preferred_language=preferred_language,
                                available_balance=available_balance,
@@ -89,25 +76,21 @@ class MenuProcessor:
         :rtype:
         """
         cached_statement = get_cached_statement(self.account.blockchain_address)
-        transaction_sets = []
-        if cached_statement:
-            statement = json.loads(cached_statement)
-            statement_transactions = parse_statement_transactions(statement)
-            transaction_sets = [statement_transactions[tx:tx + 3] for tx in range(0, len(statement_transactions), 3)]
+        statement = json.loads(cached_statement)
+        statement_transactions = parse_statement_transactions(statement)
+        transaction_sets = [statement_transactions[tx:tx + 3] for tx in range(0, len(statement_transactions), 3)]
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
-        no_transaction_history = statement_transaction_set(preferred_language, transaction_sets)
-        first_transaction_set = no_transaction_history
-        middle_transaction_set = no_transaction_history
-        last_transaction_set = no_transaction_history
+        first_transaction_set = []
+        middle_transaction_set = []
+        last_transaction_set = []
         if transaction_sets:
             first_transaction_set = statement_transaction_set(preferred_language, transaction_sets[0])
         if len(transaction_sets) >= 2:
             middle_transaction_set = statement_transaction_set(preferred_language, transaction_sets[1])
         if len(transaction_sets) >= 3:
             last_transaction_set = statement_transaction_set(preferred_language, transaction_sets[2])
-
         if self.display_key == 'ussd.kenya.first_transaction_set':
             return translation_for(
                 self.display_key, preferred_language, first_transaction_set=first_transaction_set
@@ -121,63 +104,7 @@ class MenuProcessor:
                 self.display_key, preferred_language, last_transaction_set=last_transaction_set
             )
 
-    def add_guardian_pin_authorization(self):
-        guardian_information = self.guardian_metadata()
-        return self.pin_authorization(guardian_information=guardian_information)
-
-    def guardian_list(self):
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        set_guardians = self.account.get_guardians()
-        if set_guardians:
-            guardians_list = ''
-            guardians_list_header = translation_for('helpers.guardians_list_header', preferred_language)
-            for phone_number in set_guardians:
-                guardian = Account.get_by_phone_number(phone_number, self.session)
-                guardian_information = guardian.standard_metadata_id()
-                guardians_list += f'{guardian_information}\n'
-            guardians_list = guardians_list_header + '\n' + guardians_list
-        else:
-            guardians_list = translation_for('helpers.no_guardians_list', preferred_language)
-        return translation_for(self.display_key, preferred_language, guardians_list=guardians_list)
-
-    def account_tokens(self) -> str:
-        cached_token_data_list = get_cached_token_data_list(self.account.blockchain_address)
-        token_data_list = parse_token_list(cached_token_data_list)
-        token_list_sets = [token_data_list[tds:tds + 3] for tds in range(0, len(token_data_list), 3)]
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        no_token_list = token_list_set(preferred_language, [])
-        first_account_tokens_set = no_token_list
-        middle_account_tokens_set = no_token_list
-        last_account_tokens_set = no_token_list
-        if token_list_sets:
-            data = {
-                'account_tokens_list': cached_token_data_list
-            }
-            save_session_data(data=data, queue='cic-ussd', session=self.session, ussd_session=self.ussd_session)
-            first_account_tokens_set = token_list_set(preferred_language, token_list_sets[0])
-
-        if len(token_list_sets) >= 2:
-            middle_account_tokens_set = token_list_set(preferred_language, token_list_sets[1])
-        if len(token_list_sets) >= 3:
-            last_account_tokens_set = token_list_set(preferred_language, token_list_sets[2])
-        if self.display_key == 'ussd.kenya.first_account_tokens_set':
-            return translation_for(
-                self.display_key, preferred_language, first_account_tokens_set=first_account_tokens_set
-            )
-        if self.display_key == 'ussd.kenya.middle_account_tokens_set':
-            return translation_for(
-                self.display_key, preferred_language, middle_account_tokens_set=middle_account_tokens_set
-            )
-        if self.display_key == 'ussd.kenya.last_account_tokens_set':
-            return translation_for(
-                self.display_key, preferred_language, last_account_tokens_set=last_account_tokens_set
-            )
-
-    def help(self) -> str:
+    def help(self):
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
@@ -228,48 +155,30 @@ class MenuProcessor:
             f'{self.display_key}.retry', preferred_language, retry_pin_entry=retry_pin_entry
         )
 
-    def guarded_account_metadata(self):
-        guarded_account_phone_number = self.ussd_session.get('data').get('guarded_account_phone_number')
-        guarded_account = Account.get_by_phone_number(guarded_account_phone_number, self.session)
-        return guarded_account.standard_metadata_id()
-
-    def guardian_metadata(self):
-        guardian_phone_number = self.ussd_session.get('data').get('guardian_phone_number')
-        guardian = Account.get_by_phone_number(guardian_phone_number, self.session)
-        return guardian.standard_metadata_id()
-
-    def reset_guarded_pin_authorization(self):
-        guarded_account_information = self.guarded_account_metadata()
-        return self.pin_authorization(guarded_account_information=guarded_account_information)
-
     def start_menu(self):
         """
         :return:
         :rtype:
         """
         chain_str = Chain.spec.__str__()
-        token_symbol = get_active_token_symbol(self.account.blockchain_address)
-        token_data = get_cached_token_data(self.account.blockchain_address, token_symbol)
-        decimals = token_data.get('decimals')
+        token_symbol = get_default_token_symbol()
         blockchain_address = self.account.blockchain_address
         balances = get_balances(blockchain_address, chain_str, token_symbol, False)[0]
-        key = cache_data_key([self.identifier, token_symbol.encode('utf-8')], MetadataPointer.BALANCES)
+        key = cache_data_key(self.identifier, MetadataPointer.BALANCES)
         cache_data(key, json.dumps(balances))
-        available_balance = calculate_available_balance(balances, decimals)
+        available_balance = calculate_available_balance(balances)
         now = datetime.now()
         if (now - self.account.created).days >= 30:
             if available_balance <= 0:
                 logg.info(f'Not retrieving adjusted balance, available balance: {available_balance} is insufficient.')
             else:
                 timestamp = int((now - timedelta(30)).timestamp())
-                adjusted_balance = get_adjusted_balance(to_wei(decimals, int(available_balance)), chain_str, timestamp, token_symbol)
-                key = cache_data_key([self.identifier, token_symbol.encode('utf-8')], MetadataPointer.BALANCES_ADJUSTED)
+                adjusted_balance = get_adjusted_balance(to_wei(int(available_balance)), chain_str, timestamp, token_symbol)
+                key = cache_data_key(self.identifier, MetadataPointer.BALANCES_ADJUSTED)
                 cache_data(key, json.dumps(adjusted_balance))
 
         query_statement(blockchain_address)
-        token_symbols_list = get_cached_token_symbol_list(blockchain_address)
-        get_account_tokens_balance(blockchain_address, chain_str, token_symbols_list)
-        create_account_tokens_list(blockchain_address)
+
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
@@ -277,20 +186,6 @@ class MenuProcessor:
             self.display_key, preferred_language, account_balance=available_balance, account_token_name=token_symbol
         )
 
-    def token_selection_pin_authorization(self) -> str:
-        """
-        :return:
-        :rtype:
-        """
-        selected_token = self.ussd_session.get('data').get('selected_token')
-        token_name = selected_token.get('name')
-        token_symbol = selected_token.get('symbol')
-        token_issuer = selected_token.get('issuer')
-        token_contact = selected_token.get('contact')
-        token_location = selected_token.get('location')
-        token_data = f'{token_name} ({token_symbol})\n{token_issuer}\n{token_contact}\n{token_location}\n'
-        return self.pin_authorization(token_data=token_data)
-
     def transaction_pin_authorization(self) -> str:
         """
         :return:
@@ -300,81 +195,36 @@ class MenuProcessor:
         recipient = Account.get_by_phone_number(recipient_phone_number, self.session)
         tx_recipient_information = recipient.standard_metadata_id()
         tx_sender_information = self.account.standard_metadata_id()
-        token_symbol = get_active_token_symbol(self.account.blockchain_address)
-        token_data = get_cached_token_data(self.account.blockchain_address, token_symbol)
+        token_symbol = get_default_token_symbol()
         user_input = self.ussd_session.get('data').get('transaction_amount')
-        decimals = token_data.get('decimals')
-        transaction_amount = to_wei(decimals=decimals, value=int(user_input))
+        transaction_amount = to_wei(value=int(user_input))
         return self.pin_authorization(
             recipient_information=tx_recipient_information,
-            transaction_amount=from_wei(decimals, transaction_amount),
+            transaction_amount=from_wei(transaction_amount),
             token_symbol=token_symbol,
             sender_information=tx_sender_information
         )
 
-    def exit_guardian_addition_success(self) -> str:
-        guardian_information = self.guardian_metadata()
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key,
-                               preferred_language,
-                               guardian_information=guardian_information)
-
-    def exit_guardian_removal_success(self):
-        guardian_information = self.guardian_metadata()
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key,
-                               preferred_language,
-                               guardian_information=guardian_information)
-
-    def exit_invalid_guardian_addition(self):
-        failure_reason = self.ussd_session.get('data').get('failure_reason')
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key, preferred_language, error_exit=failure_reason)
-
-    def exit_invalid_guardian_removal(self):
-        failure_reason = self.ussd_session.get('data').get('failure_reason')
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key, preferred_language, error_exit=failure_reason)
-
-    def exit_pin_reset_initiated_success(self):
-        guarded_account_information = self.guarded_account_metadata()
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key,
-                               preferred_language,
-                               guarded_account_information=guarded_account_information)
-
     def exit_insufficient_balance(self):
         """
         :return:
         :rtype:
         """
+        available_balance = get_cached_available_balance(self.account.blockchain_address)
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
         session_data = self.ussd_session.get('data')
-        token_symbol = get_active_token_symbol(self.account.blockchain_address)
-        token_data = get_cached_token_data(self.account.blockchain_address, token_symbol)
-        decimals = token_data.get('decimals')
-        available_balance = get_cached_available_balance(decimals, [self.identifier, token_symbol.encode('utf-8')])
         transaction_amount = session_data.get('transaction_amount')
-        transaction_amount = to_wei(decimals=decimals, value=int(transaction_amount))
+        transaction_amount = to_wei(value=int(transaction_amount))
+        token_symbol = get_default_token_symbol()
         recipient_phone_number = self.ussd_session.get('data').get('recipient_phone_number')
         recipient = Account.get_by_phone_number(recipient_phone_number, self.session)
         tx_recipient_information = recipient.standard_metadata_id()
         return translation_for(
             self.display_key,
             preferred_language,
-            amount=from_wei(decimals, transaction_amount),
+            amount=from_wei(transaction_amount),
             token_symbol=token_symbol,
             recipient_information=tx_recipient_information,
             token_balance=available_balance
@@ -392,14 +242,6 @@ class MenuProcessor:
             preferred_language = i18n.config.get('fallback')
         return translation_for('ussd.kenya.exit_pin_blocked', preferred_language, support_phone=Support.phone_number)
 
-    def exit_successful_token_selection(self) -> str:
-        selected_token = self.ussd_session.get('data').get('selected_token')
-        token_symbol = selected_token.get('symbol')
-        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
-        if not preferred_language:
-            preferred_language = i18n.config.get('fallback')
-        return translation_for(self.display_key,preferred_language,token_symbol=token_symbol)
-
     def exit_successful_transaction(self):
         """
         :return:
@@ -409,10 +251,8 @@ class MenuProcessor:
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
-        token_symbol = get_active_token_symbol(self.account.blockchain_address)
-        token_data = get_cached_token_data(self.account.blockchain_address, token_symbol)
-        decimals = token_data.get('decimals')
-        transaction_amount = to_wei(decimals, amount)
+        transaction_amount = to_wei(amount)
+        token_symbol = get_default_token_symbol()
         recipient_phone_number = self.ussd_session.get('data').get('recipient_phone_number')
         recipient = Account.get_by_phone_number(phone_number=recipient_phone_number, session=self.session)
         tx_recipient_information = recipient.standard_metadata_id()
@@ -420,7 +260,7 @@ class MenuProcessor:
         return translation_for(
             self.display_key,
             preferred_language,
-            transaction_amount=from_wei(decimals, transaction_amount),
+            transaction_amount=from_wei(transaction_amount),
             token_symbol=token_symbol,
             recipient_information=tx_recipient_information,
             sender_information=tx_sender_information
@@ -454,42 +294,15 @@ def response(account: Account, display_key: str, menu_name: str, session: Sessio
     if menu_name == 'transaction_pin_authorization':
         return menu_processor.transaction_pin_authorization()
 
-    if menu_name == 'token_selection_pin_authorization':
-        return menu_processor.token_selection_pin_authorization()
-
     if menu_name == 'exit_insufficient_balance':
         return menu_processor.exit_insufficient_balance()
 
-    if menu_name == 'exit_invalid_guardian_addition':
-        return menu_processor.exit_invalid_guardian_addition()
-
-    if menu_name == 'exit_invalid_guardian_removal':
-        return menu_processor.exit_invalid_guardian_removal()
-
     if menu_name == 'exit_successful_transaction':
         return menu_processor.exit_successful_transaction()
 
-    if menu_name == 'exit_guardian_addition_success':
-        return menu_processor.exit_guardian_addition_success()
-
-    if menu_name == 'exit_guardian_removal_success':
-        return menu_processor.exit_guardian_removal_success()
-
-    if menu_name == 'exit_pin_reset_initiated_success':
-        return menu_processor.exit_pin_reset_initiated_success()
-
     if menu_name == 'account_balances':
         return menu_processor.account_balances()
 
-    if menu_name == 'guardian_list':
-        return menu_processor.guardian_list()
-
-    if menu_name == 'add_guardian_pin_authorization':
-        return menu_processor.add_guardian_pin_authorization()
-
-    if menu_name == 'reset_guarded_pin_authorization':
-        return menu_processor.reset_guarded_pin_authorization()
-
     if 'pin_authorization' in menu_name:
         return menu_processor.pin_authorization()
 
@@ -499,9 +312,6 @@ def response(account: Account, display_key: str, menu_name: str, session: Sessio
     if 'transaction_set' in menu_name:
         return menu_processor.account_statement()
 
-    if 'account_tokens_set' in menu_name:
-        return menu_processor.account_tokens()
-
     if menu_name == 'display_user_metadata':
         return menu_processor.person_metadata()
 
@@ -511,9 +321,6 @@ def response(account: Account, display_key: str, menu_name: str, session: Sessio
     if menu_name == 'exit_pin_blocked':
         return menu_processor.exit_pin_blocked()
 
-    if menu_name == 'exit_successful_token_selection':
-        return menu_processor.exit_successful_token_selection()
-
     preferred_language = get_cached_preferred_language(account.blockchain_address)
 
     return translation_for(display_key, preferred_language)

apps/cic-ussd/cic_ussd/processor/util.py

@@ -1,22 +1,15 @@
 # standard imports
 import datetime
 import json
-import logging
-import time
-from typing import Union
 
 # external imports
-from cic_types.condiments import MetadataPointer
 from cic_types.models.person import get_contact_data_from_vcard
 from tinydb.table import Document
 
 # local imports
-from cic_ussd.cache import cache_data_key, get_cached_data
 from cic_ussd.menu.ussd_menu import UssdMenu
 from cic_ussd.translation import translation_for
 
-logg = logging.getLogger(__file__)
-
 
 def latest_input(user_input: str) -> str:
     """
@@ -83,66 +76,3 @@ def resume_last_ussd_session(last_state: str) -> Document:
     if last_state in non_reusable_states:
         return UssdMenu.find_by_name('start')
     return UssdMenu.find_by_name(last_state)
-
-
-def wait_for_cache(identifier: Union[list, bytes], resource_name: str, salt: MetadataPointer, interval: int = 1, max_retry: int = 5):
-    """
-    :param identifier:
-    :type identifier:
-    :param interval:
-    :type interval:
-    :param resource_name:
-    :type resource_name:
-    :param salt:
-    :type salt:
-    :param max_retry:
-    :type max_retry:
-    :return:
-    :rtype:
-    """
-    key = cache_data_key(identifier=identifier, salt=salt)
-    resource = get_cached_data(key)
-    counter = 0
-    while resource is None:
-        logg.debug(f'Waiting for: {resource_name} at: {key}. Checking after: {interval} ...')
-        time.sleep(interval)
-        counter += 1
-        resource = get_cached_data(key)
-        if resource is not None:
-            logg.debug(f'{resource_name} now available.')
-            break
-        else:
-            if counter == max_retry:
-                logg.debug(f'Could not find: {resource_name} within: {max_retry}')
-                break
-
-
-def wait_for_session_data(resource_name: str, session_data_key: str, ussd_session: dict, interval: int = 1, max_retry: int = 5):
-    """
-    :param interval:
-    :type interval:
-    :param resource_name:
-    :type resource_name:
-    :param session_data_key:
-    :type session_data_key:
-    :param ussd_session:
-    :type ussd_session:
-    :param max_retry:
-    :type max_retry:
-    :return:
-    :rtype:
-    """
-    session_data = ussd_session.get('data').get(session_data_key)
-    counter = 0
-    while session_data is None:
-        logg.debug(f'Waiting for: {resource_name}. Checking after: {interval} ...')
-        time.sleep(interval)
-        counter += 1
-        session_data = ussd_session.get('data').get(session_data_key)
-        if session_data is not None:
-            logg.debug(f'{resource_name} now available.')
-            break
-        else:
-            if counter == max_retry:
-                logg.debug(f'Could not find: {resource_name} within: {max_retry}')
-                break

apps/cic-ussd/cic_ussd/runnable/client.py

@@ -63,6 +63,7 @@ elif ssl == 0:
 else:
     ssl = True
 
+valid_service_codes = config.get('USSD_SERVICE_CODE').split(",")
 def main():
 
     # TODO: improve url building 
@@ -78,7 +79,7 @@ def main():
     session = uuid.uuid4().hex
     data = {
             'sessionId': session,
-            'serviceCode': config.get('USSD_SERVICE_CODE'),
+            'serviceCode': valid_service_codes[0],
             'phoneNumber': args.phone,
             'text': "",
         }

apps/cic-ussd/cic_ussd/session/ussd_session.py

@@ -13,7 +13,7 @@ from cic_ussd.cache import Cache
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.models.ussd_session import UssdSession as DbUssdSession
 
-logg = logging.getLogger(__file__)
+logg = logging.getLogger()
 
 
 class UssdSession:
@@ -239,16 +239,11 @@ def save_session_data(queue: Optional[str], session: Session, data: dict, ussd_s
     :param ussd_session: A ussd session passed to the state machine.
     :type ussd_session: UssdSession
     """
-    logg.debug(f'Saving: {data} session data to: {ussd_session}')
     cache = Cache.store
     external_session_id = ussd_session.get('external_session_id')
     existing_session_data = ussd_session.get('data')
     if existing_session_data:
-        # replace session data entry
-        keys = data.keys()
-        for key in keys:
-            existing_session_data[key] = data[key]
-        data = existing_session_data
+        data = {**existing_session_data, **data}
     in_redis_ussd_session = cache.get(external_session_id)
     in_redis_ussd_session = json.loads(in_redis_ussd_session)
     create_or_update_session(

apps/cic-ussd/cic_ussd/state_machine/logic/menu.py

@@ -81,18 +81,6 @@ def menu_six_selected(state_machine_data: Tuple[str, dict, Account, Session]) ->
     return user_input == '6'
 
 
-def menu_nine_selected(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
-    """
-    This function checks that user input matches a string with value '6'
-    :param state_machine_data: A tuple containing user input, a ussd session and user object.
-    :type state_machine_data: tuple
-    :return: A user input's match with '6'
-    :rtype: bool
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    return user_input == '9'
-
-
 def menu_zero_zero_selected(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
     """
     This function checks that user input matches a string with value '00'
@@ -105,30 +93,6 @@ def menu_zero_zero_selected(state_machine_data: Tuple[str, dict, Account, Sessio
     return user_input == '00'
 
 
-def menu_eleven_selected(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
-    """
-    This function checks that user input matches a string with value '11'
-    :param state_machine_data: A tuple containing user input, a ussd session and user object.
-    :type state_machine_data: tuple
-    :return: A user input's match with '99'
-    :rtype: bool
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    return user_input == '11'
-
-
-def menu_twenty_two_selected(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
-    """
-    This function checks that user input matches a string with value '22'
-    :param state_machine_data: A tuple containing user input, a ussd session and user object.
-    :type state_machine_data: tuple
-    :return: A user input's match with '99'
-    :rtype: bool
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    return user_input == '22'
-
-
 def menu_ninety_nine_selected(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
     """
     This function checks that user input matches a string with value '99'

apps/cic-ussd/cic_ussd/state_machine/logic/pin.py

@@ -3,6 +3,7 @@ user's pin.
 """
 
 # standard imports
+import json
 import logging
 import re
 from typing import Tuple
@@ -15,7 +16,6 @@ from cic_ussd.db.models.account import Account
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.enum import AccountStatus
 from cic_ussd.encoder import create_password_hash, check_password_hash
-from cic_ussd.processor.util import wait_for_session_data
 from cic_ussd.session.ussd_session import create_or_update_session, persist_ussd_session
 
 
@@ -31,8 +31,11 @@ def is_valid_pin(state_machine_data: Tuple[str, dict, Account, Session]) -> bool
     :rtype: bool
     """
     user_input, ussd_session, account, session = state_machine_data
+    pin_is_valid = False
     matcher = r'^\d{4}$'
-    return bool(re.match(matcher, user_input))
+    if re.match(matcher, user_input):
+        pin_is_valid = True
+    return pin_is_valid
 
 
 def is_authorized_pin(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
@@ -65,7 +68,7 @@ def save_initial_pin_to_session_data(state_machine_data: Tuple[str, dict, Accoun
     :param state_machine_data: A tuple containing user input, a ussd session and user object.
     :type state_machine_data: tuple
     """
-    user_input, ussd_session, account, session = state_machine_data
+    user_input, ussd_session, user, session = state_machine_data
     initial_pin = create_password_hash(user_input)
     if ussd_session.get('data'):
         data = ussd_session.get('data')
@@ -94,8 +97,7 @@ def pins_match(state_machine_data: Tuple[str, dict, Account, Session]) -> bool:
     :return: A match between two pin values.
     :rtype: bool
     """
-    user_input, ussd_session, account, session = state_machine_data
-    wait_for_session_data('Initial pin', session_data_key='initial_pin', ussd_session=ussd_session)
+    user_input, ussd_session, user, session = state_machine_data
     initial_pin = ussd_session.get('data').get('initial_pin')
     return check_password_hash(user_input, initial_pin)
 
@@ -105,12 +107,11 @@ def complete_pin_change(state_machine_data: Tuple[str, dict, Account, Session]):
     :param state_machine_data: A tuple containing user input, a ussd session and user object.
     :type state_machine_data: tuple
     """
-    user_input, ussd_session, account, session = state_machine_data
+    user_input, ussd_session, user, session = state_machine_data
     session = SessionBase.bind_session(session=session)
-    wait_for_session_data('Initial pin', session_data_key='initial_pin', ussd_session=ussd_session)
     password_hash = ussd_session.get('data').get('initial_pin')
-    account.password_hash = password_hash
-    session.add(account)
+    user.password_hash = password_hash
+    session.add(user)
     session.flush()
     SessionBase.release_session(session=session)
 
@@ -133,6 +134,6 @@ def is_valid_new_pin(state_machine_data: Tuple[str, dict, Account, Session]) ->
     :return: A match between two pin values.
     :rtype: bool
     """
-    user_input, ussd_session, account, session = state_machine_data
-    is_old_pin = account.verify_password(password=user_input)
+    user_input, ussd_session, user, session = state_machine_data
+    is_old_pin = user.verify_password(password=user_input)
     return is_valid_pin(state_machine_data=state_machine_data) and not is_old_pin

apps/cic-ussd/cic_ussd/state_machine/logic/pin_guard.py

@@ -1,200 +0,0 @@
-# standard imports
-import logging
-from typing import Tuple
-
-# external imports
-import celery
-import i18n
-from phonenumbers.phonenumberutil import NumberParseException
-from sqlalchemy.orm.session import Session
-
-# local imports
-from cic_ussd.account.metadata import get_cached_preferred_language
-from cic_ussd.db.models.account import Account
-from cic_ussd.db.models.base import SessionBase
-from cic_ussd.phone_number import process_phone_number, E164Format
-from cic_ussd.session.ussd_session import save_session_data
-from cic_ussd.translation import translation_for
-
-
-logg = logging.getLogger(__file__)
-
-
-def save_guardian_to_session_data(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    session_data = ussd_session.get('data') or {}
-    guardian_phone_number = process_phone_number(phone_number=user_input, region=E164Format.region)
-    session_data['guardian_phone_number'] = guardian_phone_number
-    save_session_data('cic-ussd', session, session_data, ussd_session)
-
-
-def save_guarded_account_session_data(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    session_data = ussd_session.get('data') or {}
-    guarded_account_phone_number = process_phone_number(phone_number=user_input, region=E164Format.region)
-    session_data['guarded_account_phone_number'] = guarded_account_phone_number
-    save_session_data('cic-ussd', session, session_data, ussd_session)
-
-
-def retrieve_person_metadata(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    guardian_phone_number = process_phone_number(user_input, E164Format.region)
-    guardian = Account.get_by_phone_number(guardian_phone_number, session)
-    blockchain_address = guardian.blockchain_address
-    s_query_person_metadata = celery.signature(
-        'cic_ussd.tasks.metadata.query_person_metadata', [blockchain_address], queue='cic-ussd')
-    s_query_person_metadata.apply_async()
-
-
-def is_valid_guardian_addition(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    try:
-        phone_number = process_phone_number(user_input, E164Format.region)
-    except NumberParseException:
-        phone_number = None
-
-    preferred_language = get_cached_preferred_language(account.blockchain_address)
-    if not preferred_language:
-        preferred_language = i18n.config.get('fallback')
-
-    is_valid_account = Account.get_by_phone_number(phone_number, session) is not None
-    is_initiator = phone_number == account.phone_number
-    is_existent_guardian = phone_number in account.get_guardians()
-
-    failure_reason = ''
-    if not is_valid_account:
-        failure_reason = translation_for('helpers.error.no_matching_account', preferred_language)
-
-    if is_initiator:
-        failure_reason = translation_for('helpers.error.is_initiator', preferred_language)
-
-    if is_existent_guardian:
-        failure_reason = translation_for('helpers.error.is_existent_guardian', preferred_language)
-
-    if failure_reason:
-        session_data = ussd_session.get('data') or {}
-        session_data['failure_reason'] = failure_reason
-        save_session_data('cic-ussd', session, session_data, ussd_session)
-
-    return phone_number is not None and is_valid_account and not is_existent_guardian and not is_initiator
-
-
-def add_pin_guardian(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    guardian_phone_number = ussd_session.get('data').get('guardian_phone_number')
-    account.add_guardian(guardian_phone_number)
-    session.add(account)
-    session.flush()
-    SessionBase.release_session(session=session)
-
-
-def is_set_pin_guardian(account: Account, checked_number: str, preferred_language: str, session: Session, ussd_session: dict):
-    """"""
-    failure_reason = ''
-    set_guardians = []
-    if account:
-        set_guardians = account.get_guardians()
-    else:
-        failure_reason = translation_for('helpers.error.no_matching_account', preferred_language)
-
-    is_set_guardian = checked_number in set_guardians
-    is_initiator = checked_number == account.phone_number
-
-    if not is_set_guardian:
-        failure_reason = translation_for('helpers.error.is_not_existent_guardian', preferred_language)
-
-    if is_initiator:
-        failure_reason = translation_for('helpers.error.is_initiator', preferred_language)
-
-    if failure_reason:
-        session_data = ussd_session.get('data') or {}
-        session_data['failure_reason'] = failure_reason
-        save_session_data('cic-ussd', session, session_data, ussd_session)
-
-    return is_set_guardian and not is_initiator
-
-
-def is_dialers_pin_guardian(state_machine_data: Tuple[str, dict, Account, Session]):
-    user_input, ussd_session, account, session = state_machine_data
-    phone_number = process_phone_number(phone_number=user_input, region=E164Format.region)
-    preferred_language = get_cached_preferred_language(account.blockchain_address)
-    if not preferred_language:
-        preferred_language = i18n.config.get('fallback')
-    return is_set_pin_guardian(account, phone_number, preferred_language, session, ussd_session)
-
-
-def is_others_pin_guardian(state_machine_data: Tuple[str, dict, Account, Session]):
-    user_input, ussd_session, account, session = state_machine_data
-    preferred_language = get_cached_preferred_language(account.blockchain_address)
-    phone_number = process_phone_number(phone_number=user_input, region=E164Format.region)
-    guarded_account = Account.get_by_phone_number(phone_number, session)
-    if not preferred_language:
-        preferred_language = i18n.config.get('fallback')
-    return is_set_pin_guardian(guarded_account, account.phone_number, preferred_language, session, ussd_session)
-
-
-def remove_pin_guardian(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    guardian_phone_number = ussd_session.get('data').get('guardian_phone_number')
-    account.remove_guardian(guardian_phone_number)
-    session.add(account)
-    session.flush()
-    SessionBase.release_session(session=session)
-
-
-def initiate_pin_reset(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    session_data = ussd_session.get('data')
-    quorum_count = session_data['quorum_count'] if session_data.get('quorum_count') else 0
-    quorum_count += 1
-    session_data['quorum_count'] = quorum_count
-    save_session_data('cic-ussd', session, session_data, ussd_session)
-    guarded_account_phone_number = session_data.get('guarded_account_phone_number')
-    guarded_account = Account.get_by_phone_number(guarded_account_phone_number, session)
-    if quorum_count >= guarded_account.guardian_quora:
-        guarded_account.reset_pin(session)
-        logg.debug(f'Reset initiated for: {guarded_account.phone_number}')
-        session_data['quorum_count'] = 0
-        save_session_data('cic-ussd', session, session_data, ussd_session)

apps/cic-ussd/cic_ussd/state_machine/logic/sms.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm.session import Session
 
 # local imports
 from cic_ussd.account.metadata import get_cached_preferred_language
-from cic_ussd.account.tokens import get_active_token_symbol
+from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.db.models.account import Account
 from cic_ussd.notifications import Notifier
 from cic_ussd.phone_number import Support
@@ -18,7 +18,7 @@ def upsell_unregistered_recipient(state_machine_data: Tuple[str, dict, Account,
     notifier = Notifier()
     phone_number = ussd_session.get('data')['recipient_phone_number']
     preferred_language = get_cached_preferred_language(account.blockchain_address)
-    token_symbol = get_active_token_symbol(account.blockchain_address)
+    token_symbol = get_default_token_symbol()
     tx_sender_information = account.standard_metadata_id()
     notifier.send_sms_notification('sms.upsell_unregistered_recipient',
                                    phone_number,

apps/cic-ussd/cic_ussd/state_machine/logic/tokens.py

@@ -1,69 +0,0 @@
-# standard imports
-from typing import Tuple
-
-# external imports
-from sqlalchemy.orm.session import Session
-
-# local imports
-from cic_ussd.account.tokens import set_active_token
-from cic_ussd.db.models.account import Account
-from cic_ussd.processor.util import wait_for_session_data
-from cic_ussd.session.ussd_session import save_session_data
-
-
-def is_valid_token_selection(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    session_data = ussd_session.get('data')
-    account_tokens_list = session_data.get('account_tokens_list')
-    if not account_tokens_list:
-        wait_for_session_data('Account token list', session_data_key='account_tokens_list', ussd_session=ussd_session)
-    if user_input not in ['00', '22']:
-        try:
-            user_input = int(user_input)
-            return user_input <= len(account_tokens_list)
-        except ValueError:
-            user_input = user_input.upper()
-            return any(token_data['symbol'] == user_input for token_data in account_tokens_list)
-
-
-def process_token_selection(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    account_tokens_list = ussd_session.get('data').get('account_tokens_list')
-    try:
-        user_input = int(user_input)
-        selected_token = account_tokens_list[user_input-1]
-    except ValueError:
-        user_input = user_input.upper()
-        selected_token = next(token_data for token_data in account_tokens_list if token_data['symbol'] == user_input)
-    data = {
-        'selected_token': selected_token
-    }
-    save_session_data(queue='cic-ussd', session=session, data=data, ussd_session=ussd_session)
-
-
-def set_selected_active_token(state_machine_data: Tuple[str, dict, Account, Session]):
-    """
-    :param state_machine_data:
-    :type state_machine_data:
-    :return:
-    :rtype:
-    """
-    user_input, ussd_session, account, session = state_machine_data
-    wait_for_session_data(resource_name='Selected token', session_data_key='selected_token', ussd_session=ussd_session)
-    selected_token = ussd_session.get('data').get('selected_token')
-    token_symbol = selected_token.get('symbol')
-    set_active_token(blockchain_address=account.blockchain_address, token_symbol=token_symbol)
-
-

apps/cic-ussd/cic_ussd/state_machine/logic/transaction.py

@@ -5,17 +5,18 @@ from typing import Tuple
 # third party imports
 import celery
 from phonenumbers.phonenumberutil import NumberParseException
-from sqlalchemy.orm.session import Session
 
 # local imports
 from cic_ussd.account.balance import get_cached_available_balance
 from cic_ussd.account.chain import Chain
-from cic_ussd.account.tokens import get_active_token_symbol, get_cached_token_data
+from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import OutgoingTransaction
+from cic_ussd.db.enum import AccountStatus
 from cic_ussd.db.models.account import Account
+from cic_ussd.db.models.base import SessionBase
 from cic_ussd.phone_number import process_phone_number, E164Format
 from cic_ussd.session.ussd_session import save_session_data
-
+from sqlalchemy.orm.session import Session
 
 logg = logging.getLogger(__file__)
 
@@ -62,11 +63,7 @@ def has_sufficient_balance(state_machine_data: Tuple[str, dict, Account, Session
     :rtype: bool
     """
     user_input, ussd_session, account, session = state_machine_data
-    identifier = bytes.fromhex(account.blockchain_address)
-    token_symbol = get_active_token_symbol(account.blockchain_address)
-    token_data = get_cached_token_data(account.blockchain_address, token_symbol)
-    decimals = token_data.get('decimals')
-    return int(user_input) <= get_cached_available_balance(decimals, [identifier, token_symbol.encode('utf-8')])
+    return int(user_input) <= get_cached_available_balance(account.blockchain_address)
 
 
 def save_recipient_phone_to_session_data(state_machine_data: Tuple[str, dict, Account, Session]):
@@ -125,10 +122,9 @@ def process_transaction_request(state_machine_data: Tuple[str, dict, Account, Se
     to_address = recipient.blockchain_address
     from_address = account.blockchain_address
     amount = int(ussd_session.get('data').get('transaction_amount'))
-    token_symbol = get_active_token_symbol(account.blockchain_address)
-    token_data = get_cached_token_data(account.blockchain_address, token_symbol)
-    decimals = token_data.get('decimals')
+    token_symbol = get_default_token_symbol()
+
     outgoing_tx_processor = OutgoingTransaction(chain_str=chain_str,
                                                 from_address=from_address,
                                                 to_address=to_address)
-    outgoing_tx_processor.transfer(amount=amount, decimals=decimals, token_symbol=token_symbol)
+    outgoing_tx_processor.transfer(amount=amount, token_symbol=token_symbol)

apps/cic-ussd/cic_ussd/tasks/callback_handler.py

@@ -1,5 +1,4 @@
 # standard imports
-
 import json
 import logging
 from datetime import timedelta
@@ -8,6 +7,7 @@ from datetime import timedelta
 import celery
 from cic_types.condiments import MetadataPointer
 
+
 # local imports
 from cic_ussd.account.balance import get_balances, calculate_available_balance
 from cic_ussd.account.statement import generate
@@ -15,15 +15,8 @@ from cic_ussd.cache import Cache, cache_data, cache_data_key, get_cached_data
 from cic_ussd.account.chain import Chain
 from cic_ussd.db.models.base import SessionBase
 from cic_ussd.db.models.account import Account
-from cic_ussd.processor.util import wait_for_cache
 from cic_ussd.account.statement import filter_statement_transactions
 from cic_ussd.account.transaction import transaction_actors
-from cic_ussd.account.tokens import (collate_token_metadata,
-                                     get_cached_token_data,
-                                     get_default_token_symbol,
-                                     handle_token_symbol_list,
-                                     process_token_data,
-                                     set_active_token)
 from cic_ussd.error import AccountCreationDataNotFound
 from cic_ussd.tasks.base import CriticalSQLAlchemyTask
 
@@ -65,9 +58,6 @@ def account_creation_callback(self, result: str, url: str, status_code: int):
     session.close()
     logg.debug(f'recorded account with identifier: {result}')
 
-    token_symbol = get_default_token_symbol()
-    set_active_token(blockchain_address=result, token_symbol=token_symbol)
-
     queue = self.request.delivery_info.get('routing_key')
     s_phone_pointer = celery.signature(
         'cic_ussd.tasks.metadata.add_phone_pointer', [result, phone_number], queue=queue
@@ -98,16 +88,8 @@ def balances_callback(result: list, param: str, status_code: int):
         raise ValueError(f'Unexpected status code: {status_code}.')
 
     balances = result[0]
-    identifier = []
-    param = param.split(',')
-    for identity in param:
-        try:
-            i = bytes.fromhex(identity)
-            identifier.append(i)
-        except ValueError:
-            i = identity.encode('utf-8')
-            identifier.append(i)
-    key = cache_data_key(identifier=identifier, salt=MetadataPointer.BALANCES)
+    identifier = bytes.fromhex(param)
+    key = cache_data_key(identifier, MetadataPointer.BALANCES)
     cache_data(key, json.dumps(balances))
 
 
@@ -140,38 +122,6 @@ def statement_callback(self, result, param: str, status_code: int):
             generate(param, queue, sender_transaction)
 
 
-@celery_app.task
-def token_data_callback(result: dict, param: str, status_code: int):
-    """
-    :param result:
-    :type result:
-    :param param:
-    :type param:
-    :param status_code:
-    :type status_code:
-    :return:
-    :rtype:
-    """
-
-    if status_code != 0:
-        raise ValueError(f'Unexpected status code: {status_code}.')
-
-    token = result[0]
-    token_symbol = token.get('symbol')
-    identifier = token_symbol.encode('utf-8')
-    token_meta_key = cache_data_key(identifier, MetadataPointer.TOKEN_META_SYMBOL)
-    token_info_key = cache_data_key(identifier, MetadataPointer.TOKEN_PROOF_SYMBOL)
-    token_meta = get_cached_data(token_meta_key)
-    token_meta = json.loads(token_meta)
-    token_info = get_cached_data(token_info_key)
-    token_info = json.loads(token_info)
-    token_data = collate_token_metadata(token_info=token_info, token_metadata=token_meta)
-    token_data = {**token_data, **token}
-    token_data_key = cache_data_key([bytes.fromhex(param), identifier], MetadataPointer.TOKEN_DATA)
-    cache_data(token_data_key, json.dumps(token_data))
-    handle_token_symbol_list(blockchain_address=param, token_symbol=token_symbol)
-
-
 @celery_app.task(bind=True)
 def transaction_balances_callback(self, result: list, param: dict, status_code: int):
     """
@@ -188,15 +138,10 @@ def transaction_balances_callback(self, result: list, param: dict, status_code:
     """
     if status_code != 0:
         raise ValueError(f'Unexpected status code: {status_code}.')
+
     balances_data = result[0]
+    available_balance = calculate_available_balance(balances_data)
     transaction = param
-    token_symbol = transaction.get('token_symbol')
-    blockchain_address = transaction.get('blockchain_address')
-    identifier = [bytes.fromhex(blockchain_address), token_symbol.encode('utf-8')]
-    wait_for_cache(identifier, f'Cached token data for: {token_symbol}', MetadataPointer.TOKEN_DATA)
-    token_data = get_cached_token_data(blockchain_address, token_symbol)
-    decimals = token_data.get('decimals')
-    available_balance = calculate_available_balance(balances_data, decimals)
     transaction['available_balance'] = available_balance
     queue = self.request.delivery_info.get('routing_key')
 
@@ -230,8 +175,6 @@ def transaction_callback(result: dict, param: str, status_code: int):
     source_token_symbol = result.get('source_token_symbol')
     source_token_value = result.get('source_token_value')
 
-    process_token_data(blockchain_address=recipient_blockchain_address, token_symbol=destination_token_symbol)
-
     recipient_metadata = {
         "alt_blockchain_address": sender_blockchain_address,
         "blockchain_address": recipient_blockchain_address,

apps/cic-ussd/cic_ussd/tasks/notifications.py

@@ -6,7 +6,6 @@ import logging
 import celery
 
 # local imports
-from cic_ussd.account.tokens import get_cached_token_data
 from cic_ussd.account.transaction import from_wei
 from cic_ussd.notifications import Notifier
 from cic_ussd.phone_number import Support
@@ -26,15 +25,11 @@ def transaction(notification_data: dict):
     """
     role = notification_data.get('role')
     token_value = notification_data.get('token_value')
-    token_symbol = notification_data.get('token_symbol')
-    blockchain_address = notification_data.get('blockchain_address')
-    token_data = get_cached_token_data(blockchain_address, token_symbol)
-    decimals = token_data.get('decimals')
-    amount = token_value if token_value == 0 else from_wei(decimals, token_value)
+    amount = token_value if token_value == 0 else from_wei(token_value)
     balance = notification_data.get('available_balance')
     phone_number = notification_data.get('phone_number')
     preferred_language = notification_data.get('preferred_language')
-
+    token_symbol = notification_data.get('token_symbol')
     alt_metadata_id = notification_data.get('alt_metadata_id')
     metadata_id = notification_data.get('metadata_id')
     transaction_type = notification_data.get('transaction_type')

apps/cic-ussd/cic_ussd/tasks/processor.py

@@ -47,8 +47,7 @@ def cache_statement(parsed_transaction: dict, querying_party: str):
     statement_transactions = []
     if cached_statement:
         statement_transactions = json.loads(cached_statement)
-    if parsed_transaction not in statement_transactions:
-        statement_transactions.append(parsed_transaction)
+    statement_transactions.append(parsed_transaction)
     data = json.dumps(statement_transactions)
     identifier = bytes.fromhex(querying_party)
     key = cache_data_key(identifier, MetadataPointer.STATEMENT)
@@ -75,14 +74,6 @@ def parse_transaction(transaction: dict) -> dict:
     role = transaction.get('role')
     alt_blockchain_address = transaction.get('alt_blockchain_address')
     blockchain_address = transaction.get('blockchain_address')
-    identifier = bytes.fromhex(blockchain_address)
-    token_symbol = transaction.get('token_symbol')
-    if role == 'recipient':
-        key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_LAST_RECEIVED)
-        cache_data(key, token_symbol)
-    if role == 'sender':
-        key = cache_data_key(identifier=identifier, salt=MetadataPointer.TOKEN_LAST_SENT)
-        cache_data(key, token_symbol)
     account = validate_transaction_account(blockchain_address, role, session)
     alt_account = session.query(Account).filter_by(blockchain_address=alt_blockchain_address).first()
     if alt_account:

apps/cic-ussd/cic_ussd/version.py

@@ -1,7 +1,7 @@
 # standard imports
 import semver
 
-version = (0, 3, 1, 'alpha.6')
+version = (0, 3, 1, 'alpha.5')
 
 version_object = semver.VersionInfo(
         major=version[0],

apps/cic-ussd/docker/Dockerfile

@@ -1,8 +1,8 @@
 ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
 
-FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
+FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-55da5f4e
 
-RUN apt-get install -y redis-server
+RUN apt-get install redis-server libffi-dev -y
 # create secrets directory
 RUN mkdir -vp pgp/keys
 
@@ -10,21 +10,17 @@ RUN mkdir -vp pgp/keys
 RUN mkdir -vp cic-ussd
 RUN mkdir -vp data
 
-ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net
+ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433
 ARG EXTRA_PIP_ARGS=""
 ARG PIP_INDEX_URL=https://pypi.org/simple
 
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
-    --pre \
+RUN    pip install --index-url $PIP_INDEX_URL \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
-    cic-eth-aux-erc20-demurrage-token~=0.0.2a7
+        cic-eth-aux-erc20-demurrage-token~=0.0.2a7
 
 
 COPY *requirements.txt ./
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url $PIP_INDEX_URL \
-    --pre \
+RUN    pip install --index-url $PIP_INDEX_URL \
     --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
     -r requirements.txt 
 
@@ -37,7 +33,7 @@ COPY cic_ussd/db/ussd_menu.json data/
 COPY docker/*.sh ./
 RUN chmod +x /root/*.sh
 
-## copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
+# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
 COPY config/ /usr/local/etc/cic-ussd/
 COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic