Merge branch 'develop' of https://github.com/maticnetwork/bor into develop-v1.9.16

This commit is contained in:
ptsayli@gmail.com 2020-07-29 21:13:51 +05:30
commit dfe6a86da5
3 changed files with 29 additions and 15 deletions

View 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"

View file

@ -1,14 +1,6 @@
## Go Ethereum
## Bor
Official Golang implementation of the Ethereum protocol.
[![API Reference](https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667)](https://godoc.org/github.com/maticnetwork/bor)
[![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor)
[![CircleCI](https://circleci.com/gh/maticnetwork/bor/tree/master.svg?style=shield)](https://circleci.com/gh/maticnetwork/bor/tree/master)
[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](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/.
Official Golang implementation of the Matic protocol (fork of Go Ethereum - https://github.com/ethereum/go-ethereum)
## Building the source

View file

@ -1125,17 +1125,12 @@ func (c *Bor) CommitStates(
Data: hex.EncodeToString(eventRecord.Data),
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 {
return nil, err
}
lastStateID++
}
fmt.Println("retuning state Data", &stateData)
return &stateData, nil
}