cerc-io/ipld-eth-server
18
0
Fork 1
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 37 Wiki Activity

Merge branch 'staging' into VDB-101-vat-fold-transformer

Browse Source
This commit is contained in:
David Terry 2018-10-09 14:15:07 +03:00
commit 09770b2e50
10 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/migrations/1538670026_update_frob_bite_urn_ilk_type.down.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE maker.bite
ALTER COLUMN ilk SET DATA TYPE bytea,
ALTER COLUMN urn SET DATA TYPE bytea;
ALTER TABLE maker.frob
ALTER COLUMN ilk SET DATA TYPE bytea,
ALTER COLUMN urn SET DATA TYPE bytea;

7
db/migrations/1538670026_update_frob_bite_urn_ilk_type.up.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE maker.bite
ALTER COLUMN ilk SET DATA TYPE text,
ALTER COLUMN urn SET DATA TYPE text;
ALTER TABLE maker.frob
ALTER COLUMN ilk SET DATA TYPE text,
ALTER COLUMN urn SET DATA TYPE text;

8
db/schema.sql
View File

@ -64,8 +64,8 @@ SET default_with_oids = false;
CREATE TABLE maker.bite ( CREATE TABLE maker.bite (
id integer NOT NULL, id integer NOT NULL,
header_id integer NOT NULL, header_id integer NOT NULL,
ilk bytea, ilk text,
urn bytea, urn text,
ink character varying, ink character varying,
art character varying, art character varying,
iart character varying, iart character varying,
@ -490,8 +490,8 @@ ALTER SEQUENCE maker.flop_kick_id_seq OWNED BY maker.flop_kick.id;
CREATE TABLE maker.frob ( CREATE TABLE maker.frob (
id integer NOT NULL, id integer NOT NULL,
header_id integer NOT NULL, header_id integer NOT NULL,
ilk bytea, ilk text,
urn bytea, urn text,
dink numeric, dink numeric,
dart numeric, dart numeric,
ink numeric, ink numeric,

11
pkg/transformers/bite/converter.go
View File

@ -19,6 +19,7 @@ package bite
import ( import (
"encoding/json" "encoding/json"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/vulcanize/vulcanizedb/pkg/geth" "github.com/vulcanize/vulcanizedb/pkg/geth"
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared" "github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
@ -34,7 +35,7 @@ type BiteConverter struct{}
func (BiteConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]BiteEntity, error) { func (BiteConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]BiteEntity, error) {
var entities []BiteEntity var entities []BiteEntity
for _, ethLog := range ethLogs { for _, ethLog := range ethLogs {
entity := BiteEntity{} entity := &BiteEntity{}
address := ethLog.Address address := ethLog.Address
abi, err := geth.ParseAbi(contractAbi) abi, err := geth.ParseAbi(contractAbi)
if err != nil { if err != nil {
@ -43,7 +44,7 @@ func (BiteConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]Bite
contract := bind.NewBoundContract(address, abi, nil, nil, nil) contract := bind.NewBoundContract(address, abi, nil, nil, nil)
err = contract.UnpackLog(&entity, "Bite", ethLog) err = contract.UnpackLog(entity, "Bite", ethLog)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -51,7 +52,7 @@ func (BiteConverter) ToEntities(contractAbi string, ethLogs []types.Log) ([]Bite
entity.Raw = ethLog entity.Raw = ethLog
entity.TransactionIndex = ethLog.TxIndex entity.TransactionIndex = ethLog.TxIndex
entities = append(entities, entity) entities = append(entities, *entity)
} }
return entities, nil return entities, nil
@ -61,8 +62,8 @@ func (converter BiteConverter) ToModels(entities []BiteEntity) ([]BiteModel, err
var models []BiteModel var models []BiteModel
for _, entity := range entities { for _, entity := range entities {
id := entity.Id id := entity.Id
ilk := entity.Ilk[:] ilk := common.BytesToAddress(entity.Ilk[:common.AddressLength]).String()
urn := entity.Urn[:] urn := common.BytesToAddress(entity.Urn[:common.AddressLength]).String()
ink := entity.Ink ink := entity.Ink
art := entity.Art art := entity.Art
iArt := entity.IArt iArt := entity.IArt

4
pkg/transformers/bite/converter_test.go
View File

@ -79,8 +79,8 @@ var _ = Describe("Bite Converter", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
expectedModel := bite.BiteModel{ expectedModel := bite.BiteModel{
Id: "1", Id: "1",
Ilk: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, Ilk: "0x0000000000000000000000000000000000000000",
Urn: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, Urn: "0x0000000000000000000000000000000000000000",
Ink: "", Ink: "",
Art: "", Art: "",
IArt: "", IArt: "",

4
pkg/transformers/bite/model.go
View File

@ -16,8 +16,8 @@ package bite
type BiteModel struct { type BiteModel struct {
Id string Id string
Ilk []byte Ilk string
Urn []byte Urn string
Ink string Ink string
Art string Art string
IArt string IArt string

5
pkg/transformers/frob/converter.go
View File

@ -19,6 +19,7 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"encoding/json" "encoding/json"
"github.com/ethereum/go-ethereum/common"
"github.com/vulcanize/vulcanizedb/pkg/geth" "github.com/vulcanize/vulcanizedb/pkg/geth"
) )
@ -56,8 +57,8 @@ func (FrobConverter) ToModels(entities []FrobEntity) ([]FrobModel, error) {
return nil, err return nil, err
} }
model := FrobModel{ model := FrobModel{
Ilk: entity.Ilk[:], Ilk: common.BytesToAddress(entity.Ilk[:common.AddressLength]).String(),
Urn: entity.Urn[:], Urn: common.BytesToAddress(entity.Urn[:common.AddressLength]).String(),
Ink: entity.Ink.String(), Ink: entity.Ink.String(),
Art: entity.Art.String(), Art: entity.Art.String(),
Dink: entity.Dink.String(), Dink: entity.Dink.String(),

4
pkg/transformers/frob/model.go
View File

@ -15,8 +15,8 @@
package frob package frob
type FrobModel struct { type FrobModel struct {
Ilk []byte Ilk string
Urn []byte Urn string
Ink string Ink string
Art string Art string
Dink string Dink string

6
pkg/transformers/test_data/bite.go
View File

@ -42,6 +42,8 @@ var (
biteRawString = string(biteRawJson) biteRawString = string(biteRawJson)
biteIlk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} biteIlk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
biteLad = [32]byte{102, 97, 107, 101, 32, 108, 97, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} biteLad = [32]byte{102, 97, 107, 101, 32, 108, 97, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
biteIlkString = "0x66616b6520696c6B000000000000000000000000"
biteLadString = "0x66616B65206c6164000000000000000000000000"
biteId = int64(1) biteId = int64(1)
) )
@ -76,8 +78,8 @@ var BiteEntity = bite.BiteEntity{
var BiteModel = bite.BiteModel{ var BiteModel = bite.BiteModel{
Id: strconv.FormatInt(biteId, 10), Id: strconv.FormatInt(biteId, 10),
Ilk: biteIlk[:], Ilk: biteIlkString,
Urn: biteLad[:], Urn: biteLadString,
Ink: biteInk.String(), Ink: biteInk.String(),
Art: biteArt.String(), Art: biteArt.String(),
Tab: biteTab.String(), Tab: biteTab.String(),

22
pkg/transformers/test_data/frob.go
View File

@ -33,14 +33,16 @@ var (
var ( var (
// need to set bytes as 0 or else the big Int 0 evaluates differently from the one unpacked by the abi // need to set bytes as 0 or else the big Int 0 evaluates differently from the one unpacked by the abi
art = big.NewInt(20) art = big.NewInt(20)
dink = big.NewInt(10) dink = big.NewInt(10)
dart = big.NewInt(0).SetBytes([]byte{0}) dart = big.NewInt(0).SetBytes([]byte{0})
iArt = big.NewInt(25) iArt = big.NewInt(25)
frobLad = [32]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 217, 34, 137, 65, 83, 190, 158, 239, 123, 114, 24, 220, 86, 93, 29, 12, 226, 160, 146} frobLad = [32]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 217, 34, 137, 65, 83, 190, 158, 239, 123, 114, 24, 220, 86, 93, 29, 12, 226, 160, 146}
gem, _ = big.NewInt(0).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639926", 10) gem, _ = big.NewInt(0).SetString("115792089237316195423570985008687907853269984665640564039457584007913129639926", 10)
ink = big.NewInt(15) ink = big.NewInt(15)
ilk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} ilk = [32]byte{102, 97, 107, 101, 32, 105, 108, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
frobIlkString = "0x66616b6520696c6B000000000000000000000000"
frobUrnString = "0x00000000000000000000000064D922894153BE9E"
) )
var EthFrobLog = types.Log{ var EthFrobLog = types.Log{
@ -73,8 +75,8 @@ var FrobEntity = frob.FrobEntity{
var rawFrobLog, _ = json.Marshal(EthFrobLog) var rawFrobLog, _ = json.Marshal(EthFrobLog)
var FrobModel = frob.FrobModel{ var FrobModel = frob.FrobModel{
Ilk: ilk[:], Ilk: frobIlkString,
Urn: frobLad[:], Urn: frobUrnString,
Ink: ink.String(), Ink: ink.String(),
Art: art.String(), Art: art.String(),
Dink: dink.String(), Dink: dink.String(),