23 changed files with 1629 additions and 2261 deletions
--- a/.pylintrc
+++ b/.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]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,65 +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))
-
-## v0.3.4 (2022-04-27)
-### Fix
-* Bump deps again ([`37188a6`](https://git.grassecon.net/cicnet/cic-cli/commit/37188a60e85d9545acfd950c1c160801c22d2b5b))
-
-## v0.3.3 (2022-04-26)
-### Fix
-* It's ok if you already exsist ([`38cfb18`](https://git.grassecon.net/cicnet/cic-cli/commit/38cfb185270fb361ff5d9da9976745e1fecc40f8))
-* Take the reins off ([`c84517e`](https://git.grassecon.net/cicnet/cic-cli/commit/c84517e3db264f541e6e5a8eef30703bf28d32d0))
-* Bump deps ([`dcea763`](https://git.grassecon.net/cicnet/cic-cli/commit/dcea763ce5b3d542ed0a50586720fc3a45142e77))
-* **attachement:** Directory not getting created ([`e55b82f`](https://git.grassecon.net/cicnet/cic-cli/commit/e55b82f5295397b3e4123297bc6b231ca251bc83))
-
-## v0.3.2 (2022-04-26)
-### Fix
-* Update deps ([`d2e55fa`](https://git.grassecon.net/cicnet/cic-cli/commit/d2e55fad0efd13fa7a1de8ed8ab43e703a4aa046))
-
-## v0.3.1 (2022-04-26)
-### Fix
-* Throw if directory exsists ([`5f22220`](https://git.grassecon.net/cicnet/cic-cli/commit/5f22220825f5c485550ca9a21a54598fbe3b3ba3))
-
-## v0.3.0 (2022-04-26)
-### Feature
-* **wizard:** Add csv input flag ([`a9f97a9`](https://git.grassecon.net/cicnet/cic-cli/commit/a9f97a9a5c6908e4d51710e3b121764d2511c0ab))
-
-### Fix
-* Tests ([`f300767`](https://git.grassecon.net/cicnet/cic-cli/commit/f30076783d5fc93d91d29e9343d62af4c0fdffaa))
-* Bump ci ([`60e8ecc`](https://git.grassecon.net/cicnet/cic-cli/commit/60e8ecc41a472dbea25c36d869259c8161145002))
-
 ## v0.2.3 (2022-03-22)
 ### Fix
 * Remove this ([`92794a2`](https://git.grassecon.net/cicnet/cic-cli/commit/92794a2e3b2fc5ace63f519bbe5b23c542afc853))
--- a/cic/init.py
+++ b/cic/init.py
@ -1 +1 @@
-__version__ = "0.5.5"
+__version__ = "0.2.3"
--- a/cic/cmd/wizard.py
+++ b/cic/cmd/wizard.py
@ -2,7 +2,7 @@ from __future__ import annotations

 # standard import
 import logging
-import os
+

 from chainlib.cli.config import Config

@ -66,17 +66,13 @@ def execute(
    if wallet_keystore:
        config.add(wallet_keystore, "WALLET_KEY_FILE", exists_ok=True)

-    if skip_gen:
-        contract = load_contract(directory)
-    else:
-        if os.path.exists(directory):
-            raise Exception(f"Directory {directory} already exists")
+    if not skip_gen:
        if csv_file:
-            print(f"Generating from csv:{csv_file} to {directory}")
            contract = load_contract_from_csv(config, directory, csv_file)
        else:
-            print("Using Interactive Mode")
            contract = generate_contract(directory, [target], config, interactive=True)
+    else:
+        contract = load_contract(directory)

    print(contract)

--- a/cic/configs/docker/config.ini
+++ b/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

--- a/cic/configs/local/config.ini
+++ b/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
--- a/cic/configs/mainnet/config.ini
+++ b/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
--- a/cic/configs/testnet/config.ini
+++ b/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
--- a/cic/contract/components/attachment.py
+++ b/cic/contract/components/attachment.py
@ -23,8 +23,8 @@ class Attachment(Data):
        self.path = path
        self.writer = writer
        self.attachment_path = os.path.join(self.path, "attachments")
-        self.start()
        if interactive:
+            self.start()
            input(
                f"Please add attachment files to '{os.path.abspath(os.path.join(self.path,'attachments'))}' and then press ENTER to continue"
            )
@ -45,7 +45,7 @@ class Attachment(Data):
    def start(self):
        """Initialize attachment settings from template."""
        super(Attachment, self).start()
-        os.makedirs(self.attachment_path, exist_ok=True)
+        os.makedirs(self.attachment_path)

    def get(self, k):
        """Get a single attachment by the sha256 hash of the content.
--- a/cic/contract/constants.py
+++ b/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 = [
    {
--- a/cic/contract/contract.py
+++ b/cic/contract/contract.py
@ -4,7 +4,10 @@ import logging
 import os
 from typing import List

-# External imports
+
+# external imports
+from cic_types.ext.metadata import MetadataRequestsHandler
+from cic_types.ext.metadata.signer import Signer as MetadataSigner
 from chainlib.chain import ChainSpec
 from chainlib.cli.config import Config

@ -17,8 +20,8 @@ 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
-from cic_types.ext.metadata import MetadataRequestsHandler
-from cic_types.ext.metadata.signer import Signer as MetadataSigner
+
+

 log = logging.getLogger(__name__)

@ -71,6 +74,16 @@ def load_contract(directory) -> Contract:
 def generate_contract(
    directory: str, targets: List[str], config, interactive=True
 ) -> Contract:
+    if os.path.exists(directory):
+        contine = input(
+            f"Directory {directory} already exists, Would you like to delete it? (y/n): "
+        )
+        if contine.lower() != "y":
+            log.debug("Trying to load existing contract")
+            return load_contract(directory)
+        else:
+            print(f"Deleted {directory}")
+            os.system(f"rm -rf {directory}")
    os.makedirs(directory)
    log.info("Generating token")
    token = Token(directory, interactive=interactive)
@ -147,12 +160,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 +177,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)

--- a/cic/contract/csv.py
+++ b/cic/contract/csv.py
@ -11,7 +11,7 @@ from cic.contract.components.attachment import Attachment
 from cic.contract.components.meta import Meta
 from cic.contract.components.proof import Proof
 from cic.contract.components.token import Token
-from cic.contract.constants import DMR_CONTRACT_URL, GITABLE_CONTRACT_URL
+from cic.contract.constants import DMR_CONTRACT_URL
 from cic.contract.contract import Contract
 from cic.contract.helpers import download_file
 from cic.contract.network import Network
@ -59,6 +59,7 @@ def load_contracts_from_csv(config, directory, csv_path: str) -> List[Contract]:
    targets = ["eth"]
    os.makedirs(directory)
    contract_rows = []
+    bin_path = os.path.abspath(download_file(DMR_CONTRACT_URL + ".bin"))
    with open(csv_path, "rt", encoding="utf-8") as file:
        csvreader = csv.reader(file, delimiter=",")
        for idx, row in enumerate(csvreader):
@ -87,9 +88,12 @@ def load_contracts_from_csv(config, directory, csv_path: str) -> List[Contract]:
        sink_account = contract_row[CSV_Column.sink_account]
        description = contract_row[CSV_Column.description]

-        if token_type == "demurrage":
-            bin_path = os.path.abspath(download_file(DMR_CONTRACT_URL + ".bin"))
-            log.info(f"Generating {token_type} contract for {issuer}")
+        if token_type != "demurrage":
+            raise Exception(
+                f"Only demurrage tokens are supported at this time. {token_type} is not supported"
+            )
+
+        log.info("Generating token")
        token = Token(
            directory,
            name=voucher_name,
@ -100,25 +104,6 @@ def load_contracts_from_csv(config, directory, csv_path: str) -> List[Contract]:
            extra_args_types=["uint256", "uint256", "address"],
            code=bin_path,
        )
-        elif token_type == "giftable":
-            bin_path = os.path.abspath(download_file(GITABLE_CONTRACT_URL + ".bin"))
-            token = Token(
-                directory,
-                name=voucher_name,
-                symbol=symbol,
-                precision=precision,
-                supply=supply,
-                extra_args=[],
-                extra_args_types=[],
-                code=bin_path,
-            )
-        else:
-            raise Exception(
-                f"Only demurrage and gitable contracts currently supported at this time. {token_type} is not supported"
-            )
-        if token is None:
-            raise Exception(f"There was an issue building the contract")
-
        token.start()

        log.info("Generating proof")
--- a/cic/contract/processor.py
+++ b/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,
--- a/cic/data/config/config.ini
+++ b/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 = 
--- a/cic/runnable/cic_cmd.py
+++ b/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)


--- a/cic/utils.py
+++ b/cic/utils.py
@ -4,15 +4,15 @@ def object_to_str(obj, keys):
    for key in keys:
        value = eval("obj." + key)
        key = key.replace("()", "")
-        if isinstance(value, str):
+        if type(value) == str:
            s += f"{key} = {value}\n"
-        elif isinstance(value, list):
+        elif type(value) == list:
            for idx, vv in enumerate(value):
                if not vv:
                    s += f"{key}[{idx}] = \n"
                    continue
                s += f"{key}[{idx}] = {vv}\n"
-        elif isinstance(value, dict):
+        elif type(value) == dict:
            for vv_key in value.keys():
                vv_value = value[vv_key]
                if not vv_value:
--- a/cic/writers.py
+++ b/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

@ -26,14 +26,13 @@ class StdoutWriter(OutputWriter):


 class KVWriter(OutputWriter):
-    def __init__(self, path=None, *args, **kwargs):
+    def __init__(self, *args, path=None, **kwargs):
        try:
            os.stat(path)
        except FileNotFoundError:
            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, *args, path=None, **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, *_args, path=None, **_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)


--- a/poetry.lock
+++ b/poetry.lock
--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cic-cli"
-version = "0.5.5"
+version = "0.2.3"
 description = "Generic cli tooling for the CIC token network"
 authors = [
  "Louis Holbrook <dev@holbrook.no>",
@ -32,30 +32,27 @@ 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"
-confini = "^0.6.0"
-chainlib = "~0.1.0"
-cbor2 = "~5.4.1"
+funga-eth = "~0.5.5"
+cic-types = "~0.2.1a8"
+confini = "~0.5.3"
+chainlib = "~0.0.17"
+cbor2 = "5.4.1"

-chainlib-eth = { version = "~0.1.1", optional = true }
-eth-token-index = { version = "^0.3.0", optional = true }
-eth-address-index = { version = "~0.5.0", optional = true }
-okota = { version = "^0.4.0", optional = true }
-cic-eth-registry = { version = "^0.6.9", optional = true }
-cic-contracts = { version = "~0.1.0", optional = true }
+chainlib-eth = { version = "~0.0.25", optional = true }
+eth-token-index = { version = "~0.2.4", optional = true }
+eth-address-index = { version = "~0.2.4", optional = true }
+okota = { version = "~0.2.5", optional = true }
+cic_eth_registry = { version = "~0.6.6", optional = true }
+cic_contracts = { version = "~0.0.5", optional = true }


 [tool.poetry.dev-dependencies]
@ -64,10 +61,10 @@ pytest-cov = "2.10.1"
 python-semantic-release = "^7.25.2"
 pylint = "^2.12.2"
 black = { version = "^22.1.0", allow-prereleases = true }
+eth-erc20 = ">0.1.2a3,<0.2.0"
 eth_tester = "0.5.0b3"
 py-evm = "0.3.0a20"
 rlp = "2.0.1"
-mypy = "^0.961"

 [tool.poetry.extras]
 eth = [
@ -97,3 +94,4 @@ build_command = "pip install poetry && poetry build"
 hvcs = "gitea"
 hvcs_domain = "git.grassecon.net"
 check_build_status = false
+
--- a/tests/base_cic.py
+++ b/tests/base_cic.py
@ -4,15 +4,16 @@ import random
 import tempfile
 import unittest

-# external imports
-from hexathon import add_0x
-
-# local imports
-from cic.writers import KVWriter
 from cic.contract.components.attachment import Attachment
 from cic.contract.components.proof import Proof
 from cic.contract.processor import ContractProcessor

+# local imports
+from cic.writers import KVWriter
+
+# external imports
+from hexathon import add_0x
+
 test_base_dir = os.path.dirname(os.path.realpath(__file__))
 test_data_dir = os.path.join(test_base_dir, "testdata")

--- a/tests/test_csv_generate.py
+++ b/tests/test_csv_generate.py
@ -1,12 +1,12 @@
 import os
 import tempfile
-import pytest
+
 from cic.contract.csv import load_contract_from_csv

 from tests.base_cic import test_data_dir

-@pytest.mark.skip(reason="Public RPC is currently dead")
-def test_csv_generate_demurrage():
+
+def test_csv_generate():
    outputs_dir = os.path.join(tempfile.mkdtemp(), "outputs")
    test_csv_path = os.path.join(test_data_dir, "voucher", "bondi.csv")
    contract = load_contract_from_csv(
@ -72,67 +72,3 @@ def test_csv_generate_demurrage():
    assert contract.proof.namespace == "ge"
    assert contract.proof.proofs == []
    assert contract.proof.version() == 0
-
-@pytest.mark.skip(reason="Public RPC is currently dead")
-def test_csv_generate_giftable():
-    outputs_dir = os.path.join(tempfile.mkdtemp(), "outputs")
-    test_csv_path = os.path.join(test_data_dir, "voucher", "bondi_giftable.csv")
-    contract = load_contract_from_csv(
-        {
-            "WALLET_KEY_FILE": os.path.join(test_data_dir, "keystore", "ok"),
-            "WALLET_PASSPHRASE": "test",
-            "CHAIN_SPEC": "evm:kitabu:6060:sarafu",
-            "RPC_PROVIDER": "http://142.93.38.53:8545",
-            "CIC_REGISTRY_ADDRESS": "0xe3e3431BF25b06166513019Ed7B21598D27d05dC",
-        },
-        outputs_dir,
-        csv_path=test_csv_path,
-    )
-    # assert len(contracts) == 1
-    # contract = contracts[0]
-    # Token
-    assert contract.token.name == "Bondeni"
-    assert contract.token.extra_args == []
-    assert contract.token.extra_args_types == []
-    # assert contract.token.code == os.path.join(test_data_dir, "contracts", "Bondi.bin")
-    assert contract.token.precision == '6'
-    assert contract.token.supply == "5025"
-    assert contract.token.symbol == "BONDE"
-
-    # Meta
-    assert contract.meta.country_code == "KE"
-    assert contract.meta.location == "Mutitu Kilifi"
-    assert contract.meta.contact == {
-        "email": "info@grassecon.org",
-        "phone": "254797782065",
-    }
-    assert contract.meta.name == "Bondeni SHG"
-
-    # Network
-    assert contract.network.resources["eth"]["chain_spec"] == {
-        "arch": "evm",
-        "common_name": "sarafu",
-        "custom": [],
-        "extra": {},
-        "fork": "kitabu",
-        "network_id": 6060,
-    }
-    assert contract.network.resources["eth"]["contents"] == {
-        "address_declarator": {
-            "key_account": "cc4f82f5dacde395e1e0cfc4d62827c8b8b5688c",
-            "reference": "f055e83f713DbFF947e923749Af9802eaffFB5f9",
-        },
-        "token": {
-            "key_account": "cc4f82f5dacde395e1e0cfc4d62827c8b8b5688c",
-            "reference": None,
-        },
-        "token_index": {
-            "key_account": "cc4f82f5dacde395e1e0cfc4d62827c8b8b5688c",
-            "reference": "5A1EB529438D8b3cA943A45a48744f4c73d1f098",
-        },
-    }
-
-    assert contract.proof.description == "1 BONDE = 1 itumbe"
-    assert contract.proof.namespace == "ge"
-    assert contract.proof.proofs == []
-    assert contract.proof.version() == 0
--- a/tests/test_keyfile.py
+++ b/tests/test_keyfile.py
@ -14,7 +14,7 @@ from cic.keystore import KeystoreDirectory
 # test imports
 from tests.base_cic import test_base_dir

-log = logging.getLogger(__name__)
+logging = logging.getLogger()

 script_dir = test_base_dir

--- a/tests/testdata/voucher/bondi_giftable.csv
+++ b/tests/testdata/voucher/bondi_giftable.csv
@ -1,2 +0,0 @@
-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