forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1220 from maticnetwork/master

Browse source 
Back-merge master branch into 'develop'
This commit is contained in:
SHIVAM SHARMA 2024-04-15 12:37:34 +05:30 committed by GitHub
commit d8db72ae01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 90 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.goreleaser.yml
View file

@ -96,6 +96,9 @@ nfpms:
- src: builder/files/genesis-testnet-v4.json
dst: /etc/bor/genesis-testnet-v4.json
type: config
- src: builder/files/genesis-amoy.json
dst: /etc/bor/genesis-amoy.json
type: config
- src: builder/files/config.toml
dst: /var/lib/bor/config.toml
type: config
@ -119,6 +122,7 @@ dockers:
extra_files:
- builder/files/genesis-mainnet-v1.json
- builder/files/genesis-testnet-v4.json
- builder/files/genesis-amoy.json
- image_templates:
- 0xpolygon/{{ .ProjectName }}:{{ .Version }}-arm64
@ -132,6 +136,7 @@ dockers:
extra_files:
- builder/files/genesis-mainnet-v1.json
- builder/files/genesis-testnet-v4.json
- builder/files/genesis-amoy.json
docker_manifests:
- name_template: 0xpolygon/{{ .ProjectName }}:{{ .Version }}

1
Dockerfile.release
View file

@ -10,6 +10,7 @@ WORKDIR ${BOR_DIR}
COPY bor /usr/bin/
COPY builder/files/genesis-mainnet-v1.json ${BOR_DIR}
COPY builder/files/genesis-testnet-v4.json ${BOR_DIR}
COPY builder/files/genesis-amoy.json ${BOR_DIR}
EXPOSE 8545 8546 8547 30303 30303/udp
ENTRYPOINT ["bor"]

72
builder/files/genesis-amoy.json Normal file
View file

File diff suppressed because one or more lines are too long

1
internal/cli/server/chains/amoy.go
View file

@ -27,6 +27,7 @@ var amoyTestnet = &Chain{
BerlinBlock: big.NewInt(0),
LondonBlock: big.NewInt(73100),
ShanghaiBlock: big.NewInt(73100),
CancunBlock: big.NewInt(5423600),
Bor: &params.BorConfig{
JaipurBlock: big.NewInt(73100),
DelhiBlock: big.NewInt(73100),

2
packaging/templates/package_scripts/control
View file

@ -1,5 +1,5 @@
Source: bor
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

2
packaging/templates/package_scripts/control.arm64
View file

@ -1,5 +1,5 @@
Source: bor
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

2
packaging/templates/package_scripts/control.profile.amd64
View file

@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

2
packaging/templates/package_scripts/control.profile.arm64
View file

@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

2
packaging/templates/package_scripts/control.validator
View file

@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

2
packaging/templates/package_scripts/control.validator.arm64
View file

@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.3.0-beta-1
Version: 1.3.0
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>

1
params/config.go
View file

@ -266,6 +266,7 @@ var (
BerlinBlock: big.NewInt(0),
LondonBlock: big.NewInt(73100),
ShanghaiBlock: big.NewInt(73100),
CancunBlock: big.NewInt(5423600),
Bor: &BorConfig{
JaipurBlock: big.NewInt(73100),
DelhiBlock: big.NewInt(73100),

2
params/version.go
View file

@ -24,7 +24,7 @@ const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "beta-1" // Version metadata to append to the version string
VersionMeta = "" // Version metadata to append to the version string
)
var GitCommit string