eth-prototype 0.7.5__tar.gz → 1.0.0__tar.gz

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/.github/workflows/test.yaml

@@ -23,6 +23,11 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install tox tox-gh-actions
-          npm install -g ganache@7.6.0
+      - name: Initialize hardhat
+        run: |
+          cd tests/hardhat-project
+          npm ci
+          npx hardhat compile
+          npx hardhat node &
       - name: Test with tox
         run: tox

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/.gitignore

@@ -51,3 +51,9 @@ MANIFEST
 # Per-project virtualenvs
 .venv*/
 .conda*/
+.env
+
+# Tests hardhat project
+tests/hardhat-project/artifacts
+tests/hardhat-project/cache
+tests/hardhat-project/node_modules

eth-prototype-1.0.0/.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile = black

eth-prototype-1.0.0/.pre-commit-config.yaml

@@ -0,0 +1,41 @@
+exclude: "^docs/conf.py"
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-xml
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: requirements-txt-fixer
+      - id: mixed-line-ending
+        args: ["--fix=auto"] # replace 'auto' with 'lf' to enforce Linux/Mac line endings or 'crlf' for Windows
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/psf/black
+    rev: stable
+    hooks:
+      - id: black
+        language_version: python3
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+    ## You can add flake8 plugins via `additional_dependencies`:
+    #  additional_dependencies: [flake8-bugbear]
+
+  - repo: https://github.com/zricethezav/gitleaks
+    rev: v8.12.0
+    hooks:
+      - id: gitleaks-docker

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-prototype
-Version: 0.7.5
+Version: 1.0.0
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -11,18 +11,16 @@ Platform: any
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Requires-Python: >=3.7
-Description-Content-Type: text/x-rst; charset=UTF-8
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
 Requires-Dist: m9g
 Requires-Dist: environs
 Requires-Dist: requests
+Requires-Dist: hexbytes
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Provides-Extra: brownie
-Requires-Dist: eth-brownie; extra == "brownie"
 Provides-Extra: web3
 Requires-Dist: web3; extra == "web3"
-Requires-Dist: eth-event; extra == "web3"
 Provides-Extra: defender
 Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
@@ -32,71 +30,44 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: gmpy2; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Provides-Extra: testing-br
-Requires-Dist: eth-brownie; extra == "testing-br"
-Requires-Dist: setuptools; extra == "testing-br"
-Requires-Dist: pytest; extra == "testing-br"
-Requires-Dist: pytest-cov; extra == "testing-br"
 Provides-Extra: testing-w3
 Requires-Dist: web3[tester]; extra == "testing-w3"
 Requires-Dist: setuptools; extra == "testing-w3"
 Requires-Dist: pytest; extra == "testing-w3"
-Requires-Dist: eth-event; extra == "testing-w3"
 Requires-Dist: pytest-cov; extra == "testing-w3"
 Requires-Dist: boto3; extra == "testing-w3"
 
-=============
-eth-prototype
-=============
+# eth-prototype
 
 
 Prototype Ethereum Smart Contracts in Python
 
 
-Description
-===========
+## Description
 
 Library with base classes to prototype Ethereum Smart Contracts in Python. This includes:
 
 - wadray: classes for fixed number of decimals math implemented with integers.
 - contracts: classes to simulate contracts in Python with features like *rollback* on exception, external
   methods, views. Also classes for common contracts like ERC20 (tokens), ERC721 (NFTs) and AccessControl.
