(VDB-110) cat wards storage transformer by gslaughl · Pull Request #88 · sky-ecosystem/vdb-mcd-transformers

gslaughl · 2020-01-09T15:23:18Z

Transforms wards storage mapping for the Cat contract. Using usr and msg_sender of rely and deny events for key discovery.

gslaughl · 2020-01-09T15:26:01Z

db/migrations/20191219074134_create_rely.sql

    header_id  INTEGER NOT NULL REFERENCES headers (id) ON DELETE CASCADE,
    log_id     BIGINT  NOT NULL REFERENCES header_sync_logs (id) ON DELETE CASCADE,
    address_id INTEGER NOT NULL REFERENCES addresses (id) ON DELETE CASCADE,
+    msg_sender INTEGER NOT NULL REFERENCES addresses (id) ON DELETE CASCADE,


Had to make some event transformer updates, because we ended up needing the msg.sender of auth events (for all contracts besides Vat, which doesn't give us an easy way of finding msg.sender).

Heads on up these for the rebase... header_sync_logs => event_logs and addresses => public.addresses

gslaughl · 2020-01-09T15:27:07Z

db/migrations/20200102160236_create_wards_storage_table.sql

+    header_id  INTEGER NOT NULL REFERENCES headers (id) ON DELETE CASCADE,
+    address_id INTEGER NOT NULL REFERENCES addresses (id) ON DELETE CASCADE,
+    usr        INTEGER NOT NULL REFERENCES addresses (id) ON DELETE CASCADE,
+    wards      INTEGER NOT NULL,


This is a uint256 in the contract, but I figured a regular int would work here since the value can only be 0 or 1 :P

gslaughl · 2020-01-09T15:50:07Z

transformers/events/vat_auth/transformer.go

+	TableName event.TableName
+}
+
+func (t Transformer) ToModels(_ string, logs []core.HeaderSyncLog, db *postgres.DB) ([]event.InsertionModel, error) {


Ended up separating out the vat_auth event transformer, because it's looking less and less like the generic auth one. I figured since both the structure of the log and the structure of the target InsertionModel are different from the generic version, it would make sense to just let vat_auth events have their own transformer.

gslaughl · 2020-01-09T16:19:24Z

transformers/storage/repository.go

+		SELECT addresses.address
+		FROM maker.rely
+		    LEFT JOIN public.addresses ON rely.usr = addresses.id
+		WHERE rely.address_id = $1
+		UNION
+		SELECT addresses.address
+		FROM maker.rely
+		    LEFT JOIN public.addresses ON rely.msg_sender = addresses.id
+		WHERE rely.address_id = $1
+		UNION
+		SELECT addresses.address
+		FROM maker.deny
+		    LEFT JOIN public.addresses ON deny.usr = addresses.id
+		WHERE deny.address_id = $1
+		UNION
+		SELECT addresses.address
+		FROM maker.deny
+		LEFT JOIN public.addresses ON deny.msg_sender = addresses.id
+		WHERE deny.address_id = $1`, contractAddressID)


The only reason this query needs to combine more than just rely.usr and deny.usr is because we also want to find the msg_sender of the transaction that deployed the contract. Since we don't have a direct way of doing that (constructor doesn't emit an event), we have to infer it.

The msg_sender of the first rely event must be the msg_sender who deployed the contract, because at that point no one else is authorized to call rely (or any other method with the auth modifier). Technically I didn't need to UNION with all rely/deny msg_senders (just the 1st rely event's), but I figured we might as well for redundancy's sake.

Also worth noting that these tables will likely be very small, so hopefully there's no reason to worry about performance.

gslaughl · 2020-01-09T16:42:36Z

transformers/integration_tests/deny_test.go

 	Context("Cat deny events", func() {
 		usrAddress := "0x13141b8a5e4a82ebc6b636849dd6a515185d6236"
-		denyIntegrationTest(int64(14764643), test_data.CatAddress(), usrAddress, defaultOffset)
+		denyIntegrationTest(int64(14764643), test_data.CatAddress(), usrAddress, usrAddress)


Kind of weird that for all these integration tests I'm passing in usrAddress twice, but it's because I just happened to pick deny events where msg.senders are passing their own addresses in as the usr parameter. I didn't want to abstract usrAddressHex and msgSenderAddressHex (on line 59) into a single parameter, because I was worried that would imply that those 2 addresses have to be the same, which they don't.

rmulhol

yaoandrew · 2020-01-14T01:40:18Z

transformers/component_tests/cat/transformer_test.go

-		storageKeysLookup = storage.NewKeysLookup(cat.NewKeysLoader(&mcdStorage.MakerStorageRepository{}))
-		repository        = cat.CatStorageRepository{}
-		contractAddress   = "81f7aa9c1570de564eb511b3a1e57dae558c65b5"
+		contractAddress   = test_data.CatAddress()


yaoandrew · 2020-01-14T01:43:24Z

transformers/events/auth/transformer_test.go

@@ -30,41 +30,25 @@ var _ = Describe("Deny Transformer", func() {
 			test_data.RelyHeaderSyncLog.Log.Address.String())


RelyHeaderSyncLog => RelyEventLog

yaoandrew · 2020-01-14T01:47:12Z

transformers/storage/test_helpers/maker_storage_repository.go

+	repository.GetFlopBidIdsCalledWith = contractAddress
+	return repository.FlopBidIds, repository.GetFlopBidIdsError
+}
+


yaoandrew · 2020-01-14T01:50:27Z

transformers/storage/utilities/wards/repository.go

+
+var insertWardsQuery = `INSERT INTO maker.wards (diff_id, header_id, address_id, usr, wards) VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING`
+
+func InsertWards(diffID, headerID int64, metadata storage.ValueMetadata, contractAddress, wards string, db *postgres.DB) error {


Transform auth event msg.sender, separate out Vat auth transformer

Reduce wards duplication between transformers

yaoandrew · 2020-01-14T07:56:52Z

transformers/storage/repository.go

+	GetCdpis() ([]string, error)
 	GetDaiKeys() ([]string, error)
 	GetFlapBidIds(string) ([]string, error)
+	GetFlipBidIds(contractAddress string) ([]string, error)


gslaughl commented Jan 9, 2020

View reviewed changes

gslaughl requested review from elizabethengelman, m0ar, rmulhol and yaoandrew January 9, 2020 16:43

gslaughl force-pushed the vdb-1074-rely-transformer branch from eaccd13 to f78198d Compare January 9, 2020 19:51

gslaughl changed the base branch from vdb-1074-rely-transformer to staging January 10, 2020 19:27

gslaughl force-pushed the vdb-1110-cat-wards branch 2 times, most recently from f6e442c to 0b19eed Compare January 10, 2020 19:31

rmulhol approved these changes Jan 13, 2020

View reviewed changes

yaoandrew reviewed Jan 14, 2020

View reviewed changes

yaoandrew approved these changes Jan 14, 2020

View reviewed changes

Gabe Laughlin added 4 commits January 13, 2020 22:34

(VDB-1110) Add cat wards storage transformer

b2cea80

Transform auth event msg.sender, separate out Vat auth transformer

(VDB-1118) Vow wards storage transformer

200f8c9

Reduce wards duplication between transformers

(VDB-1116) Spot wards storage transformer

714376d

Fix pot pie key loader

7609e50

yaoandrew reviewed Jan 14, 2020

View reviewed changes

yaoandrew mentioned this pull request Jan 14, 2020

Pot wards vdb 1115 #90

Closed

gslaughl force-pushed the vdb-1110-cat-wards branch from c827534 to 7609e50 Compare January 14, 2020 14:50

gslaughl merged commit a2e1f1b into staging Jan 14, 2020

gslaughl deleted the vdb-1110-cat-wards branch January 14, 2020 17:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(VDB-110) cat wards storage transformer#88

(VDB-110) cat wards storage transformer#88
gslaughl merged 4 commits intostagingfrom
vdb-1110-cat-wards

gslaughl commented Jan 9, 2020

Uh oh!

gslaughl Jan 9, 2020

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

gslaughl Jan 9, 2020

Uh oh!

gslaughl Jan 9, 2020

Uh oh!

gslaughl Jan 9, 2020

Uh oh!

gslaughl Jan 9, 2020

Uh oh!

rmulhol left a comment

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

yaoandrew Jan 14, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -30,41 +30,25 @@ var _ = Describe("Deny Transformer", func() {
		test_data.RelyHeaderSyncLog.Log.Address.String())


		var insertWardsQuery = `INSERT INTO maker.wards (diff_id, header_id, address_id, usr, wards) VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING`

		func InsertWards(diffID, headerID int64, metadata storage.ValueMetadata, contractAddress, wards string, db *postgres.DB) error {

Conversation

gslaughl commented Jan 9, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rmulhol left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants