Update flip kick and tend transformers due to contract changes
* Update FlipperAddress to new local ganache address * Update flip_kick table * Update flipkick transformer to handle new signature and abi * Update tend table * Update tend converter
This commit is contained in:
@@ -1,27 +0,0 @@
|
||||
// Copyright 2018 Vulcanize
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package test_data
|
||||
|
||||
var (
|
||||
FlipAddress = "0x08cb6176addcca2e1d1ffe21bee464b72ee4cd8d"
|
||||
FlipKickTransactionHash = "0x6b155a55fd77b751195deeebf7abfd8691ca01ee588817a920f19d5b27f65191"
|
||||
FlipKickData = "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000038219779a699d67d7e7740b8c8f43d3e2dae218266616b6520696c6b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064d922894153be9eef7b7218dc565d1d0ce2a09200000000000000000000000007fa9ef6609ca7921112231f8f195138ebba2977000000000000000000000000000000000000000000000000000000005b8063b7000000000000000000000000000000000000000000000000000000005b7729370000000000000000000000007340e006f4135ba6970d43bf43d88dcad4e7a8ca0000000000000000000000000000000000000000000000000000000000000032"
|
||||
FlipKickBlockHash = "0x32f8b12023b3a1b4c73f9a46da976931b0355714ada8b8044ebcb2cd295751a9"
|
||||
FlipKickBlockNumber = int64(10)
|
||||
TendData = "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000003200000000000000000000000064d922894153be9eef7b7218dc565d1d0ce2a0920000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005b6db414"
|
||||
TendTransactionHash = "0xadeddf804e0fef88b6145807df063c538c9942df2725a0458a084900c0fbf5e9"
|
||||
TendBlockHash = "0xdd6238b841c8cf4d91b05da7540b7f0851176fcc8477cdc4b75c93e28dfe0a88"
|
||||
TendBlockNumber = int64(11)
|
||||
)
|
||||
@@ -27,62 +27,64 @@ import (
|
||||
"github.com/vulcanize/vulcanizedb/pkg/transformers/shared"
|
||||
)
|
||||
|
||||
var idString = "1"
|
||||
var id, _ = new(big.Int).SetString(idString, 10)
|
||||
var vat = "0x38219779a699d67d7e7740b8c8f43d3e2dae2182"
|
||||
var 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}
|
||||
var lotString = "100"
|
||||
var lot, _ = new(big.Int).SetString(lotString, 10)
|
||||
var bidString = "0"
|
||||
var bid = new(big.Int).SetBytes([]byte{0})
|
||||
var guy = "0x64d922894153be9eef7b7218dc565d1d0ce2a092"
|
||||
var gal = "0x07fa9ef6609ca7921112231f8f195138ebba2977"
|
||||
var end = int64(1535140791)
|
||||
var era = int64(1534535991)
|
||||
var lad = "0x7340e006f4135ba6970d43bf43d88dcad4e7a8ca"
|
||||
var tabString = "50"
|
||||
var tab, _ = new(big.Int).SetString(tabString, 10)
|
||||
var rawLogJson, _ = json.Marshal(EthFlipKickLog)
|
||||
var rawLogString = string(rawLogJson)
|
||||
var (
|
||||
idString = "1"
|
||||
id, _ = new(big.Int).SetString(idString, 10)
|
||||
lotString = "100"
|
||||
lot, _ = new(big.Int).SetString(lotString, 10)
|
||||
bidString = "0"
|
||||
bid = new(big.Int).SetBytes([]byte{0})
|
||||
gal = "0x07Fa9eF6609cA7921112231F8f195138ebbA2977"
|
||||
end = int64(1535991025)
|
||||
urn = [32]byte{115, 64, 224, 6, 244, 19, 91, 166, 151, 13, 67, 191, 67, 216, 141, 202, 212, 231, 168, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
||||
urnString = "0x7340e006f4135BA6970D43bf43d88DCAD4e7a8CA"
|
||||
tabString = "50"
|
||||
tab, _ = new(big.Int).SetString(tabString, 10)
|
||||
rawLogJson, _ = json.Marshal(EthFlipKickLog)
|
||||
rawLogString = string(rawLogJson)
|
||||
)
|
||||
|
||||
var (
|
||||
flipKickTransactionHash = "0xd11ab35cfb1ad71f790d3dd488cc1a2046080e765b150e8997aa0200947d4a9b"
|
||||
flipKickData = "0x0000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fa9ef6609ca7921112231f8f195138ebba2977000000000000000000000000000000000000000000000000000000005b8d5cf10000000000000000000000000000000000000000000000000000000000000032"
|
||||
flipKickBlockHash = "0x40fcad7863ab4bef421d638b7ad6116e81577f14a62ef847b07f8527944466fd"
|
||||
FlipKickBlockNumber = int64(10)
|
||||
)
|
||||
|
||||
var EthFlipKickLog = types.Log{
|
||||
Address: common.HexToAddress(FlipAddress),
|
||||
Topics: []common.Hash{common.HexToHash(shared.FlipKickSignature)},
|
||||
Data: hexutil.MustDecode(FlipKickData),
|
||||
Address: common.HexToAddress(shared.FlipperContractAddress),
|
||||
Topics: []common.Hash{
|
||||
common.HexToHash(shared.FlipKickSignature),
|
||||
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"),
|
||||
common.HexToHash("0x7340e006f4135ba6970d43bf43d88dcad4e7a8ca000000000000000000000000"),
|
||||
},
|
||||
Data: hexutil.MustDecode(flipKickData),
|
||||
BlockNumber: uint64(FlipKickBlockNumber),
|
||||
TxHash: common.HexToHash(FlipKickTransactionHash),
|
||||
TxHash: common.HexToHash(flipKickTransactionHash),
|
||||
TxIndex: 0,
|
||||
BlockHash: common.HexToHash(FlipKickBlockHash),
|
||||
BlockHash: common.HexToHash(flipKickBlockHash),
|
||||
Index: 0,
|
||||
Removed: false,
|
||||
}
|
||||
|
||||
var FlipKickEntity = flip_kick.FlipKickEntity{
|
||||
Id: id,
|
||||
Vat: common.HexToAddress(vat),
|
||||
Ilk: ilk,
|
||||
Lot: lot,
|
||||
Bid: bid,
|
||||
Guy: common.HexToAddress(guy),
|
||||
Gal: common.HexToAddress(gal),
|
||||
End: big.NewInt(end),
|
||||
Era: big.NewInt(era),
|
||||
Lad: common.HexToAddress(lad),
|
||||
Urn: urn,
|
||||
Tab: tab,
|
||||
Raw: EthFlipKickLog,
|
||||
}
|
||||
|
||||
var FlipKickModel = flip_kick.FlipKickModel{
|
||||
Id: idString,
|
||||
Vat: vat,
|
||||
Ilk: "0x" + common.Bytes2Hex(ilk[:]),
|
||||
Lot: lotString,
|
||||
Bid: bidString,
|
||||
Guy: guy,
|
||||
Gal: gal,
|
||||
End: time.Unix(end, 0),
|
||||
Era: time.Unix(era, 0),
|
||||
Lad: lad,
|
||||
Urn: urnString,
|
||||
Tab: tabString,
|
||||
Raw: rawLogString,
|
||||
}
|
||||
|
||||
@@ -39,6 +39,7 @@ var (
|
||||
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)
|
||||
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}
|
||||
)
|
||||
|
||||
var EthFrobLog = types.Log{
|
||||
|
||||
@@ -16,6 +16,7 @@ package flip_kick
|
||||
|
||||
import (
|
||||
"github.com/ethereum/go-ethereum/core/types"
|
||||
|
||||
"github.com/vulcanize/vulcanizedb/pkg/transformers/flip_kick"
|
||||
"github.com/vulcanize/vulcanizedb/pkg/transformers/test_data"
|
||||
)
|
||||
|
||||
@@ -25,19 +25,13 @@ type MockTendConverter struct {
|
||||
ConverterContract string
|
||||
ConverterAbi string
|
||||
LogsToConvert []types.Log
|
||||
EntitiesToConvert []tend.TendEntity
|
||||
ConverterError error
|
||||
}
|
||||
|
||||
func (c *MockTendConverter) ToEntity(contractAddress string, contractAbi string, ethLog types.Log) (tend.TendEntity, error) {
|
||||
func (c *MockTendConverter) Convert(contractAddress string, contractAbi string, ethLog types.Log) (tend.TendModel, error) {
|
||||
c.ConverterContract = contractAddress
|
||||
c.ConverterAbi = contractAbi
|
||||
c.LogsToConvert = append(c.LogsToConvert, ethLog)
|
||||
return test_data.TendEntity, c.ConverterError
|
||||
}
|
||||
|
||||
func (c *MockTendConverter) ToModel(entity tend.TendEntity) (tend.TendModel, error) {
|
||||
c.EntitiesToConvert = append(c.EntitiesToConvert, entity)
|
||||
return test_data.TendModel, c.ConverterError
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ import (
|
||||
"encoding/json"
|
||||
"math/big"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
"github.com/ethereum/go-ethereum/common/hexutil"
|
||||
@@ -28,45 +27,41 @@ import (
|
||||
"github.com/vulcanize/vulcanizedb/pkg/transformers/tend"
|
||||
)
|
||||
|
||||
var tendLot = big.NewInt(100)
|
||||
var tendBid = big.NewInt(50)
|
||||
var tendGuy = common.HexToAddress("0x64d922894153be9eef7b7218dc565d1d0ce2a092")
|
||||
var tic = new(big.Int).SetBytes([]byte{0})
|
||||
var tendEra = big.NewInt(1533916180)
|
||||
var RawJson, _ = json.Marshal(TendLog)
|
||||
var rawString = string(RawJson)
|
||||
var (
|
||||
tendId = int64(10)
|
||||
tendLot = "85000000000000000000"
|
||||
tendBid = "1000000000000000000"
|
||||
tendGuy = "0x7d7bEe5fCfD8028cf7b00876C5b1421c800561A6"
|
||||
tic = new(big.Int).SetBytes([]byte{0})
|
||||
tendData = "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000644b43ed12000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000049b9ca9a6943400000000000000000000000000000000000000000000000000000de0b6b3a7640000"
|
||||
tendTransactionHash = "0x7909c8793ded2b8348f5db623044fbc26bb7ab78ad5792897abdf68ddc1df63d"
|
||||
tendBlockHash = "0xa8ea87147c0a68daeb6b1d9f8c0937ba975a650809cab80d19c969e8d0df452c"
|
||||
)
|
||||
|
||||
var TendLog = types.Log{
|
||||
Address: common.HexToAddress(FlipAddress),
|
||||
Topics: []common.Hash{common.HexToHash(shared.TendSignature)},
|
||||
Data: hexutil.MustDecode(TendData),
|
||||
BlockNumber: uint64(TendBlockNumber),
|
||||
TxHash: common.HexToHash(TendTransactionHash),
|
||||
TxIndex: 1,
|
||||
BlockHash: common.HexToHash(TendBlockHash),
|
||||
Index: 0,
|
||||
var TendLogNote = types.Log{
|
||||
Address: common.StringToAddress(shared.FlipperContractAddress),
|
||||
Topics: []common.Hash{
|
||||
common.HexToHash("0x4b43ed1200000000000000000000000000000000000000000000000000000000"), //abbreviated tend function signature
|
||||
common.HexToHash("0x0000000000000000000000007d7bee5fcfd8028cf7b00876c5b1421c800561a6"), //msg caller address
|
||||
common.HexToHash("0x000000000000000000000000000000000000000000000000000000000000000a"), //first param of the function called (i.e. flip kick id)
|
||||
common.HexToHash("0x0000000000000000000000000000000000000000000000049b9ca9a694340000"), //second param of the function called (i.e. lot)
|
||||
},
|
||||
Data: hexutil.MustDecode(tendData),
|
||||
BlockNumber: 11,
|
||||
TxHash: common.HexToHash(tendTransactionHash),
|
||||
TxIndex: 10,
|
||||
BlockHash: common.HexToHash(tendBlockHash),
|
||||
Index: 1,
|
||||
Removed: false,
|
||||
}
|
||||
var RawLogNoteJson, _ = json.Marshal(TendLogNote)
|
||||
|
||||
var tendId = int64(1)
|
||||
var TendEntity = tend.TendEntity{
|
||||
Id: big.NewInt(tendId),
|
||||
var TendModel = tend.TendModel{
|
||||
BidId: strconv.FormatInt(tendId, 10),
|
||||
Lot: tendLot,
|
||||
Bid: tendBid,
|
||||
Guy: tendGuy,
|
||||
Tic: tic,
|
||||
Era: tendEra,
|
||||
TransactionIndex: TendLog.TxIndex,
|
||||
Raw: TendLog,
|
||||
}
|
||||
|
||||
var TendModel = tend.TendModel{
|
||||
Id: strconv.FormatInt(tendId, 10),
|
||||
Lot: tendLot.String(),
|
||||
Bid: tendBid.String(),
|
||||
Guy: tendGuy[:],
|
||||
Tic: tic.String(),
|
||||
Era: time.Unix(tendEra.Int64(), 0),
|
||||
TransactionIndex: TendLog.TxIndex,
|
||||
Raw: rawString,
|
||||
TransactionIndex: TendLogNote.TxIndex,
|
||||
Raw: string(RawLogNoteJson),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user