From a735698f776458256178a3cb0baff2137f07e563 Mon Sep 17 00:00:00 2001 From: Rob Mulholand Date: Tue, 18 Sep 2018 15:03:10 -0500 Subject: [PATCH] Update config for Kovan --- pkg/transformers/bite/config.go | 2 +- pkg/transformers/deal/config.go | 2 +- pkg/transformers/dent/config.go | 2 +- pkg/transformers/drip_drip/config.go | 2 +- pkg/transformers/drip_file/config.go | 2 +- pkg/transformers/flip_kick/config.go | 2 +- pkg/transformers/frob/config.go | 2 +- pkg/transformers/pit_file/config.go | 2 +- pkg/transformers/price_feeds/config.go | 2 +- pkg/transformers/shared/constants.go | 18 +++++++++--------- pkg/transformers/tend/config.go | 2 +- pkg/transformers/vat_init/config.go | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/transformers/bite/config.go b/pkg/transformers/bite/config.go index 8266d62a..4908cd0b 100644 --- a/pkg/transformers/bite/config.go +++ b/pkg/transformers/bite/config.go @@ -25,5 +25,5 @@ var BiteConfig = shared.TransformerConfig{ ContractAbi: shared.CatABI, Topics: []string{shared.BiteSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/deal/config.go b/pkg/transformers/deal/config.go index 621921b7..6764a6af 100644 --- a/pkg/transformers/deal/config.go +++ b/pkg/transformers/deal/config.go @@ -21,5 +21,5 @@ var Config = shared.TransformerConfig{ ContractAbi: shared.FlipperABI, Topics: []string{shared.DealSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/dent/config.go b/pkg/transformers/dent/config.go index cd15c67f..2b7b5a8d 100644 --- a/pkg/transformers/dent/config.go +++ b/pkg/transformers/dent/config.go @@ -21,5 +21,5 @@ var DentConfig = shared.TransformerConfig{ ContractAbi: shared.FlipperABI, Topics: []string{shared.DentFunctionSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/drip_drip/config.go b/pkg/transformers/drip_drip/config.go index 83a519ab..407910a9 100644 --- a/pkg/transformers/drip_drip/config.go +++ b/pkg/transformers/drip_drip/config.go @@ -21,5 +21,5 @@ var DripDripConfig = shared.TransformerConfig{ ContractAbi: shared.DripABI, Topics: []string{shared.DripDripSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/drip_file/config.go b/pkg/transformers/drip_file/config.go index 299ff25d..f1d2f503 100644 --- a/pkg/transformers/drip_file/config.go +++ b/pkg/transformers/drip_file/config.go @@ -21,5 +21,5 @@ var DripFileConfig = shared.TransformerConfig{ ContractAbi: shared.DripABI, Topics: []string{shared.DripFileIlkSignature, shared.DripFileRepoSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/flip_kick/config.go b/pkg/transformers/flip_kick/config.go index c5e1448f..7c20c279 100644 --- a/pkg/transformers/flip_kick/config.go +++ b/pkg/transformers/flip_kick/config.go @@ -21,5 +21,5 @@ var FlipKickConfig = shared.TransformerConfig{ ContractAbi: shared.FlipperABI, Topics: []string{shared.FlipKickSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/frob/config.go b/pkg/transformers/frob/config.go index 8c934544..d658c643 100644 --- a/pkg/transformers/frob/config.go +++ b/pkg/transformers/frob/config.go @@ -21,5 +21,5 @@ var FrobConfig = shared.TransformerConfig{ ContractAbi: shared.PitABI, Topics: []string{shared.FrobSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/pit_file/config.go b/pkg/transformers/pit_file/config.go index c596b3fb..b0509a2c 100644 --- a/pkg/transformers/pit_file/config.go +++ b/pkg/transformers/pit_file/config.go @@ -23,5 +23,5 @@ var PitFileConfig = shared.TransformerConfig{ ContractAbi: shared.PitABI, Topics: []string{shared.PitFileIlkSignature, shared.PitFileDebtCeilingSignature, shared.PitFileStabilityFeeSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/price_feeds/config.go b/pkg/transformers/price_feeds/config.go index b468d0ec..844a2431 100644 --- a/pkg/transformers/price_feeds/config.go +++ b/pkg/transformers/price_feeds/config.go @@ -31,5 +31,5 @@ var PriceFeedConfig = IPriceFeedConfig{ shared.RepContractAddress, }, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/shared/constants.go b/pkg/transformers/shared/constants.go index e7b60dee..a8ee6d4f 100644 --- a/pkg/transformers/shared/constants.go +++ b/pkg/transformers/shared/constants.go @@ -24,15 +24,15 @@ var ( 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"}]` - // temporary addresses from local Ganache deployment - CatContractAddress = "0xF56D79323fa7F82ACf0A4F88331093a77486dA7e" - DripContractAddress = "0xD4ae7420FCF54ab7cd27ab9c24DCC876eF6b64C3" - FlipperContractAddress = "0x6b59c42097e2fff7cad96cb08ceefd601081ad9c" - PepContractAddress = "0x99041F808D598B782D5a3e498681C2452A31da08" - PipContractAddress = "0x729D19f657BD0614b4985Cf1D82531c67569197B" - PitContractAddress = "0xff3f2400f1600f3f493a9a92704a29b96795af1a" - RepContractAddress = "0xF5f94b7F9De14D43112e713835BCef2d55b76c1C" - VatContractAddress = "0x239E6f0AB02713f1F8AA90ebeDeD9FC66Dc96CD6" + // temporary addresses from Kovan deployment + CatContractAddress = "0x2f34f22a00ee4b7a8f8bbc4eaee1658774c624e0" + DripContractAddress = "0x891c04639a5edcae088e546fa125b5d7fb6a2b9d" + FlipperContractAddress = "0x32d496ad866d110060866b7125981c73642cc509" // ETH FLIP Contract + PepContractAddress = "0xB1997239Cfc3d15578A3a09730f7f84A90BB4975" + PipContractAddress = "0x9FfFE440258B79c5d6604001674A4722FfC0f7Bc" + PitContractAddress = "0xe7cf3198787c9a4daac73371a38f29aaeeced87e" + RepContractAddress = "0xf88bbdc1e2718f8857f30a180076ec38d53cf296" + VatContractAddress = "0xcd726790550afcd77e9a7a47e86a3f9010af126b" //TODO: get pit and drip file method signatures directly from the ABI biteMethod = GetSolidityMethodSignature(CatABI, "Bite") diff --git a/pkg/transformers/tend/config.go b/pkg/transformers/tend/config.go index f8fcc847..1e8b8fa3 100644 --- a/pkg/transformers/tend/config.go +++ b/pkg/transformers/tend/config.go @@ -21,5 +21,5 @@ var TendConfig = shared.TransformerConfig{ ContractAbi: shared.FlipperABI, Topics: []string{shared.TendFunctionSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, } diff --git a/pkg/transformers/vat_init/config.go b/pkg/transformers/vat_init/config.go index 846032d3..11c2db4d 100644 --- a/pkg/transformers/vat_init/config.go +++ b/pkg/transformers/vat_init/config.go @@ -23,5 +23,5 @@ var VatInitConfig = shared.TransformerConfig{ ContractAbi: shared.VatABI, Topics: []string{shared.VatInitSignature}, StartingBlockNumber: 0, - EndingBlockNumber: 100, + EndingBlockNumber: 10000000, }