mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-13 07:23:46 +00:00
Merge branch 'develop' of https://github.com/maticnetwork/bor into develop-v1.9.16
This commit is contained in:
commit
dfe6a86da5
3 changed files with 29 additions and 15 deletions
27
.github/workflows/dockerimage-latest.yml
vendored
Normal file
27
.github/workflows/dockerimage-latest.yml
vendored
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
name: Docker Images For Latest Branches
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- develop
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Build docker image
|
||||||
|
env:
|
||||||
|
DOCKERHUB: ${{ secrets.DOCKERHUB }}
|
||||||
|
DOCKERHUB_KEY: ${{ secrets.DOCKERHUB_KEY }}
|
||||||
|
run: |
|
||||||
|
set -x
|
||||||
|
ls -l
|
||||||
|
echo "Docker login"
|
||||||
|
docker login -u $DOCKERHUB -p $DOCKERHUB_KEY
|
||||||
|
echo "Running build"
|
||||||
|
docker build -t maticnetwork/bor:${GITHUB_REF/refs\/heads\//} .
|
||||||
|
echo "Pushing image"
|
||||||
|
docker push maticnetwork/bor:${GITHUB_REF/refs\/heads\//}
|
||||||
|
echo "Done"
|
||||||
12
README.md
12
README.md
|
|
@ -1,14 +1,6 @@
|
||||||
## Go Ethereum
|
## Bor
|
||||||
|
|
||||||
Official Golang implementation of the Ethereum protocol.
|
Official Golang implementation of the Matic protocol (fork of Go Ethereum - https://github.com/ethereum/go-ethereum)
|
||||||
|
|
||||||
[](https://godoc.org/github.com/maticnetwork/bor)
|
|
||||||
[](https://goreportcard.com/report/github.com/maticnetwork/bor)
|
|
||||||
[](https://circleci.com/gh/maticnetwork/bor/tree/master)
|
|
||||||
[](https://discord.gg/nthXNEv)
|
|
||||||
|
|
||||||
Automated builds are available for stable releases and the unstable master branch. Binary
|
|
||||||
archives are published at https://geth.ethereum.org/downloads/.
|
|
||||||
|
|
||||||
## Building the source
|
## Building the source
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1125,17 +1125,12 @@ func (c *Bor) CommitStates(
|
||||||
Data: hex.EncodeToString(eventRecord.Data),
|
Data: hex.EncodeToString(eventRecord.Data),
|
||||||
TxHash: eventRecord.TxHash,
|
TxHash: eventRecord.TxHash,
|
||||||
}
|
}
|
||||||
fmt.Println("stateData", stateData)
|
|
||||||
// go func() {
|
|
||||||
// c.stateSyncFeed.Send(core.StateSyncEvent{StateData: &stateData})
|
|
||||||
// }()
|
|
||||||
|
|
||||||
if err := c.GenesisContractsClient.CommitState(eventRecord, state, header, chain); err != nil {
|
if err := c.GenesisContractsClient.CommitState(eventRecord, state, header, chain); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
lastStateID++
|
lastStateID++
|
||||||
}
|
}
|
||||||
fmt.Println("retuning state Data", &stateData)
|
|
||||||
return &stateData, nil
|
return &stateData, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue