Skip to content

Commit

Permalink
updated all typo
Browse files Browse the repository at this point in the history
  • Loading branch information
nnlgsakib committed Jul 15, 2024
1 parent 26bc499 commit a425db5
Show file tree
Hide file tree
Showing 95 changed files with 234 additions and 237 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ ARG BUILDNUM=""
FROM golang:1.16-buster as builder

ADD . /go-ethereum
RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth
RUN cd /go-ethereum && go run build/ci.go install ./cmd/biz

# Pull Geth into a second stage deploy alpine container
FROM ubuntu:18.04

COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
COPY --from=builder /go-ethereum/build/bin/biz /usr/local/bin/

EXPOSE 8545 8546 30303 30303/udp
ENTRYPOINT ["biz"]
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# with Go source code. If you know what GOPATH is then you probably
# don't need to bother with make.

.PHONY: geth android ios evm all test clean
.PHONY: biz android ios evm all test clean

GOBIN = ./build/bin
GO ?= latest
Expand All @@ -19,8 +19,8 @@ all:
android:
$(GORUN) build/ci.go aar --local
@echo "Done building."
@echo "Import \"$(GOBIN)/geth.aar\" to use the library."
@echo "Import \"$(GOBIN)/geth-sources.jar\" to add javadocs"
@echo "Import \"$(GOBIN)/biz.aar\" to use the library."
@echo "Import \"$(GOBIN)/biz-sources.jar\" to add javadocs"
@echo "For more info see https://stackoverflow.com/questions/20994336/android-studio-how-to-attach-javadoc"

ios:
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Audit reports are published in the `docs` folder: https://github.com/BIZchain-la

