diff --git a/.github/workflows/validate-pr-commit.yml b/.github/workflows/validate-pr-commit.yml index 275ba54..f8e9765 100644 --- a/.github/workflows/validate-pr-commit.yml +++ b/.github/workflows/validate-pr-commit.yml @@ -46,17 +46,17 @@ jobs: - if: matrix.os != 'windows-latest' name: build patched neo-go for Unix run: | - git clone https://github.com/ixje/neo-go.git + git clone https://github.com/nspcc-dev/neo-go.git cd neo-go - git checkout 61d9eda9932519d7f6c4c61daaecfd675df4a72a + git checkout tags/v0.104.0 make mv bin/neo-go ../boatest/boaconstructor/data/neogo - if: matrix.os == 'windows-latest' name: build patched neo-go for Windows run: | - git clone https://github.com/ixje/neo-go.git + git clone https://github.com/nspcc-dev/neo-go.git cd neo-go - git checkout 61d9eda9932519d7f6c4c61daaecfd675df4a72a + git checkout tags/v0.104.0 make mv bin/neo-go.exe ../boatest/boaconstructor/data/neogo.exe - name: prep for persist diff --git a/boaconstructor/data/protocol.unittest.yml b/boaconstructor/data/protocol.unittest.yml index a5f998b..69bd65b 100644 --- a/boaconstructor/data/protocol.unittest.yml +++ b/boaconstructor/data/protocol.unittest.yml @@ -8,17 +8,6 @@ ProtocolConfiguration: ValidatorsCount: 1 VerifyTransactions: true P2PSigExtensions: true - NativeActivations: - ContractManagement: [0] - StdLib: [0] - CryptoLib: [0] - LedgerContract: [0] - NeoToken: [0] - GasToken: [0] - PolicyContract: [0] - RoleManagement: [0] - OracleContract: [0] - Notary: [0] Hardforks: Aspidochelone: 25 @@ -49,7 +38,6 @@ ApplicationConfiguration: UnlockWallet: Path: "wallet1_solo.json" Password: "one" - Relative: true P2PNotary: Enabled: false UnlockWallet: diff --git a/boaconstructor/node.py b/boaconstructor/node.py index 9dcdc00..066b84a 100644 --- a/boaconstructor/node.py +++ b/boaconstructor/node.py @@ -64,7 +64,7 @@ def start(self): prog += ".exe" posix = False - cmd = f"{self.data_dir}/{prog} node --config-file {self.config_path} --relative-path {self.consensus_wallet_path}" + cmd = f"{self.data_dir}/{prog} node --config-file {self.config_path} --relative-path {self.data_dir}" self._process = subprocess.Popen( shlex.split(cmd, posix=posix), diff --git a/pyproject.toml b/pyproject.toml index f4ca361..edfb5a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ build-backend = "setuptools.build_meta" target-version = ['py310'] [tool.neogo] -tag = "v0.102.0" +tag = "v0.104.0" [tool.mypy] check_untyped_defs = true diff --git a/scripts/download-node.py b/scripts/download-node.py index ac73d95..d0bef59 100644 --- a/scripts/download-node.py +++ b/scripts/download-node.py @@ -4,7 +4,6 @@ import os import stat import pathlib -from importlib import machinery from tomlkit import parse logging.getLogger("requests").setLevel(logging.WARNING) @@ -52,11 +51,9 @@ def main(): f"Found release! Downloading {asset['browser_download_url']}...", end="", ) - - module_path = ( - machinery.PathFinder().find_spec("boaconstructor").origin + data_dir = pathlib.Path(__file__).parent.parent.joinpath( + "boaconstructor/data" ) - data_dir = pathlib.Path(module_path).parent.joinpath("data") binary_filename = f"{data_dir}/neogo" if system == "windows": binary_filename += ".exe" diff --git a/scripts/fix-wheels.py b/scripts/fix-wheels.py index 2e7d883..4641f89 100644 --- a/scripts/fix-wheels.py +++ b/scripts/fix-wheels.py @@ -2,7 +2,7 @@ This script is a helper script to correctly rename wheels. While the boaconstructor package is all in Python, it relies on a platform specific executable (neo-go) in the background. -The CI setup will build the platform specific neo-go executable and place it in the correct directory where it will be +The CI setup will fetch the platform specific neo-go executable and place it in the correct directory where it will be picked up when packaging. `python -m build` creates a universal wheel and that needs to be fixed to include the correct platform tag before uploading to PyPi. This cannot be done by simply renaming the file, it also does internal changes in the wheel hence this script.