Skip to content
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.

Sign up for GitHub

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

Back-merge master branch into 'develop' #1220

Merged
merged 6 commits into from
Apr 15, 2024
Merged

Back-merge master branch into 'develop' #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b38c7b0
add : cancun block for Amoy
0xsharma Mar 26, 2024
fd4b9c2
bump : version to v1.3.0-beta-2
0xsharma Mar 26, 2024
f40abf9
add: amoy genesis json
anshalshukla Apr 4, 2024
7ae6dec
Merge pull request #1208 from maticnetwork/genesis-amoy-json
anshalshukla Apr 8, 2024
840ca99
bump : version to 1.3.0
0xsharma Apr 12, 2024
46f93b1
Merge pull request #1202 from maticnetwork/v1.3.0-beta-candidate
0xsharma Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 72 additions & 0 deletions builder/files/genesis-amoy.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions internal/cli/server/chains/amoy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.profile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.profile.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.validator
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.validator.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 1 addition & 0 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions params/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
)

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
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 = "" // Version metadata to append to the version string
)

var GitCommit string
Expand Down
Loading