From 854236fd99ed148d7a78335b3870a50a47dc24c3 Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Wed, 14 Nov 2018 13:07:11 -0600 Subject: [PATCH] (VDB-267) Remove pit file stability fee - Method is no longer present on the Pit contract --- cmd/continuousLogSync.go | 1 - cmd/getSignatures.go | 1 - ...22088_drop_pit_file_stability_fee.down.sql | 13 +++ ...2222088_drop_pit_file_stability_fee.up.sql | 4 + db/schema.sql | 67 ------------- .../pit_file_stability_fee.go | 63 ------------- .../pit_file/stability_fee/config.go | 29 ------ .../pit_file/stability_fee/converter.go | 59 ------------ .../pit_file/stability_fee/converter_test.go | 45 --------- .../pit_file/stability_fee/model.go | 23 ----- .../pit_file/stability_fee/repository.go | 79 ---------------- .../pit_file/stability_fee/repository_test.go | 93 ------------------- .../stability_fee/stability_fee_suite_test.go | 33 ------- pkg/transformers/shared/constants/abi.go | 7 +- .../shared/constants/checked_headers.go | 57 ++++++------ pkg/transformers/shared/constants/method.go | 57 ++++++------ .../shared/constants/signature.go | 57 ++++++------ pkg/transformers/test_data/pit_file.go | 29 +----- pkg/transformers/transformers.go | 9 -- test_config/test_config.go | 1 - 20 files changed, 106 insertions(+), 621 deletions(-) create mode 100644 db/migrations/1542222088_drop_pit_file_stability_fee.down.sql create mode 100644 db/migrations/1542222088_drop_pit_file_stability_fee.up.sql delete mode 100644 pkg/transformers/integration_tests/pit_file_stability_fee.go delete mode 100644 pkg/transformers/pit_file/stability_fee/config.go delete mode 100644 pkg/transformers/pit_file/stability_fee/converter.go delete mode 100644 pkg/transformers/pit_file/stability_fee/converter_test.go delete mode 100644 pkg/transformers/pit_file/stability_fee/model.go delete mode 100644 pkg/transformers/pit_file/stability_fee/repository.go delete mode 100644 pkg/transformers/pit_file/stability_fee/repository_test.go delete mode 100644 pkg/transformers/pit_file/stability_fee/stability_fee_suite_test.go diff --git a/cmd/continuousLogSync.go b/cmd/continuousLogSync.go index d4249724..9589a8d8 100644 --- a/cmd/continuousLogSync.go +++ b/cmd/continuousLogSync.go @@ -108,7 +108,6 @@ func buildTransformerInitializerMap() map[string]shared2.TransformerInitializer transformerInitializerMap[constants.FrobLabel] = transformers.FrobTransformerInitializer transformerInitializerMap[constants.PitFileDebtCeilingLabel] = transformers.PitFileDebtCeilingTransformerInitializer transformerInitializerMap[constants.PitFileIlkLabel] = transformers.PitFileIlkTransformerInitializer - transformerInitializerMap[constants.PitFileStabilityFeeLabel] = transformers.PitFileStabilityFeeTransformerInitializer transformerInitializerMap[constants.PriceFeedLabel] = transformers.PriceFeedTransformerInitializer transformerInitializerMap[constants.TendLabel] = transformers.TendTransformerInitializer transformerInitializerMap[constants.VatFluxLabel] = transformers.VatFluxTransformerInitializer diff --git a/cmd/getSignatures.go b/cmd/getSignatures.go index 544c2088..64c43d97 100644 --- a/cmd/getSignatures.go +++ b/cmd/getSignatures.go @@ -50,7 +50,6 @@ func getSignatures() { signatures["LogValueSignature"] = constants.LogValueSignature signatures["PitFileDebtCeilingSignature"] = constants.PitFileDebtCeilingSignature signatures["PitFileIlkSignature"] = constants.PitFileIlkSignature - signatures["PitFileStabilityFeeSignature"] = constants.PitFileStabilityFeeSignature signatures["TendFunctionSignature"] = constants.TendFunctionSignature signatures["VatFluxSignature"] = constants.VatFluxSignature signatures["VatFoldSignature"] = constants.VatFoldSignature diff --git a/db/migrations/1542222088_drop_pit_file_stability_fee.down.sql b/db/migrations/1542222088_drop_pit_file_stability_fee.down.sql new file mode 100644 index 00000000..e8590699 --- /dev/null +++ b/db/migrations/1542222088_drop_pit_file_stability_fee.down.sql @@ -0,0 +1,13 @@ +CREATE TABLE maker.pit_file_stability_fee ( + id SERIAL PRIMARY KEY, + header_id INTEGER NOT NULL REFERENCES headers (id) ON DELETE CASCADE, + what TEXT, + data TEXT, + log_idx INTEGER NOT NULL, + tx_idx INTEGER NOT NULL, + raw_log JSONB, + UNIQUE (header_id, tx_idx, log_idx) +); + +ALTER TABLE public.checked_headers + ADD COLUMN pit_file_stability_fee_checked BOOLEAN NOT NULL DEFAULT FALSE; \ No newline at end of file diff --git a/db/migrations/1542222088_drop_pit_file_stability_fee.up.sql b/db/migrations/1542222088_drop_pit_file_stability_fee.up.sql new file mode 100644 index 00000000..2d43642d --- /dev/null +++ b/db/migrations/1542222088_drop_pit_file_stability_fee.up.sql @@ -0,0 +1,4 @@ +DROP TABLE maker.pit_file_stability_fee; + +ALTER TABLE public.checked_headers + DROP COLUMN pit_file_stability_fee_checked; diff --git a/db/schema.sql b/db/schema.sql index faab8258..94e5e203 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -644,41 +644,6 @@ CREATE SEQUENCE maker.pit_file_ilk_id_seq ALTER SEQUENCE maker.pit_file_ilk_id_seq OWNED BY maker.pit_file_ilk.id; --- --- Name: pit_file_stability_fee; Type: TABLE; Schema: maker; Owner: - --- - -CREATE TABLE maker.pit_file_stability_fee ( - id integer NOT NULL, - header_id integer NOT NULL, - what text, - data text, - log_idx integer NOT NULL, - tx_idx integer NOT NULL, - raw_log jsonb -); - - --- --- Name: pit_file_stability_fee_id_seq; Type: SEQUENCE; Schema: maker; Owner: - --- - -CREATE SEQUENCE maker.pit_file_stability_fee_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: pit_file_stability_fee_id_seq; Type: SEQUENCE OWNED BY; Schema: maker; Owner: - --- - -ALTER SEQUENCE maker.pit_file_stability_fee_id_seq OWNED BY maker.pit_file_stability_fee.id; - - -- -- Name: price_feeds; Type: TABLE; Schema: maker; Owner: - -- @@ -1206,7 +1171,6 @@ CREATE TABLE public.checked_headers ( dent_checked boolean DEFAULT false NOT NULL, pit_file_debt_ceiling_checked boolean DEFAULT false NOT NULL, pit_file_ilk_checked boolean DEFAULT false NOT NULL, - pit_file_stability_fee_checked boolean DEFAULT false NOT NULL, vat_init_checked boolean DEFAULT false NOT NULL, drip_file_ilk_checked boolean DEFAULT false NOT NULL, drip_file_repo_checked boolean DEFAULT false NOT NULL, @@ -1660,13 +1624,6 @@ ALTER TABLE ONLY maker.pit_file_debt_ceiling ALTER COLUMN id SET DEFAULT nextval ALTER TABLE ONLY maker.pit_file_ilk ALTER COLUMN id SET DEFAULT nextval('maker.pit_file_ilk_id_seq'::regclass); --- --- Name: pit_file_stability_fee id; Type: DEFAULT; Schema: maker; Owner: - --- - -ALTER TABLE ONLY maker.pit_file_stability_fee ALTER COLUMN id SET DEFAULT nextval('maker.pit_file_stability_fee_id_seq'::regclass); - - -- -- Name: price_feeds id; Type: DEFAULT; Schema: maker; Owner: - -- @@ -2077,22 +2034,6 @@ ALTER TABLE ONLY maker.pit_file_ilk ADD CONSTRAINT pit_file_ilk_pkey PRIMARY KEY (id); --- --- Name: pit_file_stability_fee pit_file_stability_fee_header_id_tx_idx_log_idx_key; Type: CONSTRAINT; Schema: maker; Owner: - --- - -ALTER TABLE ONLY maker.pit_file_stability_fee - ADD CONSTRAINT pit_file_stability_fee_header_id_tx_idx_log_idx_key UNIQUE (header_id, tx_idx, log_idx); - - --- --- Name: pit_file_stability_fee pit_file_stability_fee_pkey; Type: CONSTRAINT; Schema: maker; Owner: - --- - -ALTER TABLE ONLY maker.pit_file_stability_fee - ADD CONSTRAINT pit_file_stability_fee_pkey PRIMARY KEY (id); - - -- -- Name: price_feeds price_feeds_header_id_medianizer_address_tx_idx_log_idx_key; Type: CONSTRAINT; Schema: maker; Owner: - -- @@ -2567,14 +2508,6 @@ ALTER TABLE ONLY maker.pit_file_ilk ADD CONSTRAINT pit_file_ilk_header_id_fkey FOREIGN KEY (header_id) REFERENCES public.headers(id) ON DELETE CASCADE; --- --- Name: pit_file_stability_fee pit_file_stability_fee_header_id_fkey; Type: FK CONSTRAINT; Schema: maker; Owner: - --- - -ALTER TABLE ONLY maker.pit_file_stability_fee - ADD CONSTRAINT pit_file_stability_fee_header_id_fkey FOREIGN KEY (header_id) REFERENCES public.headers(id) ON DELETE CASCADE; - - -- -- Name: price_feeds price_feeds_header_id_fkey; Type: FK CONSTRAINT; Schema: maker; Owner: - -- diff --git a/pkg/transformers/integration_tests/pit_file_stability_fee.go b/pkg/transformers/integration_tests/pit_file_stability_fee.go deleted file mode 100644 index 1ca226ff..00000000 --- a/pkg/transformers/integration_tests/pit_file_stability_fee.go +++ /dev/null @@ -1,63 +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 integration_tests - -import ( - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/vulcanize/vulcanizedb/pkg/transformers/factories" - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared" - - "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee" - "github.com/vulcanize/vulcanizedb/test_config" -) - -var _ = Describe("PitFileStabilityFee LogNoteTransformer", func() { - It("fetches and transforms a PitFileStabilityFee event from Kovan chain", func() { - blockNumber := int64(8535544) - config := stability_fee.StabilityFeeFileConfig - config.StartingBlockNumber = blockNumber - config.EndingBlockNumber = blockNumber - - rpcClient, ethClient, err := getClients(ipc) - Expect(err).NotTo(HaveOccurred()) - blockChain, err := getBlockChain(rpcClient, ethClient) - Expect(err).NotTo(HaveOccurred()) - - db := test_config.NewTestDB(blockChain.Node()) - test_config.CleanTestDB(db) - - err = persistHeader(db, blockNumber, blockChain) - Expect(err).NotTo(HaveOccurred()) - - initializer := factories.LogNoteTransformer{ - Config: config, - Fetcher: &shared.Fetcher{}, - Converter: &stability_fee.PitFileStabilityFeeConverter{}, - Repository: &stability_fee.PitFileStabilityFeeRepository{}, - } - transformer := initializer.NewLogNoteTransformer(db, blockChain) - err = transformer.Execute() - Expect(err).NotTo(HaveOccurred()) - - var dbResult []stability_fee.PitFileStabilityFeeModel - err = db.Select(&dbResult, `SELECT what, data from maker.pit_file_stability_fee`) - Expect(err).NotTo(HaveOccurred()) - - Expect(len(dbResult)).To(Equal(1)) - Expect(dbResult[0].What).To(Equal("drip")) - Expect(dbResult[0].Data).To(Equal("0xea29Db06E0Aa791E8ca2330D8cd9073E0760b3F1")) - }) -}) diff --git a/pkg/transformers/pit_file/stability_fee/config.go b/pkg/transformers/pit_file/stability_fee/config.go deleted file mode 100644 index e2aeb536..00000000 --- a/pkg/transformers/pit_file/stability_fee/config.go +++ /dev/null @@ -1,29 +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 stability_fee - -import ( - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared" - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants" -) - -var StabilityFeeFileConfig = shared.TransformerConfig{ - TransformerName: constants.PitFileStabilityFeeLabel, - ContractAddresses: []string{constants.PitContractAddress}, - ContractAbi: constants.PitABI, - Topic: constants.PitFileStabilityFeeSignature, - StartingBlockNumber: 0, - EndingBlockNumber: -1, -} diff --git a/pkg/transformers/pit_file/stability_fee/converter.go b/pkg/transformers/pit_file/stability_fee/converter.go deleted file mode 100644 index 4ca8a209..00000000 --- a/pkg/transformers/pit_file/stability_fee/converter.go +++ /dev/null @@ -1,59 +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 stability_fee - -import ( - "bytes" - "encoding/json" - "errors" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" -) - -type PitFileStabilityFeeConverter struct{} - -func (PitFileStabilityFeeConverter) ToModels(ethLogs []types.Log) ([]interface{}, error) { - var models []interface{} - for _, ethLog := range ethLogs { - err := verifyLog(ethLog) - if err != nil { - return nil, err - } - what := string(bytes.Trim(ethLog.Topics[2].Bytes(), "\x00")) - data := common.HexToAddress(ethLog.Topics[3].String()).Hex() - - raw, err := json.Marshal(ethLog) - if err != nil { - return nil, err - } - model := PitFileStabilityFeeModel{ - What: what, - Data: data, - LogIndex: ethLog.Index, - TransactionIndex: ethLog.TxIndex, - Raw: raw, - } - models = append(models, model) - } - return models, nil -} - -func verifyLog(log types.Log) error { - if len(log.Topics) < 3 { - return errors.New("log missing topics") - } - return nil -} diff --git a/pkg/transformers/pit_file/stability_fee/converter_test.go b/pkg/transformers/pit_file/stability_fee/converter_test.go deleted file mode 100644 index 1b07605c..00000000 --- a/pkg/transformers/pit_file/stability_fee/converter_test.go +++ /dev/null @@ -1,45 +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 stability_fee_test - -import ( - "github.com/ethereum/go-ethereum/core/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - - "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee" - "github.com/vulcanize/vulcanizedb/pkg/transformers/test_data" -) - -var _ = Describe("Pit file stability fee converter", func() { - It("returns err if log is missing topics", func() { - converter := stability_fee.PitFileStabilityFeeConverter{} - badLog := types.Log{} - - _, err := converter.ToModels([]types.Log{badLog}) - - Expect(err).To(HaveOccurred()) - }) - - It("converts a log to an model", func() { - converter := stability_fee.PitFileStabilityFeeConverter{} - - models, err := converter.ToModels([]types.Log{test_data.EthPitFileStabilityFeeLog}) - - Expect(err).NotTo(HaveOccurred()) - Expect(len(models)).To(Equal(1)) - Expect(models[0]).To(Equal(test_data.PitFileStabilityFeeModel)) - }) -}) diff --git a/pkg/transformers/pit_file/stability_fee/model.go b/pkg/transformers/pit_file/stability_fee/model.go deleted file mode 100644 index 257ca43f..00000000 --- a/pkg/transformers/pit_file/stability_fee/model.go +++ /dev/null @@ -1,23 +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 stability_fee - -type PitFileStabilityFeeModel struct { - What string - Data string - LogIndex uint `db:"log_idx"` - TransactionIndex uint `db:"tx_idx"` - Raw []byte `db:"raw_log"` -} diff --git a/pkg/transformers/pit_file/stability_fee/repository.go b/pkg/transformers/pit_file/stability_fee/repository.go deleted file mode 100644 index 17c2063a..00000000 --- a/pkg/transformers/pit_file/stability_fee/repository.go +++ /dev/null @@ -1,79 +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 stability_fee - -import ( - "fmt" - "github.com/vulcanize/vulcanizedb/pkg/core" - "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared" - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants" -) - -type PitFileStabilityFeeRepository struct { - db *postgres.DB -} - -func (repository PitFileStabilityFeeRepository) Create(headerID int64, models []interface{}) error { - tx, err := repository.db.Begin() - if err != nil { - return err - } - - for _, model := range models { - pitFileSF, ok := model.(PitFileStabilityFeeModel) - if !ok { - tx.Rollback() - return fmt.Errorf("model of type %T, not %T", model, PitFileStabilityFeeModel{}) - } - - err = shared.ValidateHeaderConsistency(headerID, pitFileSF.Raw, repository.db) - if err != nil { - tx.Rollback() - return err - } - - _, err = tx.Exec( - `INSERT into maker.pit_file_stability_fee (header_id, what, data, log_idx, tx_idx, raw_log) - VALUES($1, $2, $3, $4, $5, $6)`, - headerID, pitFileSF.What, pitFileSF.Data, pitFileSF.LogIndex, pitFileSF.TransactionIndex, pitFileSF.Raw, - ) - - if err != nil { - tx.Rollback() - return err - } - } - - err = shared.MarkHeaderCheckedInTransaction(headerID, tx, constants.PitFileStabilityFeeChecked) - if err != nil { - tx.Rollback() - return err - } - - return tx.Commit() -} - -func (repository PitFileStabilityFeeRepository) MarkHeaderChecked(headerID int64) error { - return shared.MarkHeaderChecked(headerID, repository.db, constants.PitFileStabilityFeeChecked) -} - -func (repository PitFileStabilityFeeRepository) MissingHeaders(startingBlockNumber, endingBlockNumber int64) ([]core.Header, error) { - return shared.MissingHeaders(startingBlockNumber, endingBlockNumber, repository.db, constants.PitFileStabilityFeeChecked) -} - -func (repository *PitFileStabilityFeeRepository) SetDB(db *postgres.DB) { - repository.db = db -} diff --git a/pkg/transformers/pit_file/stability_fee/repository_test.go b/pkg/transformers/pit_file/stability_fee/repository_test.go deleted file mode 100644 index 701bc97a..00000000 --- a/pkg/transformers/pit_file/stability_fee/repository_test.go +++ /dev/null @@ -1,93 +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 stability_fee_test - -import ( - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - - "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/fakes" - "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee" - "github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/transformers/test_data" - "github.com/vulcanize/vulcanizedb/pkg/transformers/test_data/shared_behaviors" - "github.com/vulcanize/vulcanizedb/test_config" -) - -var _ = Describe("Pit file stability fee repository", func() { - var ( - db *postgres.DB - pitFileStabilityFeeRepository stability_fee.PitFileStabilityFeeRepository - headerRepository repositories.HeaderRepository - ) - - BeforeEach(func() { - db = test_config.NewTestDB(test_config.NewTestNode()) - test_config.CleanTestDB(db) - pitFileStabilityFeeRepository = stability_fee.PitFileStabilityFeeRepository{} - pitFileStabilityFeeRepository.SetDB(db) - headerRepository = repositories.NewHeaderRepository(db) - }) - - Describe("Create", func() { - modelWithDifferentLogIdx := test_data.PitFileStabilityFeeModel - modelWithDifferentLogIdx.LogIndex = modelWithDifferentLogIdx.LogIndex + 1 - inputs := shared_behaviors.CreateBehaviorInputs{ - CheckedHeaderColumnName: constants.PitFileStabilityFeeChecked, - LogEventTableName: "maker.pit_file_stability_fee", - TestModel: test_data.PitFileStabilityFeeModel, - ModelWithDifferentLogIdx: modelWithDifferentLogIdx, - Repository: &pitFileStabilityFeeRepository, - } - - shared_behaviors.SharedRepositoryCreateBehaviors(&inputs) - - It("adds a pit file stability fee event", func() { - headerID, err := headerRepository.CreateOrUpdateHeader(fakes.FakeHeader) - Expect(err).NotTo(HaveOccurred()) - err = pitFileStabilityFeeRepository.Create(headerID, []interface{}{test_data.PitFileStabilityFeeModel}) - - Expect(err).NotTo(HaveOccurred()) - var dbPitFile stability_fee.PitFileStabilityFeeModel - err = db.Get(&dbPitFile, `SELECT what, data, log_idx, tx_idx, raw_log FROM maker.pit_file_stability_fee WHERE header_id = $1`, headerID) - Expect(err).NotTo(HaveOccurred()) - Expect(dbPitFile.What).To(Equal(test_data.PitFileStabilityFeeModel.What)) - Expect(dbPitFile.Data).To(Equal(test_data.PitFileStabilityFeeModel.Data)) - Expect(dbPitFile.LogIndex).To(Equal(test_data.PitFileStabilityFeeModel.LogIndex)) - Expect(dbPitFile.TransactionIndex).To(Equal(test_data.PitFileStabilityFeeModel.TransactionIndex)) - Expect(dbPitFile.Raw).To(MatchJSON(test_data.PitFileStabilityFeeModel.Raw)) - }) - }) - - Describe("MarkHeaderChecked", func() { - inputs := shared_behaviors.MarkedHeaderCheckedBehaviorInputs{ - CheckedHeaderColumnName: constants.PitFileStabilityFeeChecked, - Repository: &pitFileStabilityFeeRepository, - } - - shared_behaviors.SharedRepositoryMarkHeaderCheckedBehaviors(&inputs) - }) - - Describe("MissingHeaders", func() { - inputs := shared_behaviors.MissingHeadersBehaviorInputs{ - Repository: &pitFileStabilityFeeRepository, - RepositoryTwo: &stability_fee.PitFileStabilityFeeRepository{}, - } - - shared_behaviors.SharedRepositoryMissingHeadersBehaviors(&inputs) - }) -}) diff --git a/pkg/transformers/pit_file/stability_fee/stability_fee_suite_test.go b/pkg/transformers/pit_file/stability_fee/stability_fee_suite_test.go deleted file mode 100644 index 8b428b62..00000000 --- a/pkg/transformers/pit_file/stability_fee/stability_fee_suite_test.go +++ /dev/null @@ -1,33 +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 stability_fee_test - -import ( - "io/ioutil" - "log" - "testing" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -func TestStabilityFee(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "StabilityFee Suite") -} - -var _ = BeforeSuite(func() { - log.SetOutput(ioutil.Discard) -}) diff --git a/pkg/transformers/shared/constants/abi.go b/pkg/transformers/shared/constants/abi.go index 53b85880..82e09bb1 100644 --- a/pkg/transformers/shared/constants/abi.go +++ b/pkg/transformers/shared/constants/abi.go @@ -7,7 +7,8 @@ var ( FlipperABI = `[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"bids","outputs":[{"name":"bid","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"guy","type":"address"},{"name":"tic","type":"uint48"},{"name":"end","type":"uint48"},{"name":"urn","type":"bytes32"},{"name":"gal","type":"address"},{"name":"tab","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x4423c5f1"},{"constant":true,"inputs":[],"name":"ttl","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x4e8b1dd5"},{"constant":true,"inputs":[],"name":"gem","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x7bd2bea7"},{"constant":true,"inputs":[],"name":"beg","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x7d780d82"},{"constant":true,"inputs":[],"name":"tau","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xcfc4af55"},{"constant":true,"inputs":[],"name":"kicks","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xcfdd3302"},{"constant":true,"inputs":[],"name":"dai","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xf4b9fa75"},{"inputs":[{"name":"dai_","type":"address"},{"name":"gem_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"lot","type":"uint256"},{"indexed":false,"name":"bid","type":"uint256"},{"indexed":false,"name":"gal","type":"address"},{"indexed":false,"name":"end","type":"uint48"},{"indexed":true,"name":"urn","type":"bytes32"},{"indexed":false,"name":"tab","type":"uint256"}],"name":"Kick","type":"event","signature":"0xbac86238bdba81d21995024470425ecb370078fa62b7271b90cf28cbd1e3e87e"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event","signature":"0x644843f351d3fba4abcd60109eaff9f54bac8fb8ccf0bab941009c21df21cf31"},{"constant":true,"inputs":[],"name":"era","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x143e55e0"},{"constant":false,"inputs":[{"name":"urn","type":"bytes32"},{"name":"gal","type":"address"},{"name":"tab","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"bid","type":"uint256"}],"name":"kick","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xeae19d9e"},{"constant":false,"inputs":[{"name":"id","type":"uint256"}],"name":"tick","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xfc7b6aee"},{"constant":false,"inputs":[{"name":"id","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"bid","type":"uint256"}],"name":"tend","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x4b43ed12"},{"constant":false,"inputs":[{"name":"id","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"bid","type":"uint256"}],"name":"dent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5ff3a382"},{"constant":false,"inputs":[{"name":"id","type":"uint256"}],"name":"deal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xc959c42b"}]` FlopperABI = `[{"constant":true,"inputs":[],"name":"era","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"bids","outputs":[{"name":"bid","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"guy","type":"address"},{"name":"tic","type":"uint48"},{"name":"end","type":"uint48"},{"name":"vow","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"ttl","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"uint256"},{"name":"lot","type":"uint256"},{"name":"bid","type":"uint256"}],"name":"dent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"gem","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"beg","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"gal","type":"address"},{"name":"lot","type":"uint256"},{"name":"bid","type":"uint256"}],"name":"kick","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"uint256"}],"name":"deal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"tau","outputs":[{"name":"","type":"uint48"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"kicks","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"dai","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"dai_","type":"address"},{"name":"gem_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"id","type":"uint256"},{"indexed":false,"name":"lot","type":"uint256"},{"indexed":false,"name":"bid","type":"uint256"},{"indexed":false,"name":"gal","type":"address"},{"indexed":false,"name":"end","type":"uint48"}],"name":"Kick","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event"}]` MedianizerABI = `[{"constant":false,"inputs":[{"name":"owner_","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"","type":"bytes32"}],"name":"poke","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"poke","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"compute","outputs":[{"name":"","type":"bytes32"},{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wat","type":"address"}],"name":"set","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"wat","type":"address"}],"name":"unset","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"indexes","outputs":[{"name":"","type":"bytes12"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"next","outputs":[{"name":"","type":"bytes12"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"read","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peek","outputs":[{"name":"","type":"bytes32"},{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes12"}],"name":"values","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"min_","type":"uint96"}],"name":"setMin","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"authority_","type":"address"}],"name":"setAuthority","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"void","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"pos","type":"bytes12"},{"name":"wat","type":"address"}],"name":"set","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"authority","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"pos","type":"bytes12"}],"name":"unset","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"next_","type":"bytes12"}],"name":"setNext","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"min","outputs":[{"name":"","type":"uint96"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"val","type":"bytes32"}],"name":"LogValue","type":"event"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"authority","type":"address"}],"name":"LogSetAuthority","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"}],"name":"LogSetOwner","type":"event"}]]` - PitABI = `[{"constant":true,"inputs":[],"name":"vat","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x36569e77"},{"constant":true,"inputs":[],"name":"live","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x957aa58c"},{"constant":true,"inputs":[],"name":"drip","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x9f678cca"},{"constant":true,"inputs":[],"name":"Line","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbabe8a3f"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbf353dbb"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"ilks","outputs":[{"name":"spot","type":"uint256"},{"name":"line","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xd9638d36"},{"inputs":[{"name":"vat_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"ilk","type":"bytes32"},{"indexed":true,"name":"urn","type":"bytes32"},{"indexed":false,"name":"ink","type":"uint256"},{"indexed":false,"name":"art","type":"uint256"},{"indexed":false,"name":"dink","type":"int256"},{"indexed":false,"name":"dart","type":"int256"},{"indexed":false,"name":"iArt","type":"uint256"}],"name":"Frob","type":"event","signature":"0xb2afa28318bcc689926b52835d844de174ef8de97e982a85c0199d584920791b"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event","signature":"0x644843f351d3fba4abcd60109eaff9f54bac8fb8ccf0bab941009c21df21cf31"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x65fae35e"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x9c52a7f1"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x1a0b287e"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x29ae8114"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"address"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xd4e8be83"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"frob","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5a984ded"}]` - VatABI = `[{"constant":true,"inputs":[],"name":"debt","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x0dca59c1"},{"constant":true,"inputs":[{"name":"","type":"bytes32"},{"name":"","type":"bytes32"}],"name":"urns","outputs":[{"name":"ink","type":"uint256"},{"name":"art","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x26e27482"},{"constant":true,"inputs":[],"name":"vice","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x2d61a355"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xa60f1d3e"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbf353dbb"},{"constant":true,"inputs":[{"name":"","type":"bytes32"},{"name":"","type":"bytes32"}],"name":"gem","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xc0912683"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"ilks","outputs":[{"name":"take","type":"uint256"},{"name":"rate","type":"uint256"},{"name":"Ink","type":"uint256"},{"name":"Art","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xd9638d36"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"dai","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xf53e4e69"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":true,"name":"too","type":"bytes32"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"Note","type":"event","signature":"0x8c2dbbc2b33ffaa77c104b777e574a8a4ff79829dfee8b66f4dc63e3f8067152"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x65fae35e"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x9c52a7f1"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"}],"name":"init","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x3b663195"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"guy","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"slip","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x42066cbb"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"src","type":"bytes32"},{"name":"dst","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"flux","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xa6e41821"},{"constant":false,"inputs":[{"name":"src","type":"bytes32"},{"name":"dst","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"move","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x78f19470"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"w","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"tune","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5dd6471a"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"w","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"grab","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x3690ae4c"},{"constant":false,"inputs":[{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"heal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x990a5f63"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"rate","type":"int256"}],"name":"fold","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xe6a6a64d"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"take","type":"int256"}],"name":"toll","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x09b7a0b5"}]` - VowABI = `[{"constant":true,"inputs":[],"name":"Awe","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Joy","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"flap","outputs":[{"name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"hump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"Ash","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"era","type":"uint48"}],"name":"flog","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"vat","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Woe","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"wait","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"tab","type":"uint256"}],"name":"fess","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"row","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint48"}],"name":"sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"flop","outputs":[{"name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"sump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"addr","type":"address"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"cow","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"heal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event"}]` + // TODO: replace with updated ABI when contract is deployed (with no pit file stability fee method + modified Frob event) + PitABI = `[{"constant":true,"inputs":[],"name":"vat","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x36569e77"},{"constant":true,"inputs":[],"name":"live","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x957aa58c"},{"constant":true,"inputs":[],"name":"drip","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x9f678cca"},{"constant":true,"inputs":[],"name":"Line","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbabe8a3f"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbf353dbb"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"ilks","outputs":[{"name":"spot","type":"uint256"},{"name":"line","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xd9638d36"},{"inputs":[{"name":"vat_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"ilk","type":"bytes32"},{"indexed":true,"name":"urn","type":"bytes32"},{"indexed":false,"name":"ink","type":"uint256"},{"indexed":false,"name":"art","type":"uint256"},{"indexed":false,"name":"dink","type":"int256"},{"indexed":false,"name":"dart","type":"int256"},{"indexed":false,"name":"iArt","type":"uint256"}],"name":"Frob","type":"event","signature":"0xb2afa28318bcc689926b52835d844de174ef8de97e982a85c0199d584920791b"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event","signature":"0x644843f351d3fba4abcd60109eaff9f54bac8fb8ccf0bab941009c21df21cf31"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x65fae35e"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x9c52a7f1"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x1a0b287e"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x29ae8114"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"address"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xd4e8be83"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"frob","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5a984ded"}]` + VatABI = `[{"constant":true,"inputs":[],"name":"debt","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x0dca59c1"},{"constant":true,"inputs":[{"name":"","type":"bytes32"},{"name":"","type":"bytes32"}],"name":"urns","outputs":[{"name":"ink","type":"uint256"},{"name":"art","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x26e27482"},{"constant":true,"inputs":[],"name":"vice","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0x2d61a355"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xa60f1d3e"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xbf353dbb"},{"constant":true,"inputs":[{"name":"","type":"bytes32"},{"name":"","type":"bytes32"}],"name":"gem","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xc0912683"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"ilks","outputs":[{"name":"take","type":"uint256"},{"name":"rate","type":"uint256"},{"name":"Ink","type":"uint256"},{"name":"Art","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xd9638d36"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"dai","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function","signature":"0xf53e4e69"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor","signature":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":true,"name":"too","type":"bytes32"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"Note","type":"event","signature":"0x8c2dbbc2b33ffaa77c104b777e574a8a4ff79829dfee8b66f4dc63e3f8067152"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x65fae35e"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x9c52a7f1"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"}],"name":"init","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x3b663195"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"guy","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"slip","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x42066cbb"},{"constant":false,"inputs":[{"name":"ilk","type":"bytes32"},{"name":"src","type":"bytes32"},{"name":"dst","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"flux","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xa6e41821"},{"constant":false,"inputs":[{"name":"src","type":"bytes32"},{"name":"dst","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"move","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x78f19470"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"w","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"tune","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x5dd6471a"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"w","type":"bytes32"},{"name":"dink","type":"int256"},{"name":"dart","type":"int256"}],"name":"grab","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x3690ae4c"},{"constant":false,"inputs":[{"name":"u","type":"bytes32"},{"name":"v","type":"bytes32"},{"name":"rad","type":"int256"}],"name":"heal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x990a5f63"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"rate","type":"int256"}],"name":"fold","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0xe6a6a64d"},{"constant":false,"inputs":[{"name":"i","type":"bytes32"},{"name":"u","type":"bytes32"},{"name":"take","type":"int256"}],"name":"toll","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function","signature":"0x09b7a0b5"}]` + VowABI = `[{"constant":true,"inputs":[],"name":"Awe","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Joy","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"flap","outputs":[{"name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"hump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"data","type":"uint256"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"Ash","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"era","type":"uint48"}],"name":"flog","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"vat","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Woe","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"wait","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"tab","type":"uint256"}],"name":"fess","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"row","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint48"}],"name":"sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"guy","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"flop","outputs":[{"name":"id","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"wards","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"sump","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Sin","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"what","type":"bytes32"},{"name":"addr","type":"address"}],"name":"file","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"cow","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"wad","type":"uint256"}],"name":"heal","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"name":"sig","type":"bytes4"},{"indexed":true,"name":"guy","type":"address"},{"indexed":true,"name":"foo","type":"bytes32"},{"indexed":true,"name":"bar","type":"bytes32"},{"indexed":false,"name":"wad","type":"uint256"},{"indexed":false,"name":"fax","type":"bytes"}],"name":"LogNote","type":"event"}]` ) diff --git a/pkg/transformers/shared/constants/checked_headers.go b/pkg/transformers/shared/constants/checked_headers.go index 5ffe031d..00dae88b 100644 --- a/pkg/transformers/shared/constants/checked_headers.go +++ b/pkg/transformers/shared/constants/checked_headers.go @@ -1,33 +1,32 @@ package constants var ( - BiteChecked = "bite_checked" - CatFileChopLumpChecked = "cat_file_chop_lump_checked" - CatFileFlipChecked = "cat_file_flip_checked" - CatFilePitVowChecked = "cat_file_pit_vow_checked" - DealChecked = "deal_checked" - DentChecked = "dent_checked" - DripDripChecked = "drip_drip_checked" - DripFileIlkChecked = "drip_file_ilk_checked" - DripFileRepoChecked = "drip_file_repo_checked" - DripFileVowChecked = "drip_file_vow_checked" - FlapKickChecked = "flap_kick_checked" - FlipKickChecked = "flip_kick_checked" - FlopKickChecked = "flop_kick_checked" - FrobChecked = "frob_checked" - PitFileDebtCeilingChecked = "pit_file_debt_ceiling_checked" - PitFileIlkChecked = "pit_file_ilk_checked" - PitFileStabilityFeeChecked = "pit_file_stability_fee_checked" - PriceFeedsChecked = "price_feeds_checked" - TendChecked = "tend_checked" - VatFluxChecked = "vat_flux_checked" - VatFoldChecked = "vat_fold_checked" - VatGrabChecked = "vat_grab_checked" - VatHealChecked = "vat_heal_checked" - VatInitChecked = "vat_init_checked" - VatMoveChecked = "vat_move_checked" - VatSlipChecked = "vat_slip_checked" - VatTollChecked = "vat_toll_checked" - VatTuneChecked = "vat_tune_checked" - VowFlogChecked = "vow_flog_checked" + BiteChecked = "bite_checked" + CatFileChopLumpChecked = "cat_file_chop_lump_checked" + CatFileFlipChecked = "cat_file_flip_checked" + CatFilePitVowChecked = "cat_file_pit_vow_checked" + DealChecked = "deal_checked" + DentChecked = "dent_checked" + DripDripChecked = "drip_drip_checked" + DripFileIlkChecked = "drip_file_ilk_checked" + DripFileRepoChecked = "drip_file_repo_checked" + DripFileVowChecked = "drip_file_vow_checked" + FlapKickChecked = "flap_kick_checked" + FlipKickChecked = "flip_kick_checked" + FlopKickChecked = "flop_kick_checked" + FrobChecked = "frob_checked" + PitFileDebtCeilingChecked = "pit_file_debt_ceiling_checked" + PitFileIlkChecked = "pit_file_ilk_checked" + PriceFeedsChecked = "price_feeds_checked" + TendChecked = "tend_checked" + VatFluxChecked = "vat_flux_checked" + VatFoldChecked = "vat_fold_checked" + VatGrabChecked = "vat_grab_checked" + VatHealChecked = "vat_heal_checked" + VatInitChecked = "vat_init_checked" + VatMoveChecked = "vat_move_checked" + VatSlipChecked = "vat_slip_checked" + VatTollChecked = "vat_toll_checked" + VatTuneChecked = "vat_tune_checked" + VowFlogChecked = "vow_flog_checked" ) diff --git a/pkg/transformers/shared/constants/method.go b/pkg/transformers/shared/constants/method.go index d326d3fb..c6524b37 100644 --- a/pkg/transformers/shared/constants/method.go +++ b/pkg/transformers/shared/constants/method.go @@ -2,33 +2,32 @@ package constants var ( //TODO: get cat, pit, and drip file method signatures directly from the ABI - biteMethod = GetSolidityMethodSignature(CatABI, "Bite") - catFileChopLumpMethod = "file(bytes32,bytes32,uint256)" - catFileFlipMethod = GetSolidityMethodSignature(CatABI, "file") - catFilePitVowMethod = "file(bytes32,address)" - dealMethod = GetSolidityMethodSignature(FlipperABI, "deal") - dentMethod = GetSolidityMethodSignature(FlipperABI, "dent") - dripDripMethod = GetSolidityMethodSignature(DripABI, "drip") - dripFileIlkMethod = "file(bytes32,bytes32,uint256)" - dripFileRepoMethod = GetSolidityMethodSignature(DripABI, "file") - dripFileVowMethod = "file(bytes32,bytes32)" - flapKickMethod = GetSolidityMethodSignature(FlapperABI, "Kick") - flipKickMethod = GetSolidityMethodSignature(FlipperABI, "Kick") - flopKickMethod = GetSolidityMethodSignature(FlopperABI, "Kick") - frobMethod = GetSolidityMethodSignature(PitABI, "Frob") - logValueMethod = GetSolidityMethodSignature(MedianizerABI, "LogValue") - pitFileDebtCeilingMethod = "file(bytes32,uint256)" - pitFileIlkMethod = "file(bytes32,bytes32,uint256)" - pitFileStabilityFeeMethod = GetSolidityMethodSignature(PitABI, "file") - tendMethod = GetSolidityMethodSignature(FlipperABI, "tend") - vatFluxMethod = GetSolidityMethodSignature(VatABI, "flux") - vatFoldMethod = GetSolidityMethodSignature(VatABI, "fold") - vatGrabMethod = GetSolidityMethodSignature(VatABI, "grab") - vatHealMethod = GetSolidityMethodSignature(VatABI, "heal") - vatInitMethod = GetSolidityMethodSignature(VatABI, "init") - vatMoveMethod = GetSolidityMethodSignature(VatABI, "move") - vatSlipMethod = GetSolidityMethodSignature(VatABI, "slip") - vatTollMethod = GetSolidityMethodSignature(VatABI, "toll") - vatTuneMethod = GetSolidityMethodSignature(VatABI, "tune") - vowFlogMethod = GetSolidityMethodSignature(VowABI, "flog") + biteMethod = GetSolidityMethodSignature(CatABI, "Bite") + catFileChopLumpMethod = "file(bytes32,bytes32,uint256)" + catFileFlipMethod = GetSolidityMethodSignature(CatABI, "file") + catFilePitVowMethod = "file(bytes32,address)" + dealMethod = GetSolidityMethodSignature(FlipperABI, "deal") + dentMethod = GetSolidityMethodSignature(FlipperABI, "dent") + dripDripMethod = GetSolidityMethodSignature(DripABI, "drip") + dripFileIlkMethod = "file(bytes32,bytes32,uint256)" + dripFileRepoMethod = GetSolidityMethodSignature(DripABI, "file") + dripFileVowMethod = "file(bytes32,bytes32)" + flapKickMethod = GetSolidityMethodSignature(FlapperABI, "Kick") + flipKickMethod = GetSolidityMethodSignature(FlipperABI, "Kick") + flopKickMethod = GetSolidityMethodSignature(FlopperABI, "Kick") + frobMethod = GetSolidityMethodSignature(PitABI, "Frob") + logValueMethod = GetSolidityMethodSignature(MedianizerABI, "LogValue") + pitFileDebtCeilingMethod = "file(bytes32,uint256)" + pitFileIlkMethod = "file(bytes32,bytes32,uint256)" + tendMethod = GetSolidityMethodSignature(FlipperABI, "tend") + vatFluxMethod = GetSolidityMethodSignature(VatABI, "flux") + vatFoldMethod = GetSolidityMethodSignature(VatABI, "fold") + vatGrabMethod = GetSolidityMethodSignature(VatABI, "grab") + vatHealMethod = GetSolidityMethodSignature(VatABI, "heal") + vatInitMethod = GetSolidityMethodSignature(VatABI, "init") + vatMoveMethod = GetSolidityMethodSignature(VatABI, "move") + vatSlipMethod = GetSolidityMethodSignature(VatABI, "slip") + vatTollMethod = GetSolidityMethodSignature(VatABI, "toll") + vatTuneMethod = GetSolidityMethodSignature(VatABI, "tune") + vowFlogMethod = GetSolidityMethodSignature(VowABI, "flog") ) diff --git a/pkg/transformers/shared/constants/signature.go b/pkg/transformers/shared/constants/signature.go index 597be8a3..5fb4bc97 100644 --- a/pkg/transformers/shared/constants/signature.go +++ b/pkg/transformers/shared/constants/signature.go @@ -1,33 +1,32 @@ package constants var ( - BiteSignature = GetEventSignature(biteMethod) - CatFileChopLumpSignature = GetLogNoteSignature(catFileChopLumpMethod) - CatFileFlipSignature = GetLogNoteSignature(catFileFlipMethod) - CatFilePitVowSignature = GetLogNoteSignature(catFilePitVowMethod) - DealSignature = GetLogNoteSignature(dealMethod) - DentFunctionSignature = GetLogNoteSignature(dentMethod) - DripDripSignature = GetLogNoteSignature(dripDripMethod) - DripFileIlkSignature = GetLogNoteSignature(dripFileIlkMethod) - DripFileRepoSignature = GetLogNoteSignature(dripFileRepoMethod) - DripFileVowSignature = GetLogNoteSignature(dripFileVowMethod) - FlapKickSignature = GetEventSignature(flapKickMethod) - FlipKickSignature = GetEventSignature(flipKickMethod) - FlopKickSignature = GetEventSignature(flopKickMethod) - FrobSignature = GetEventSignature(frobMethod) - LogValueSignature = GetEventSignature(logValueMethod) - PitFileDebtCeilingSignature = GetLogNoteSignature(pitFileDebtCeilingMethod) - PitFileIlkSignature = GetLogNoteSignature(pitFileIlkMethod) - PitFileStabilityFeeSignature = GetLogNoteSignature(pitFileStabilityFeeMethod) - TendFunctionSignature = GetLogNoteSignature(tendMethod) - VatFluxSignature = GetLogNoteSignature(vatFluxMethod) - VatFoldSignature = GetLogNoteSignature(vatFoldMethod) - VatGrabSignature = GetLogNoteSignature(vatGrabMethod) - VatHealSignature = GetLogNoteSignature(vatHealMethod) - VatInitSignature = GetLogNoteSignature(vatInitMethod) - VatMoveSignature = GetLogNoteSignature(vatMoveMethod) - VatSlipSignature = GetLogNoteSignature(vatSlipMethod) - VatTollSignature = GetLogNoteSignature(vatTollMethod) - VatTuneSignature = GetLogNoteSignature(vatTuneMethod) - VowFlogSignature = GetLogNoteSignature(vowFlogMethod) + BiteSignature = GetEventSignature(biteMethod) + CatFileChopLumpSignature = GetLogNoteSignature(catFileChopLumpMethod) + CatFileFlipSignature = GetLogNoteSignature(catFileFlipMethod) + CatFilePitVowSignature = GetLogNoteSignature(catFilePitVowMethod) + DealSignature = GetLogNoteSignature(dealMethod) + DentFunctionSignature = GetLogNoteSignature(dentMethod) + DripDripSignature = GetLogNoteSignature(dripDripMethod) + DripFileIlkSignature = GetLogNoteSignature(dripFileIlkMethod) + DripFileRepoSignature = GetLogNoteSignature(dripFileRepoMethod) + DripFileVowSignature = GetLogNoteSignature(dripFileVowMethod) + FlapKickSignature = GetEventSignature(flapKickMethod) + FlipKickSignature = GetEventSignature(flipKickMethod) + FlopKickSignature = GetEventSignature(flopKickMethod) + FrobSignature = GetEventSignature(frobMethod) + LogValueSignature = GetEventSignature(logValueMethod) + PitFileDebtCeilingSignature = GetLogNoteSignature(pitFileDebtCeilingMethod) + PitFileIlkSignature = GetLogNoteSignature(pitFileIlkMethod) + TendFunctionSignature = GetLogNoteSignature(tendMethod) + VatFluxSignature = GetLogNoteSignature(vatFluxMethod) + VatFoldSignature = GetLogNoteSignature(vatFoldMethod) + VatGrabSignature = GetLogNoteSignature(vatGrabMethod) + VatHealSignature = GetLogNoteSignature(vatHealMethod) + VatInitSignature = GetLogNoteSignature(vatInitMethod) + VatMoveSignature = GetLogNoteSignature(vatMoveMethod) + VatSlipSignature = GetLogNoteSignature(vatSlipMethod) + VatTollSignature = GetLogNoteSignature(vatTollMethod) + VatTuneSignature = GetLogNoteSignature(vatTuneMethod) + VowFlogSignature = GetLogNoteSignature(vowFlogMethod) ) diff --git a/pkg/transformers/test_data/pit_file.go b/pkg/transformers/test_data/pit_file.go index 01881495..3dfa8ba5 100644 --- a/pkg/transformers/test_data/pit_file.go +++ b/pkg/transformers/test_data/pit_file.go @@ -16,16 +16,15 @@ package test_data import ( "encoding/json" - "github.com/vulcanize/vulcanizedb/pkg/fakes" "math/big" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" + "github.com/vulcanize/vulcanizedb/pkg/fakes" "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/debt_ceiling" ilk2 "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/ilk" - "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee" "github.com/vulcanize/vulcanizedb/pkg/transformers/shared/constants" ) @@ -81,29 +80,3 @@ var PitFileIlkModel = ilk2.PitFileIlkModel{ TransactionIndex: EthPitFileIlkLog.TxIndex, Raw: rawPitFileIlkLog, } - -var EthPitFileStabilityFeeLog = types.Log{ - Address: common.HexToAddress("0x6b59c42097e2Fff7cad96cb08cEeFd601081aD9c"), - Topics: []common.Hash{ - common.HexToHash("0xd4e8be8300000000000000000000000000000000000000000000000000000000"), - common.HexToHash("0x00000000000000000000000064d922894153be9eef7b7218dc565d1d0ce2a092"), - common.HexToHash("0x6472697000000000000000000000000000000000000000000000000000000000"), - common.HexToHash("0x0000000000000000000000008e84a1e068d77059cbe263c43ad0cdc130863313"), - }, - Data: hexutil.MustDecode("0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000044d4e8be8364726970000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), - BlockNumber: 12, - TxHash: common.HexToHash("0x78cdc62316ccf8e31515d09745cc724f557569f01a557d0d09b1066bf7079fd2"), - TxIndex: 222, - BlockHash: fakes.FakeHash, - Index: 13, - Removed: false, -} - -var rawPitFileStabilityFeeLog, _ = json.Marshal(EthPitFileStabilityFeeLog) -var PitFileStabilityFeeModel = stability_fee.PitFileStabilityFeeModel{ - What: "drip", - Data: "0x8E84a1e068d77059Cbe263C43AD0cDc130863313", - LogIndex: EthPitFileStabilityFeeLog.Index, - TransactionIndex: EthPitFileStabilityFeeLog.TxIndex, - Raw: rawPitFileStabilityFeeLog, -} diff --git a/pkg/transformers/transformers.go b/pkg/transformers/transformers.go index b4a7c210..f79ac036 100644 --- a/pkg/transformers/transformers.go +++ b/pkg/transformers/transformers.go @@ -32,7 +32,6 @@ import ( "github.com/vulcanize/vulcanizedb/pkg/transformers/frob" "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/debt_ceiling" "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/ilk" - "github.com/vulcanize/vulcanizedb/pkg/transformers/pit_file/stability_fee" "github.com/vulcanize/vulcanizedb/pkg/transformers/price_feeds" "github.com/vulcanize/vulcanizedb/pkg/transformers/shared" "github.com/vulcanize/vulcanizedb/pkg/transformers/tend" @@ -168,13 +167,6 @@ var ( Fetcher: &shared.Fetcher{}, }.NewLogNoteTransformer - PitFileStabilityFeeTransformerInitializer = factories.LogNoteTransformer{ - Config: stability_fee.StabilityFeeFileConfig, - Converter: &stability_fee.PitFileStabilityFeeConverter{}, - Repository: &stability_fee.PitFileStabilityFeeRepository{}, - Fetcher: &shared.Fetcher{}, - }.NewLogNoteTransformer - PriceFeedTransformerInitializer = factories.LogNoteTransformer{ Config: price_feeds.PriceFeedConfig, Converter: &price_feeds.PriceFeedConverter{}, @@ -272,7 +264,6 @@ func TransformerInitializers() []shared.TransformerInitializer { FrobTransformerInitializer, PitFileDebtCeilingTransformerInitializer, PitFileIlkTransformerInitializer, - PitFileStabilityFeeTransformerInitializer, PriceFeedTransformerInitializer, TendTransformerInitializer, VatGrabTransformerInitializer, diff --git a/test_config/test_config.go b/test_config/test_config.go index 7d769223..32e3b524 100644 --- a/test_config/test_config.go +++ b/test_config/test_config.go @@ -94,7 +94,6 @@ func CleanTestDB(db *postgres.DB) { db.MustExec("DELETE FROM maker.frob") db.MustExec("DELETE FROM maker.pit_file_debt_ceiling") db.MustExec("DELETE FROM maker.pit_file_ilk") - db.MustExec("DELETE FROM maker.pit_file_stability_fee") db.MustExec("DELETE FROM maker.price_feeds") db.MustExec("DELETE FROM maker.tend") db.MustExec("DELETE FROM maker.vat_flux")