| Scope | Date | Report Link |
| ------- | ------- | ----------- |
| `geth` | 20170425 | [pdf](https://github.com/BIZchain-labs/biz-node/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) |
| `biz` | 20170425 | [pdf](https://github.com/BIZchain-labs/biz-node/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) |
| `clef` | 20180914 | [pdf](https://github.com/BIZchain-labs/biz-node/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) |
| `Discv5` | 20191015 | [pdf](https://github.com/BIZchain-labs/biz-node/blob/master/docs/audits/2019-10-15_Discv5_audit_LeastAuthority.pdf) |
| `Discv5` | 20200124 | [pdf](https://github.com/BIZchain-labs/biz-node/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) |
Expand All @@ -21,7 +21,7 @@ Audit reports are published in the `docs` folder: https://github.com/BIZchain-la

To find out how to disclose a vulnerability in Ethereum visit [https://bounty.ethereum.org](https://bounty.ethereum.org) or email [email protected]. Please read the [disclosure page](https://github.com/BIZchain-labs/biz-node/security/advisories?state=published) for more information about publically disclosed security vulnerabilities.

Use the built-in `geth version-check` feature to check whether the software is affected by any known vulnerability. This command will fetch the latest [`vulnerabilities.json`](https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities.json) file which contains known security vulnerabilities concerning `geth`, and cross-check the data against its own version number.
Use the built-in `biz version-check` feature to check whether the software is affected by any known vulnerability. This command will fetch the latest [`vulnerabilities.json`](https://biz.ethereum.org/docs/vulnerabilities/vulnerabilities.json) file which contains known security vulnerabilities concerning `biz`, and cross-check the data against its own version number.

The following key may be used to communicate sensitive information to developers.

Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2048,7 +2048,7 @@ func TestJavaBindings(t *testing.T) {
package bindtest;
import org.ethereum.geth.*;
import org.ethereum.biz.*;
import java.util.*;
public class Test {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ const tmplSourceJava = `
package {{.Package}};
import org.ethereum.geth.*;
import org.ethereum.biz.*;
import java.util.*;
{{$structs := .Structs}}
Expand Down
2 changes: 1 addition & 1 deletion accounts/keystore/plain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
d, err := ioutil.TempDir("", "geth-keystore-test")
d, err := ioutil.TempDir("", "biz-keystore-test")
if err != nil {
t.Fatal(err)
}
Expand Down
2 changes: 1 addition & 1 deletion accounts/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (am *Manager) Config() *Config {
}

// AddBackend starts the tracking of an additional backend for wallet updates.
// cmd/geth assumes once this func returns the backends have been already integrated.
// cmd/biz assumes once this func returns the backends have been already integrated.
func (am *Manager) AddBackend(backend Backend) {
done := make(chan struct{})
am.newBackends <- newBackendEvent{backend, done}
Expand Down
8 changes: 4 additions & 4 deletions accounts/scwallet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

At the end of this process, you will be provided with a PIN, a PUK and a pairing password. Write them down, you'll need them shortly.

Start `geth` with the `console` command. You will notice the following warning:
Start `biz` with the `console` command. You will notice the following warning:

```
WARN [04-09|16:58:38.898] Failed to open wallet url=keycard://044def09 err="smartcard: pairing password needed"
```

Write down the URL (`keycard://044def09` in this example). Then ask `geth` to open the wallet:
Write down the URL (`keycard://044def09` in this example). Then ask `biz` to open the wallet:

```
> personal.openWallet("keycard://044def09", "pairing password")
Expand Down Expand Up @@ -82,7 +82,7 @@

## Usage

1. Start `geth` with the `console` command
1. Start `biz` with the `console` command
2. Check the card's URL by checking `personal.listWallets`:

```
Expand All @@ -102,5 +102,5 @@ personal.openWallet("keycard://a4d73015")

## Known issues

* Starting geth with a valid card seems to make firefox crash.
* Starting biz with a valid card seems to make firefox crash.
* PCSC version 4.4 should work, but is currently untested
Binary file modified build/bin/biz
Binary file not shown.
2 changes: 1 addition & 1 deletion build/ci-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ Then go into the source package directory for your running distribution and buil
Built packages are placed in the dist/ directory.

$ cd ..
$ dpkg-deb -c geth-unstable_1.9.6+bionic_amd64.deb
$ dpkg-deb -c biz-unstable_1.9.6+bionic_amd64.deb
40 changes: 20 additions & 20 deletions build/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
)

var (
// Files that end up in the geth*.zip archive.
// Files that end up in the biz*.zip archive.
gethArchiveFiles = []string{
"COPYING",
executablePath("biz"),
}

// Files that end up in the geth-alltools*.zip archive.
// Files that end up in the biz-alltools*.zip archive.
allToolsArchiveFiles = []string{
"COPYING",
executablePath("abigen"),
Expand Down Expand Up @@ -329,17 +329,17 @@ func doArchive(cmdline []string) {
var (
env = build.Env()
basegeth = archiveBasename(*arch, params.ArchiveVersion(env.Commit))
geth = "biz-" + basegeth + ext
alltools = "geth-alltools-" + basegeth + ext
biz = "biz-" + basegeth + ext
alltools = "biz-alltools-" + basegeth + ext
)
maybeSkipArchive(env)
if err := build.WriteArchive(geth, gethArchiveFiles); err != nil {
if err := build.WriteArchive(biz, gethArchiveFiles); err != nil {
log.Fatal(err)
}
if err := build.WriteArchive(alltools, allToolsArchiveFiles); err != nil {
log.Fatal(err)
}
for _, archive := range []string{geth, alltools} {
for _, archive := range []string{biz, alltools} {
if err := archiveUpload(archive, *upload, *signer, *signify); err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -370,7 +370,7 @@ func archiveUpload(archive string, blobstore string, signer string, signifyVar s
}
if signifyVar != "" {
key := os.Getenv(signifyVar)
untrustedComment := "verify with geth-release.pub"
untrustedComment := "verify with biz-release.pub"
trustedComment := fmt.Sprintf("%s (%s)", archive, time.Now().UTC().Format(time.RFC1123))
if err := signify.SignFile(archive, archive+".sig", key, untrustedComment, trustedComment); err != nil {
return err
Expand Down Expand Up @@ -588,7 +588,7 @@ func doDebianSource(cmdline []string) {
cachedir = flag.String("cachedir", "./build/cache", `Filesystem path to cache the downloaded Go bundles at`)
signer = flag.String("signer", "", `Signing key name, also used as package author`)
upload = flag.String("upload", "", `Where to upload the source package (usually "ethereum/ethereum")`)
sshUser = flag.String("sftp-user", "", `Username for SFTP upload (usually "geth-ci")`)
sshUser = flag.String("sftp-user", "", `Username for SFTP upload (usually "biz-ci")`)
workdir = flag.String("workdir", "", `Output directory for packages (uses temp dir if unset)`)
now = time.Now()
)
Expand Down Expand Up @@ -707,7 +707,7 @@ func makeWorkdir(wdflag string) string {
if wdflag != "" {
err = os.MkdirAll(wdflag, 0744)
} else {
wdflag, err = ioutil.TempDir("", "geth-build-")
wdflag, err = ioutil.TempDir("", "biz-build-")
}
if err != nil {
log.Fatal(err)
Expand Down Expand Up @@ -885,21 +885,21 @@ func doWindowsInstaller(cmdline []string) {
continue
}
allTools = append(allTools, filepath.Base(file))
if filepath.Base(file) == "geth.exe" {
if filepath.Base(file) == "biz.exe" {
gethTool = file
} else {
devTools = append(devTools, file)
}
}

// Render NSIS scripts: Installer NSIS contains two installer sections,
// first section contains the geth binary, second section holds the dev tools.
// first section contains the biz binary, second section holds the dev tools.
templateData := map[string]interface{}{
"License": "COPYING",
"Geth": gethTool,
"DevTools": devTools,
}
build.Render("build/nsis.geth.nsi", filepath.Join(*workdir, "geth.nsi"), 0644, nil)
build.Render("build/nsis.biz.nsi", filepath.Join(*workdir, "biz.nsi"), 0644, nil)
build.Render("build/nsis.install.nsh", filepath.Join(*workdir, "install.nsh"), 0644, templateData)
build.Render("build/nsis.uninstall.nsh", filepath.Join(*workdir, "uninstall.nsh"), 0644, allTools)
build.Render("build/nsis.pathupdate.nsh", filepath.Join(*workdir, "PathUpdate.nsh"), 0644, nil)
Expand All @@ -917,14 +917,14 @@ func doWindowsInstaller(cmdline []string) {
if env.Commit != "" {
version[2] += "-" + env.Commit[:8]
}
installer, _ := filepath.Abs("geth-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe")
installer, _ := filepath.Abs("biz-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe")
build.MustRunCommand("makensis.exe",
"/DOUTPUTFILE="+installer,
"/DMAJORVERSION="+version[0],
"/DMINORVERSION="+version[1],
"/DBUILDVERSION="+version[2],
"/DARCH="+*arch,
filepath.Join(*workdir, "geth.nsi"),
filepath.Join(*workdir, "biz.nsi"),
)
// Sign and publish installer.
if err := archiveUpload(installer, *upload, *signer, *signify); err != nil {
Expand Down Expand Up @@ -965,8 +965,8 @@ func doAndroidArchive(cmdline []string) {

if *local {
// If we're building locally, copy bundle to build dir and skip Maven
os.Rename("geth.aar", filepath.Join(GOBIN, "geth.aar"))
os.Rename("geth-sources.jar", filepath.Join(GOBIN, "geth-sources.jar"))
os.Rename("biz.aar", filepath.Join(GOBIN, "biz.aar"))
os.Rename("biz-sources.jar", filepath.Join(GOBIN, "biz-sources.jar"))
return
}
meta := newMavenMetadata(env)
Expand All @@ -976,8 +976,8 @@ func doAndroidArchive(cmdline []string) {
maybeSkipArchive(env)

// Sign and upload the archive to Azure
archive := "geth-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar"
os.Rename("geth.aar", archive)
archive := "biz-" + archiveBasename("android", params.ArchiveVersion(env.Commit)) + ".aar"
os.Rename("biz.aar", archive)

if err := archiveUpload(archive, *upload, *signer, *signify); err != nil {
log.Fatal(err)
Expand Down Expand Up @@ -1062,7 +1062,7 @@ func newMavenMetadata(env build.Environment) mavenMetadata {
}
return mavenMetadata{
Version: version,
Package: "geth-" + version,
Package: "biz-" + version,
Develop: isUnstableBuild(env),
Contributors: contribs,
}
Expand Down Expand Up @@ -1101,7 +1101,7 @@ func doXCodeFramework(cmdline []string) {

// Create the archive.
maybeSkipArchive(env)
archive := "geth-" + archiveBasename("ios", params.ArchiveVersion(env.Commit))
archive := "biz-" + archiveBasename("ios", params.ArchiveVersion(env.Commit))
if err := os.MkdirAll(archive, 0755); err != nil {
log.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions build/deb/ethereum/deb.control
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Vcs-Browser: https://github.com/BIZchain-labs/biz-node
Package: {{.Name}}
Architecture: any
Depends: ${misc:Depends}, {{.ExeList}}
Description: Meta-package to install geth and other tools
Meta-package to install geth and other tools
Description: Meta-package to install biz and other tools
Meta-package to install biz and other tools

{{range .Executables}}
Package: {{$.ExeName .}}
Expand Down
2 changes: 1 addition & 1 deletion build/deb/ethereum/deb.copyright
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2018 The go-ethereum Authors
Copyright 2018 The go-biz Authors

go-ethereum is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion build/mvn.pom
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>org.ethereum</groupId>
<artifactId>geth</artifactId>
<artifactId>biz</artifactId>
<version>{{.Version}}</version>
<packaging>aar</packaging>

Expand Down
8 changes: 4 additions & 4 deletions build/nsis.geth.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# - BUILDVERSION, build id version
#
# The created installer executes the following steps:
# 1. install geth for all users
# 1. install biz for all users
# 2. install optional development tools such as abigen
# 3. create an uninstaller
# 4. configures the Windows firewall for geth
# 5. create geth, attach and uninstall start menu entries
# 4. configures the Windows firewall for biz
# 5. create biz, attach and uninstall start menu entries
# 6. configures the registry that allows Windows to manage the package through its platform tools
# 7. adds the environment system wide variable ETHEREUM_SOCKET
# 8. adds the install directory to %PATH%
Expand Down Expand Up @@ -55,7 +55,7 @@ ${EndIf}
!macroend

function .onInit
# make vars are global for all users since geth is installed global
# make vars are global for all users since biz is installed global
setShellVarContext all
!insertmacro VerifyUserIsAdmin

Expand Down
18 changes: 9 additions & 9 deletions build/nsis.install.nsh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name "geth ${MAJORVERSION}.${MINORVERSION}.${BUILDVERSION}" # VERSION variables set through command line arguments
Name "biz ${MAJORVERSION}.${MINORVERSION}.${BUILDVERSION}" # VERSION variables set through command line arguments
InstallDir "$InstDir"
OutFile "${OUTPUTFILE}" # set through command line arguments

Expand All @@ -12,15 +12,15 @@ PageEx license
LicenseData {{.License}}
PageExEnd

# Install geth binary
# Install biz binary
Section "Geth" GETH_IDX
SetOutPath $INSTDIR
file {{.Geth}}

# Create start menu launcher
createDirectory "$SMPROGRAMS\${APPNAME}"
createShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\geth.exe"
createShortCut "$SMPROGRAMS\${APPNAME}\Attach.lnk" "$INSTDIR\geth.exe" "attach"
createShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\biz.exe"
createShortCut "$SMPROGRAMS\${APPNAME}\Attach.lnk" "$INSTDIR\biz.exe" "attach"
createShortCut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"

# Firewall - remove rules (if exists)
Expand All @@ -29,13 +29,13 @@ Section "Geth" GETH_IDX
SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"

# Firewall - add rules
SimpleFC::AdvAddRule "Geth incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" 30303 "" "" ""
SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Geth incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$INSTDIR\biz.exe" "" "" "Ethereum" 30303 "" "" ""
SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$INSTDIR\biz.exe" "" "" "Ethereum" "" 30303 "" ""
SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\biz.exe" "" "" "Ethereum" "" 30303 "" ""

# Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc"
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\biz.ipc"
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\biz.ipc"

# Add instdir to PATH
Push "$INSTDIR"
Expand Down
2 changes: 1 addition & 1 deletion build/nsis.uninstall.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Section "Uninstall"
SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"

# Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc"
${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\biz.ipc"

# Remove install directory from PATH
Push "$INSTDIR"
Expand Down
6 changes: 3 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ dependencies:
test:
override:
# Build Geth and move into a known folder
- make geth
- cp ./build/bin/geth $HOME/geth
- make biz
- cp ./build/bin/biz $HOME/biz

# Run hive and move all generated logs into the public artifacts folder
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=go-ethereum:local --override=$HOME/geth --test=. --sim=.)
- (cd ~/.go_workspace/src/github.com/karalabe/hive && hive --docker-noshell --client=go-ethereum:local --override=$HOME/biz --test=. --sim=.)
- cp -r ~/.go_workspace/src/github.com/karalabe/hive/workspace/logs/* $CIRCLE_ARTIFACTS
Loading

0 comments on commit a425db5

Please sign in to comment.