cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Add contract address and storage value to csv

Browse Source
This commit is contained in:
Elizabeth Engelman 2019-01-10 15:08:06 -06:00
parent 569a5a6dd8
commit dceddbfbaa
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
statediff/publisher/csv.go
View File

@ -8,12 +8,14 @@ import (
"strconv"
"strings"
"time"
"github.com/ethereum/go-ethereum/common"
)
var (
Headers = []string{
"blockNumber", "blockHash", "accountAction", "codeHash",
"nonceValue", "balanceValue", "contractRoot", "storageDiffPaths",
"accountAddress", "storageValue",
}
timeStampFormat = "20060102150405.00000"
@ -67,8 +69,8 @@ func (p *publisher) publishStateDiffToCSV(sd builder.StateDiff) (string, error)
func accumulateUpdatedAccountRows(sd builder.StateDiff) [][]string {
var updatedAccountRows [][]string
for _, accountDiff := range sd.UpdatedAccounts {
formattedAccountData := formatAccountDiffIncremental(accountDiff, sd, updatedAccountAction)
for accountAddr, accountDiff := range sd.UpdatedAccounts {
formattedAccountData := formatAccountDiffIncremental(accountAddr, accountDiff, sd, updatedAccountAction)
updatedAccountRows = append(updatedAccountRows, formattedAccountData)
}
@ -78,8 +80,8 @@ func accumulateUpdatedAccountRows(sd builder.StateDiff) [][]string {
func accumulateDeletedAccountRows(sd builder.StateDiff) [][]string {
var deletedAccountRows [][]string
for _, accountDiff := range sd.DeletedAccounts {
formattedAccountData := formatAccountDiffEventual(accountDiff, sd, deletedAccountAction)
for accountAddr, accountDiff := range sd.DeletedAccounts {
formattedAccountData := formatAccountDiffEventual(accountAddr, accountDiff, sd, deletedAccountAction)
deletedAccountRows = append(deletedAccountRows, formattedAccountData)
}
@ -89,8 +91,8 @@ func accumulateDeletedAccountRows(sd builder.StateDiff) [][]string {
func accumulateCreatedAccountRows(sd builder.StateDiff) [][]string {
var createdAccountRows [][]string
for _, accountDiff := range sd.CreatedAccounts {
formattedAccountData := formatAccountDiffEventual(accountDiff, sd, createdAccountAction)
for accountAddr, accountDiff := range sd.CreatedAccounts {
formattedAccountData := formatAccountDiffEventual(accountAddr, accountDiff, sd, createdAccountAction)
createdAccountRows = append(createdAccountRows, formattedAccountData)
}
@ -98,10 +100,12 @@ func accumulateCreatedAccountRows(sd builder.StateDiff) [][]string {
return createdAccountRows
}
func formatAccountDiffEventual(accountDiff builder.AccountDiff, sd builder.StateDiff, accountAction string) []string {
func formatAccountDiffEventual(accountAddr common.Address, accountDiff builder.AccountDiff, sd builder.StateDiff, accountAction string) []string {
newContractRoot := accountDiff.ContractRoot.Value
var storageDiffPaths []string
for k := range accountDiff.Storage {
var storageValue builder.DiffString
for k, v := range accountDiff.Storage {
storageValue = v
storageDiffPaths = append(storageDiffPaths, k)
}
formattedAccountData := []string{
@ -113,15 +117,19 @@ func formatAccountDiffEventual(accountDiff builder.AccountDiff, sd builder.State
accountDiff.Balance.Value.String(),
*newContractRoot,
strings.Join(storageDiffPaths, ","),
accountAddr.String(),
*storageValue.Value,
}
return formattedAccountData
}
func formatAccountDiffIncremental(accountDiff builder.AccountDiff, sd builder.StateDiff, accountAction string) []string {
func formatAccountDiffIncremental(accountAddr common.Address, accountDiff builder.AccountDiff, sd builder.StateDiff, accountAction string) []string {
newContractRoot := accountDiff.ContractRoot.Value
var storageDiffPaths []string
for k := range accountDiff.Storage {
var storageValue builder.DiffString
for k, v := range accountDiff.Storage {
storageDiffPaths = append(storageDiffPaths, k)
storageValue = v
}
formattedAccountData := []string{
strconv.FormatInt(sd.BlockNumber, 10),
@ -132,6 +140,8 @@ func formatAccountDiffIncremental(accountDiff builder.AccountDiff, sd builder.St
accountDiff.Balance.Value.String(),
*newContractRoot,
strings.Join(storageDiffPaths, ","),
accountAddr.String(),
*storageValue.Value,
}
return formattedAccountData
}

6
statediff/publisher/publisher_test.go
View File

@ -34,6 +34,8 @@ var expectedCreatedAccountRow = []string{
strconv.FormatInt(testhelpers.NewBalanceValue, 10),
testhelpers.ContractRoot,
testhelpers.StoragePath,
testhelpers.ContractAddress,
testhelpers.StorageValue,
}
var expectedUpdatedAccountRow = []string{
@ -45,6 +47,8 @@ var expectedUpdatedAccountRow = []string{
strconv.FormatInt(testhelpers.NewBalanceValue, 10),
testhelpers.ContractRoot,
testhelpers.StoragePath,
testhelpers.ContractAddress,
testhelpers.StorageValue,
}
var expectedDeletedAccountRow = []string{
@ -56,6 +60,8 @@ var expectedDeletedAccountRow = []string{
strconv.FormatInt(testhelpers.NewBalanceValue, 10),
testhelpers.ContractRoot,
testhelpers.StoragePath,
testhelpers.ContractAddress,
testhelpers.StorageValue,
}
func TestPublisher(t *testing.T) {

5
statediff/testhelpers/test_data.go
View File

@ -15,9 +15,10 @@ var (
NewBalanceValue = rand.Int63()
ContractRoot = "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
StoragePath = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
newStorage = "0x03"
storage = map[string]builder.DiffString{StoragePath: {Value: &newStorage}}
StorageValue = "0x03"
storage = map[string]builder.DiffString{StoragePath: {Value: &StorageValue}}
address = common.HexToAddress("0xaE9BEa628c4Ce503DcFD7E305CaB4e29E7476592")
ContractAddress = address.String()
CreatedAccountDiffs = map[common.Address]builder.AccountDiff{address: {
Nonce: builder.DiffUint64{Value: &NewNonceValue},
Balance: builder.DiffBigInt{Value: big.NewInt(NewBalanceValue)},