.pylintrc

@@ -59,7 +59,7 @@ confidence=
 #
 # Kubeflow disables string-interpolation because we are starting to use f
 # style strings
-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
+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
 
 
 [REPORTS]

CHANGELOG.md

@@ -2,34 +2,6 @@
 
 <!--next-version-placeholder-->
 
-## v0.5.5 (2023-03-24)
-### Fix
-* Lock erc20-demurrage-token ([`3cde79e`](https://git.grassecon.net/cicnet/cic-cli/commit/3cde79ef8fb77a6b03454e675568834e0ab4ba80))
-
-## v0.5.4 (2022-07-05)
-### Fix
-* Pass headers through KeyedWriterFactory ([`de78753`](https://git.grassecon.net/cicnet/cic-cli/commit/de78753675242dd253359a5a5601d9062d81f0ee))
-
-## v0.5.3 (2022-07-05)
-### Fix
-* Add auth headers to HTTPWriter ([`4eda0fb`](https://git.grassecon.net/cicnet/cic-cli/commit/4eda0fb5cc2c41a735619dc3e34f21c4e27fd112))
-
-## v0.5.2 (2022-07-05)
-### Fix
-* Bump cic-types ([`15ae114`](https://git.grassecon.net/cicnet/cic-cli/commit/15ae1143a5230078219072d096741546ebcc3d07))
-
-## 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.5.5"
+__version__ = "0.4.0"

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

cic/configs/mainnet/config.ini

@@ -10,10 +10,9 @@ registry_address = 0xe3e3431BF25b06166513019Ed7B21598D27d05dC
 [meta]
 url = https://meta.sarafu.network
 http_origin = 
-auth_token = 
 
 [rpc]
-provider = https://rpc.sarafu.network
+provider = http://142.93.38.53:8545
 
 [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 = 0x47269C43e4aCcA5CFd09CB4778553B2F69963303
+registry_address = 0xcf60ebc445b636a5ab787f9e8bc465a2a3ef8299
 
 [meta]
-url = https://meta.sarafu.network
+url = https://meta.grassecon.net
 http_origin = 
-auth_token = 
+
 [rpc]
-provider = https://rpc.sarafu.network
+provider = https://rpc.grassecon.net
 
 [auth]
 type = gnupg
-keyfile_path = 
-passphrase =
+keyfile_path = /home/will/grassroots/cic-internal-integration/apps/cic-ussd/tests/data/pgp/privatekeys_meta.asc
+passphrase = merman
 
 [wallet]
-key_file =
+key_file =  /home/will/grassroots/cic-internal-integration/apps/contract-migration/keystore
 passphrase = 
 
 [chain]
-spec = evm:kitabu:6060:sarafu
+spec = evm:byzantium:5050:bloxberg

cic/contract/constants.py

@@ -1,5 +1,5 @@
 GITABLE_CONTRACT_URL = "https://gitlab.com/cicnet/eth-erc20/-/raw/master/python/giftable_erc20_token/data/GiftableToken"
-DMR_CONTRACT_URL = "https://gitlab.com/cicnet/erc20-demurrage-token/-/raw/v0.1.1/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap"
+DMR_CONTRACT_URL = "https://gitlab.com/cicnet/erc20-demurrage-token/-/raw/master/python/erc20_demurrage_token/data/DemurrageTokenSingleNocap"
 
 CONTRACT_URLS = [
     {

cic/contract/contract.py

@@ -4,10 +4,8 @@ import logging
 import os
 from typing import List
 
-# External imports
 from chainlib.chain import ChainSpec
 from chainlib.cli.config import Config
-
 # Local Modules
 from cic.contract.components.attachment import Attachment
 from cic.contract.components.meta import Meta
@@ -17,6 +15,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
 
@@ -147,12 +146,9 @@ def deploy_contract(
     output_writer_path_meta = output_directory
 
     metadata_endpoint = config.get("META_URL")
-    metadata_auth_token = config.get("META_AUTH_TOKEN")
-    headers = {"Authorization": f"Basic {metadata_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")
@@ -167,12 +163,12 @@ def deploy_contract(
     )
     ca = Attachment(
         path=contract_directory,
-        writer=writers["attachment"](path=output_writer_path_meta, headers=headers),
+        writer=writers["attachment"](path=output_writer_path_meta),
     )
     cp = Proof(
         path=contract_directory,
         attachments=ca,
-        writer=writers["proof"](path=output_writer_path_meta, headers=headers),
+        writer=writers["proof"](path=output_writer_path_meta),
     )
     cn = Network(path=contract_directory)
 

cic/contract/processor.py

@@ -84,7 +84,6 @@ class ContractProcessor:
                 if a is None:
                     logg.debug(f'skipping missing task receiver "{task}"')
                     continue
-                logg.debug(f'Processing "{ext}:{task}"')
                 v = a.process(
                     token_address=token_address,
                     token_symbol=token_symbol,

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,6 +90,7 @@ 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)
 
 

cic/writers.py

@@ -5,7 +5,7 @@ import logging
 import os
 import sys
 import urllib.request
-from typing import Dict, Type, Union
+from typing import Type, Union
 
 from cic_types.ext.metadata import MetadataPointer, MetadataRequestsHandler
 
@@ -33,7 +33,6 @@ class KVWriter(OutputWriter):
             os.makedirs(path)
         self.path = path
         super().__init__(*args, **kwargs)
-
     def write(self, k, v):
         fp = os.path.join(self.path, str(k))
         logg.debug(f"path write {fp} {str(v)}")
@@ -43,17 +42,16 @@ class KVWriter(OutputWriter):
 
 
 class HTTPWriter(OutputWriter):
-    def __init__(self, path=None, headers: Dict[str, str] = None, *args, **kwargs):
+    def __init__(self, path=None, *args, **kwargs):
         super(HTTPWriter, self).__init__(*args, **kwargs)
         self.path = path
-        self.headers = headers
 
     def write(self, k, v):
         path = self.path
         if k is not None:
             path = os.path.join(path, k)
-        logg.debug(f"HTTPWriter POST {path} data: {v}, headers: {self.headers}")
-        rq = urllib.request.Request(path, method="POST", data=v, headers=self.headers)
+        logg.debug(f"http writer post {path} \n key: {k}, value: {v}")
+        rq = urllib.request.Request(path, method="POST", data=v)
         r = urllib.request.urlopen(rq)
         logg.info(f"http writer submitted at {r.read()}")
 
@@ -85,15 +83,13 @@ class KeyedWriterFactory:
             logg.debug(f"adding key {k} t keyed writer factory")
             self.x[k] = v
 
-    def new(self, path=None, headers: Dict[str, str] = None, *_args, **_kwargs):
+    def new(self, path=None, *_args, **_kwargs):
         writer_keyed = None
         writer_immutable = None
         if self.key_writer_constructor is not None:
             writer_keyed = self.key_writer_constructor(path, **self.x)
         if self.immutable_writer_constructor is not None:
-            writer_immutable = self.immutable_writer_constructor(
-                path, headers, **self.x
-            )
+            writer_immutable = self.immutable_writer_constructor(path, **self.x)
         return KeyedWriter(writer_keyed, writer_immutable)
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cic-cli"
-version = "0.5.5"
+version = "0.4.0"
 description = "Generic cli tooling for the CIC token network"
 authors = [
   "Louis Holbrook <dev@holbrook.no>",
@@ -32,20 +32,17 @@ cic = 'cic.runnable.cic_cmd:main'
 [[tool.poetry.source]]
 name = "grassroots_"
 url = "https://pip.grassrootseconomics.net/"
-default = false
-secondary = true
+default = true
 
 [[tool.poetry.source]]
 name = "pypi_"
 url = "https://pypi.org/simple/"
-default = true
-secondary = false
-
+secondary = true
 
 [tool.poetry.dependencies]
 python = "^3.8"
 funga-eth = "^0.6.0"
-cic-types = "^0.2.7"
+cic-types = "^0.2.2"
 confini = "^0.6.0"
 chainlib = "~0.1.0"
 cbor2 = "~5.4.1"
@@ -67,7 +64,6 @@ 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 = [
@@ -97,3 +93,4 @@ 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,,1 BONDE = 1 itumbe
+Bondeni SHG,ge,Bondeni,BONDE,Mutitu Kilifi,KE,5025,6,giftable,,,254797782065,info@grassecon.org,0xB8830b647C01433F9492F315ddBFDc35CB3Be6A6,1 BONDE = 1 itumbe