First pass at decoded packed storage slots

This commit is contained in:
Elizabeth Engelman 2019-07-18 13:30:04 -05:00
parent af6190ea09
commit b0fff9a1dd
4 changed files with 67 additions and 1 deletions

View File

@ -33,6 +33,8 @@ func Decode(row StorageDiffRow, metadata StorageValueMetadata) (interface{}, err
return decodeAddress(row.StorageValue.Bytes()), nil return decodeAddress(row.StorageValue.Bytes()), nil
case Bytes32: case Bytes32:
return row.StorageValue.Hex(), nil return row.StorageValue.Hex(), nil
case PackedSlot:
return decodePackedSlot(row.StorageValue.Bytes(), metadata.PackedTypes), nil
default: default:
panic(fmt.Sprintf("can't decode unknown type: %d", metadata.Type)) panic(fmt.Sprintf("can't decode unknown type: %d", metadata.Type))
} }
@ -51,3 +53,41 @@ func decodeUint48(raw []byte) string {
func decodeAddress(raw []byte) string { func decodeAddress(raw []byte) string {
return common.BytesToAddress(raw).Hex() return common.BytesToAddress(raw).Hex()
} }
//this may need to return a slice of strings, a string for each item
func decodePackedSlot(raw []byte, packedTypes map[int]ValueType) []string{
storageSlot := raw
var results []string
//the reason we're using a map and not a slice is that golang doesn't guarantee the order of a slice
for _, valueType := range packedTypes {
lengthOfStorageSlot := len(storageSlot)
lengthOfItem := getLengthOfItem(valueType)
itemStartingIndex := lengthOfStorageSlot - lengthOfItem
value := storageSlot[itemStartingIndex:]
decodedValue := decodeIndividualItems(value, valueType)
results = append(results, decodedValue)
//pop last item off slot before moving on
storageSlot = storageSlot[0:itemStartingIndex]
}
return results
}
func decodeIndividualItems(itemBytes []byte, valueType ValueType) string {
switch valueType {
case Uint48:
return decodeUint48(itemBytes)
default:
panic(fmt.Sprintf("can't decode unknown type: %d", valueType))
}
}
func getLengthOfItem(valueType ValueType) int{
switch valueType {
case Uint48:
return 6
default:
panic(fmt.Sprintf("ValueType %d not recognized", valueType))
}
}

View File

@ -49,6 +49,31 @@ var _ = Describe("Storage decoder", func() {
Expect(result).To(Equal(big.NewInt(0).SetBytes(fakeInt.Bytes()).String())) Expect(result).To(Equal(big.NewInt(0).SetBytes(fakeInt.Bytes()).String()))
}) })
Describe("when there are multiple items packed in the storage slot", func() {
It("decodes the first uint48 item packed in", func() {
packedStorage := common.HexToHash("000000000000000000000000000000000000000000000002a300000000002a30")
row := utils.StorageDiffRow{StorageValue: packedStorage}
packedTypes := map[int]utils.ValueType{}
packedTypes[0] = utils.Uint48
packedTypes[1] = utils.Uint48
metadata := utils.StorageValueMetadata{
Type: utils.PackedSlot,
PackedTypes: packedTypes,
}
result, err := utils.Decode(row, metadata)
decodedValues := result.([]string)
Expect(err).NotTo(HaveOccurred())
expectedResult1 := big.NewInt(0).SetBytes(common.HexToHash("2a30").Bytes()).String()
expectedResult2 := big.NewInt(0).SetBytes(common.HexToHash("2a300").Bytes()).String()
Expect(decodedValues[0]).To(Equal(expectedResult1))
Expect(decodedValues[1]).To(Equal(expectedResult2))
})
})
It("decodes address", func() { It("decodes address", func() {
fakeAddress := common.HexToAddress("0x12345") fakeAddress := common.HexToAddress("0x12345")
row := utils.StorageDiffRow{StorageValue: fakeAddress.Hash()} row := utils.StorageDiffRow{StorageValue: fakeAddress.Hash()}

View File

@ -23,6 +23,7 @@ const (
Uint48 Uint48
Bytes32 Bytes32
Address Address
PackedSlot
) )
type Key string type Key string
@ -31,6 +32,7 @@ type StorageValueMetadata struct {
Name string Name string
Keys map[Key]string Keys map[Key]string
Type ValueType Type ValueType
PackedTypes map[int]ValueType //type of each item packed and their order
} }
func GetStorageValueMetadata(name string, keys map[Key]string, t ValueType) StorageValueMetadata { func GetStorageValueMetadata(name string, keys map[Key]string, t ValueType) StorageValueMetadata {

View File

@ -61,4 +61,3 @@ func RetrieveAndUpdateHeaders(blockChain core.BlockChain, headerRepository datas
} }
return len(blockNumbers), nil return len(blockNumbers), nil
} }