0.5.1

Automatically generated by python-semantic-release

.pylintrc

@@ -59,7 +59,7 @@ confidence=
 #
 # Kubeflow disables string-interpolation because we are starting to use f
 # style strings
-disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,missing-docstring,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,relative-import,invalid-name,bad-continuation,no-member,locally-disabled,fixme,import-error,too-many-locals,no-name-in-module,too-many-instance-attributes,no-self-use,logging-fstring-interpolation
+disable=old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,missing-docstring,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,relative-import,invalid-name,bad-continuation,no-member,locally-disabled,fixme,import-error,too-many-locals,no-name-in-module,too-many-instance-attributes,no-self-use,logging-fstring-interpolation
 
 
 [REPORTS]

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 <!--next-version-placeholder-->
 
+## v0.5.1 (2022-07-05)
+### Fix
+* Upgrade cic-types to support meta auth ([`22b3062`](https://git.grassecon.net/cicnet/cic-cli/commit/22b3062c4909400664bd2a50ca36d5ee737531a1))
+
+## v0.5.0 (2022-07-04)
+### Feature
+* Add meta-auth ([#4](https://git.grassecon.net/cicnet/cic-cli/issues/4)) ([`bfe7086`](https://git.grassecon.net/cicnet/cic-cli/commit/bfe7086178f3fc2743dd68cc20c5459ca466ae8e))
+
+## v0.4.1 (2022-06-14)
+### Fix
+* Bump deps ([`e36ea4b`](https://git.grassecon.net/cicnet/cic-cli/commit/e36ea4bcfb1c417d1adf2be9455cb20b23323414))
+
 ## v0.4.0 (2022-04-29)
 ### Feature
 * Add giftable generation ([`b7acbdc`](https://git.grassecon.net/cicnet/cic-cli/commit/b7acbdc4bc5862752585fecfaee7d2fe70d8dbbe))

cic/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "0.5.1"

cic/configs/docker/config.ini

@@ -10,7 +10,7 @@ registry_address = 0xcf60ebc445b636a5ab787f9e8bc465a2a3ef8299
 [meta]
 url = http://localhost:63380
 http_origin = 
-
+auth_token = 
 [rpc]
 provider = http://localhost:63545
 

cic/configs/local/config.ini

@@ -10,6 +10,7 @@ registry_address = 0xcf60ebc445b636a5ab787f9e8bc465a2a3ef8299
 [meta]
 url = http://localhost:8000
 http_origin = 
+auth_token = 
 
 [rpc]
 provider = http://localhost:8545

cic/configs/mainnet/config.ini

@@ -10,9 +10,10 @@ registry_address = 0xe3e3431BF25b06166513019Ed7B21598D27d05dC
 [meta]
 url = https://meta.sarafu.network
 http_origin = 
+auth_token = 
 
 [rpc]
-provider = http://142.93.38.53:8545
+provider = https://rpc.sarafu.network
 
 [auth]
 type = gnupg

cic/configs/testnet/config.ini

@@ -5,23 +5,23 @@ proof_writer = cic.writers.KVWriter
 ext_writer = cic.writers.KVWriter
 
 [cic]
-registry_address = 0xcf60ebc445b636a5ab787f9e8bc465a2a3ef8299
+registry_address = 0x47269C43e4aCcA5CFd09CB4778553B2F69963303
 
 [meta]
-url = https://meta.grassecon.net
+url = https://meta.sarafu.network
 http_origin = 
-
+auth_token = 
 [rpc]
-provider = https://rpc.grassecon.net
+provider = https://rpc.sarafu.network
 
 [auth]
 type = gnupg
-keyfile_path = /home/will/grassroots/cic-internal-integration/apps/cic-ussd/tests/data/pgp/privatekeys_meta.asc
-passphrase = merman
+keyfile_path = 
+passphrase =
 
 [wallet]
-key_file =  /home/will/grassroots/cic-internal-integration/apps/contract-migration/keystore
+key_file =
 passphrase = 
 
 [chain]
-spec = evm:byzantium:5050:bloxberg
+spec = evm:kitabu:6060:sarafu

cic/contract/contract.py

@@ -4,8 +4,12 @@ import logging
 import os
 from typing import List
 
+# External imports
 from chainlib.chain import ChainSpec
 from chainlib.cli.config import Config
+from cic_types.ext.metadata import MetadataRequestsHandler
+from cic_types.ext.metadata.signer import Signer as MetadataSigner
+
 # Local Modules
 from cic.contract.components.attachment import Attachment
 from cic.contract.components.meta import Meta
@@ -15,9 +19,7 @@ from cic.contract.helpers import init_writers_from_config
 from cic.contract.network import Network
 from cic.contract.processor import ContractProcessor
 from cic.writers import HTTPWriter, KeyedWriterFactory, MetadataWriter
-# external imports
-from cic_types.ext.metadata import MetadataRequestsHandler
-from cic_types.ext.metadata.signer import Signer as MetadataSigner
+
 
 log = logging.getLogger(__name__)
 
@@ -146,9 +148,12 @@ def deploy_contract(
     output_writer_path_meta = output_directory
 
     metadata_endpoint = config.get("META_URL")
+    metadata_auth_token = config.get("META_AUTH_TOKEN")
 
     if metadata_endpoint is not None:
         MetadataRequestsHandler.base_url = metadata_endpoint
+        MetadataRequestsHandler.auth_token = metadata_auth_token
+
         MetadataSigner.gpg_path = "/tmp"
         MetadataSigner.key_file_path = config.get("AUTH_KEYFILE_PATH")
         MetadataSigner.gpg_passphrase = config.get("AUTH_PASSPHRASE")

cic/data/config/config.ini

@@ -10,7 +10,7 @@ registry_address = 0xe3e3431BF25b06166513019Ed7B21598D27d05dC
 [meta]
 url = https://meta.sarafu.network
 http_origin = 
-
+auth_token = 
 [auth]
 type = gnupg
 keyfile_path = 

cic/runnable/cic_cmd.py

@@ -90,7 +90,6 @@ def main():
     except Exception as e:
         logg.exception(e)
         sys.stderr.write("\033[;91m" + str(e) + "\033[;39m\n")
-        argparser.print_help()
         sys.exit(1)
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cic-cli"
-version = "0.4.0"
+version = "0.5.1"
 description = "Generic cli tooling for the CIC token network"
 authors = [
   "Louis Holbrook <dev@holbrook.no>",
@@ -32,17 +32,18 @@ cic = 'cic.runnable.cic_cmd:main'
 [[tool.poetry.source]]
 name = "grassroots_"
 url = "https://pip.grassrootseconomics.net/"
-default = true
+secondary = true
 
 [[tool.poetry.source]]
 name = "pypi_"
 url = "https://pypi.org/simple/"
-secondary = true
+default = true
+
 
 [tool.poetry.dependencies]
 python = "^3.8"
 funga-eth = "^0.6.0"
-cic-types = "^0.2.2"
+cic-types = "^0.2.6"
 confini = "^0.6.0"
 chainlib = "~0.1.0"
 cbor2 = "~5.4.1"
@@ -64,6 +65,7 @@ black = { version = "^22.1.0", allow-prereleases = true }
 eth_tester = "0.5.0b3"
 py-evm = "0.3.0a20"
 rlp = "2.0.1"
+mypy = "^0.961"
 
 [tool.poetry.extras]
 eth = [
@@ -93,4 +95,3 @@ build_command = "pip install poetry && poetry build"
 hvcs = "gitea"
 hvcs_domain = "git.grassecon.net"
 check_build_status = false
-

tests/testdata/voucher/bondi_giftable.csv

@@ -1,2 +1,2 @@
 issuer,namespace,voucher_name,symbol,location,country_code,supply,precision,token_type,demurrage,period_minutes,phone_number,email_address,sink_account,description
-Bondeni SHG,ge,Bondeni,BONDE,Mutitu Kilifi,KE,5025,6,giftable,,,254797782065,info@grassecon.org,0xB8830b647C01433F9492F315ddBFDc35CB3Be6A6,1 BONDE = 1 itumbe
+Bondeni SHG,ge,Bondeni,BONDE,Mutitu Kilifi,KE,5025,6,giftable,,,254797782065,info@grassecon.org,,1 BONDE = 1 itumbe