Remove exclusions from Makefile #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

szemate wants to merge 28 commits into master from remove-excludes

.github/workflows/onpush.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,10 @@ name: onpush @@
     on:
       push:
-      workflow_dispatch:
+        branches:
+          - master
+          - stable
+      pull_request:
     jobs:
       check:
@@ Expand Down @@

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ __pycache__/ @@
     # Root directories
     /.mypy_cache/
+    /build/
     /dist/
     # Root files
@@ Expand Down @@

AUTONITY_VERSION

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		v0.14.0

Makefile

-Original file line number
+Diff line change
@@ -0,0 +1,61 @@
+    VERSION := $(shell cat AUTONITY_VERSION)
+    AUTONITY := build/autonity
+    ABIDIR := $(AUTONITY)/params/generated
+    SRCDIR := $(AUTONITY)/autonity/solidity/contracts
+    OUTDIR := autonity/contracts
+    BINDINGS := \
+    	$(OUTDIR)/accountability.py \
+    	$(OUTDIR)/acu.py \
+    	$(OUTDIR)/autonity.py \
+    	$(OUTDIR)/ierc20.py \
+    	$(OUTDIR)/inflation_controller.py \
+    	$(OUTDIR)/liquid.py \
+    	$(OUTDIR)/non_stakable_vesting.py \
+    	$(OUTDIR)/oracle.py \
+    	$(OUTDIR)/stabilization.py \
+    	$(OUTDIR)/supply_control.py \
+    	$(OUTDIR)/upgrade_manager.py
+    gentargets = $(shell find $(SRCDIR) -name $(1).sol) $(addprefix $(ABIDIR)/$(1),.docdev .docuser .abi)
+    all: $(BINDINGS)
+    $(OUTDIR)/accountability.py: $(call gentargets,Accountability)
+    $(OUTDIR)/acu.py: $(call gentargets,ACU)
+    $(OUTDIR)/autonity.py: $(call gentargets,Autonity)
+    $(OUTDIR)/ierc20.py: $(call gentargets,IERC20)
+    $(OUTDIR)/inflation_controller.py: $(call gentargets,InflationController)
+    $(OUTDIR)/liquid.py: $(call gentargets,Liquid)
+    $(OUTDIR)/non_stakable_vesting.py: $(call gentargets,NonStakableVesting)
+    $(OUTDIR)/oracle.py: $(call gentargets,Oracle)
+    $(OUTDIR)/stabilization.py: $(call gentargets,Stabilization)
+    $(OUTDIR)/supply_control.py: $(call gentargets,SupplyControl)
+    $(OUTDIR)/upgrade_manager.py: $(call gentargets,UpgradeManager)
+    $(BINDINGS):
+    	hatch run generate:pyabigen \
+    		--version $(VERSION) \
+    		--src $(word 1,$^) \
+    		--devdoc $(word 2,$^) \
+    		--userdoc $(word 3,$^) \
+    		$(word 4,$^) >$@
+    $(ABIDIR)/%.abi: $(AUTONITY) AUTONITY_VERSION
+    	cd $< && \
+    	git fetch origin && \
+    	git checkout $(VERSION) && \
+    	make contracts
+    # This recipe can be removed after https://github.com/autonity/autonity/pull/1035 is released
+    $(ABIDIR)/%.docuser $(ABIDIR)/%.docdev: $(ABIDIR)/%.abi
+    	$(AUTONITY)/build/bin/solc_static_linux_v0.8.21 \
+    		--overwrite --userdoc --devdoc -o $(ABIDIR) \
+    		$$(find $(AUTONITY)/autonity/solidity/contracts -name $(basename $(notdir $<)).sol)
+    $(AUTONITY):
+    	git clone [email protected]:autonity/autonity.git $@
+    clean:
+    	rm -rf $(AUTONITY)
+    .PHONY = clean

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,9 +5,10 @@ settlement infrastructure specialized for developing new risk markets. It is a
  
    fork of the [Ethereum protocol](https://ethereum.org/). See the

    [Autonity documentation](https://docs.autonity.org) for further information.

    This package provides typed wrappers around the Autonity-specific extensions of

    Ethereum, using the [Web3.py](https://github.com/ethereum/web3.py) framework,

    for convenient and statically checked interactions with the Autonity network.

    This package provides typed bindings (a.k.a. wrappers) around the

    Autonity-specific extensions of Ethereum, using the

    [Web3.py](https://github.com/ethereum/web3.py) framework, for convenient and

    statically checked interactions with the Autonity network.

    ## Installation

    @@ -17,42 +18,41 @@ pip install autonity
  
    ## Usage

    The primary utility of this library is the typed wrappers around the Autonity

    protocol contract, which provides access to Autonity-specific functionality.

    Example usage:

    ```python

    from autonity.utils.web3 import create_web3_for_endpoint

    from autonity import Autonity, Validator

    from web3 import Web3

    from autonity import Autonity, Liquid, networks

    w3 = create_web3_for_endpoint("<RPC_ENDPOINT>")

    # Connect to the default RPC provider on the Autonity Piccadilly Testnet

    w3 = Web3(networks.piccadilly.http_provider)

    # Create the typed wrapper around the Autonity contract.

    # Create the typed binding around the Autonity contract

    autonity = Autonity(w3)

    # Get total supply of Newton

    # Get the total supply of Newton

    ntn_supply = autonity.total_supply()

    print(f"Total NTN supply: {ntn_supply}")

    # Get the current validator list

    validator_ids = autonity.get_validators()

    validator_addresses = autonity.get_validators()

    # Get descriptor for the 0-th validator.  Print LNTN contract address.

    validator_desc_0 = autonity.get_validator(validator_ids[0])

    print(f"LNTN contract addr: {validator_desc_0['liquid_contract']}")

    # Get the description of the 0-th validator and print its Liquid contract address

    validator = autonity.get_validator(validator_addresses[0])

    print(f"LNTN contract address: {validator.liquid_contract}")

    # Typed validator Liquid Newton contract.  Query unclaimed fees for <ADDRESS>.

    validator_0 = Validator(w3, validator_desc_0)

    unclaimed_atn, unclaimed_ntn = validator_0.unclaimed_rewards("<ADDRESS>")

    print(f"unclaimed rewards: {unclaimed_atn} ATN, {unclaimed_ntn} NTN")

    # Query unclaimed fees for <ADDRESS> from the validator's Liquid contract

    liquid = Liquid(w3, validator.liquid_contract)

    unclaimed_atn, unclaimed_ntn = liquid.unclaimed_rewards("<ADDRESS>")

    print(f"Unclaimed rewards: {unclaimed_atn} ATN, {unclaimed_ntn} NTN")

    ```

    Where`<RPC_ENDPOINT>` is the name of the Autonity network being connected to.

    See <https://docs.autonity.org/networks/> for information about specific

    networks.

    ## Development

    The project uses [hatch](https://hatch.pypa.io/latest/install/#pipx) as the

    build tool. To launch the tests, run:

    build tool.

    To launch the tests, run:

    ```console

    hatch run test:all

    @@ -64,15 +64,24 @@ For linting use the command:
  
    hatch run lint:check

    ```

    ### Updating the Contract ABIs

    ### Updating the Contract Bindings

    To update contract bindings for a new version of the Autonity protocol, add the

    new [AGC](https://github.com/autonity/autonity) version (Git tag or commit ID)

    to `AUTONITY_VERSION`, then generate the contract bindings with `make`:

    ```console

    echo v0.14.0 > AUTONITY_VERSION

    make

    ```

    The script `script/update_abi.sh [AUTONITY_COMMIT]` builds the contract ABIs

    using AGC at the specified Git commit ID or tag. Keys are ordered via the `jq`

    tool, in order to produce deterministic output, and the results written to the

    `autonity/abi` directory. Further, it normalizes the commit ID that was used.

    Contract functions are ordered alphabetically in order to produce deterministic

    output. After executing the script against a new version of the code, the diffs

    can be reviewed to determine which methods have been modified, removed or

    added. The generated Python bindings include the contract ABIs as Python dictionaries.

    After executing the script against a new version of the code, the diffs can be

    reviewed to determine which methods have been modified, removed or added.

    If there is a new contract to include, add a new target to `Makefile` and a new

    factory function to `autonity/factory.py` and `autonity/__init__.py`.

    ## Reporting a Vulnerability

autonity/__init__.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,19 +1,33 @@
  
    # Copyright (C) 2015-2022 Clearmatics Technologies Ltd - All Rights Reserved.

    # Copyright (C) 2015-2024 Clearmatics Technologies Ltd - All Rights Reserved.

    """

    Top-level Autonity module exposing primary types.

    """

    """Package for interacting with the protocol contracts of the Autonity network."""

    # pylint: disable=unused-import

    # flake8: noqa

    from autonity.autonity import (

    from . import constants, contracts, networks

    from .factory import (

        Accountability,

        ACU,

        Autonity,

        AUTONITY_CONTRACT_ADDRESS,

        get_autonity_contract_version,

        get_autonity_contract_abi_path,

        InflationController,

        Liquid,

        NonStakableVesting,

        Oracle,

        Stabilization,

        SupplyControl,

        UpgradeManager,

    )

    __all__ = (

        "constants",

        "contracts",

        "networks",

        "Accountability",

        "ACU",

        "Autonity",

        "InflationController",

        "Liquid",

        "NonStakableVesting",

        "Oracle",

        "Stabilization",

        "SupplyControl",

        "UpgradeManager",

    )

    from autonity.config import Config

    from autonity.committee_member import CommitteeMember

    from autonity.validator import ValidatorDescriptor, Validator

    from autonity.tendermint import Tendermint

autonity/__version__.py

-Original file line number
+Diff line change
@@ -1,5 +1 @@
-    """
-    Release version of autonity package.
-    """
     __version__ = "v4.0.0"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove exclusions from Makefile #60

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Remove exclusions from Makefile #60

Are you sure you want to change the base?

Uh oh!

Remove exclusions from Makefile #60

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!