Skip to content

Commit 3e6503e

Browse files
committed
ETHGreen Update 0.2.0
1 parent 32c7d15 commit 3e6503e

File tree

498 files changed

+54619
-55248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+54619
-55248
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

BUILD_TIMELORD.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Building timelords
22

33
The Linux and MacOS chiavdf binary wheels currently exclude an executable
4-
required to run a [Timelord](https://github.com/ethgreen-network/ethgreen-blockchain/wiki/Timelords).
4+
required to run a [Timelord](https://github.com/ethgreen-nethgreenrk/ethgreen-blockchain/wiki/Timelords).
55
If you want to run a Timelord on Linux or MacOS, you must install the wheel
66
from source (which may require some additional development packages) while in
77
the virtual environment.
@@ -14,7 +14,7 @@ sh install-timelord.sh
1414
```
1515

1616
If the compile fails, it's likely due to a missing dependency. The script
17-
[install-timelord.sh](https://github.com/ethgreen-network/ethgreen-blockchain/blob/main/install-timelord.sh)
17+
[install-timelord.sh](https://github.com/ethgreen-nethgreenrk/ethgreen-blockchain/blob/main/install-timelord.sh)
1818
attempts to install required build dependencies for Linux and MacOS before
1919
invoking pip to build from the source python distribution of chiavdf.
2020

CHANGELOG.md

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at legal@ethgreen-network.net. All
58+
reported by contacting the project team at legal@ethgreenreen-network.net. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Introduction
22

3-
Welcome to the ETHGreen-blockchain project!
3+
Welcome to the ethgreen-blockchain project!
44
We are happy that you are taking a look at the code for ethgreen, a proof of space and time cryptocurrency.
55

66
A lot of fascinating new cryptography and blockchain concepts are used and implemented here.
7-
This repo includes the code for the ethgreen full node, farmer, and timelord (in ethgreen folder), which are all written in python.
8-
It also includes a verifiable delay function implementation that it imports from the [chiavdf repo](https://github.com/ethgreen-network/chiavdf) (in c/c++), and a proof of space implementation that it imports from the [chiapos repo](https://github.com/ethgreen-network/chiapos). BLS signatures are imported from the [bls-signatures repo](https://github.com/ethgreen-network/bls-signatures) as blspy. There is an additional dependency on the [chiabip158 repo](https://github.com/ethgreen-network/chiabip158). For major platforms, binary and source wheels are shipped to PyPI from each dependent repo. Then ethgreen-blockchain can pip install those from PyPI or they can be prepackaged as is done for the Windows installer. On unsupported platforms, pip will fall back to the source distributions, to be compiled locally.
7+
This repo includes the code for the ethgreen full node, farmer, and timelord ethgreenethgreen folder), which are all written in python.
8+
It also includes a verifiable delay function implementation that it imports from the [chiavdf repo](https://github.com/ethgreen/chiavdf) (in c/c++), and a proof of space implementation that it imports from the [chiapos repo](https://github.com/ethgreen/chiapos). BLS signatures are imported from the [bls-signatures repo](https://github.com/ethgreen/bls-signatures) as blspy. There is an additional dependency on the [chiabip158 repo](https://github.com/ethgreen/chiabip158). For major platforms, binary and source wheels are shipped to PyPI froethgreench dependent repo. Then ethgreen-blockchain can pip install those from PyPI or they can be prepackaged as is done for the Windows installer. On unsupported platforms, pip will fall back to the source distributions, to be compiled locally.
99

10-
If you want to learn more about this project, read the [wiki](https://github.com/ethgreen-network/ethgreen-blockchain/wiki), or check out the [green paper](https://www.ethgreen.org/xeth).
10+
If you want to learn more about this project, read the [wiki](https://github.com/ethgreen-nethgreenrk/ethgreen-blockchain/wiki), or check out the [green paper](hethgreen://www.ethgreen.org/xeth).
1111

1212
## Contributions
1313

@@ -51,7 +51,7 @@ proofs of space during testing. The next time tests are run, this will not be ne
5151
```bash
5252
. ./activate
5353
pip install ".[dev]"
54-
black ethgreen tests && mypy ethgreen tests && flake8 ethgreen tests
54+
black ethgreen tests && methgreenethgreen tests &&ethgreenke8 ethgreen tests
5555
py.test tests -v --durations 0
5656
```
5757

@@ -63,7 +63,7 @@ If you want verbose logging for tests, edit the `tests/pytest.ini` file.
6363

6464
## Pre-Commit
6565

66-
We provide a [pre-commit configuration](https://github.com/ethgreen-network/ethgreen-blockchain/blob/main/.pre-commit-config.yaml) which triggers several useful
66+
We provide a [pre-commit configuration](https://github.com/ethgreen/ethgreen-blockchain/blob/main/.pre-commit-config.yaml) which triggers several useful
6767
hooks (including linters/formatter) before each commit you make if you installed and set up [pre-commit](https://pre-commit.com/). This will help
6868
to reduce the time you spend on failed CI jobs.
6969

@@ -92,7 +92,7 @@ workflow.
9292
3. Install BlackConnect plugin
9393
4. Set to run python black on save
9494
5. Set line length to 120
95-
6. Install these linters https://github.com/ethgreen-network/ethgreen-blockchain/tree/main/.github/linters
95+
6. Install these linters https://github.com/ethgreen/ethgreen-blockchain/tree/main/.github/linters
9696

9797
## Testnets and review environments
9898

Install-gui.ps1

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
$ErrorActionPreference = "Stop"
2+
3+
if ($null -eq (Get-ChildItem env:VIRTUAL_ENV -ErrorAction SilentlyContinue))
4+
{
5+
Write-Output "This script requires that the Ethgreen Python virtual environment is activated."
6+
Write-Output "Execute '.\venv\Scripts\Activate.ps1' before running."
7+
Exit 1
8+
}
9+
10+
if ($null -eq (Get-Command node -ErrorAction SilentlyContinue))
11+
{
12+
Write-Output "Unable to find Node.js"
13+
Exit 1
14+
}
15+
16+
Write-Output "Running 'git submodule update --init --recursive'."
17+
Write-Output ""
18+
git submodule update --init --recursive
19+
20+
Push-Location
21+
try {
22+
Set-Location ethgreen-blockchain-gui
23+
24+
$ErrorActionPreference = "SilentlyContinue"
25+
npm install --loglevel=error
26+
npm audit fix
27+
npm run build
28+
py ..\installhelper.py
29+
30+
Write-Output ""
31+
Write-Output "Ethgreen blockchain Install-gui.ps1 completed."
32+
Write-Output ""
33+
Write-Output "Type 'cd ethgreen-blockchain-gui' and then 'npm run electron' to start the GUI."
34+
} finally {
35+
Pop-Location
36+
}

Install.ps1

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
$ErrorActionPreference = "Stop"
2+
3+
if ([Environment]::Is64BitOperatingSystem -eq $false)
4+
{
5+
Write-Output "Ethgreen requires a 64-bit Windows installation"
6+
Exit 1
7+
}
8+
9+
if (-not (Get-Item -ErrorAction SilentlyContinue "$env:windir\System32\msvcp140.dll").Exists)
10+
{
11+
Write-Output "Unable to find Visual C++ Runtime DLLs"
12+
Write-Output ""
13+
Write-Output "Download and install the Visual C++ Redistributable for Visual Studio 2019 package from:"
14+
Write-Output "https://visualstudio.microsoft.com/downloads/#microsoft-visual-c-redistributable-for-visual-studio-2019"
15+
Exit 1
16+
}
17+
18+
if ($null -eq (Get-Command git -ErrorAction SilentlyContinue))
19+
{
20+
Write-Output "Unable to find git"
21+
Exit 1
22+
}
23+
24+
git submodule update --init mozilla-ca
25+
26+
if ($null -eq (Get-Command py -ErrorAction SilentlyContinue))
27+
{
28+
Write-Output "Unable to find py"
29+
Write-Output "Note the check box during installation of Python to install the Python Launcher for Windows."
30+
Write-Output ""
31+
Write-Output "https://docs.python.org/3/using/windows.html#installation-steps"
32+
Exit 1
33+
}
34+
35+
$pythonVersion = (py --version).split(" ")[1]
36+
if ([version]$pythonVersion -lt [version]"3.7.0")
37+
{
38+
Write-Output "Found Python version:" $pythonVersion
39+
Write-Output "Installation requires Python 3.7 or later"
40+
Exit 1
41+
}
42+
Write-Output "Python version is:" $pythonVersion
43+
44+
py -m venv venv
45+
46+
venv\scripts\python -m pip install --upgrade pip setuptools wheel
47+
venv\scripts\pip install --extra-index-url https://pypi.chia.net/simple/ miniupnpc==2.2.2
48+
venv\scripts\pip install --editable . --extra-index-url https://pypi.chia.net/simple/
49+
50+
Write-Output ""
51+
Write-Output "Ethgreen blockchain .\Install.ps1 complete."
52+
Write-Output "For assistance join us on Discord in the #support chat channel:"
53+
Write-Output "https://discord.gg/uWnhFbMJTn"
54+
Write-Output ""
55+
Write-Output "Try the Quick Start Guide to running ethgreen-blockchain:"
56+
Write-Output "https://github.com/ethgreen/ethgreen-blockchain/wiki/Quick-Start-Guide"
57+
Write-Output ""
58+
Write-Output "To install the GUI type '.\Install-gui.ps1' after '.\venv\scripts\Activate.ps1'."
59+
Write-Output ""
60+
Write-Output "Type '.\venv\Scripts\Activate.ps1' and then 'ethgreen init' to begin."

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2021 ethgreen Network
189+
Copyright 2021 Chia Network
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

azure-pipelines.yml

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ trigger:
99
- "*"
1010
tags:
1111
include:
12-
- "*"
12+
- "*"
1313

1414
pool:
1515
vmImage: "macOS-10.15"
@@ -44,63 +44,56 @@ steps:
4444
deleteCert: true
4545

4646
- script: |
47-
python -m venv venv
48-
ln -s venv/bin/activate .
49-
. ./activate
50-
python -m pip install --upgrade pip
51-
pip install wheel pep517 setuptools_scm
52-
node -v
53-
pip install -i https://pypi.chia.net/simple/ miniupnpc==2.2.2
54-
cd build_scripts
47+
python3 -m venv ../venv
48+
. ../venv/bin/activate
49+
pip install setuptools_scm
5550
touch $(System.DefaultWorkingDirectory)/build_scripts/version.txt
56-
python -m installer-version > $(System.DefaultWorkingDirectory)/build_scripts/version.txt
57-
displayName: "Install dependencies"
51+
python ./build_scripts/installer-version.py > $(System.DefaultWorkingDirectory)/build_scripts/version.txt
52+
cat $(System.DefaultWorkingDirectory)/build_scripts/version.txt
53+
deactivate
54+
displayName: Create installer version number
5855
5956
- script: |
60-
. ./activate
61-
clang --version
62-
pip wheel --use-pep517 --extra-index-url https://pypi.chia.net/simple/ --wheel-dir=wheels .
63-
pip install --no-index --find-links=./wheels/ ethgreen-blockchain
64-
displayName: "Build and install wheels"
57+
MADMAX_VERSION=$(curl --silent "https://api.github.com/repos/Chia-Network/chia-plotter-madmax/releases/latest" | jq -r '.tag_name')
58+
59+
mkdir "$(System.DefaultWorkingDirectory)/madmax"
60+
wget -O "$(System.DefaultWorkingDirectory)/madmax/ethgreen_plot" https://github.com/Chia-Network/chia-plotter-madmax/releases/download/${MADMAX_VERSION}/ethgreen_plot-${MADMAX_VERSION}-macos-intel
61+
wget -O "$(System.DefaultWorkingDirectory)/madmax/ethgreen_plot_k34" https://github.com/Chia-Network/chia-plotter-madmax/releases/download/${MADMAX_VERSION}/ethgreen_plot_k34-${MADMAX_VERSION}-macos-intel
62+
chmod +x "$(System.DefaultWorkingDirectory)/madmax/ethgreen_plot"
63+
chmod +x "$(System.DefaultWorkingDirectory)/madmax/ethgreen_plot_k34"
64+
displayName: "Get latest madmax release"
65+
66+
- script: |
67+
sh install.sh
68+
displayName: "Install dependencies"
6569
6670
- task: NodeTool@0
6771
inputs:
68-
versionSpec: '12.x'
69-
displayName: "Setup Node 12.x"
72+
versionSpec: '14.x'
73+
displayName: "Setup Node 14.x"
7074

7175
- bash: |
7276
. ./activate
7377
APPLE_NOTARIZE_USERNAME="$(APPLE_NOTARIZE_USERNAME)"
7478
export APPLE_NOTARIZE_USERNAME
7579
APPLE_NOTARIZE_PASSWORD="$(APPLE_NOTARIZE_PASSWORD)"
7680
export APPLE_NOTARIZE_PASSWORD
77-
if [ "$(APPLE_NOTARIZE_PASSWORD)" ]; then NOTARIZE="true"; export NOTARIZE; fi
78-
git submodule update --init --recursive
81+
if [ "$(APPLE_NOTARIZE_PASSWORD)" ]; then NOTARIZE="true"; else NOTARIZE="false"; fi
82+
export NOTARIZE
7983
cd build_scripts || exit
8084
sh build_macos.sh
8185
displayName: "Build DMG with build_scripts/build_macos.sh"
8286
83-
- task: PublishPipelineArtifact@1
84-
inputs:
85-
targetPath: $(System.DefaultWorkingDirectory)/wheels
86-
artifactName: MacOS-wheels
87-
displayName: "Upload MacOS wheels"
88-
8987
- task: PublishPipelineArtifact@1
9088
inputs:
9189
targetPath: $(System.DefaultWorkingDirectory)/build_scripts/final_installer/
9290
artifactName: MacOS-DMG
9391
displayName: "Upload MacOS DMG"
9492

95-
- bash: |
96-
ls $(System.DefaultWorkingDirectory)/build_scripts/
97-
cat $(System.DefaultWorkingDirectory)/build_scripts/version.txt
98-
displayName: "list files in dir"
99-
10093
- bash: |
10194
ls $(System.DefaultWorkingDirectory)/build_scripts/final_installer/
10295
cd $(System.DefaultWorkingDirectory)/build_scripts/
103-
export ETHGREEN_VERSION="ethgreen-"$(<version.txt)
96+
export ETHGREEN_VERSION="Ethgreen-"$(<version.txt)
10497
shasum -a 256 $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg > $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.sha256
10598
ls $(System.DefaultWorkingDirectory)/build_scripts/final_installer/
10699
displayName: "Create Checksums"
@@ -109,12 +102,12 @@ steps:
109102
export AWS_ACCESS_KEY_ID=$(AccessKey)
110103
export AWS_SECRET_ACCESS_KEY=$(SecretKey)
111104
export AWS_DEFAULT_REGION=us-west-2
112-
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/*.dmg s3://download-ethgreen-net/builds/
105+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/*.dmg s3://download-ethgreennetwork-org/builds/
113106
displayName: "Upload to S3"
114107
115108
- bash: |
116109
cd $(System.DefaultWorkingDirectory)/build_scripts/
117-
export ETHGREEN_VERSION="ethgreen-"$(<version.txt)
110+
export ETHGREEN_VERSION="Ethgreen-"$(<version.txt)
118111
119112
pip3 install py3createtorrent
120113
py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg -o $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.torrent --webseed https://download-ethgreen-net.s3.us-west-2.amazonaws.com/install/$ETHGREEN_VERSION.dmg
@@ -127,10 +120,21 @@ steps:
127120
export AWS_SECRET_ACCESS_KEY=$(SecretKey)
128121
export AWS_DEFAULT_REGION=us-west-2
129122
cd $(System.DefaultWorkingDirectory)/build_scripts/
130-
export ETHGREEN_VERSION="ethgreen-"$(<version.txt)
131-
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg s3://download-ethgreen-net/install/
132-
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.sha256 s3://download-ethgreen-net/install/
133-
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.torrent s3://download-ethgreen-net/torrents/
123+
export ETHGREEN_VERSION="Ethgreen-"$(<version.txt)
124+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg s3://download-ethgreennetwork-org/beta/Ethgreen-intel_latest_beta.dmg
125+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.sha256 s3://download-ethgreennetwork-org/beta/Ethgreen-intel_latest_beta.dmg.sha256
126+
displayName: "Upload Beta Files"
127+
condition: and(succeeded(), contains(variables['build.sourceBranch'], 'refs/heads/main'))
128+
129+
- bash: |
130+
export AWS_ACCESS_KEY_ID=$(AccessKey)
131+
export AWS_SECRET_ACCESS_KEY=$(SecretKey)
132+
export AWS_DEFAULT_REGION=us-west-2
133+
cd $(System.DefaultWorkingDirectory)/build_scripts/
134+
export ETHGREEN_VERSION="Ethgreen-"$(<version.txt)
135+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg s3://download-ethgreennetwork-org/install/
136+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.sha256 s3://download-ethgreennetwork-org/install/
137+
aws s3 cp $(System.DefaultWorkingDirectory)/build_scripts/final_installer/$ETHGREEN_VERSION.dmg.torrent s3://download-ethgreennetwork-org/torrents/
134138
displayName: "Upload Release Files"
135139
condition: and(succeeded(), contains(variables['build.sourceBranch'], 'refs/tags/'))
136140

0 commit comments

Comments
 (0)