-- brwrappers: classes to wrap ethereum contracts called thru [brownie](https://github.com/eth-brownie/brownie/) but with a pythonic interface
 - w3wrappers: classes to wrap ethereum contracts called thru [web3py](https://web3py.readthedocs.io/) but with a pythonic interface
 
+To use the `defender_relay` module you need to have the `warrant` package from this repo: https://github.com/gnarvaja/warrant. Add it to your requirements.txt as:
 
-Tox Tests
-=========
+```
+warrant @ git+https://github.com/gnarvaja/warrant.git#egg=warrant
+```
 
-The tox tests run in three variants:
+Note that using the `warrant` package from pypi will not work because of incompatibilities with newer python versions.
 
-- `default`: only uses and tests the prototype libraries, no blockchain.
-- `default-w3`: users and tests two variants: prototype and w3wrappers (wrappers using web3py).
-- `default-br`: users and tests two variants: prototype and brwrappers (wrappers using brownie).
-
-It's not possible for now running all the tests together because of incompatibilities between brownie and web3[tester].
-
-
-To run the tox `default-br` tests, you need an environment with Brownie, SOLC and other requirements.
+## Tox Tests
 
-You can do it using a Docker image an a few commands
+The tox tests run in two variants:
 
-.. code-block:: bash
-
-   docker run -it -v $PWD:/code -w /code gnarvaja/eth-dev:1.0.0 bash
-   gnarvaja/eth-dev:eth-proto-brownie
-   pip install tox
-   brownie pm install OpenZeppelin/openzeppelin-contracts@4.3.2
-   brownie pm install OpenZeppelin/openzeppelin-contracts-upgradeable@4.3.2
-   tox -e py39-br
-
-   docker run -it -v $PWD:/code -w /code gnarvaja/eth-dev:eth-proto-brownie bash
-   tox -e py39-br
-
-.. _pyscaffold-notes:
+- `default`: only uses and tests the prototype libraries, no blockchain.
+- `default-w3`: users and tests two variants: prototype and w3wrappers (wrappers using web3py).
 
-Note
-====
+# Note
 
 This project has been set up using PyScaffold 4.0.2. For details and usage
 information on PyScaffold see https://pyscaffold.org/.

eth-prototype-1.0.0/README.md

@@ -0,0 +1,34 @@
+# eth-prototype
+
+
+Prototype Ethereum Smart Contracts in Python
+
+
+## Description
+
+Library with base classes to prototype Ethereum Smart Contracts in Python. This includes:
+
+- wadray: classes for fixed number of decimals math implemented with integers.
+- contracts: classes to simulate contracts in Python with features like *rollback* on exception, external
+  methods, views. Also classes for common contracts like ERC20 (tokens), ERC721 (NFTs) and AccessControl.
+- w3wrappers: classes to wrap ethereum contracts called thru [web3py](https://web3py.readthedocs.io/) but with a pythonic interface
+
+To use the `defender_relay` module you need to have the `warrant` package from this repo: https://github.com/gnarvaja/warrant. Add it to your requirements.txt as:
+
+```
+warrant @ git+https://github.com/gnarvaja/warrant.git#egg=warrant
+```
+
+Note that using the `warrant` package from pypi will not work because of incompatibilities with newer python versions.
+
+## Tox Tests
+
+The tox tests run in two variants:
+
+- `default`: only uses and tests the prototype libraries, no blockchain.
+- `default-w3`: users and tests two variants: prototype and w3wrappers (wrappers using web3py).
+
+# Note
+
+This project has been set up using PyScaffold 4.0.2. For details and usage
+information on PyScaffold see https://pyscaffold.org/.

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/pyproject.toml

@@ -6,3 +6,6 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 # See configuration details in https://github.com/pypa/setuptools_scm
 version_scheme = "no-guess-dev"
+
+[tool.black]
+line-length = 110

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/setup.cfg

@@ -4,8 +4,8 @@ description = Prototype Ethereum Smart Contracts in Python
 author = Guillermo M. Narvaja
 author_email = guillermo@ensuro.co
 license = MIT
-long_description = file: README.rst
-long_description_content_type = text/x-rst; charset=UTF-8
+long_description = file: README.md
+long_description_content_type = text/markdown; charset=UTF-8; variant=GFM
 url = https://github.com/gnarvaja/eth-prototype
 project_urls = 
 	Documentation = https://pyscaffold.org/
@@ -25,6 +25,7 @@ install_requires =
 	m9g
 	environs
 	requests
+	hexbytes
 	importlib-metadata; python_version<"3.8"
 
 [options.packages.find]
@@ -33,10 +34,8 @@ exclude =
 	tests
 
 [options.extras_require]
-brownie = eth-brownie
 web3 = 
 	web3
-	eth-event
 defender = 
 	boto3
 gmpy2 = 
@@ -46,16 +45,10 @@ testing =
 	pytest
 	gmpy2
 	pytest-cov
-testing-br = 
-	eth-brownie
-	setuptools
-	pytest
-	pytest-cov
 testing-w3 = 
 	web3[tester]
 	setuptools
 	pytest
-	eth-event
 	pytest-cov
 	boto3
 

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/src/eth_prototype.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-prototype
-Version: 0.7.5
+Version: 1.0.0
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -11,18 +11,16 @@ Platform: any
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Requires-Python: >=3.7
-Description-Content-Type: text/x-rst; charset=UTF-8
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
 Requires-Dist: m9g
 Requires-Dist: environs
 Requires-Dist: requests
+Requires-Dist: hexbytes
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Provides-Extra: brownie
-Requires-Dist: eth-brownie; extra == "brownie"
 Provides-Extra: web3
 Requires-Dist: web3; extra == "web3"
-Requires-Dist: eth-event; extra == "web3"
 Provides-Extra: defender
 Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
@@ -32,71 +30,44 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: gmpy2; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Provides-Extra: testing-br
-Requires-Dist: eth-brownie; extra == "testing-br"
-Requires-Dist: setuptools; extra == "testing-br"
-Requires-Dist: pytest; extra == "testing-br"
-Requires-Dist: pytest-cov; extra == "testing-br"
 Provides-Extra: testing-w3
 Requires-Dist: web3[tester]; extra == "testing-w3"
 Requires-Dist: setuptools; extra == "testing-w3"
 Requires-Dist: pytest; extra == "testing-w3"
-Requires-Dist: eth-event; extra == "testing-w3"
 Requires-Dist: pytest-cov; extra == "testing-w3"
 Requires-Dist: boto3; extra == "testing-w3"
 
-=============
-eth-prototype
-=============
+# eth-prototype
 
 
 Prototype Ethereum Smart Contracts in Python
 
 
-Description
-===========
+## Description
 
 Library with base classes to prototype Ethereum Smart Contracts in Python. This includes:
 
 - wadray: classes for fixed number of decimals math implemented with integers.
 - contracts: classes to simulate contracts in Python with features like *rollback* on exception, external
   methods, views. Also classes for common contracts like ERC20 (tokens), ERC721 (NFTs) and AccessControl.
-- brwrappers: classes to wrap ethereum contracts called thru [brownie](https://github.com/eth-brownie/brownie/) but with a pythonic interface
 - w3wrappers: classes to wrap ethereum contracts called thru [web3py](https://web3py.readthedocs.io/) but with a pythonic interface
 
+To use the `defender_relay` module you need to have the `warrant` package from this repo: https://github.com/gnarvaja/warrant. Add it to your requirements.txt as:
 
-Tox Tests
-=========
+```
+warrant @ git+https://github.com/gnarvaja/warrant.git#egg=warrant
+```
 
-The tox tests run in three variants:
+Note that using the `warrant` package from pypi will not work because of incompatibilities with newer python versions.
 
-- `default`: only uses and tests the prototype libraries, no blockchain.
-- `default-w3`: users and tests two variants: prototype and w3wrappers (wrappers using web3py).
-- `default-br`: users and tests two variants: prototype and brwrappers (wrappers using brownie).
-
-It's not possible for now running all the tests together because of incompatibilities between brownie and web3[tester].
-
-
-To run the tox `default-br` tests, you need an environment with Brownie, SOLC and other requirements.
+## Tox Tests
 
-You can do it using a Docker image an a few commands
+The tox tests run in two variants:
 
-.. code-block:: bash
-
-   docker run -it -v $PWD:/code -w /code gnarvaja/eth-dev:1.0.0 bash
-   gnarvaja/eth-dev:eth-proto-brownie
-   pip install tox
-   brownie pm install OpenZeppelin/openzeppelin-contracts@4.3.2
-   brownie pm install OpenZeppelin/openzeppelin-contracts-upgradeable@4.3.2
-   tox -e py39-br
-
-   docker run -it -v $PWD:/code -w /code gnarvaja/eth-dev:eth-proto-brownie bash
-   tox -e py39-br
-
-.. _pyscaffold-notes:
+- `default`: only uses and tests the prototype libraries, no blockchain.
+- `default-w3`: users and tests two variants: prototype and w3wrappers (wrappers using web3py).
 
-Note
-====
+# Note
 
 This project has been set up using PyScaffold 4.0.2. For details and usage
 information on PyScaffold see https://pyscaffold.org/.

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/src/eth_prototype.egg-info/SOURCES.txt

@@ -1,10 +1,12 @@
 .coveragerc
 .gitignore
+.isort.cfg
+.pre-commit-config.yaml
 .readthedocs.yml
 AUTHORS.rst
 CHANGELOG.rst
 LICENSE.txt
-README.rst
+README.md
 pyproject.toml
 setup.cfg
 setup.py
@@ -27,23 +29,30 @@ src/eth_prototype.egg-info/not-zip-safe
 src/eth_prototype.egg-info/requires.txt
 src/eth_prototype.egg-info/top_level.txt
 src/ethproto/__init__.py
-src/ethproto/brwrappers.py
+src/ethproto/build_artifacts.py
 src/ethproto/contracts.py
 src/ethproto/defender_relay.py
 src/ethproto/w3wrappers.py
 src/ethproto/wadray.py
 src/ethproto/wrappers.py
 tests/conftest.py
+tests/test_build_artifacts.py
 tests/test_contracts.py
 tests/test_defender.py
+tests/test_time_control.py
+tests/test_w3.py
 tests/test_wadray.py
-tests/brownie-project/.gitattributes
-tests/brownie-project/.gitignore
-tests/brownie-project/brownie-config.yaml
-tests/brownie-project/contracts/TestCurrency.sol
-tests/brownie-project/contracts/TestCurrencyUUPS.sol
-tests/brownie-project/contracts/TestNFT.sol
-tests/json-project/TestCurrency.json
-tests/json-project/TestCurrencyUUPS.json
-tests/json-project/TestNFT.json
-tests/json-project/dependencies/ERC1967Proxy.json
+tests/hardhat-project/README.md
+tests/hardhat-project/hardhat.config.js
+tests/hardhat-project/package-lock.json
+tests/hardhat-project/package.json
+tests/hardhat-project/artifacts2/TestCurrency.sol/TestCurrency.json
+tests/hardhat-project/contracts/Count.sol
+tests/hardhat-project/contracts/Counter.sol
+tests/hardhat-project/contracts/CounterUpgradeable.sol
+tests/hardhat-project/contracts/CounterUpgradeableWithLibrary.sol
+tests/hardhat-project/contracts/CounterWithLibrary.sol
+tests/hardhat-project/contracts/Datatypes.sol
+tests/hardhat-project/contracts/TestCurrency.sol
+tests/hardhat-project/contracts/TestCurrencyUUPS.sol
+tests/hardhat-project/contracts/TestNFT.sol

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/src/eth_prototype.egg-info/requires.txt

@@ -1,13 +1,11 @@
 m9g
 environs
 requests
+hexbytes
 
 [:python_version < "3.8"]
 importlib-metadata
 
-[brownie]
-eth-brownie
-
 [defender]
 boto3
 
@@ -20,20 +18,12 @@ pytest
 gmpy2
 pytest-cov
 
-[testing-br]
-eth-brownie
-setuptools
-pytest
-pytest-cov
-
 [testing-w3]
 web3[tester]
 setuptools
 pytest
-eth-event
 pytest-cov
 boto3
 
 [web3]
 web3
-eth-event

eth-prototype-1.0.0/src/ethproto/build_artifacts.py

@@ -0,0 +1,152 @@
+"""Helper classes to use hardhat build artifacts from python"""
+
+
+import json
+import os
+import os.path
+import re
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Union, Tuple
+
+LIBRARY_PLACEHOLDER_MATCHER = re.compile(r"__\$[0-9a-f]{34}\$__")
+
+
+@dataclass
+class Artifact:
+    contract_name: str
+    abi: list
+    bytecode: str
+    deployed_bytecode: str
+    link_references: dict
+    deployed_link_references: dict
+
+    def __init__(self, **kwargs):
+        self.contract_name = kwargs["contractName"]
+        self.abi = kwargs["abi"]
+        self.bytecode = kwargs["bytecode"]
+        self.deployed_bytecode = kwargs["deployedBytecode"]
+        self.link_references = kwargs["linkReferences"]
+        self.deployed_link_references = kwargs["deployedLinkReferences"]
+
+    def link(self, libraries: dict) -> "Artifact":
+        """Returns a new artifact with the external libraries linked
+
+        Libraries is a dictionary of the form {library_name: address}
+        """
+        bytecode = self._replace_link_references(
+            self.bytecode, self.link_references, libraries
+        )
+        deployed_bytecode = self._replace_link_references(
+            self.deployed_bytecode, self.deployed_link_references, libraries
+        )
+        return Artifact(
+            contractName=self.contract_name,
+            abi=self.abi,
+            bytecode=bytecode,
+            deployedBytecode=deployed_bytecode,
+            linkReferences=self.link_references,
+            deployedLinkReferences=self.deployed_link_references,
+        )
+
+    def libraries(self) -> Tuple[str, str]:
+        """Generates a tuple of (library, source) for each library reference in the artifact"""
+        for source, libs in self.link_references.items():
+            for lib in libs.keys():
+                yield lib, source
+
+    def _replace_link_references(
+        self, bytecode: str, link_references: dict, libraries: dict
+    ) -> str:
+        # remove 0x prefix if present
+        bytecode = bytecode[2:] if bytecode.startswith("0x") else bytecode
+
+        for libs in link_references.values():
+            for lib, lib_refs in libs.items():
+                try:
+                    address = libraries[lib]
+                except KeyError:
+                    raise ValueError(f"Missing library address for {lib}")
+                address = address[2:] if address.startswith("0x") else address
+
+                assert len(address) == 40  # Sanity check
+
+                for ref in lib_refs:
+                    # 2 nibbles -> 1 byte
+                    start = ref["start"] * 2
+                    length = ref["length"] * 2
+
+                    # Sanity check
+                    assert LIBRARY_PLACEHOLDER_MATCHER.match(
+                        bytecode[start : start + length]
+                    ), f"Unexpected placeholder at position {start}: {bytecode[start:start + length]}"
+
+                    # Replace the placeholder with the actual address
+                    bytecode = bytecode[:start] + address + bytecode[start + length :]
+
+        # Return value always has 0x prefix
+        return "0x" + bytecode
+
+    def __str__(self):
+        return f"Artifact({self.contract_name})"
+
+    def __repr__(self):
+        return f"Artifact({self.contract_name})"
+
+
+class ArtifactLibrary:
+    def __init__(self, *paths: Tuple[Union[str, Path]]):
+        self.lookup_paths = [Path(p).absolute() for p in paths]
+        self._fullpath_cache = {}
+        self._name_cache = {}
+
+    def get_artifact(self, contract: str) -> Artifact:
+        """Returns a build artifact by full contract path
+
+        This method is compatible with hardhat's artifact structure.
+
+        Examples:
+
+        >>> library = ArtifactLibrary("./artifacts")
+        >>> counter_build = library.get_artifact("contracts/Counter.sol")
+        >>> proxy_build = library.get_artifact("@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol")
+        """
+        contract = Path(os.path.normpath(contract))
+
+        if contract not in self._fullpath_cache:
+            for path in self.lookup_paths:
+                build_artifact_path = (
+                    path / contract / contract.with_suffix(".json").name
+                )
+                if build_artifact_path.exists():
+                    with open(build_artifact_path) as f:
+                        self._fullpath_cache[contract] = Artifact(**json.load(f))
+
+            if contract not in self._fullpath_cache:
+                raise FileNotFoundError(
+                    f"Could not find artifact for {contract} on {self.lookup_paths}"
+                )
+
+        return self._fullpath_cache[contract]
+
+    def get_artifact_by_name(self, contract_name: str) -> Artifact:
+        """Returns a build artifact by looking for a matching contract name
+
+        Example:
+
+        >>> library = ArtifactLibrary("./artifacts")
+        >>> counter_build = library.get_artifact_by_name("Counter")
+        """
+        if contract_name not in self._name_cache:
+            for path in self.lookup_paths:
+                for dirpath, _, filenames in os.walk(path):
+                    if f"{contract_name}.json" in filenames:
+                        with open(Path(dirpath) / f"{contract_name}.json") as f:
+                            self._name_cache[contract_name] = Artifact(**json.load(f))
+
+            if contract_name not in self._name_cache:
+                raise FileNotFoundError(
+                    f"Could not find artifact for {contract_name} on {self.lookup_paths}"
+                )
+
+        return self._name_cache[contract_name]

{eth-prototype-0.7.5 → eth-prototype-1.0.0}/src/ethproto/contracts.py

@@ -1,11 +1,13 @@
 import os
 import time
+from contextlib import contextmanager
 from decimal import Decimal
 from functools import wraps
-from contextlib import contextmanager
+
 from m9g import Model
-from m9g.fields import IntField, DictField, StringField, TupleField, ListField
-from .wadray import Wad, Ray
+from m9g.fields import DictField, IntField, ListField, StringField, TupleField
+
+from .wadray import Ray, Wad
 
 __author__ = "Guillermo M. Narvaja"
 __copyright__ = "Guillermo M. Narvaja"
@@ -501,7 +503,7 @@ class ERC721Token(AccessControlContract):   # NFT
     @view
     def owner_of(self, token_id):
         if token_id not in self.owners:
-            raise RevertError("ERC721: owner query for nonexistent token")
+            raise RevertError("ERC721: invalid token ID")
         return self.owners[token_id]
 
     # def token_uri
@@ -536,7 +538,7 @@ class ERC721Token(AccessControlContract):   # NFT
         owner = self.owners[token_id]
         if sender != owner and self.token_approvals.get(token_id, None) != sender and \
                 sender not in self.operator_approvals.get(owner, []):
-            raise RevertError("ERC721: transfer caller is not owner nor approved")
+            raise RevertError("ERC721: caller is not token owner or approved")
         return self._transfer(from_, to, token_id)
 
     @external
@@ -544,7 +546,7 @@ class ERC721Token(AccessControlContract):   # NFT
         owner = self.owners[token_id]
         if sender != owner and self.token_approvals.get(token_id, None) != sender and \
                 sender not in self.operator_approvals.get(owner, []):
-            raise RevertError("ERC721: transfer caller is not owner nor approved")
+            raise RevertError("ERC721: caller is not token owner or approved")
         # TODO: if `to` is contract, call onERC721Received
         return self._transfer(from_, to, token_id)