Compare commits
5 Commits
master
...
lash/meta-
Author | SHA1 | Date | |
---|---|---|---|
|
15cb3478fb | ||
|
dd79fa7bd6 | ||
|
341a7eebec | ||
|
b05fc43086 | ||
|
fe2a88a4e1 |
@ -10,7 +10,6 @@ include:
|
|||||||
#- local: 'apps/data-seeding/.gitlab-ci.yml'
|
#- local: 'apps/data-seeding/.gitlab-ci.yml'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- version
|
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
- deploy
|
- deploy
|
||||||
@ -21,41 +20,9 @@ variables:
|
|||||||
DOCKER_BUILDKIT: "1"
|
DOCKER_BUILDKIT: "1"
|
||||||
COMPOSE_DOCKER_CLI_BUILD: "1"
|
COMPOSE_DOCKER_CLI_BUILD: "1"
|
||||||
CI_DEBUG_TRACE: "true"
|
CI_DEBUG_TRACE: "true"
|
||||||
SEMVERBOT_VERSION: "0.2.0"
|
|
||||||
|
|
||||||
#before_script:
|
before_script:
|
||||||
# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
- 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
|
|
||||||
|
|
||||||
# runs on protected branches and pushes to repo
|
# runs on protected branches and pushes to repo
|
||||||
build-push:
|
build-push:
|
||||||
@ -63,17 +30,12 @@ build-push:
|
|||||||
tags:
|
tags:
|
||||||
- integration
|
- integration
|
||||||
#script:
|
#script:
|
||||||
# - TAG=$CI_Cbefore_script:
|
# - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
|
||||||
before_script:
|
|
||||||
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
|
|
||||||
script:
|
script:
|
||||||
- TAG=latest ./scripts/build-push.sh
|
- TAG=latest sh ./scripts/build-push.sh
|
||||||
- TAG=$(cat ./version) ./scripts/build-push.sh
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_REF_PROTECTED == "true"
|
- if: $CI_COMMIT_REF_PROTECTED == "true"
|
||||||
when: always
|
when: always
|
||||||
- if: $CI_COMMIT_REF_NAME == "master"
|
|
||||||
when: always
|
|
||||||
|
|
||||||
deploy-dev:
|
deploy-dev:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -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"
|
|
@ -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"]
|
|
@ -1,83 +0,0 @@
|
|||||||
# Contributor Covenant 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 [INSERT EMAIL ADDRESS]. 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."
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
Hello and welcome to the CIC Stack repository. Targeted for use with the ethereum virtual machine and a ussd capable telecom provider.
|
|
||||||
|
|
||||||
__To request a change to the code please fork this repository and sumbit a merge request.__
|
|
||||||
|
|
||||||
__If there is a Grassroots Economics Kanban Issue please include that in our MR it will help us track contributions. Karibu sana!__
|
|
||||||
|
|
||||||
__Visit the Development Kanban board here: https://gitlab.com/grassrootseconomics/cic-internal-integration/-/boards/2419764__
|
|
||||||
|
|
||||||
__Ask a question in our dev chat:__
|
|
||||||
|
|
||||||
[Mattermost](https://chat.grassrootseconomics.net/cic/channels/dev)
|
|
||||||
|
|
||||||
[Discord](https://discord.gg/XWunwAsX)
|
|
||||||
|
|
||||||
[Matrix, IRC soon?]
|
|
||||||
|
|
@ -1,117 +0,0 @@
|
|||||||
# CORE TEAM CONTRIBUTION GUIDE
|
|
||||||
|
|
||||||
# 1. Transparency
|
|
||||||
|
|
||||||
1.1 Use work logs for reflection of work done, aswell as telling your peers about changes that may affect their own tasks
|
|
||||||
|
|
||||||
1.2 A work log SHOULD be submitted after a "unit of work" is complete.
|
|
||||||
|
|
||||||
1.2.1 A "unit of work" should not span more than one full day's worth of work.
|
|
||||||
|
|
||||||
1.2.2 A "unit of work" should be small enough that the log entries give useful insight.
|
|
||||||
|
|
||||||
1.3 Individual logs are reviewed in weekly meetings
|
|
||||||
|
|
||||||
<!--1.4 Bullet point list of topics and one or more sub-points describing each item in short sentences, eg;
|
|
||||||
|
|
||||||
```
|
|
||||||
- Core
|
|
||||||
* fixed foo
|
|
||||||
* fixed bar
|
|
||||||
- Frontend
|
|
||||||
* connected bar to baz
|
|
||||||
|
|
||||||
```-->
|
|
||||||
|
|
||||||
1.4 Work log format is defined in []()
|
|
||||||
|
|
||||||
1.5 Link to issue/MR in bullet point where appropriate
|
|
||||||
|
|
||||||
1.6
|
|
||||||
|
|
||||||
|
|
||||||
# 2. Code hygiene
|
|
||||||
|
|
||||||
2.1 Keep function names and variable names short
|
|
||||||
|
|
||||||
2.2 Keep code files, functions and test fixtures short
|
|
||||||
|
|
||||||
2.3 The less magic the better. Recombinable and replaceable is king
|
|
||||||
|
|
||||||
2.4 Group imports by `standard`, `external`, `local`, `test` - in that order
|
|
||||||
|
|
||||||
2.5 Only auto-import when necessary, and always with a minimum of side-effects
|
|
||||||
|
|
||||||
2.6 Use custom errors. Let them bubble up
|
|
||||||
|
|
||||||
2.7 No logs in tight loops
|
|
||||||
|
|
||||||
2.8 Keep executable main routine minimal. Pass variables (do not use globals) in main business logic function
|
|
||||||
|
|
||||||
2.9 Test coverage MUST be kept higher than 90% after changes
|
|
||||||
|
|
||||||
2.10 Docstrings. Always. Always!
|
|
||||||
|
|
||||||
|
|
||||||
# 3. Versioning
|
|
||||||
|
|
||||||
3.1 Use [Semantic Versioning](https://semver.org/)
|
|
||||||
|
|
||||||
3.2 When merging code, explicit dependencies SHOULD NOT use pre-release version
|
|
||||||
|
|
||||||
|
|
||||||
# 4. Issues
|
|
||||||
|
|
||||||
4.1 Issue title should use [Convention Commit structure](https://www.conventionalcommits.org/en/v1.0.0-beta.2/)
|
|
||||||
|
|
||||||
4.2 Issues need proper problem statement
|
|
||||||
|
|
||||||
4.2.1. What is the current state
|
|
||||||
|
|
||||||
4.2.2. If current state is not behaving as expected, what was the expected state
|
|
||||||
|
|
||||||
4.2.3. What is the desired new state.
|
|
||||||
|
|
||||||
4.3 Issues need proper resolution statement
|
|
||||||
|
|
||||||
4.3.1. Bullet point list of short sentences describing practical steps to reach desired state
|
|
||||||
|
|
||||||
4.3.2. Builet point list of external resources informing the issue and resolution
|
|
||||||
|
|
||||||
4.4 Tasks needs to be appropriately labelled using GROUP labels.
|
|
||||||
|
|
||||||
|
|
||||||
# 5. Code submission
|
|
||||||
|
|
||||||
5.1 A branch and new MR is always created BEFORE THE WORK STARTS
|
|
||||||
|
|
||||||
5.2 An MR should solve ONE SINGLE PART of a problem
|
|
||||||
|
|
||||||
5.3 Every MR should have at least ONE ISSUE associated with it. Ideally issue can be closed when MR is merged
|
|
||||||
|
|
||||||
5.4 MRs should not be open for more than one week (during normal operation periods)
|
|
||||||
|
|
||||||
5.5 MR should ideally not be longer than 400 lines of changes of logic
|
|
||||||
|
|
||||||
5.6 MRs that MOVE or DELETE code should not CHANGE that same code in a single MR. Scope MOVEs and DELETEs in separate commits (or even better, separate MRs) for transparency
|
|
||||||
|
|
||||||
|
|
||||||
# 6. Code reviews
|
|
||||||
|
|
||||||
6.1 At least one peer review before merge
|
|
||||||
|
|
||||||
6.2 If MR is too long, evaluate whether this affects the quality of the review negatively. If it does, expect to be asked to split it up
|
|
||||||
|
|
||||||
6.3 Evaluate changes against associated issues' problem statement and proposed resolution steps. If there is a mismatch, either MR needs to change or issue needs to be amended accordingly
|
|
||||||
|
|
||||||
6.4 Make sure all technical debt introduced by MR is documented in issues. Add them according to criteria in section ISSUES if not
|
|
||||||
|
|
||||||
6.5 If CI is not working, reviewer MUST make sure code builds and runs
|
|
||||||
|
|
||||||
6.6 Behave!
|
|
||||||
|
|
||||||
6.6.1 Don't be a jerk
|
|
||||||
|
|
||||||
6.6.2 Don't block needlessly
|
|
||||||
|
|
||||||
6.6.3 Say please
|
|
661
LICENSE
661
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/>.
|
|
33
README.md
33
README.md
@ -1,6 +1,4 @@
|
|||||||
# Community Inclusion Currency Stack (CIC Stack)
|
# cic-internal-integration
|
||||||
|
|
||||||
A custodial evm wallet for executing transactions via USSD
|
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|
||||||
@ -11,9 +9,32 @@ export COMPOSE_DOCKER_CLI_BUILD=1
|
|||||||
export DOCKER_BUILDKIT=1
|
export DOCKER_BUILDKIT=1
|
||||||
```
|
```
|
||||||
|
|
||||||
To get started see [./apps/contract-migration/README.md](./apps/contract-migration/README.md)
|
start services, database, redis and local ethereum node
|
||||||
|
```
|
||||||
|
docker-compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
## Documentation
|
Run app/contract-migration to deploy contracts
|
||||||
|
```
|
||||||
|
RUN_MASK=3 docker-compose up contract-migration
|
||||||
|
```
|
||||||
|
|
||||||
[https://docs.grassecon.org/software/](https://docs.grassecon.org/software/)
|
stop cluster
|
||||||
|
```
|
||||||
|
docker-compose down
|
||||||
|
```
|
||||||
|
|
||||||
|
stop cluster and delete data
|
||||||
|
```
|
||||||
|
docker-compose down -v --remove-orphans
|
||||||
|
```
|
||||||
|
|
||||||
|
rebuild an images
|
||||||
|
```
|
||||||
|
docker-compose up --build <service_name>
|
||||||
|
```
|
||||||
|
|
||||||
|
to delete the buildkit cache
|
||||||
|
```
|
||||||
|
docker builder prune --filter type=exec.cachemount
|
||||||
|
```
|
||||||
|
@ -1 +1 @@
|
|||||||
include *requirements.txt cic_cache/data/config/* cic_cache/db/migrations/default/* cic_cache/db/migrations/default/versions/*
|
include *requirements.txt cic_cache/data/config/*
|
||||||
|
@ -14,7 +14,7 @@ class ArgumentParser(BaseArgumentParser):
|
|||||||
if local_arg_flags & CICFlag.CELERY:
|
if local_arg_flags & CICFlag.CELERY:
|
||||||
self.add_argument('-q', '--celery-queue', dest='celery_queue', type=str, default='cic-cache', help='Task queue')
|
self.add_argument('-q', '--celery-queue', dest='celery_queue', type=str, default='cic-cache', help='Task queue')
|
||||||
if local_arg_flags & CICFlag.SYNCER:
|
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')
|
self.add_argument('--no-history', action='store_true', dest='no_history', help='Skip initial history sync')
|
||||||
if local_arg_flags & CICFlag.CHAIN:
|
if local_arg_flags & CICFlag.CHAIN:
|
||||||
self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')
|
self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
[cic]
|
[cic]
|
||||||
registry_address =
|
registry_address =
|
||||||
trust_address =
|
trust_address =
|
||||||
health_modules =
|
health_modules = cic_eth.check.db,cic_eth.check.redis,cic_eth.check.signer,cic_eth.check.gas
|
||||||
|
@ -3,8 +3,7 @@ engine =
|
|||||||
driver =
|
driver =
|
||||||
host =
|
host =
|
||||||
port =
|
port =
|
||||||
#name = cic-cache
|
name = cic-cache
|
||||||
prefix =
|
|
||||||
user =
|
user =
|
||||||
password =
|
password =
|
||||||
debug = 0
|
debug = 0
|
||||||
|
@ -9,26 +9,21 @@ from .list import (
|
|||||||
tag_transaction,
|
tag_transaction,
|
||||||
add_tag,
|
add_tag,
|
||||||
)
|
)
|
||||||
from cic_cache.db.models.base import SessionBase
|
|
||||||
|
|
||||||
|
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
def dsn_from_config(config, name):
|
def dsn_from_config(config):
|
||||||
scheme = config.get('DATABASE_ENGINE')
|
scheme = config.get('DATABASE_ENGINE')
|
||||||
if config.get('DATABASE_DRIVER') != None:
|
if config.get('DATABASE_DRIVER') != None:
|
||||||
scheme += '+{}'.format(config.get('DATABASE_DRIVER'))
|
scheme += '+{}'.format(config.get('DATABASE_DRIVER'))
|
||||||
|
|
||||||
database_name = name
|
|
||||||
if config.get('DATABASE_PREFIX'):
|
|
||||||
database_name = '{}_{}'.format(config.get('DATABASE_PREFIX'), database_name)
|
|
||||||
dsn = ''
|
dsn = ''
|
||||||
if config.get('DATABASE_ENGINE') == 'sqlite':
|
if config.get('DATABASE_ENGINE') == 'sqlite':
|
||||||
SessionBase.poolable = False
|
|
||||||
dsn = '{}:///{}'.format(
|
dsn = '{}:///{}'.format(
|
||||||
scheme,
|
scheme,
|
||||||
database_name,
|
config.get('DATABASE_NAME'),
|
||||||
)
|
)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -38,7 +33,7 @@ def dsn_from_config(config, name):
|
|||||||
config.get('DATABASE_PASSWORD'),
|
config.get('DATABASE_PASSWORD'),
|
||||||
config.get('DATABASE_HOST'),
|
config.get('DATABASE_HOST'),
|
||||||
config.get('DATABASE_PORT'),
|
config.get('DATABASE_PORT'),
|
||||||
database_name,
|
config.get('DATABASE_NAME'),
|
||||||
)
|
)
|
||||||
logg.debug('parsed dsn from config: {}'.format(dsn))
|
logg.debug('parsed dsn from config: {}'.format(dsn))
|
||||||
return dsn
|
return dsn
|
||||||
|
@ -5,11 +5,7 @@ import re
|
|||||||
import base64
|
import base64
|
||||||
|
|
||||||
# external imports
|
# external imports
|
||||||
from hexathon import (
|
from hexathon import add_0x
|
||||||
add_0x,
|
|
||||||
strip_0x,
|
|
||||||
)
|
|
||||||
from chainlib.encode import TxHexNormalizer
|
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from cic_cache.cache import (
|
from cic_cache.cache import (
|
||||||
@ -20,72 +16,27 @@ from cic_cache.cache import (
|
|||||||
logg = logging.getLogger(__name__)
|
logg = logging.getLogger(__name__)
|
||||||
#logg = logging.getLogger()
|
#logg = logging.getLogger()
|
||||||
|
|
||||||
re_transactions_all_bloom = r'/tx/?(\d+)?/?(\d+)?/?(\d+)?/?(\d+)?/?'
|
re_transactions_all_bloom = r'/tx/(\d+)?/?(\d+)/?'
|
||||||
re_transactions_account_bloom = r'/tx/user/((0x)?[a-fA-F0-9]+)(/(\d+)(/(\d+))?)?/?'
|
re_transactions_account_bloom = r'/tx/user/((0x)?[a-fA-F0-9]+)(/(\d+)(/(\d+))?)?/?'
|
||||||
re_transactions_all_data = r'/txa/?(\d+)?/?(\d+)?/?(\d+)?/?(\d+)?/?'
|
re_transactions_all_data = r'/txa/(\d+)?/?(\d+)/?'
|
||||||
re_transactions_account_data = r'/txa/user/((0x)?[a-fA-F0-9]+)(/(\d+)(/(\d+))?)?/?'
|
|
||||||
re_default_limit = r'/defaultlimit/?'
|
|
||||||
|
|
||||||
DEFAULT_LIMIT = 100
|
DEFAULT_LIMIT = 100
|
||||||
|
|
||||||
tx_normalize = TxHexNormalizer()
|
|
||||||
|
|
||||||
def parse_query_account(r):
|
|
||||||
address = strip_0x(r[1])
|
|
||||||
#address = tx_normalize.wallet_address(address)
|
|
||||||
limit = DEFAULT_LIMIT
|
|
||||||
g = r.groups()
|
|
||||||
if len(g) > 3:
|
|
||||||
limit = int(r[4])
|
|
||||||
if limit == 0:
|
|
||||||
limit = DEFAULT_LIMIT
|
|
||||||
offset = 0
|
|
||||||
if len(g) > 4:
|
|
||||||
offset = int(r[6])
|
|
||||||
|
|
||||||
logg.debug('account query is address {} offset {} limit {}'.format(address, offset, limit))
|
|
||||||
|
|
||||||
return (address, offset, limit,)
|
|
||||||
|
|
||||||
|
|
||||||
# r is an re.Match
|
|
||||||
def parse_query_any(r):
|
|
||||||
limit = DEFAULT_LIMIT
|
|
||||||
offset = 0
|
|
||||||
block_offset = None
|
|
||||||
block_end = None
|
|
||||||
if r.lastindex != None:
|
|
||||||
if r.lastindex > 0:
|
|
||||||
limit = int(r[1])
|
|
||||||
if r.lastindex > 1:
|
|
||||||
offset = int(r[2])
|
|
||||||
if r.lastindex > 2:
|
|
||||||
block_offset = int(r[3])
|
|
||||||
if r.lastindex > 3:
|
|
||||||
block_end = int(r[4])
|
|
||||||
if block_end < block_offset:
|
|
||||||
raise ValueError('cart before the horse, dude')
|
|
||||||
|
|
||||||
logg.debug('data query is offset {} limit {} block_offset {} block_end {}'.format(offset, limit, block_offset, block_end))
|
|
||||||
|
|
||||||
return (offset, limit, block_offset, block_end,)
|
|
||||||
|
|
||||||
|
|
||||||
def process_default_limit(session, env):
|
|
||||||
r = re.match(re_default_limit, env.get('PATH_INFO'))
|
|
||||||
if not r:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return ('application/json', str(DEFAULT_LIMIT).encode('utf-8'),)
|
|
||||||
|
|
||||||
|
|
||||||
def process_transactions_account_bloom(session, env):
|
def process_transactions_account_bloom(session, env):
|
||||||
r = re.match(re_transactions_account_bloom, env.get('PATH_INFO'))
|
r = re.match(re_transactions_account_bloom, env.get('PATH_INFO'))
|
||||||
if not r:
|
if not r:
|
||||||
return None
|
return None
|
||||||
logg.debug('match account bloom')
|
|
||||||
|
|
||||||
(address, offset, limit,) = parse_query_account(r)
|
address = r[1]
|
||||||
|
if r[2] == None:
|
||||||
|
address = add_0x(address)
|
||||||
|
offset = 0
|
||||||
|
if r.lastindex > 2:
|
||||||
|
offset = r[4]
|
||||||
|
limit = DEFAULT_LIMIT
|
||||||
|
if r.lastindex > 4:
|
||||||
|
limit = r[6]
|
||||||
|
|
||||||
c = BloomCache(session)
|
c = BloomCache(session)
|
||||||
(lowest_block, highest_block, bloom_filter_block, bloom_filter_tx) = c.load_transactions_account(address, offset, limit)
|
(lowest_block, highest_block, bloom_filter_block, bloom_filter_tx) = c.load_transactions_account(address, offset, limit)
|
||||||
@ -108,9 +59,13 @@ def process_transactions_all_bloom(session, env):
|
|||||||
r = re.match(re_transactions_all_bloom, env.get('PATH_INFO'))
|
r = re.match(re_transactions_all_bloom, env.get('PATH_INFO'))
|
||||||
if not r:
|
if not r:
|
||||||
return None
|
return None
|
||||||
logg.debug('match all bloom')
|
|
||||||
|
|
||||||
(limit, offset, block_offset, block_end,) = parse_query_any(r)
|
offset = DEFAULT_LIMIT
|
||||||
|
if r.lastindex > 0:
|
||||||
|
offset = r[1]
|
||||||
|
limit = 0
|
||||||
|
if r.lastindex > 1:
|
||||||
|
limit = r[2]
|
||||||
|
|
||||||
c = BloomCache(session)
|
c = BloomCache(session)
|
||||||
(lowest_block, highest_block, bloom_filter_block, bloom_filter_tx) = c.load_transactions(offset, limit)
|
(lowest_block, highest_block, bloom_filter_block, bloom_filter_tx) = c.load_transactions(offset, limit)
|
||||||
@ -133,16 +88,17 @@ def process_transactions_all_data(session, env):
|
|||||||
r = re.match(re_transactions_all_data, env.get('PATH_INFO'))
|
r = re.match(re_transactions_all_data, env.get('PATH_INFO'))
|
||||||
if not r:
|
if not r:
|
||||||
return None
|
return None
|
||||||
#if env.get('HTTP_X_CIC_CACHE_MODE') != 'all':
|
if env.get('HTTP_X_CIC_CACHE_MODE') != 'all':
|
||||||
# return None
|
return None
|
||||||
logg.debug('match all data')
|
|
||||||
|
|
||||||
logg.debug('got data request {}'.format(env))
|
logg.debug('got data request {}'.format(env))
|
||||||
|
block_offset = r[1]
|
||||||
(offset, limit, block_offset, block_end) = parse_query_any(r)
|
block_end = r[2]
|
||||||
|
if int(r[2]) < int(r[1]):
|
||||||
|
raise ValueError('cart before the horse, dude')
|
||||||
|
|
||||||
c = DataCache(session)
|
c = DataCache(session)
|
||||||
(lowest_block, highest_block, tx_cache) = c.load_transactions_with_data(offset, limit, block_offset, block_end, oldest=True) # oldest needs to be settable
|
(lowest_block, highest_block, tx_cache) = c.load_transactions_with_data(0, 0, block_offset, block_end, oldest=True) # oldest needs to be settable
|
||||||
|
|
||||||
for r in tx_cache:
|
for r in tx_cache:
|
||||||
r['date_block'] = r['date_block'].timestamp()
|
r['date_block'] = r['date_block'].timestamp()
|
||||||
@ -157,30 +113,3 @@ def process_transactions_all_data(session, env):
|
|||||||
j = json.dumps(o)
|
j = json.dumps(o)
|
||||||
|
|
||||||
return ('application/json', j.encode('utf-8'),)
|
return ('application/json', j.encode('utf-8'),)
|
||||||
|
|
||||||
|
|
||||||
def process_transactions_account_data(session, env):
|
|
||||||
r = re.match(re_transactions_account_data, env.get('PATH_INFO'))
|
|
||||||
if not r:
|
|
||||||
return None
|
|
||||||
logg.debug('match account data')
|
|
||||||
#if env.get('HTTP_X_CIC_CACHE_MODE') != 'all':
|
|
||||||
# return None
|
|
||||||
|
|
||||||
(address, offset, limit,) = parse_query_account(r)
|
|
||||||
|
|
||||||
c = DataCache(session)
|
|
||||||
(lowest_block, highest_block, tx_cache) = c.load_transactions_account_with_data(address, offset, limit)
|
|
||||||
|
|
||||||
for r in tx_cache:
|
|
||||||
r['date_block'] = r['date_block'].timestamp()
|
|
||||||
|
|
||||||
o = {
|
|
||||||
'low': lowest_block,
|
|
||||||
'high': highest_block,
|
|
||||||
'data': tx_cache,
|
|
||||||
}
|
|
||||||
|
|
||||||
j = json.dumps(o)
|
|
||||||
|
|
||||||
return ('application/json', j.encode('utf-8'),)
|
|
||||||
|
@ -12,20 +12,21 @@ import cic_cache.cli
|
|||||||
from cic_cache.db import dsn_from_config
|
from cic_cache.db import dsn_from_config
|
||||||
from cic_cache.db.models.base import SessionBase
|
from cic_cache.db.models.base import SessionBase
|
||||||
from cic_cache.runnable.daemons.query import (
|
from cic_cache.runnable.daemons.query import (
|
||||||
process_default_limit,
|
|
||||||
process_transactions_account_bloom,
|
process_transactions_account_bloom,
|
||||||
process_transactions_account_data,
|
|
||||||
process_transactions_all_bloom,
|
process_transactions_all_bloom,
|
||||||
process_transactions_all_data,
|
process_transactions_all_data,
|
||||||
)
|
)
|
||||||
import cic_cache.cli
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING)
|
logging.basicConfig(level=logging.WARNING)
|
||||||
logg = logging.getLogger()
|
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')
|
||||||
|
|
||||||
arg_flags = cic_cache.cli.argflag_std_read
|
# process args
|
||||||
local_arg_flags = cic_cache.cli.argflag_local_sync | cic_cache.cli.argflag_local_task
|
arg_flags = cic_cache.cli.argflag_std_base
|
||||||
|
local_arg_flags = cic_cache.cli.argflag_local_task
|
||||||
argparser = cic_cache.cli.ArgumentParser(arg_flags)
|
argparser = cic_cache.cli.ArgumentParser(arg_flags)
|
||||||
argparser.process_local_flags(local_arg_flags)
|
argparser.process_local_flags(local_arg_flags)
|
||||||
args = argparser.parse_args()
|
args = argparser.parse_args()
|
||||||
@ -34,7 +35,7 @@ args = argparser.parse_args()
|
|||||||
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
||||||
|
|
||||||
# connect to database
|
# connect to database
|
||||||
dsn = dsn_from_config(config, 'cic_cache')
|
dsn = dsn_from_config(config)
|
||||||
SessionBase.connect(dsn, config.true('DATABASE_DEBUG'))
|
SessionBase.connect(dsn, config.true('DATABASE_DEBUG'))
|
||||||
|
|
||||||
|
|
||||||
@ -46,11 +47,9 @@ def application(env, start_response):
|
|||||||
|
|
||||||
session = SessionBase.create_session()
|
session = SessionBase.create_session()
|
||||||
for handler in [
|
for handler in [
|
||||||
process_transactions_account_data,
|
|
||||||
process_transactions_account_bloom,
|
|
||||||
process_transactions_all_data,
|
process_transactions_all_data,
|
||||||
process_transactions_all_bloom,
|
process_transactions_all_bloom,
|
||||||
process_default_limit,
|
process_transactions_account_bloom,
|
||||||
]:
|
]:
|
||||||
r = None
|
r = None
|
||||||
try:
|
try:
|
||||||
|
@ -3,7 +3,6 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import argparse
|
import argparse
|
||||||
import tempfile
|
|
||||||
|
|
||||||
# third-party imports
|
# third-party imports
|
||||||
import celery
|
import celery
|
||||||
@ -29,7 +28,7 @@ args = argparser.parse_args()
|
|||||||
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
||||||
|
|
||||||
# connect to database
|
# connect to database
|
||||||
dsn = dsn_from_config(config, 'cic_cache')
|
dsn = dsn_from_config(config)
|
||||||
SessionBase.connect(dsn)
|
SessionBase.connect(dsn)
|
||||||
|
|
||||||
# set up celery
|
# set up celery
|
||||||
|
@ -50,7 +50,7 @@ args = argparser.parse_args()
|
|||||||
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
||||||
|
|
||||||
# connect to database
|
# connect to database
|
||||||
dsn = dsn_from_config(config, 'cic_cache')
|
dsn = dsn_from_config(config)
|
||||||
SessionBase.connect(dsn, debug=config.true('DATABASE_DEBUG'))
|
SessionBase.connect(dsn, debug=config.true('DATABASE_DEBUG'))
|
||||||
|
|
||||||
# set up rpc
|
# set up rpc
|
||||||
@ -95,10 +95,10 @@ def main():
|
|||||||
syncer_backends = SQLBackend.resume(chain_spec, block_offset)
|
syncer_backends = SQLBackend.resume(chain_spec, block_offset)
|
||||||
|
|
||||||
if len(syncer_backends) == 0:
|
if len(syncer_backends) == 0:
|
||||||
initial_block_start = int(config.get('SYNCER_OFFSET'))
|
initial_block_start = config.get('SYNCER_OFFSET')
|
||||||
initial_block_offset = int(block_offset)
|
initial_block_offset = block_offset
|
||||||
if config.get('SYNCER_NO_HISTORY'):
|
if config.get('SYNCER_NO_HISTORY'):
|
||||||
initial_block_start = initial_block_offset
|
initial_block_start = block_offset
|
||||||
initial_block_offset += 1
|
initial_block_offset += 1
|
||||||
syncer_backends.append(SQLBackend.initial(chain_spec, initial_block_offset, start_block_height=initial_block_start))
|
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))
|
logg.info('found no backends to resume, adding initial sync from history start {} end {}'.format(initial_block_start, initial_block_offset))
|
||||||
|
@ -5,7 +5,7 @@ version = (
|
|||||||
0,
|
0,
|
||||||
2,
|
2,
|
||||||
1,
|
1,
|
||||||
'alpha.3',
|
'alpha.2',
|
||||||
)
|
)
|
||||||
|
|
||||||
version_object = semver.VersionInfo(
|
version_object = semver.VersionInfo(
|
||||||
|
3
apps/cic-cache/config/celery.ini
Normal file
3
apps/cic-cache/config/celery.ini
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[celery]
|
||||||
|
broker_url = redis:///
|
||||||
|
result_url = redis:///
|
3
apps/cic-cache/config/cic.ini
Normal file
3
apps/cic-cache/config/cic.ini
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[cic]
|
||||||
|
registry_address =
|
||||||
|
trust_address =
|
9
apps/cic-cache/config/database.ini
Normal file
9
apps/cic-cache/config/database.ini
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[database]
|
||||||
|
NAME=cic_cache
|
||||||
|
USER=postgres
|
||||||
|
PASSWORD=
|
||||||
|
HOST=localhost
|
||||||
|
PORT=5432
|
||||||
|
ENGINE=postgresql
|
||||||
|
DRIVER=psycopg2
|
||||||
|
DEBUG=0
|
3
apps/cic-cache/config/docker/celery.ini
Normal file
3
apps/cic-cache/config/docker/celery.ini
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[celery]
|
||||||
|
broker_url = redis://localhost:63379
|
||||||
|
result_url = redis://localhost:63379
|
3
apps/cic-cache/config/docker/cic.ini
Normal file
3
apps/cic-cache/config/docker/cic.ini
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[cic]
|
||||||
|
registry_address =
|
||||||
|
trust_address = 0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
|
9
apps/cic-cache/config/docker/database.ini
Normal file
9
apps/cic-cache/config/docker/database.ini
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[database]
|
||||||
|
NAME=cic_cache
|
||||||
|
USER=grassroots
|
||||||
|
PASSWORD=
|
||||||
|
HOST=localhost
|
||||||
|
PORT=63432
|
||||||
|
ENGINE=postgresql
|
||||||
|
DRIVER=psycopg2
|
||||||
|
DEBUG=0
|
4
apps/cic-cache/config/docker/syncer.ini
Normal file
4
apps/cic-cache/config/docker/syncer.ini
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[syncer]
|
||||||
|
loop_interval = 1
|
||||||
|
offset = 0
|
||||||
|
no_history = 0
|
2
apps/cic-cache/config/test/bancor.ini
Normal file
2
apps/cic-cache/config/test/bancor.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[bancor]
|
||||||
|
dir =
|
@ -1,3 +1,4 @@
|
|||||||
[cic]
|
[cic]
|
||||||
registry_address =
|
registry_address =
|
||||||
|
chain_spec =
|
||||||
trust_address =
|
trust_address =
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[database]
|
[database]
|
||||||
PREFIX=cic-cache-test
|
NAME=cic-cache-test
|
||||||
USER=postgres
|
USER=postgres
|
||||||
PASSWORD=
|
PASSWORD=
|
||||||
HOST=localhost
|
HOST=localhost
|
||||||
|
5
apps/cic-cache/config/test/eth.ini
Normal file
5
apps/cic-cache/config/test/eth.ini
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
[eth]
|
||||||
|
#ws_provider = ws://localhost:8546
|
||||||
|
#ttp_provider = http://localhost:8545
|
||||||
|
provider = http://localhost:8545
|
||||||
|
#chain_id =
|
@ -1,4 +1,4 @@
|
|||||||
openapi: "3.0.2"
|
openapi: "3.0.3"
|
||||||
info:
|
info:
|
||||||
title: Grassroots Economics CIC Cache
|
title: Grassroots Economics CIC Cache
|
||||||
description: Cache of processed transaction data from Ethereum blockchain and worker queues
|
description: Cache of processed transaction data from Ethereum blockchain and worker queues
|
||||||
@ -9,34 +9,17 @@ info:
|
|||||||
email: will@grassecon.org
|
email: will@grassecon.org
|
||||||
license:
|
license:
|
||||||
name: GPLv3
|
name: GPLv3
|
||||||
version: 0.2.0
|
version: 0.1.0
|
||||||
|
|
||||||
paths:
|
paths:
|
||||||
/defaultlimit:
|
/tx/{offset}/{limit}:
|
||||||
summary: The default limit value of result sets.
|
description: Bloom filter for batch of latest transactions
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve default limit
|
|
||||||
operationId: limit.default
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Limit query successful
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/Limit"
|
|
||||||
|
|
||||||
/tx:
|
|
||||||
summary: Bloom filter for batch of latest transactions
|
|
||||||
description: Generate a bloom filter of the latest transactions in the cache. The number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
- transactions
|
- transactions
|
||||||
description:
|
description:
|
||||||
Retrieve transactions
|
Retrieve transactions
|
||||||
operationId: tx.get.latest
|
operationId: tx.get
|
||||||
responses:
|
responses:
|
||||||
200:
|
200:
|
||||||
description: Transaction query successful.
|
description: Transaction query successful.
|
||||||
@ -46,109 +29,27 @@ paths:
|
|||||||
$ref: "#/components/schemas/BlocksBloom"
|
$ref: "#/components/schemas/BlocksBloom"
|
||||||
|
|
||||||
|
|
||||||
/tx/{limit}:
|
|
||||||
summary: Bloom filter for batch of latest transactions
|
|
||||||
description: Generate a bloom filter of the latest transactions in the cache. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.latest.limit
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful. Results are ordered from newest to oldest.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
parameters:
|
parameters:
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/tx/{limit}/{offset}:
|
|
||||||
summary: Bloom filter for batch of latest transactions
|
|
||||||
description: Generate a bloom filter of the latest transactions in the cache. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.latest.range
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful. Results are ordered from newest to oldest.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
- name: offset
|
||||||
in: path
|
in: path
|
||||||
required: true
|
|
||||||
schema:
|
schema:
|
||||||
type: integer
|
type: integer
|
||||||
format: int32
|
format: int32
|
||||||
|
|
||||||
|
|
||||||
/tx/{limit}/{offset}/{block_offset}:
|
|
||||||
summary: Bloom filter for batch of transactions since a particular block.
|
|
||||||
description: Generate a bloom filter of the latest transactions since a particular block in the cache. The block parameter is inclusive. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.latest.range.block.offset
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful. Results are ordered from oldest to newest.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
- name: limit
|
||||||
in: path
|
in: path
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
schema:
|
||||||
type: integer
|
type: integer
|
||||||
format: int32
|
format: int32
|
||||||
|
|
||||||
|
|
||||||
/tx/{limit}/{offset}/{block_offset}/{block_end}:
|
/tx/{address}/{offset}/{limit}:
|
||||||
summary: Bloom filter for batch of transactions within a particular block range.
|
description: Bloom filter for batch of latest transactions by account
|
||||||
description: Generate a bloom filter of the latest transactions within a particular block range in the cache. The block parameters are inclusive. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
- transactions
|
- transactions
|
||||||
description:
|
description:
|
||||||
Retrieve transactions
|
Retrieve transactions
|
||||||
operationId: tx.get.latest.range.block.range
|
operationId: tx.get
|
||||||
responses:
|
responses:
|
||||||
200:
|
200:
|
||||||
description: Transaction query successful.
|
description: Transaction query successful.
|
||||||
@ -157,49 +58,6 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
$ref: "#/components/schemas/BlocksBloom"
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_end
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/tx/{address}:
|
|
||||||
summary: Bloom filter for batch of latest transactions by account.
|
|
||||||
description: Generate a bloom filter of the latest transactions where a specific account is the spender or beneficiary.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.user
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
- name: address
|
- name: address
|
||||||
@ -207,342 +65,26 @@ paths:
|
|||||||
required: true
|
required: true
|
||||||
schema:
|
schema:
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
|
||||||
/tx/{address}/{limit}:
|
|
||||||
summary: Bloom filter for batch of latest transactions by account.
|
|
||||||
description: Generate a bloom filter of the latest transactions where a specific account is the spender or beneficiary. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.user.limit
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: address
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/tx/{address}/{limit}/{offset}:
|
|
||||||
summary: Bloom filter for batch of latest transactions by account
|
|
||||||
description: Generate a bloom filter of the latest transactions where a specific account is the spender or beneficiary. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: tx.get.user.range
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/BlocksBloom"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: address
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
- name: offset
|
||||||
in: path
|
in: path
|
||||||
required: true
|
|
||||||
schema:
|
schema:
|
||||||
type: integer
|
type: integer
|
||||||
format: int32
|
format: int32
|
||||||
|
|
||||||
|
|
||||||
/txa:
|
|
||||||
summary: Cached data for latest transactions.
|
|
||||||
description: Return data entries of the latest transactions in the cache. The number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.latest
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
|
|
||||||
/txa/{limit}:
|
|
||||||
summary: Cached data for latest transactions.
|
|
||||||
description: Return data entries of the latest transactions in the cache. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.latest.limit
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
- name: limit
|
||||||
in: path
|
in: path
|
||||||
required: true
|
|
||||||
schema:
|
schema:
|
||||||
type: integer
|
type: integer
|
||||||
format: int32
|
format: int32
|
||||||
|
|
||||||
|
|
||||||
/txa/{limit}/{offset}:
|
|
||||||
summary: Cached data for latest transactions.
|
|
||||||
description: Return data entries of the latest transactions in the cache. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.latest.range
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/txa/{limit}/{offset}/{block_offset}:
|
|
||||||
summary: Cached data for transactions since a particular block.
|
|
||||||
description: Return cached data entries of transactions since a particular block. The block parameter is inclusive. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.latest.range.block.offset
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
/txa/{limit}/{offset}/{block_offset}/{block_end}:
|
|
||||||
summary: Cached data for transactions within a particular block range.
|
|
||||||
description: Return cached data entries of transactions within a particular block range in the cache. The block parameters are inclusive. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.latest.range.block.range
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: block_end
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/txa/{address}:
|
|
||||||
summary: Cached data for batch of latest transactions by account.
|
|
||||||
description: Return cached data of the latest transactions where a specific account is the spender or beneficiary.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.user
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: address
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
|
|
||||||
|
|
||||||
/txa/{address}/{limit}:
|
|
||||||
summary: Cached data for batch of latest transactions by account.
|
|
||||||
description: Return cached data of the latest transactions where a specific account is the spender or beneficiary. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.user.limit
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: address
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
/txa/{address}/{limit}/{offset}:
|
|
||||||
summary: Cached data for batch of latest transactions by account.
|
|
||||||
description: Return cached data of the latest transactions where a specific account is the spender or beneficiary. If `limit` is 0, the number of maximum number of transactions returned is returned by the `/defaultlimit` API call.
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- transactions
|
|
||||||
description:
|
|
||||||
Retrieve transactions
|
|
||||||
operationId: txa.get.user.range
|
|
||||||
responses:
|
|
||||||
200:
|
|
||||||
description: Transaction query successful.
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/TransactionList"
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- name: address
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
- name: limit
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
- name: offset
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
|
|
||||||
|
|
||||||
components:
|
components:
|
||||||
schemas:
|
schemas:
|
||||||
Limit:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
BlocksBloom:
|
BlocksBloom:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
low:
|
low:
|
||||||
type: integer
|
type: int
|
||||||
format: int32
|
format: int32
|
||||||
description: The lowest block number included in the filter
|
description: The lowest block number included in the filter
|
||||||
high:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
description: The highest block number included in the filter
|
|
||||||
block_filter:
|
block_filter:
|
||||||
type: string
|
type: string
|
||||||
format: byte
|
format: byte
|
||||||
@ -555,89 +97,6 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
description: Hashing algorithm (currently only using sha256)
|
description: Hashing algorithm (currently only using sha256)
|
||||||
filter_rounds:
|
filter_rounds:
|
||||||
type: integer
|
type: int
|
||||||
format: int32
|
format: int32
|
||||||
description: Number of hash rounds used to create the filter
|
description: Number of hash rounds used to create the filter
|
||||||
TransactionList:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
low:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
description: The lowest block number included in the result set
|
|
||||||
high:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
description: The highest block number included in the filter
|
|
||||||
data:
|
|
||||||
type: array
|
|
||||||
description: Cached transaction data
|
|
||||||
items:
|
|
||||||
$ref: "#/components/schemas/Transaction"
|
|
||||||
Transaction:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
block_number:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
description: Block number transaction was included in.
|
|
||||||
tx_hash:
|
|
||||||
type: string
|
|
||||||
description: Transaction hash, in hex.
|
|
||||||
date_block:
|
|
||||||
type: integer
|
|
||||||
format: int32
|
|
||||||
description: Block timestamp.
|
|
||||||
sender:
|
|
||||||
type: string
|
|
||||||
description: Spender address, in hex.
|
|
||||||
recipient:
|
|
||||||
type: string
|
|
||||||
description: Beneficiary address, in hex.
|
|
||||||
from_value:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
description: Value deducted from spender's balance.
|
|
||||||
to_value:
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
description: Value added to beneficiary's balance.
|
|
||||||
source_token:
|
|
||||||
type: string
|
|
||||||
description: Network address of token in which `from_value` is denominated.
|
|
||||||
destination_token:
|
|
||||||
type: string
|
|
||||||
description: Network address of token in which `to_value` is denominated.
|
|
||||||
success:
|
|
||||||
type: boolean
|
|
||||||
description: Network consensus state on whether the transaction was successful or not.
|
|
||||||
tx_type:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- erc20.faucet
|
|
||||||
- faucet.give_to
|
|
||||||
|
|
||||||
examples:
|
|
||||||
data_last:
|
|
||||||
summary: Get the latest cached transactions, using the server's default limit.
|
|
||||||
value: "/txa"
|
|
||||||
|
|
||||||
data_limit:
|
|
||||||
summary: Get the last 42 cached transactions.
|
|
||||||
value: "/txa/42"
|
|
||||||
|
|
||||||
data_range:
|
|
||||||
summary: Get the next 42 cached transactions, starting from the 13th (zero-indexed).
|
|
||||||
value: "/txa/42/13"
|
|
||||||
|
|
||||||
data_range_block_offset:
|
|
||||||
summary: Get the next 42 cached transactions, starting from block 1337 (inclusive).
|
|
||||||
value: "/txa/42/0/1337"
|
|
||||||
|
|
||||||
data_range_block_offset:
|
|
||||||
summary: Get the next 42 cached transactions within blocks 1337 and 1453 (inclusive).
|
|
||||||
value: "/txa/42/0/1337/1453"
|
|
||||||
|
|
||||||
data_range_block_range:
|
|
||||||
summary: Get the next 42 cached transactions after the 13th, within blocks 1337 and 1453 (inclusive).
|
|
||||||
value: "/txa/42/13/1337/1453"
|
|
||||||
|
@ -1,22 +1,30 @@
|
|||||||
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 .
|
COPY requirements.txt .
|
||||||
|
|
||||||
ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net
|
RUN apt-get install libffi-dev -y
|
||||||
ARG EXTRA_PIP_ARGS=""
|
|
||||||
ARG PIP_INDEX_URL=https://pypi.org/simple
|
|
||||||
|
|
||||||
RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
|
ARG EXTRA_PIP_INDEX_URL="https://pip.grassrootseconomics.net:8433"
|
||||||
pip install --index-url $PIP_INDEX_URL \
|
ARG EXTRA_PIP_ARGS=""
|
||||||
|
ARG PIP_INDEX_URL="https://pypi.org/simple"
|
||||||
|
|
||||||
|
RUN pip install --index-url $PIP_INDEX_URL \
|
||||||
--pre \
|
--pre \
|
||||||
|
--force-reinstall \
|
||||||
|
--no-cache \
|
||||||
--extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
|
--extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
|
||||||
-r requirements.txt
|
-r requirements.txt
|
||||||
|
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN pip install . --extra-index-url $EXTRA_PIP_INDEX_URL
|
|
||||||
|
RUN python setup.py install
|
||||||
|
|
||||||
|
# ini files in config directory defines the configurable parameters for the application
|
||||||
|
# they can all be overridden by environment variables
|
||||||
|
# to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
|
||||||
|
#COPY config/ /usr/local/etc/cic-cache/
|
||||||
|
|
||||||
# for db migrations
|
# for db migrations
|
||||||
COPY ./aux/wait-for-it/wait-for-it.sh ./
|
COPY ./aux/wait-for-it/wait-for-it.sh ./
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
>&2 echo executing database migration
|
>&2 echo executing database migration
|
||||||
python scripts/migrate_cic_cache.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
|
set +e
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -e
|
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 \
|
--extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
|
||||||
-r test_requirements.txt
|
-r test_requirements.txt
|
||||||
|
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
alembic==1.4.2
|
alembic==1.4.2
|
||||||
confini~=0.5.3
|
confini>=0.3.6rc4,<0.5.0
|
||||||
uwsgi==2.0.19.1
|
uwsgi==2.0.19.1
|
||||||
moolb~=0.2.0
|
moolb~=0.1.1b2
|
||||||
cic-eth-registry~=0.6.6
|
cic-eth-registry~=0.6.1a1
|
||||||
SQLAlchemy==1.3.20
|
SQLAlchemy==1.3.20
|
||||||
semver==2.13.0
|
semver==2.13.0
|
||||||
psycopg2==2.8.6
|
psycopg2==2.8.6
|
||||||
celery==4.4.7
|
celery==4.4.7
|
||||||
redis==3.5.3
|
redis==3.5.3
|
||||||
chainsyncer[sql]~=0.0.7
|
chainsyncer[sql]>=0.0.6a3,<0.1.0
|
||||||
erc20-faucet~=0.3.2
|
erc20-faucet>=0.3.2a2, <0.4.0
|
||||||
chainlib-eth~=0.0.15
|
chainlib-eth>=0.0.9a14,<0.1.0
|
||||||
eth-address-index~=0.2.4
|
eth-address-index>=0.2.3a4,<0.3.0
|
||||||
okota~=0.2.5
|
|
||||||
|
@ -1,55 +1,53 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python
|
||||||
|
|
||||||
# standard imports
|
|
||||||
import os
|
import os
|
||||||
import argparse
|
import argparse
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
|
|
||||||
# external imports
|
|
||||||
import alembic
|
import alembic
|
||||||
from alembic.config import Config as AlembicConfig
|
from alembic.config import Config as AlembicConfig
|
||||||
import confini
|
import confini
|
||||||
|
|
||||||
# local imports
|
|
||||||
from cic_cache.db import dsn_from_config
|
from cic_cache.db import dsn_from_config
|
||||||
import cic_cache.cli
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING)
|
logging.basicConfig(level=logging.WARNING)
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
|
|
||||||
# BUG: the dbdir doesn't work after script install
|
# BUG: the dbdir doesn't work after script install
|
||||||
rootdir = os.path.dirname(os.path.dirname(os.path.realpath(cic_cache.__file__)))
|
rootdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
dbdir = os.path.join(rootdir, 'cic_cache', 'db')
|
dbdir = os.path.join(rootdir, 'cic_cache', 'db')
|
||||||
default_migrations_dir = os.path.join(dbdir, 'migrations')
|
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')
|
||||||
|
|
||||||
arg_flags = cic_cache.cli.argflag_std_base
|
argparser = argparse.ArgumentParser()
|
||||||
local_arg_flags = cic_cache.cli.argflag_local_sync
|
argparser.add_argument('-c', type=str, default=config_dir, help='config file')
|
||||||
argparser = cic_cache.cli.ArgumentParser(arg_flags)
|
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.process_local_flags(local_arg_flags)
|
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')
|
argparser.add_argument('--reset', action='store_true', help='downgrade before upgrading')
|
||||||
argparser.add_argument('-f', '--force', action='store_true', help='force action')
|
argparser.add_argument('-f', action='store_true', help='force action')
|
||||||
argparser.add_argument('--migrations-dir', dest='migrations_dir', default=default_migrations_dir, type=str, help='migrations directory')
|
argparser.add_argument('-v', action='store_true', help='be verbose')
|
||||||
|
argparser.add_argument('-vv', action='store_true', help='be more verbose')
|
||||||
args = argparser.parse_args()
|
args = argparser.parse_args()
|
||||||
|
|
||||||
extra_args = {
|
if args.vv:
|
||||||
'reset': None,
|
logging.getLogger().setLevel(logging.DEBUG)
|
||||||
'force': None,
|
elif args.v:
|
||||||
'migrations_dir': None,
|
logging.getLogger().setLevel(logging.INFO)
|
||||||
}
|
|
||||||
# process config
|
|
||||||
config = cic_cache.cli.Config.from_args(args, arg_flags, local_arg_flags, extra_args=extra_args)
|
|
||||||
|
|
||||||
migrations_dir = os.path.join(config.get('_MIGRATIONS_DIR'), config.get('DATABASE_ENGINE', 'default'))
|
config = confini.Config(args.c, args.env_prefix)
|
||||||
|
config.process()
|
||||||
|
config.censor('PASSWORD', 'DATABASE')
|
||||||
|
config.censor('PASSWORD', 'SSL')
|
||||||
|
logg.debug('config:\n{}'.format(config))
|
||||||
|
|
||||||
|
migrations_dir = os.path.join(args.migrations_dir, config.get('DATABASE_ENGINE'))
|
||||||
if not os.path.isdir(migrations_dir):
|
if not os.path.isdir(migrations_dir):
|
||||||
logg.debug('migrations dir for engine {} not found, reverting to default'.format(config.get('DATABASE_ENGINE')))
|
logg.debug('migrations dir for engine {} not found, reverting to default'.format(config.get('DATABASE_ENGINE')))
|
||||||
migrations_dir = os.path.join(args.migrations_dir, 'default')
|
migrations_dir = os.path.join(args.migrations_dir, 'default')
|
||||||
|
|
||||||
# connect to database
|
# connect to database
|
||||||
dsn = dsn_from_config(config, 'cic_cache')
|
dsn = dsn_from_config(config)
|
||||||
|
|
||||||
|
|
||||||
logg.info('using migrations dir {}'.format(migrations_dir))
|
logg.info('using migrations dir {}'.format(migrations_dir))
|
@ -1,7 +1,6 @@
|
|||||||
[metadata]
|
[metadata]
|
||||||
name = cic-cache
|
name = cic-cache
|
||||||
description = CIC Cache API and server
|
description = CIC Cache API and server
|
||||||
version = 0.3.0a2
|
|
||||||
author = Louis Holbrook
|
author = Louis Holbrook
|
||||||
author_email = dev@holbrook.no
|
author_email = dev@holbrook.no
|
||||||
url = https://gitlab.com/grassrootseconomics/cic-eth
|
url = https://gitlab.com/grassrootseconomics/cic-eth
|
||||||
@ -35,7 +34,7 @@ packages =
|
|||||||
cic_cache.runnable.daemons
|
cic_cache.runnable.daemons
|
||||||
cic_cache.runnable.daemons.filters
|
cic_cache.runnable.daemons.filters
|
||||||
scripts =
|
scripts =
|
||||||
./scripts/migrate_cic_cache.py
|
./scripts/migrate.py
|
||||||
|
|
||||||
[options.entry_points]
|
[options.entry_points]
|
||||||
console_scripts =
|
console_scripts =
|
||||||
|
@ -1,39 +1,38 @@
|
|||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
# import configparser
|
import configparser
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
# import time
|
from cic_cache.version import (
|
||||||
|
version_object,
|
||||||
|
version_string
|
||||||
|
)
|
||||||
|
|
||||||
# from cic_cache.version import (
|
class PleaseCommitFirstError(Exception):
|
||||||
# version_object,
|
pass
|
||||||
# version_string
|
|
||||||
# )
|
def git_hash():
|
||||||
#
|
import subprocess
|
||||||
# class PleaseCommitFirstError(Exception):
|
git_diff = subprocess.run(['git', 'diff'], capture_output=True)
|
||||||
# pass
|
if len(git_diff.stdout) > 0:
|
||||||
#
|
raise PleaseCommitFirstError()
|
||||||
# def git_hash():
|
git_hash = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True)
|
||||||
# import subprocess
|
git_hash_brief = git_hash.stdout.decode('utf-8')[:8]
|
||||||
# git_diff = subprocess.run(['git', 'diff'], capture_output=True)
|
return git_hash_brief
|
||||||
# if len(git_diff.stdout) > 0:
|
|
||||||
# raise PleaseCommitFirstError()
|
version_string = str(version_object)
|
||||||
# git_hash = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True)
|
|
||||||
# git_hash_brief = git_hash.stdout.decode('utf-8')[:8]
|
try:
|
||||||
# return git_hash_brief
|
version_git = git_hash()
|
||||||
#
|
version_string += '+build.{}'.format(version_git)
|
||||||
# version_string = str(version_object)
|
except FileNotFoundError:
|
||||||
#
|
time_string_pair = str(time.time()).split('.')
|
||||||
# try:
|
version_string += '+build.{}{:<09d}'.format(
|
||||||
# version_git = git_hash()
|
time_string_pair[0],
|
||||||
# version_string += '+build.{}'.format(version_git)
|
int(time_string_pair[1]),
|
||||||
# except FileNotFoundError:
|
)
|
||||||
# time_string_pair = str(time.time()).split('.')
|
print('final version string will be {}'.format(version_string))
|
||||||
# version_string += '+build.{}{:<09d}'.format(
|
|
||||||
# time_string_pair[0],
|
|
||||||
# int(time_string_pair[1]),
|
|
||||||
# )
|
|
||||||
# print('final version string will be {}'.format(version_string))
|
|
||||||
|
|
||||||
requirements = []
|
requirements = []
|
||||||
f = open('requirements.txt', 'r')
|
f = open('requirements.txt', 'r')
|
||||||
@ -53,8 +52,9 @@ while True:
|
|||||||
test_requirements.append(l.rstrip())
|
test_requirements.append(l.rstrip())
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
# version=version_string,
|
version=version_string,
|
||||||
install_requires=requirements,
|
install_requires=requirements,
|
||||||
tests_require=test_requirements,
|
tests_require=test_requirements,
|
||||||
)
|
)
|
||||||
|
@ -7,4 +7,4 @@ pytest-celery==0.0.0a1
|
|||||||
eth_tester==0.5.0b3
|
eth_tester==0.5.0b3
|
||||||
py-evm==0.3.0a20
|
py-evm==0.3.0a20
|
||||||
sarafu-faucet~=0.0.7a1
|
sarafu-faucet~=0.0.7a1
|
||||||
erc20-transfer-authorization~=0.3.6
|
erc20-transfer-authorization>=0.3.5a1,<0.4.0
|
||||||
|
@ -6,7 +6,6 @@ import datetime
|
|||||||
# external imports
|
# external imports
|
||||||
import pytest
|
import pytest
|
||||||
import moolb
|
import moolb
|
||||||
from chainlib.encode import TxHexNormalizer
|
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from cic_cache import db
|
from cic_cache import db
|
||||||
@ -43,8 +42,6 @@ def txs(
|
|||||||
list_tokens,
|
list_tokens,
|
||||||
):
|
):
|
||||||
|
|
||||||
tx_normalize = TxHexNormalizer()
|
|
||||||
|
|
||||||
session = init_database
|
session = init_database
|
||||||
|
|
||||||
tx_number = 13
|
tx_number = 13
|
||||||
@ -57,10 +54,10 @@ def txs(
|
|||||||
tx_hash_first,
|
tx_hash_first,
|
||||||
list_defaults['block'],
|
list_defaults['block'],
|
||||||
tx_number,
|
tx_number,
|
||||||
tx_normalize.wallet_address(list_actors['alice']),
|
list_actors['alice'],
|
||||||
tx_normalize.wallet_address(list_actors['bob']),
|
list_actors['bob'],
|
||||||
tx_normalize.executable_address(list_tokens['foo']),
|
list_tokens['foo'],
|
||||||
tx_normalize.executable_address(list_tokens['foo']),
|
list_tokens['foo'],
|
||||||
1024,
|
1024,
|
||||||
2048,
|
2048,
|
||||||
True,
|
True,
|
||||||
@ -77,10 +74,10 @@ def txs(
|
|||||||
tx_hash_second,
|
tx_hash_second,
|
||||||
list_defaults['block']-1,
|
list_defaults['block']-1,
|
||||||
tx_number,
|
tx_number,
|
||||||
tx_normalize.wallet_address(list_actors['diane']),
|
list_actors['diane'],
|
||||||
tx_normalize.wallet_address(list_actors['alice']),
|
list_actors['alice'],
|
||||||
tx_normalize.executable_address(list_tokens['foo']),
|
list_tokens['foo'],
|
||||||
tx_normalize.wallet_address(list_tokens['foo']),
|
list_tokens['foo'],
|
||||||
1024,
|
1024,
|
||||||
2048,
|
2048,
|
||||||
False,
|
False,
|
||||||
@ -106,8 +103,6 @@ def more_txs(
|
|||||||
|
|
||||||
session = init_database
|
session = init_database
|
||||||
|
|
||||||
tx_normalize = TxHexNormalizer()
|
|
||||||
|
|
||||||
tx_number = 666
|
tx_number = 666
|
||||||
tx_hash = '0x' + os.urandom(32).hex()
|
tx_hash = '0x' + os.urandom(32).hex()
|
||||||
tx_signed = '0x' + os.urandom(128).hex()
|
tx_signed = '0x' + os.urandom(128).hex()
|
||||||
@ -120,10 +115,10 @@ def more_txs(
|
|||||||
tx_hash,
|
tx_hash,
|
||||||
list_defaults['block']+2,
|
list_defaults['block']+2,
|
||||||
tx_number,
|
tx_number,
|
||||||
tx_normalize.wallet_address(list_actors['alice']),
|
list_actors['alice'],
|
||||||
tx_normalize.wallet_address(list_actors['diane']),
|
list_actors['diane'],
|
||||||
tx_normalize.executable_address(list_tokens['bar']),
|
list_tokens['bar'],
|
||||||
tx_normalize.executable_address(list_tokens['bar']),
|
list_tokens['bar'],
|
||||||
2048,
|
2048,
|
||||||
4096,
|
4096,
|
||||||
False,
|
False,
|
||||||
|
@ -14,8 +14,7 @@ logg = logging.getLogger(__file__)
|
|||||||
@pytest.fixture(scope='session')
|
@pytest.fixture(scope='session')
|
||||||
def load_config():
|
def load_config():
|
||||||
config_dir = os.path.join(root_dir, 'config/test')
|
config_dir = os.path.join(root_dir, 'config/test')
|
||||||
schema_config_dir = os.path.join(root_dir, 'cic_cache', 'data', 'config')
|
conf = confini.Config(config_dir, 'CICTEST')
|
||||||
conf = confini.Config(schema_config_dir, 'CICTEST', override_dirs=config_dir)
|
|
||||||
conf.process()
|
conf.process()
|
||||||
logg.debug('config {}'.format(conf))
|
logg.debug('config {}'.format(conf))
|
||||||
return conf
|
return conf
|
||||||
|
@ -24,15 +24,11 @@ def database_engine(
|
|||||||
if load_config.get('DATABASE_ENGINE') == 'sqlite':
|
if load_config.get('DATABASE_ENGINE') == 'sqlite':
|
||||||
SessionBase.transactional = False
|
SessionBase.transactional = False
|
||||||
SessionBase.poolable = False
|
SessionBase.poolable = False
|
||||||
name = 'cic_cache'
|
|
||||||
database_name = name
|
|
||||||
if load_config.get('DATABASE_PREFIX'):
|
|
||||||
database_name = '{}_{}'.format(load_config.get('DATABASE_PREFIX'), database_name)
|
|
||||||
try:
|
try:
|
||||||
os.unlink(database_name)
|
os.unlink(load_config.get('DATABASE_NAME'))
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
dsn = dsn_from_config(load_config, name)
|
dsn = dsn_from_config(load_config)
|
||||||
SessionBase.connect(dsn, debug=load_config.true('DATABASE_DEBUG'))
|
SessionBase.connect(dsn, debug=load_config.true('DATABASE_DEBUG'))
|
||||||
return dsn
|
return dsn
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ def test_api_all_data(
|
|||||||
):
|
):
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
'PATH_INFO': '/txa/100/0/410000/420000',
|
'PATH_INFO': '/txa/410000/420000',
|
||||||
'HTTP_X_CIC_CACHE_MODE': 'all',
|
'HTTP_X_CIC_CACHE_MODE': 'all',
|
||||||
}
|
}
|
||||||
j = process_transactions_all_data(init_database, env)
|
j = process_transactions_all_data(init_database, env)
|
||||||
@ -23,7 +23,7 @@ def test_api_all_data(
|
|||||||
assert len(o['data']) == 2
|
assert len(o['data']) == 2
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
'PATH_INFO': '/txa/100/0/420000/410000',
|
'PATH_INFO': '/txa/420000/410000',
|
||||||
'HTTP_X_CIC_CACHE_MODE': 'all',
|
'HTTP_X_CIC_CACHE_MODE': 'all',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@ import json
|
|||||||
|
|
||||||
# external imports
|
# external imports
|
||||||
import pytest
|
import pytest
|
||||||
from chainlib.encode import TxHexNormalizer
|
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from cic_cache import db
|
from cic_cache import db
|
||||||
@ -63,8 +62,6 @@ def test_cache_ranges(
|
|||||||
|
|
||||||
session = init_database
|
session = init_database
|
||||||
|
|
||||||
tx_normalize = TxHexNormalizer()
|
|
||||||
|
|
||||||
oldest = list_defaults['block'] - 1
|
oldest = list_defaults['block'] - 1
|
||||||
mid = list_defaults['block']
|
mid = list_defaults['block']
|
||||||
newest = list_defaults['block'] + 2
|
newest = list_defaults['block'] + 2
|
||||||
@ -103,39 +100,32 @@ def test_cache_ranges(
|
|||||||
assert b[1] == mid
|
assert b[1] == mid
|
||||||
|
|
||||||
# now check when supplying account
|
# now check when supplying account
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account(list_actors['alice'], 0, 100)
|
||||||
b = c.load_transactions_account(account, 0, 100)
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['bob'])
|
b = c.load_transactions_account(list_actors['bob'], 0, 100)
|
||||||
b = c.load_transactions_account(account, 0, 100)
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == mid
|
assert b[1] == mid
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['diane'])
|
b = c.load_transactions_account(list_actors['diane'], 0, 100)
|
||||||
b = c.load_transactions_account(account, 0, 100)
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
|
|
||||||
# add block filter to the mix
|
# add block filter to the mix
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
|
||||||
b = c.load_transactions_account(account, 0, 100, block_offset=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
|
||||||
b = c.load_transactions_account(account, 0, 100, block_offset=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['bob'])
|
b = c.load_transactions_account(list_actors['bob'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
||||||
b = c.load_transactions_account(account, 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == mid
|
assert b[1] == mid
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['diane'])
|
b = c.load_transactions_account(list_actors['diane'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
||||||
b = c.load_transactions_account(account, 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == oldest
|
assert b[1] == oldest
|
||||||
|
|
||||||
@ -150,8 +140,6 @@ def test_cache_ranges_data(
|
|||||||
|
|
||||||
session = init_database
|
session = init_database
|
||||||
|
|
||||||
tx_normalize = TxHexNormalizer()
|
|
||||||
|
|
||||||
oldest = list_defaults['block'] - 1
|
oldest = list_defaults['block'] - 1
|
||||||
mid = list_defaults['block']
|
mid = list_defaults['block']
|
||||||
newest = list_defaults['block'] + 2
|
newest = list_defaults['block'] + 2
|
||||||
@ -215,8 +203,7 @@ def test_cache_ranges_data(
|
|||||||
assert b[2][1]['tx_hash'] == more_txs[1]
|
assert b[2][1]['tx_hash'] == more_txs[1]
|
||||||
|
|
||||||
# now check when supplying account
|
# now check when supplying account
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100)
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100)
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
assert len(b[2]) == 3
|
assert len(b[2]) == 3
|
||||||
@ -224,15 +211,13 @@ def test_cache_ranges_data(
|
|||||||
assert b[2][1]['tx_hash'] == more_txs[1]
|
assert b[2][1]['tx_hash'] == more_txs[1]
|
||||||
assert b[2][2]['tx_hash'] == more_txs[2]
|
assert b[2][2]['tx_hash'] == more_txs[2]
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['bob'])
|
b = c.load_transactions_account_with_data(list_actors['bob'], 0, 100)
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100)
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == mid
|
assert b[1] == mid
|
||||||
assert len(b[2]) == 1
|
assert len(b[2]) == 1
|
||||||
assert b[2][0]['tx_hash'] == more_txs[1]
|
assert b[2][0]['tx_hash'] == more_txs[1]
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['diane'])
|
b = c.load_transactions_account_with_data(list_actors['diane'], 0, 100)
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100)
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
assert len(b[2]) == 2
|
assert len(b[2]) == 2
|
||||||
@ -240,31 +225,27 @@ def test_cache_ranges_data(
|
|||||||
assert b[2][1]['tx_hash'] == more_txs[2]
|
assert b[2][1]['tx_hash'] == more_txs[2]
|
||||||
|
|
||||||
# add block filter to the mix
|
# add block filter to the mix
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100, block_offset=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
assert len(b[2]) == 2
|
assert len(b[2]) == 2
|
||||||
assert b[2][0]['tx_hash'] == more_txs[0]
|
assert b[2][0]['tx_hash'] == more_txs[0]
|
||||||
assert b[2][1]['tx_hash'] == more_txs[1]
|
assert b[2][1]['tx_hash'] == more_txs[1]
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['alice'])
|
b = c.load_transactions_account_with_data(list_actors['alice'], 0, 100, block_offset=list_defaults['block'])
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100, block_offset=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == newest
|
assert b[1] == newest
|
||||||
assert len(b[2]) == 2
|
assert len(b[2]) == 2
|
||||||
assert b[2][0]['tx_hash'] == more_txs[0]
|
assert b[2][0]['tx_hash'] == more_txs[0]
|
||||||
assert b[2][1]['tx_hash'] == more_txs[1]
|
assert b[2][1]['tx_hash'] == more_txs[1]
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['bob'])
|
b = c.load_transactions_account_with_data(list_actors['bob'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
|
||||||
assert b[0] == mid
|
assert b[0] == mid
|
||||||
assert b[1] == mid
|
assert b[1] == mid
|
||||||
assert len(b[2]) == 1
|
assert len(b[2]) == 1
|
||||||
assert b[2][0]['tx_hash'] == more_txs[1]
|
assert b[2][0]['tx_hash'] == more_txs[1]
|
||||||
|
|
||||||
account = tx_normalize.wallet_address(list_actors['diane'])
|
b = c.load_transactions_account_with_data(list_actors['diane'], 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
||||||
b = c.load_transactions_account_with_data(account, 0, 100, block_offset=list_defaults['block'] - 1, block_limit=list_defaults['block'])
|
|
||||||
assert b[0] == oldest
|
assert b[0] == oldest
|
||||||
assert b[1] == oldest
|
assert b[1] == oldest
|
||||||
assert len(b[2]) == 1
|
assert len(b[2]) == 1
|
||||||
|
@ -82,7 +82,7 @@ def test_query_regex(
|
|||||||
[
|
[
|
||||||
('alice', None, None, [(420000, 13), (419999, 42)]),
|
('alice', None, None, [(420000, 13), (419999, 42)]),
|
||||||
('alice', None, 1, [(420000, 13)]),
|
('alice', None, 1, [(420000, 13)]),
|
||||||
('alice', 1, 1, [(419999, 42)]), # 420000 == list_defaults['block']
|
('alice', 1, None, [(419999, 42)]), # 420000 == list_defaults['block']
|
||||||
('alice', 2, None, []), # 420000 == list_defaults['block']
|
('alice', 2, None, []), # 420000 == list_defaults['block']
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -107,11 +107,10 @@ def test_query_process_txs_account(
|
|||||||
path_info = '/tx/user/0x' + strip_0x(actor)
|
path_info = '/tx/user/0x' + strip_0x(actor)
|
||||||
if query_offset != None:
|
if query_offset != None:
|
||||||
path_info += '/' + str(query_offset)
|
path_info += '/' + str(query_offset)
|
||||||
if query_limit == None:
|
if query_limit != None:
|
||||||
query_limit = 100
|
|
||||||
path_info += '/' + str(query_limit)
|
|
||||||
if query_offset == None:
|
if query_offset == None:
|
||||||
path_info += '/0'
|
path_info += '/0'
|
||||||
|
path_info += '/' + str(query_limit)
|
||||||
env = {
|
env = {
|
||||||
'PATH_INFO': path_info,
|
'PATH_INFO': path_info,
|
||||||
}
|
}
|
||||||
@ -193,7 +192,7 @@ def test_query_process_txs_bloom(
|
|||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
'query_block_start, query_block_end, query_match_count',
|
'query_block_start, query_block_end, query_match_count',
|
||||||
[
|
[
|
||||||
(1, 42, 0),
|
(None, 42, 0),
|
||||||
(420000, 420001, 1),
|
(420000, 420001, 1),
|
||||||
(419999, 419999, 1), # matches are inclusive
|
(419999, 419999, 1), # matches are inclusive
|
||||||
(419999, 420000, 2),
|
(419999, 420000, 2),
|
||||||
@ -212,7 +211,7 @@ def test_query_process_txs_data(
|
|||||||
query_match_count,
|
query_match_count,
|
||||||
):
|
):
|
||||||
|
|
||||||
path_info = '/txa/100/0'
|
path_info = '/txa'
|
||||||
if query_block_start != None:
|
if query_block_start != None:
|
||||||
path_info += '/' + str(query_block_start)
|
path_info += '/' + str(query_block_start)
|
||||||
if query_block_end != None:
|
if query_block_end != None:
|
||||||
@ -228,5 +227,4 @@ def test_query_process_txs_data(
|
|||||||
assert r != None
|
assert r != None
|
||||||
|
|
||||||
o = json.loads(r[1])
|
o = json.loads(r[1])
|
||||||
logg.debug('oo {}'.format(o))
|
|
||||||
assert len(o['data']) == query_match_count
|
assert len(o['data']) == query_match_count
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
celery==4.4.7
|
celery==4.4.7
|
||||||
erc20-demurrage-token~=0.0.6
|
erc20-demurrage-token~=0.0.5a3
|
||||||
cic-eth-registry~=0.6.3
|
cic-eth-registry~=0.6.1a6
|
||||||
chainlib~=0.0.14
|
chainlib~=0.0.9rc1
|
||||||
cic_eth~=0.12.6
|
cic_eth~=0.12.4a11
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[metadata]
|
[metadata]
|
||||||
name = cic-eth-aux-erc20-demurrage-token
|
name = cic-eth-aux-erc20-demurrage-token
|
||||||
version = 0.0.3
|
version = 0.0.2a7
|
||||||
description = cic-eth tasks supporting erc20 demurrage token
|
description = cic-eth tasks supporting erc20 demurrage token
|
||||||
author = Louis Holbrook
|
author = Louis Holbrook
|
||||||
author_email = dev@holbrook.no
|
author_email = dev@holbrook.no
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
SQLAlchemy==1.3.20
|
SQLAlchemy==1.3.20
|
||||||
hexathon~=0.1.0
|
cic-eth-registry>=0.6.1a6,<0.7.0
|
||||||
chainqueue~=0.0.6a4
|
hexathon~=0.0.1a8
|
||||||
eth-erc20~=0.1.5
|
chainqueue>=0.0.4a6,<0.1.0
|
||||||
|
eth-erc20>=0.1.2a2,<0.2.0
|
||||||
|
@ -123,7 +123,7 @@ class AdminApi:
|
|||||||
return s_lock.apply_async()
|
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.
|
"""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.
|
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',
|
'cic_eth.eth.account.set_role',
|
||||||
[
|
[
|
||||||
tag,
|
tag,
|
||||||
address,
|
address_hex,
|
||||||
chain_spec.asdict(),
|
chain_spec.asdict(),
|
||||||
],
|
],
|
||||||
queue=self.queue,
|
queue=self.queue,
|
||||||
@ -146,30 +146,6 @@ class AdminApi:
|
|||||||
return s_tag.apply_async()
|
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):
|
def have_account(self, address_hex, chain_spec):
|
||||||
s_have = celery.signature(
|
s_have = celery.signature(
|
||||||
'cic_eth.eth.account.have',
|
'cic_eth.eth.account.have',
|
||||||
@ -527,7 +503,7 @@ class AdminApi:
|
|||||||
queue=self.queue,
|
queue=self.queue,
|
||||||
)
|
)
|
||||||
t = s.apply_async()
|
t = s.apply_async()
|
||||||
role = t.get()[0][1]
|
role = t.get()
|
||||||
if role != None:
|
if role != None:
|
||||||
tx['sender_description'] = role
|
tx['sender_description'] = role
|
||||||
|
|
||||||
@ -580,7 +556,7 @@ class AdminApi:
|
|||||||
queue=self.queue,
|
queue=self.queue,
|
||||||
)
|
)
|
||||||
t = s.apply_async()
|
t = s.apply_async()
|
||||||
role = t.get()[0][1]
|
role = t.get()
|
||||||
if role != None:
|
if role != None:
|
||||||
tx['recipient_description'] = role
|
tx['recipient_description'] = role
|
||||||
|
|
||||||
|
@ -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)
|
:param password: Password to encode the password with in the backend (careful, you will have to remember it)
|
||||||
:type password: str
|
:type password: str
|
||||||
:param register: Register the new account in accounts index backend
|
:param register: Register the new account in accounts index backend
|
||||||
:type register: bool
|
:type password: bool
|
||||||
:returns: uuid of root task
|
:returns: uuid of root task
|
||||||
:rtype: celery.Task
|
:rtype: celery.Task
|
||||||
"""
|
"""
|
||||||
@ -683,4 +683,3 @@ class Api(ApiBase):
|
|||||||
|
|
||||||
t = self.callback_success.apply_async([r])
|
t = self.callback_success.apply_async([r])
|
||||||
return t
|
return t
|
||||||
|
|
||||||
|
@ -12,9 +12,8 @@ from cic_eth.db.models.base import SessionBase
|
|||||||
from cic_eth.db.enum import LockEnum
|
from cic_eth.db.enum import LockEnum
|
||||||
from cic_eth.error import LockedError
|
from cic_eth.error import LockedError
|
||||||
from cic_eth.admin.ctrl import check_lock
|
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):
|
def health(*args, **kwargs):
|
||||||
@ -32,15 +31,18 @@ def health(*args, **kwargs):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
gas_provider = AccountRole.get_address('GAS_GIFTER', session=session)
|
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()
|
session.close()
|
||||||
|
|
||||||
if not r:
|
rpc = RPCConnection.connect(chain_spec, 'default')
|
||||||
logg.error('EEK! gas gifter has balance {}, below minimum {}'.format(r, min_gas))
|
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 r
|
return True
|
||||||
|
@ -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
|
|
@ -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-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')
|
self.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use')
|
||||||
if local_arg_flags & CICFlag.REDIS_CALLBACK:
|
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-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', type=int, help='redis port to use for callback (defaults to redis port)')
|
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')
|
self.add_argument('--redis-timeout', default=20.0, type=float, help='Redis callback timeout')
|
||||||
if local_arg_flags & CICFlag.CELERY:
|
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')
|
self.add_argument('-q', '--celery-queue', dest='celery_queue', type=str, default='cic-eth', help='Task queue')
|
||||||
if local_arg_flags & CICFlag.SYNCER:
|
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')
|
self.add_argument('--no-history', action='store_true', dest='no_history', help='Skip initial history sync')
|
||||||
if local_arg_flags & CICFlag.CHAIN:
|
if local_arg_flags & CICFlag.CHAIN:
|
||||||
self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')
|
self.add_argument('-r', '--registry-address', type=str, dest='registry_address', help='CIC registry contract address')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ class CICFlag(enum.IntEnum):
|
|||||||
# sync - nibble 4
|
# sync - nibble 4
|
||||||
SYNCER = 4096
|
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_taskcallback = argflag_local_task | CICFlag.REDIS | CICFlag.REDIS_CALLBACK
|
||||||
argflag_local_chain = CICFlag.CHAIN
|
argflag_local_chain = CICFlag.CHAIN
|
||||||
|
@ -1,18 +1,12 @@
|
|||||||
# standard imports
|
# standard imports
|
||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
import urllib.parse
|
|
||||||
import copy
|
|
||||||
|
|
||||||
# external imports
|
# external imports
|
||||||
from chainlib.eth.cli import (
|
from chainlib.eth.cli import (
|
||||||
Config as BaseConfig,
|
Config as BaseConfig,
|
||||||
Flag,
|
Flag,
|
||||||
)
|
)
|
||||||
from urlybird.merge import (
|
|
||||||
urlhostmerge,
|
|
||||||
urlmerge,
|
|
||||||
)
|
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from .base import CICFlag
|
from .base import CICFlag
|
||||||
@ -46,7 +40,6 @@ class Config(BaseConfig):
|
|||||||
if local_arg_flags & CICFlag.CHAIN:
|
if local_arg_flags & CICFlag.CHAIN:
|
||||||
local_args_override['CIC_REGISTRY_ADDRESS'] = getattr(args, 'registry_address')
|
local_args_override['CIC_REGISTRY_ADDRESS'] = getattr(args, 'registry_address')
|
||||||
|
|
||||||
|
|
||||||
if local_arg_flags & CICFlag.CELERY:
|
if local_arg_flags & CICFlag.CELERY:
|
||||||
local_args_override['CELERY_QUEUE'] = getattr(args, 'celery_queue')
|
local_args_override['CELERY_QUEUE'] = getattr(args, 'celery_queue')
|
||||||
|
|
||||||
@ -56,71 +49,15 @@ class Config(BaseConfig):
|
|||||||
|
|
||||||
config.dict_override(local_args_override, 'local cli args')
|
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'),
|
|
||||||
)
|
|
||||||
db = getattr(args, 'redis_db', None)
|
|
||||||
if db != None:
|
|
||||||
db = str(db)
|
|
||||||
|
|
||||||
redis_url = (
|
|
||||||
'redis',
|
|
||||||
hostport,
|
|
||||||
db,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
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),
|
|
||||||
)
|
|
||||||
db = getattr(args, 'redis_db', None)
|
|
||||||
if db != None:
|
|
||||||
db = str(db)
|
|
||||||
celery_arg_url = (
|
|
||||||
getattr(args, 'celery_scheme', None),
|
|
||||||
hostport,
|
|
||||||
db,
|
|
||||||
)
|
|
||||||
|
|
||||||
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:
|
if local_arg_flags & CICFlag.REDIS_CALLBACK:
|
||||||
redis_host_callback = getattr(args, 'redis_host_callback', config.get('REDIS_HOST'))
|
config.add(getattr(args, 'redis_host_callback'), '_REDIS_HOST_CALLBACK')
|
||||||
redis_port_callback = getattr(args, 'redis_port_callback', config.get('REDIS_PORT'))
|
config.add(getattr(args, 'redis_port_callback'), '_REDIS_PORT_CALLBACK')
|
||||||
config.add(redis_host_callback, '_REDIS_HOST_CALLBACK')
|
|
||||||
config.add(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))
|
logg.debug('config loaded:\n{}'.format(config))
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[celery]
|
[celery]
|
||||||
broker_url =
|
broker_url = redis://localhost:6379
|
||||||
result_url =
|
result_url =
|
||||||
queue = cic-eth
|
queue = cic-eth
|
||||||
debug = 0
|
debug = 0
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
registry_address =
|
registry_address =
|
||||||
trust_address =
|
trust_address =
|
||||||
default_token_symbol =
|
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
|
run_dir = /run
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
[eth]
|
[eth]
|
||||||
gas_holder_minimum_units = 180000
|
gas_gifter_minimum_balance = 10000000000000000000000
|
||||||
gas_holder_refill_units = 15
|
|
||||||
gas_holder_refill_threshold = 3
|
|
||||||
gas_gifter_refill_buffer = 3
|
|
||||||
min_fee_price = 1
|
|
||||||
|
@ -23,7 +23,7 @@ def upgrade():
|
|||||||
op.create_table(
|
op.create_table(
|
||||||
'lock',
|
'lock',
|
||||||
sa.Column('id', sa.Integer, primary_key=True),
|
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('blockchain', sa.String),
|
||||||
sa.Column("flags", sa.BIGINT(), nullable=False, default=0),
|
sa.Column("flags", sa.BIGINT(), nullable=False, default=0),
|
||||||
sa.Column("date_created", sa.DateTime, nullable=False, default=datetime.datetime.utcnow),
|
sa.Column("date_created", sa.DateTime, nullable=False, default=datetime.datetime.utcnow),
|
||||||
|
@ -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')
|
|
@ -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
|
|
@ -12,7 +12,7 @@ from cic_eth.error import (
|
|||||||
IntegrityError,
|
IntegrityError,
|
||||||
)
|
)
|
||||||
|
|
||||||
logg = logging.getLogger(__name__)
|
logg = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
class Nonce(SessionBase):
|
class Nonce(SessionBase):
|
||||||
@ -21,7 +21,7 @@ class Nonce(SessionBase):
|
|||||||
__tablename__ = 'nonce'
|
__tablename__ = 'nonce'
|
||||||
|
|
||||||
nonce = Column(Integer)
|
nonce = Column(Integer)
|
||||||
address_hex = Column(String(40))
|
address_hex = Column(String(42))
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -25,21 +25,7 @@ class AccountRole(SessionBase):
|
|||||||
address_hex = Column(String(42))
|
address_hex = Column(String(42))
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
# TODO:
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_address(tag, session):
|
def get_address(tag, session):
|
||||||
"""Get Ethereum address matching the given tag
|
"""Get Ethereum address matching the given tag
|
||||||
|
@ -69,12 +69,9 @@ class StatusEnum(enum.IntEnum):
|
|||||||
class LockEnum(enum.IntEnum):
|
class LockEnum(enum.IntEnum):
|
||||||
"""
|
"""
|
||||||
STICKY: When set, reset is not possible
|
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
|
CREATE: Disable creation of accounts
|
||||||
SEND: Disable sending to network
|
SEND: Disable sending to network
|
||||||
QUEUE: Disable queueing new or modified transactions
|
QUEUE: Disable queueing new or modified transactions
|
||||||
QUERY: Disable all queue state and transaction queries
|
|
||||||
"""
|
"""
|
||||||
STICKY=1
|
STICKY=1
|
||||||
INIT=2
|
INIT=2
|
||||||
@ -82,8 +79,7 @@ class LockEnum(enum.IntEnum):
|
|||||||
SEND=8
|
SEND=8
|
||||||
QUEUE=16
|
QUEUE=16
|
||||||
QUERY=32
|
QUERY=32
|
||||||
START=int(0x80000000)
|
ALL=int(0xfffffffffffffffe)
|
||||||
ALL=int(0x7ffffffe)
|
|
||||||
|
|
||||||
|
|
||||||
def status_str(v, bits_only=False):
|
def status_str(v, bits_only=False):
|
||||||
|
@ -64,10 +64,8 @@ class LockedError(Exception):
|
|||||||
|
|
||||||
class SeppukuError(Exception):
|
class SeppukuError(Exception):
|
||||||
"""Exception base class for all errors that should cause system shutdown
|
"""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):
|
class SignerError(SeppukuError):
|
||||||
|
@ -136,7 +136,7 @@ def register(self, account_address, chain_spec_dict, writer_address=None):
|
|||||||
# Generate and sign transaction
|
# Generate and sign transaction
|
||||||
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
||||||
nonce_oracle = CustodialTaskNonceOracle(writer_address, self.request.root_id, session=session) #, default_nonce)
|
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)
|
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)
|
(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()
|
rpc_signer.disconnect()
|
||||||
@ -192,7 +192,7 @@ def gift(self, account_address, chain_spec_dict):
|
|||||||
# Generate and sign transaction
|
# Generate and sign transaction
|
||||||
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
||||||
nonce_oracle = CustodialTaskNonceOracle(account_address, self.request.root_id, session=session) #, default_nonce)
|
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)
|
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)
|
(tx_hash_hex, tx_signed_raw_hex) = faucet.give_to(faucet_address, account_address, account_address, tx_format=TxFormat.RLP_SIGNED)
|
||||||
rpc_signer.disconnect()
|
rpc_signer.disconnect()
|
||||||
@ -266,46 +266,19 @@ def set_role(self, tag, address, chain_spec_dict):
|
|||||||
|
|
||||||
@celery_app.task(bind=True, base=BaseTask)
|
@celery_app.task(bind=True, base=BaseTask)
|
||||||
def role(self, address, chain_spec_dict):
|
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
|
:param account: Account to check
|
||||||
:type account: str, 0x-hex
|
:type account: str, 0x-hex
|
||||||
:param chain_spec_dict: Chain spec dict representation
|
:param chain_str: Chain spec string representation
|
||||||
:type chain_spec_dict: dict
|
:type chain_str: str
|
||||||
:returns: Account, or None if not exists
|
:returns: Account, or None if not exists
|
||||||
:rtype: Varies
|
:rtype: Varies
|
||||||
"""
|
"""
|
||||||
session = self.create_session()
|
session = self.create_session()
|
||||||
role_tag = AccountRole.role_for(address, session=session)
|
role_tag = AccountRole.role_for(address, session=session)
|
||||||
session.close()
|
session.close()
|
||||||
return [(address, role_tag,)]
|
return 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
|
|
||||||
|
|
||||||
|
|
||||||
@celery_app.task(bind=True, base=CriticalSQLAlchemyTask)
|
@celery_app.task(bind=True, base=CriticalSQLAlchemyTask)
|
||||||
|
@ -10,9 +10,6 @@ from chainlib.eth.tx import (
|
|||||||
TxFormat,
|
TxFormat,
|
||||||
unpack,
|
unpack,
|
||||||
)
|
)
|
||||||
from chainlib.eth.contract import (
|
|
||||||
ABIContractEncoder,
|
|
||||||
)
|
|
||||||
from cic_eth_registry import CICRegistry
|
from cic_eth_registry import CICRegistry
|
||||||
from cic_eth_registry.erc20 import ERC20Token
|
from cic_eth_registry.erc20 import ERC20Token
|
||||||
from hexathon import (
|
from hexathon import (
|
||||||
@ -22,7 +19,7 @@ from hexathon import (
|
|||||||
from chainqueue.error import NotLocalTxError
|
from chainqueue.error import NotLocalTxError
|
||||||
from eth_erc20 import ERC20
|
from eth_erc20 import ERC20
|
||||||
from chainqueue.sql.tx import cache_tx_dict
|
from chainqueue.sql.tx import cache_tx_dict
|
||||||
from okota.token_index.index import to_identifier
|
from okota.token_index import to_identifier
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from cic_eth.db.models.base import SessionBase
|
from cic_eth.db.models.base import SessionBase
|
||||||
@ -34,8 +31,10 @@ from cic_eth.error import (
|
|||||||
YouAreBrokeError,
|
YouAreBrokeError,
|
||||||
)
|
)
|
||||||
from cic_eth.queue.tx import register_tx
|
from cic_eth.queue.tx import register_tx
|
||||||
from cic_eth.eth.gas import create_check_gas_task
|
from cic_eth.eth.gas import (
|
||||||
from cic_eth.eth.util import CacheGasOracle
|
create_check_gas_task,
|
||||||
|
MaxGasOracle,
|
||||||
|
)
|
||||||
from cic_eth.ext.address import translate_address
|
from cic_eth.ext.address import translate_address
|
||||||
from cic_eth.task import (
|
from cic_eth.task import (
|
||||||
CriticalSQLAlchemyTask,
|
CriticalSQLAlchemyTask,
|
||||||
@ -46,14 +45,13 @@ from cic_eth.task import (
|
|||||||
from cic_eth.eth.nonce import CustodialTaskNonceOracle
|
from cic_eth.eth.nonce import CustodialTaskNonceOracle
|
||||||
from cic_eth.encode import tx_normalize
|
from cic_eth.encode import tx_normalize
|
||||||
from cic_eth.eth.trust import verify_proofs
|
from cic_eth.eth.trust import verify_proofs
|
||||||
from cic_eth.error import SignerError
|
|
||||||
|
|
||||||
celery_app = celery.current_app
|
celery_app = celery.current_app
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
@celery_app.task(bind=True, base=CriticalWeb3Task)
|
@celery_app.task(base=CriticalWeb3Task)
|
||||||
def balance(self, tokens, holder_address, chain_spec_dict):
|
def balance(tokens, holder_address, chain_spec_dict):
|
||||||
"""Return token balances for a list of tokens for given address
|
"""Return token balances for a list of tokens for given address
|
||||||
|
|
||||||
:param tokens: Token addresses
|
:param tokens: Token addresses
|
||||||
@ -72,9 +70,8 @@ def balance(self, tokens, holder_address, chain_spec_dict):
|
|||||||
for t in tokens:
|
for t in tokens:
|
||||||
address = t['address']
|
address = t['address']
|
||||||
logg.debug('address {} {}'.format(address, holder_address))
|
logg.debug('address {} {}'.format(address, holder_address))
|
||||||
gas_oracle = self.create_gas_oracle(rpc, min_price=self.min_fee_price)
|
|
||||||
token = ERC20Token(chain_spec, rpc, add_0x(address))
|
token = ERC20Token(chain_spec, rpc, add_0x(address))
|
||||||
c = ERC20(chain_spec, gas_oracle=gas_oracle)
|
c = ERC20(chain_spec)
|
||||||
o = c.balance_of(address, holder_address, sender_address=caller_address)
|
o = c.balance_of(address, holder_address, sender_address=caller_address)
|
||||||
r = rpc.do(o)
|
r = rpc.do(o)
|
||||||
t['balance_network'] = c.parse_balance(r)
|
t['balance_network'] = c.parse_balance(r)
|
||||||
@ -157,12 +154,8 @@ def transfer_from(self, tokens, holder_address, receiver_address, value, chain_s
|
|||||||
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
||||||
|
|
||||||
session = self.create_session()
|
session = self.create_session()
|
||||||
|
|
||||||
nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
|
nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
|
||||||
enc = ABIContractEncoder()
|
gas_oracle = self.create_gas_oracle(rpc, MaxGasOracle.gas)
|
||||||
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)
|
|
||||||
c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
|
c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
|
||||||
try:
|
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)
|
(tx_hash_hex, tx_signed_raw_hex) = c.transfer_from(t['address'], spender_address, holder_address, receiver_address, value, tx_format=TxFormat.RLP_SIGNED)
|
||||||
@ -232,12 +225,8 @@ def transfer(self, tokens, holder_address, receiver_address, value, chain_spec_d
|
|||||||
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
||||||
|
|
||||||
session = self.create_session()
|
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)
|
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)
|
c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
|
||||||
try:
|
try:
|
||||||
(tx_hash_hex, tx_signed_raw_hex) = c.transfer(t['address'], holder_address, receiver_address, value, tx_format=TxFormat.RLP_SIGNED)
|
(tx_hash_hex, tx_signed_raw_hex) = c.transfer(t['address'], holder_address, receiver_address, value, tx_format=TxFormat.RLP_SIGNED)
|
||||||
@ -305,12 +294,8 @@ def approve(self, tokens, holder_address, spender_address, value, chain_spec_dic
|
|||||||
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
rpc_signer = RPCConnection.connect(chain_spec, 'signer')
|
||||||
|
|
||||||
session = self.create_session()
|
session = self.create_session()
|
||||||
|
|
||||||
nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
|
nonce_oracle = CustodialTaskNonceOracle(holder_address, self.request.root_id, session=session)
|
||||||
enc = ABIContractEncoder()
|
gas_oracle = self.create_gas_oracle(rpc, MaxGasOracle.gas)
|
||||||
enc.method('approve')
|
|
||||||
method = enc.get()
|
|
||||||
gas_oracle = self.create_gas_oracle(rpc, t['address'], method=method, session=session)
|
|
||||||
c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
|
c = ERC20(chain_spec, signer=rpc_signer, gas_oracle=gas_oracle, nonce_oracle=nonce_oracle)
|
||||||
try:
|
try:
|
||||||
(tx_hash_hex, tx_signed_raw_hex) = c.approve(t['address'], holder_address, spender_address, value, tx_format=TxFormat.RLP_SIGNED)
|
(tx_hash_hex, tx_signed_raw_hex) = c.approve(t['address'], holder_address, spender_address, value, tx_format=TxFormat.RLP_SIGNED)
|
||||||
@ -397,8 +382,6 @@ def cache_transfer_data(
|
|||||||
sender_address = tx_normalize.wallet_address(tx['from'])
|
sender_address = tx_normalize.wallet_address(tx['from'])
|
||||||
recipient_address = tx_normalize.wallet_address(tx_data[0])
|
recipient_address = tx_normalize.wallet_address(tx_data[0])
|
||||||
token_value = tx_data[1]
|
token_value = tx_data[1]
|
||||||
source_token_address = tx_normalize.executable_address(tx['to'])
|
|
||||||
destination_token_address = source_token_address
|
|
||||||
|
|
||||||
|
|
||||||
session = SessionBase.create_session()
|
session = SessionBase.create_session()
|
||||||
@ -406,8 +389,8 @@ def cache_transfer_data(
|
|||||||
'hash': tx_hash_hex,
|
'hash': tx_hash_hex,
|
||||||
'from': sender_address,
|
'from': sender_address,
|
||||||
'to': recipient_address,
|
'to': recipient_address,
|
||||||
'source_token': source_token_address,
|
'source_token': tx['to'],
|
||||||
'destination_token': destination_token_address,
|
'destination_token': tx['to'],
|
||||||
'from_value': token_value,
|
'from_value': token_value,
|
||||||
'to_value': token_value,
|
'to_value': token_value,
|
||||||
}
|
}
|
||||||
@ -439,16 +422,14 @@ def cache_transfer_from_data(
|
|||||||
spender_address = tx_data[0]
|
spender_address = tx_data[0]
|
||||||
recipient_address = tx_data[1]
|
recipient_address = tx_data[1]
|
||||||
token_value = tx_data[2]
|
token_value = tx_data[2]
|
||||||
source_token_address = tx_normalize.executable_address(tx['to'])
|
|
||||||
destination_token_address = source_token_address
|
|
||||||
|
|
||||||
session = SessionBase.create_session()
|
session = SessionBase.create_session()
|
||||||
tx_dict = {
|
tx_dict = {
|
||||||
'hash': tx_hash_hex,
|
'hash': tx_hash_hex,
|
||||||
'from': tx['from'],
|
'from': tx['from'],
|
||||||
'to': recipient_address,
|
'to': recipient_address,
|
||||||
'source_token': source_token_address,
|
'source_token': tx['to'],
|
||||||
'destination_token': destination_token_address,
|
'destination_token': tx['to'],
|
||||||
'from_value': token_value,
|
'from_value': token_value,
|
||||||
'to_value': token_value,
|
'to_value': token_value,
|
||||||
}
|
}
|
||||||
@ -480,16 +461,14 @@ def cache_approve_data(
|
|||||||
sender_address = tx_normalize.wallet_address(tx['from'])
|
sender_address = tx_normalize.wallet_address(tx['from'])
|
||||||
recipient_address = tx_normalize.wallet_address(tx_data[0])
|
recipient_address = tx_normalize.wallet_address(tx_data[0])
|
||||||
token_value = tx_data[1]
|
token_value = tx_data[1]
|
||||||
source_token_address = tx_normalize.executable_address(tx['to'])
|
|
||||||
destination_token_address = source_token_address
|
|
||||||
|
|
||||||
session = SessionBase.create_session()
|
session = SessionBase.create_session()
|
||||||
tx_dict = {
|
tx_dict = {
|
||||||
'hash': tx_hash_hex,
|
'hash': tx_hash_hex,
|
||||||
'from': sender_address,
|
'from': sender_address,
|
||||||
'to': recipient_address,
|
'to': recipient_address,
|
||||||
'source_token': source_token_address,
|
'source_token': tx['to'],
|
||||||
'destination_token': destination_token_address,
|
'destination_token': tx['to'],
|
||||||
'from_value': token_value,
|
'from_value': token_value,
|
||||||
'to_value': token_value,
|
'to_value': token_value,
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,6 @@ from chainqueue.db.models.tx import TxCache
|
|||||||
from chainqueue.db.models.otx import Otx
|
from chainqueue.db.models.otx import Otx
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from cic_eth.db.models.gas_cache import GasCache
|
|
||||||
from cic_eth.db.models.role import AccountRole
|
from cic_eth.db.models.role import AccountRole
|
||||||
from cic_eth.db.models.base import SessionBase
|
from cic_eth.db.models.base import SessionBase
|
||||||
from cic_eth.error import (
|
from cic_eth.error import (
|
||||||
@ -66,56 +65,17 @@ from cic_eth.encode import (
|
|||||||
ZERO_ADDRESS_NORMAL,
|
ZERO_ADDRESS_NORMAL,
|
||||||
unpack_normal,
|
unpack_normal,
|
||||||
)
|
)
|
||||||
from cic_eth.error import SeppukuError
|
|
||||||
from cic_eth.eth.util import MAXIMUM_FEE_UNITS
|
|
||||||
|
|
||||||
celery_app = celery.current_app
|
celery_app = celery.current_app
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
MAXIMUM_FEE_UNITS = 8000000
|
||||||
|
|
||||||
@celery_app.task(base=CriticalSQLAlchemyTask)
|
class MaxGasOracle:
|
||||||
def apply_gas_value_cache(address, method, value, tx_hash):
|
|
||||||
return apply_gas_value_cache_local(address, method, value, tx_hash)
|
|
||||||
|
|
||||||
|
def gas(code=None):
|
||||||
def apply_gas_value_cache_local(address, method, value, tx_hash, session=None):
|
return MAXIMUM_FEE_UNITS
|
||||||
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 value > 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 create_check_gas_task(tx_signed_raws_hex, chain_spec, holder_address, gas=None, tx_hashes_hex=None, queue=None):
|
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
|
# set up evm RPC connection
|
||||||
rpc = RPCConnection.connect(chain_spec, 'default')
|
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
|
# set up transaction builder
|
||||||
nonce_oracle = CustodialTaskNonceOracle(gas_provider, self.request.root_id, session=session)
|
nonce_oracle = CustodialTaskNonceOracle(gas_provider, self.request.root_id, session=session)
|
||||||
gas_oracle = self.create_gas_oracle(rpc)
|
gas_oracle = self.create_gas_oracle(rpc)
|
||||||
|
@ -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)
|
|
@ -8,14 +8,15 @@ import confini
|
|||||||
|
|
||||||
script_dir = os.path.dirname(os.path.realpath(__file__))
|
script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||||
root_dir = os.path.dirname(os.path.dirname(script_dir))
|
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__)
|
logg = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='session')
|
@pytest.fixture(scope='session')
|
||||||
def load_config():
|
def load_config():
|
||||||
override_config_dir = os.path.join(root_dir, 'config', 'test')
|
config_dir = os.environ.get('CONFINI_DIR')
|
||||||
conf = confini.Config(config_dir, 'CICTEST', override_dirs=[override_config_dir])
|
if config_dir == None:
|
||||||
|
config_dir = os.path.join(root_dir, 'config/test')
|
||||||
|
conf = confini.Config(config_dir, 'CICTEST')
|
||||||
conf.process()
|
conf.process()
|
||||||
logg.debug('config {}'.format(conf))
|
logg.debug('config {}'.format(conf))
|
||||||
return conf
|
return conf
|
||||||
|
@ -72,7 +72,7 @@ def __balance_incoming_compatible(token_address, receiver_address):
|
|||||||
status_compare = dead()
|
status_compare = dead()
|
||||||
q = q.filter(Otx.status.op('&')(status_compare)==0)
|
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.
|
# 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)
|
q = q.filter(TxCache.destination_token_address==token_address)
|
||||||
delta = 0
|
delta = 0
|
||||||
for r in q.all():
|
for r in q.all():
|
||||||
|
@ -3,4 +3,3 @@ from .tx import TxFilter
|
|||||||
from .gas import GasFilter
|
from .gas import GasFilter
|
||||||
from .register import RegistrationFilter
|
from .register import RegistrationFilter
|
||||||
from .transferauth import TransferAuthFilter
|
from .transferauth import TransferAuthFilter
|
||||||
from .token import TokenFilter
|
|
||||||
|
@ -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()
|
|
@ -67,10 +67,7 @@ from cic_eth.registry import (
|
|||||||
connect_declarator,
|
connect_declarator,
|
||||||
connect_token_registry,
|
connect_token_registry,
|
||||||
)
|
)
|
||||||
from cic_eth.task import (
|
from cic_eth.task import BaseTask
|
||||||
BaseTask,
|
|
||||||
CriticalWeb3Task,
|
|
||||||
)
|
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING)
|
logging.basicConfig(level=logging.WARNING)
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
@ -79,18 +76,18 @@ arg_flags = cic_eth.cli.argflag_std_read
|
|||||||
local_arg_flags = cic_eth.cli.argflag_local_task
|
local_arg_flags = cic_eth.cli.argflag_local_task
|
||||||
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
||||||
argparser.process_local_flags(local_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('--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('--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')
|
argparser.add_argument('--aux', action='append', type=str, default=[], help='add single submodule from the aux module path')
|
||||||
args = argparser.parse_args()
|
args = argparser.parse_args()
|
||||||
|
|
||||||
# process config
|
# process config
|
||||||
extra_args = {
|
extra_args = {
|
||||||
|
# 'default_token_symbol': 'CIC_DEFAULT_TOKEN_SYMBOL',
|
||||||
'aux_all': None,
|
'aux_all': None,
|
||||||
'aux': None,
|
'aux': None,
|
||||||
'trace_queue_status': 'TASKS_TRACE_QUEUE_STATUS',
|
'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)
|
config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
||||||
|
|
||||||
@ -218,7 +215,6 @@ def main():
|
|||||||
argv.append('-n')
|
argv.append('-n')
|
||||||
argv.append(config.get('CELERY_QUEUE'))
|
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_symbol = default_token_symbol
|
||||||
BaseTask.default_token_address = default_token_address
|
BaseTask.default_token_address = default_token_address
|
||||||
default_token = ERC20Token(chain_spec, conn, add_0x(BaseTask.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_decimals = default_token.decimals
|
||||||
BaseTask.default_token_name = default_token.name
|
BaseTask.default_token_name = default_token.name
|
||||||
BaseTask.trusted_addresses = trusted_addresses
|
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')
|
BaseTask.run_dir = config.get('CIC_RUN_DIR')
|
||||||
logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))
|
logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))
|
||||||
|
@ -36,7 +36,6 @@ from cic_eth.runnable.daemons.filters import (
|
|||||||
TxFilter,
|
TxFilter,
|
||||||
RegistrationFilter,
|
RegistrationFilter,
|
||||||
TransferAuthFilter,
|
TransferAuthFilter,
|
||||||
TokenFilter,
|
|
||||||
)
|
)
|
||||||
from cic_eth.stat import init_chain_stat
|
from cic_eth.stat import init_chain_stat
|
||||||
from cic_eth.registry import (
|
from cic_eth.registry import (
|
||||||
@ -100,10 +99,10 @@ def main():
|
|||||||
syncer_backends = SQLBackend.resume(chain_spec, block_offset)
|
syncer_backends = SQLBackend.resume(chain_spec, block_offset)
|
||||||
|
|
||||||
if len(syncer_backends) == 0:
|
if len(syncer_backends) == 0:
|
||||||
initial_block_start = int(config.get('SYNCER_OFFSET'))
|
initial_block_start = config.get('SYNCER_OFFSET')
|
||||||
initial_block_offset = int(block_offset)
|
initial_block_offset = block_offset
|
||||||
if config.true('SYNCER_NO_HISTORY'):
|
if config.true('SYNCER_NO_HISTORY'):
|
||||||
initial_block_start = initial_block_offset
|
initial_block_start = block_offset
|
||||||
initial_block_offset += 1
|
initial_block_offset += 1
|
||||||
syncer_backends.append(SQLBackend.initial(chain_spec, initial_block_offset, start_block_height=initial_block_start))
|
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))
|
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'))
|
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'))
|
#transfer_auth_filter = TransferAuthFilter(registry, chain_spec, config.get('_CELERY_QUEUE'))
|
||||||
|
|
||||||
i = 0
|
i = 0
|
||||||
@ -166,7 +163,6 @@ def main():
|
|||||||
syncer.add_filter(registration_filter)
|
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
|
# 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(tx_filter)
|
||||||
syncer.add_filter(token_gas_cache_filter)
|
|
||||||
#syncer.add_filter(transfer_auth_filter)
|
#syncer.add_filter(transfer_auth_filter)
|
||||||
for cf in callback_filters:
|
for cf in callback_filters:
|
||||||
syncer.add_filter(cf)
|
syncer.add_filter(cf)
|
||||||
|
@ -8,7 +8,6 @@ import re
|
|||||||
# external imports
|
# external imports
|
||||||
import cic_eth.cli
|
import cic_eth.cli
|
||||||
from chainlib.chain import ChainSpec
|
from chainlib.chain import ChainSpec
|
||||||
from chainlib.eth.address import is_address
|
|
||||||
from xdg.BaseDirectory import xdg_config_home
|
from xdg.BaseDirectory import xdg_config_home
|
||||||
|
|
||||||
# local imports
|
# 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
|
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
|
local_arg_flags = cic_eth.cli.argflag_local_taskcallback
|
||||||
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
||||||
argparser.add_argument('--set', action='store_true', help='sets the given tag')
|
argparser.add_positional('tag', type=str, help='address tag')
|
||||||
argparser.add_argument('--tag', type=str, help='operate on the given tag')
|
argparser.add_positional('address', type=str, help='address')
|
||||||
argparser.add_positional('address', required=False, type=str, help='address associated with tag')
|
|
||||||
argparser.process_local_flags(local_arg_flags)
|
argparser.process_local_flags(local_arg_flags)
|
||||||
args = argparser.parse_args()
|
args = argparser.parse_args()
|
||||||
|
|
||||||
extra_args = {
|
config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags)
|
||||||
'set': None,
|
|
||||||
'tag': None,
|
|
||||||
'address': None,
|
|
||||||
}
|
|
||||||
config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags, extra_args=extra_args)
|
|
||||||
|
|
||||||
celery_app = cic_eth.cli.CeleryApp.from_config(config)
|
celery_app = cic_eth.cli.CeleryApp.from_config(config)
|
||||||
|
|
||||||
@ -46,17 +39,7 @@ api = AdminApi(None)
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
if config.get('_ADDRESS') != None and not is_address(config.get('_ADDRESS')):
|
admin_api.tag_account(args.tag, args.address, chain_spec)
|
||||||
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]))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -18,7 +18,7 @@ from cic_eth.api import Api
|
|||||||
logging.basicConfig(level=logging.WARNING)
|
logging.basicConfig(level=logging.WARNING)
|
||||||
logg = logging.getLogger('create_account_script')
|
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
|
local_arg_flags = cic_eth.cli.argflag_local_taskcallback
|
||||||
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
||||||
argparser.add_argument('--token-symbol', dest='token_symbol', type=str, help='Token symbol')
|
argparser.add_argument('--token-symbol', dest='token_symbol', type=str, help='Token symbol')
|
||||||
|
@ -16,14 +16,9 @@ import confini
|
|||||||
import celery
|
import celery
|
||||||
from chainlib.chain import ChainSpec
|
from chainlib.chain import ChainSpec
|
||||||
from chainlib.eth.connection import EthHTTPConnection
|
from chainlib.eth.connection import EthHTTPConnection
|
||||||
from hexathon import (
|
from hexathon import add_0x
|
||||||
add_0x,
|
|
||||||
strip_0x,
|
|
||||||
uniform as hex_uniform,
|
|
||||||
)
|
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
import cic_eth.cli
|
|
||||||
from cic_eth.api.admin import AdminApi
|
from cic_eth.api.admin import AdminApi
|
||||||
from cic_eth.db.enum import (
|
from cic_eth.db.enum import (
|
||||||
StatusEnum,
|
StatusEnum,
|
||||||
@ -36,35 +31,59 @@ logging.basicConfig(level=logging.WARNING)
|
|||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
|
|
||||||
default_format = 'terminal'
|
default_format = 'terminal'
|
||||||
|
default_config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
|
||||||
|
|
||||||
arg_flags = cic_eth.cli.argflag_std_base
|
argparser = argparse.ArgumentParser()
|
||||||
local_arg_flags = cic_eth.cli.argflag_local_taskcallback
|
argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
|
||||||
argparser = cic_eth.cli.ArgumentParser(arg_flags)
|
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('-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.add_argument('query', type=str, help='Transaction, transaction hash, account or "lock"')
|
||||||
argparser.process_local_flags(local_arg_flags)
|
|
||||||
args = argparser.parse_args()
|
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',
|
config_dir = os.path.join(args.c)
|
||||||
'query': '_QUERY',
|
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)
|
try:
|
||||||
queue = config.get('CELERY_QUEUE')
|
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
|
queue = args.q
|
||||||
celery_app = cic_eth.cli.CeleryApp.from_config(config)
|
|
||||||
|
|
||||||
# set up rpc
|
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
|
||||||
rpc = cic_eth.cli.RPC.from_config(config) #, use_signer=True)
|
|
||||||
conn = rpc.get_default()
|
|
||||||
|
|
||||||
admin_api = AdminApi(conn)
|
rpc = EthHTTPConnection(args.p)
|
||||||
|
|
||||||
|
#registry_address = config.get('CIC_REGISTRY_ADDRESS')
|
||||||
|
|
||||||
|
admin_api = AdminApi(rpc)
|
||||||
|
|
||||||
t = admin_api.registry()
|
t = admin_api.registry()
|
||||||
registry_address = t.get()
|
registry_address = t.get()
|
||||||
@ -94,7 +113,7 @@ def render_tx(o, **kwargs):
|
|||||||
|
|
||||||
for v in o.get('status_log', []):
|
for v in o.get('status_log', []):
|
||||||
d = datetime.datetime.fromisoformat(v[0])
|
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)
|
content += '{}: {}\n'.format(d, e)
|
||||||
|
|
||||||
return content
|
return content
|
||||||
@ -135,24 +154,20 @@ def render_lock(o, **kwargs):
|
|||||||
def main():
|
def main():
|
||||||
txs = []
|
txs = []
|
||||||
renderer = render_tx
|
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')
|
elif len(config.get('_QUERY')) == 42:
|
||||||
try:
|
#registry = connect_registry(rpc, chain_spec, registry_address)
|
||||||
query = hex_uniform(strip_0x(query))
|
txs = admin_api.account(chain_spec, config.get('_QUERY'), include_recipient=False, renderer=render_account)
|
||||||
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)
|
|
||||||
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()
|
t = admin_api.get_lock()
|
||||||
txs = t.get()
|
txs = t.get()
|
||||||
renderer = render_lock
|
renderer = render_lock
|
||||||
@ -160,7 +175,7 @@ def main():
|
|||||||
r = renderer(txs)
|
r = renderer(txs)
|
||||||
sys.stdout.write(r + '\n')
|
sys.stdout.write(r + '\n')
|
||||||
else:
|
else:
|
||||||
raise ValueError('cannot parse argument {}'.format(query))
|
raise ValueError('cannot parse argument {}'.format(config.get('_QUERY')))
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -17,7 +17,6 @@ from cic_eth_registry.error import UnknownContractError
|
|||||||
# local imports
|
# local imports
|
||||||
from cic_eth.error import SeppukuError
|
from cic_eth.error import SeppukuError
|
||||||
from cic_eth.db.models.base import SessionBase
|
from cic_eth.db.models.base import SessionBase
|
||||||
from cic_eth.eth.util import CacheGasOracle, MaxGasOracle
|
|
||||||
|
|
||||||
#logg = logging.getLogger().getChild(__name__)
|
#logg = logging.getLogger().getChild(__name__)
|
||||||
logg = logging.getLogger()
|
logg = logging.getLogger()
|
||||||
@ -25,46 +24,19 @@ logg = logging.getLogger()
|
|||||||
celery_app = celery.current_app
|
celery_app = celery.current_app
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BaseTask(celery.Task):
|
class BaseTask(celery.Task):
|
||||||
|
|
||||||
session_func = SessionBase.create_session
|
session_func = SessionBase.create_session
|
||||||
call_address = ZERO_ADDRESS
|
call_address = ZERO_ADDRESS
|
||||||
trusted_addresses = []
|
trusted_addresses = []
|
||||||
min_fee_price = 1
|
create_nonce_oracle = RPCNonceOracle
|
||||||
min_fee_limit = 30000
|
create_gas_oracle = RPCGasOracle
|
||||||
default_token_address = None
|
default_token_address = None
|
||||||
default_token_symbol = None
|
default_token_symbol = None
|
||||||
default_token_name = None
|
default_token_name = None
|
||||||
default_token_decimals = None
|
default_token_decimals = None
|
||||||
run_dir = '/run'
|
run_dir = '/run'
|
||||||
|
|
||||||
|
|
||||||
def create_gas_oracle(self, conn, address=None, *args, **kwargs):
|
|
||||||
x = None
|
|
||||||
if address is None:
|
|
||||||
x = RPCGasOracle(
|
|
||||||
conn,
|
|
||||||
code_callback=kwargs.get('code_callback', self.get_min_fee_limit),
|
|
||||||
min_price=self.min_fee_price,
|
|
||||||
id_generator=kwargs.get('id_generator'),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
|
|
||||||
x = MaxGasOracle(conn)
|
|
||||||
x.code_callback = x.get_fee_units
|
|
||||||
|
|
||||||
return x
|
|
||||||
|
|
||||||
|
|
||||||
def get_min_fee_limit(self, code):
|
|
||||||
return self.min_fee_limit
|
|
||||||
|
|
||||||
|
|
||||||
def get_min_fee_limit(self, code):
|
|
||||||
return self.min_fee_limit
|
|
||||||
|
|
||||||
|
|
||||||
def create_session(self):
|
def create_session(self):
|
||||||
return BaseTask.session_func()
|
return BaseTask.session_func()
|
||||||
|
|
||||||
@ -106,18 +78,19 @@ class CriticalWeb3Task(CriticalTask):
|
|||||||
autoretry_for = (
|
autoretry_for = (
|
||||||
ConnectionError,
|
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_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 = (
|
autoretry_for = (
|
||||||
sqlalchemy.exc.DatabaseError,
|
sqlalchemy.exc.DatabaseError,
|
||||||
sqlalchemy.exc.TimeoutError,
|
sqlalchemy.exc.TimeoutError,
|
||||||
ConnectionError,
|
ConnectionError,
|
||||||
sqlalchemy.exc.ResourceClosedError,
|
sqlalchemy.exc.ResourceClosedError,
|
||||||
)
|
)
|
||||||
|
safe_gas_threshold_amount = 2000000000 * 60000 * 3
|
||||||
|
safe_gas_refill_amount = safe_gas_threshold_amount * 5
|
||||||
|
|
||||||
|
|
||||||
class CriticalSQLAlchemyAndSignerTask(CriticalTask):
|
class CriticalSQLAlchemyAndSignerTask(CriticalTask):
|
||||||
@ -127,10 +100,13 @@ class CriticalSQLAlchemyAndSignerTask(CriticalTask):
|
|||||||
sqlalchemy.exc.ResourceClosedError,
|
sqlalchemy.exc.ResourceClosedError,
|
||||||
)
|
)
|
||||||
|
|
||||||
class CriticalWeb3AndSignerTask(CriticalWeb3Task):
|
class CriticalWeb3AndSignerTask(CriticalTask):
|
||||||
autoretry_for = (
|
autoretry_for = (
|
||||||
ConnectionError,
|
ConnectionError,
|
||||||
)
|
)
|
||||||
|
safe_gas_threshold_amount = 2000000000 * 60000 * 3
|
||||||
|
safe_gas_refill_amount = safe_gas_threshold_amount * 5
|
||||||
|
|
||||||
|
|
||||||
@celery_app.task()
|
@celery_app.task()
|
||||||
def check_health(self):
|
def check_health(self):
|
||||||
|
@ -10,7 +10,7 @@ version = (
|
|||||||
0,
|
0,
|
||||||
12,
|
12,
|
||||||
4,
|
4,
|
||||||
'alpha.14',
|
'alpha.13',
|
||||||
)
|
)
|
||||||
|
|
||||||
version_object = semver.VersionInfo(
|
version_object = semver.VersionInfo(
|
||||||
|
2
apps/cic-eth/config/test/accounts.ini
Normal file
2
apps/cic-eth/config/test/accounts.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[accounts]
|
||||||
|
writer_address =
|
2
apps/cic-eth/config/test/bancor.ini
Normal file
2
apps/cic-eth/config/test/bancor.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[bancor]
|
||||||
|
dir = tests/testdata/bancor
|
@ -1,3 +1,5 @@
|
|||||||
[celery]
|
[celery]
|
||||||
broker_url = filesystem://
|
broker_url = filesystem://
|
||||||
result_url = filesystem://
|
result_url = filesystem://
|
||||||
|
#broker_url = redis://
|
||||||
|
#result_url = redis://
|
||||||
|
2
apps/cic-eth/config/test/chain.ini
Normal file
2
apps/cic-eth/config/test/chain.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[chain]
|
||||||
|
spec =
|
4
apps/cic-eth/config/test/cic.ini
Normal file
4
apps/cic-eth/config/test/cic.ini
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[cic]
|
||||||
|
registry_address =
|
||||||
|
chain_spec =
|
||||||
|
trust_address =
|
2
apps/cic-eth/config/test/dispatcher.ini
Normal file
2
apps/cic-eth/config/test/dispatcher.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[dispatcher]
|
||||||
|
loop_interval = 0.1
|
8
apps/cic-eth/config/test/eth.ini
Normal file
8
apps/cic-eth/config/test/eth.ini
Normal file
@ -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 =
|
@ -1,2 +1,5 @@
|
|||||||
[signer]
|
[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 =
|
||||||
|
6
apps/cic-eth/config/test/ssl.ini
Normal file
6
apps/cic-eth/config/test/ssl.ini
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[SSL]
|
||||||
|
enable_client = false
|
||||||
|
cert_file =
|
||||||
|
key_file =
|
||||||
|
password =
|
||||||
|
ca_file =
|
2
apps/cic-eth/config/test/syncer.ini
Normal file
2
apps/cic-eth/config/test/syncer.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[SYNCER]
|
||||||
|
loop_interval = 1
|
@ -1,3 +1,4 @@
|
|||||||
|
@node cic-eth-accounts
|
||||||
@section Accounts
|
@section Accounts
|
||||||
|
|
||||||
Accounts are private keys in the signer component keyed by "addresses," a one-way transformation of a public key. Data can be signed by using the account as identifier for corresponding RPC requests.
|
Accounts are private keys in the signer component keyed by "addresses," a one-way transformation of a public key. Data can be signed by using the account as identifier for corresponding RPC requests.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@anchor{cic-eth-appendix-system-maintenance}
|
@node cic-eth system maintenance
|
||||||
@appendix Admin API
|
@appendix Admin API
|
||||||
|
|
||||||
The admin API is still in an early stage of refinement. User friendliness can be considerably improved.
|
The admin API is still in an early stage of refinement. User friendliness can be considerably improved.
|
||||||
@ -33,7 +33,7 @@ Get the current state of a lock
|
|||||||
|
|
||||||
@appendixsection tag_account
|
@appendixsection tag_account
|
||||||
|
|
||||||
Associate an identifier with an account address (@xref{cic-eth-system-accounts})
|
Associate an identifier with an account address (@xref{cic-eth system accounts})
|
||||||
|
|
||||||
@appendixsection have_account
|
@appendixsection have_account
|
||||||
|
|
||||||
|
@ -14,6 +14,5 @@ Released 2021 under GPL3
|
|||||||
@c
|
@c
|
||||||
@contents
|
@contents
|
||||||
|
|
||||||
@include content.texi
|
@include index.texi
|
||||||
@include appendix.texi
|
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
@include admin.texi
|
|
||||||
@include chains.texi
|
|
||||||
@include transfertypes.texi
|
|
@ -1,4 +1,4 @@
|
|||||||
@anchor{cic-eth-appendix-task-chains}
|
@node cic-eth Appendix Task chains
|
||||||
@appendix Task chains
|
@appendix Task chains
|
||||||
|
|
||||||
TBC - explain here how to generate these chain diagrams
|
TBC - explain here how to generate these chain diagrams
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
@node cic-eth configuration
|
||||||
@section Configuration
|
@section Configuration
|
||||||
|
|
||||||
Configuration parameters are grouped by configuration filename.
|
Configuration parameters are grouped by configuration filename.
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
@node cic-eth-dependencies
|
||||||
@section Dependencies
|
@section Dependencies
|
||||||
|
|
||||||
This application is written in Python 3.8. It is tightly coupled with @code{python-celery}, which provides the task worker ecosystem. It also uses @code{SQLAlchemy} which provides useful abstractions for persistent storage though SQL, and @code{alembic} for database schema migrations.
|
This application is written in Python 3.8. It is tightly coupled with @code{python-celery}, which provides the task worker ecosystem. It also uses @code{SQLAlchemy} which provides useful abstractions for persistent storage though SQL, and @code{alembic} for database schema migrations.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
@anchor{cic-eth-incoming}
|
@node cic-eth-incoming
|
||||||
@section Incoming transactions
|
@section Incoming transactions
|
||||||
|
|
||||||
All transactions in mined blocks will be passed to a selection of plugin filters to the @code{chainsyncer} component. Each of these filters are individual python module files in @code{cic_eth.runnable.daemons.filters}. This section describes their function.
|
All transactions in mined blocks will be passed to a selection of plugin filters to the @code{chainsyncer} component. Each of these filters are individual python module files in @code{cic_eth.runnable.daemons.filters}. This section describes their function.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
@node cic-eth
|
|
||||||
@top cic-eth
|
@top cic-eth
|
||||||
|
|
||||||
|
@include intro.texi
|
||||||
@include dependencies.texi
|
@include dependencies.texi
|
||||||
@include configuration.texi
|
@include configuration.texi
|
||||||
@include system.texi
|
@include system.texi
|
||||||
@ -9,3 +9,6 @@
|
|||||||
@include incoming.texi
|
@include incoming.texi
|
||||||
@include services.texi
|
@include services.texi
|
||||||
@include tools.texi
|
@include tools.texi
|
||||||
|
@include admin.texi
|
||||||
|
@include chains.texi
|
||||||
|
@include transfertypes.texi
|
@ -1,8 +1,9 @@
|
|||||||
|
@node cic-eth-interacting
|
||||||
@section Interacting with the system
|
@section Interacting with the system
|
||||||
|
|
||||||
The API to the @var{cic-eth} component is a proxy for executing @emph{chains of Celery tasks}. The tasks that compose individual chains are documented in @ref{cic-eth-appendix-task-chains,the Task Chain appendix}, which also describes a CLI tool that can generate graph representationso of them.
|
The API to the @var{cic-eth} component is a proxy for executing @emph{chains of Celery tasks}. The tasks that compose individual chains are documented in @ref{cic-eth Appendix Task chains,the Task Chain appendix}, which also describes a CLI tool that can generate graph representationso of them.
|
||||||
|
|
||||||
There are two API classes, @var{Api} and @var{AdminApi}. The former is described later in this section, the latter described in @ref{cic-eth-appendix-system-maintenance,the Admin API appendix}.
|
There are two API classes, @var{Api} and @var{AdminApi}. The former is described later in this section, the latter described in @ref{cic-eth system maintenance,the Admin API appendix}.
|
||||||
|
|
||||||
|
|
||||||
@subsection Interface
|
@subsection Interface
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user