Skip to content

Commit

Permalink
Ishikari hardfork for mainnet (#18)
Browse files Browse the repository at this point in the history
* update mainnet parameter for Ishikari

* update release action

* update version
  • Loading branch information
0xcary committed Jun 18, 2022
1 parent 96a2b5b commit 555b10c
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 9 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Docker Image CI

on:
push:
-tags:
- v1.2.0


jobs:

build:

runs-on: ubuntu-latest

steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Log in to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: kucoincommunitychain/kcc
tags: latest, v1.2.0
labels: release

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Copy binary out of image
run: mkdir -p build/bin && docker create --name binContainer wyblockchain/kcc:latest && docker cp binContainer:/usr/local/bin/geth build/bin/geth && ls -la build/bin/geth

- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.KCC_GITHUB_TOKEN }}"
automatic_release_tag: "v1.2.0"
prerelease: false
title: "Ishikari"
files: |
build/bin/geth





2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ profile.cov
/dashboard/assets/package-lock.json

**/yarn-error.log

data
43 changes: 37 additions & 6 deletions params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,46 @@ var (
BerlinBlock: big.NewInt(0),
CVE_2021_39137Block: big.NewInt(2509228), // see more in: core/vm/instructions_kcc_issue_9.go
// @cary the block when hardfork happens.
IshikariBlock: nil,
IshikariPatch001Block: nil,
IshikariPatch002Block: nil,
IshikariBlock: big.NewInt(11171299),
IshikariPatch001Block: big.NewInt(11171299),
IshikariPatch002Block: big.NewInt(11171299),
POSA: &POSAConfig{
Period: 3,
Epoch: 100,
IshikariInitialValidators: []common.Address{}, // @cary @Junm TODO: Ishikari initial validators
IshikariInitialManagers: []common.Address{},
IshikariAdminMultiSig: common.Address{},
IshikariInitialValidators: []common.Address{
common.HexToAddress("0x1105c97ffbd985600e6dc8e06e477b99d0a9ff39"),
common.HexToAddress("0xeac6d9b96c73a637ba9d7a54dc4faece0300fcb3"),
common.HexToAddress("0x98a96f0db2185a9462c0cedd1a6259955fff7353"),

common.HexToAddress("0x429663140a87d0ee4ac6b6d3cf8a538b46d18e49"),
common.HexToAddress("0x6ee29fbbe3e0bdbf86773d71ebc6b5e38ce81e2e"),
common.HexToAddress("0x87fcfadc3af29ab3197c81ec247c0b28f465fafe"),

common.HexToAddress("0x43e3adc88f337e0596b47d4c1794294b99226e5f"),
common.HexToAddress("0xe270d4fce42c7713f1ad9cc75d41b7a69558a169"),
common.HexToAddress("0xbe5f2ffcbd26fc5304721de0c7279960c453b8f0"),

common.HexToAddress("0x9d4a6f12d16c7950ff58ab7ea26cdd837697db6f"),
common.HexToAddress("0xad291383864e1999fc7a36120562f1bb59dfea99"),
}, // @cary @Junm TODO: Ishikari initial validators

IshikariInitialManagers: []common.Address{
common.HexToAddress("0x65E958D3EA7e60F33098dc665B0C8B7Dc563FA72"),
common.HexToAddress("0x6586e16EB5574f79bA4Cfa46C3b37bAEAAC50f32"),
common.HexToAddress("0xCCbb95B446e7CFd23fb80374b92d1F6F33e073E2"),

common.HexToAddress("0x20fefFC0f3182Ec1F7507624Fe643a5B853Cb04D"),
common.HexToAddress("0x55396D01b6383f7A576460fb33ef29ced3A744f8"),
common.HexToAddress("0x914b49DBC9BDd151Cf3b76f7E19963b61e90DbEC"),

common.HexToAddress("0x0Bcc6F86f105679881456699E91389fBd07e4cC3"),
common.HexToAddress("0xD2081060FB57bF06668195979C6c200d31f7cb4B"),
common.HexToAddress("0xC2fCf0C527E0642b14778876d57b8a6f582d25f5"),

common.HexToAddress("0xb9D71eF2D3A31588EF9196e66d69EE20B7302af8"),
common.HexToAddress("0x68A6a68d03D405af7E4676e5D92AD4BD7d1d004a"),
},
IshikariAdminMultiSig: common.HexToAddress("0xD4139cc315164d4dcC696a18902F2e6b7B5D3de8"),
},
}

Expand Down
6 changes: 3 additions & 3 deletions params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 1 // Minor version component of the current release
VersionPatch = 2 // Patch version component of the current release
VersionMeta = "beta" // Version metadata to append to the version string
VersionMinor = 2 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "stable" // Version metadata to append to the version string
)

// Version holds the textual version string.
Expand Down

0 comments on commit 555b10c

Please sign in to comment.