Merge pull request #266 from oasisprotocol/xz/fix-allowance-owner-f-k…

…ey-constraint Add account on new allowance owner
oasisprotocol · Jan 3, 2023 · 77fb0e5 · 77fb0e5
2 parents 3d9514f + ff998d0
commit 77fb0e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/analyzer/consensus/consensus.go b/analyzer/consensus/consensus.go
@@ -730,6 +730,7 @@ func (m *Main) queueEscrows(batch *storage.QueryBatch, data *storage.StakingData
 func (m *Main) queueAllowanceChanges(batch *storage.QueryBatch, data *storage.StakingData) error {
 	allowanceChangeDeleteQuery := m.qf.ConsensusAllowanceChangeDeleteQuery()
 	allowanceChangeUpdateQuery := m.qf.ConsensusAllowanceChangeUpdateQuery()
+	allowanceOwnerUpsertQuery := m.qf.ConsensusAllowanceOwnerUpsertQuery()
 
 	for _, allowanceChange := range data.AllowanceChanges {
 		if allowanceChange.Allowance.IsZero() {
@@ -738,6 +739,9 @@ func (m *Main) queueAllowanceChanges(batch *storage.QueryBatch, data *storage.St
 				allowanceChange.Beneficiary.String(),
 			)
 		} else {
+			// A new account with no funds can still submit allowance change transactions.
+			// Ensure account exists and satisfy `allowances->accounts` foreign key.
+			batch.Queue(allowanceOwnerUpsertQuery, allowanceChange.Owner.String())
 			batch.Queue(allowanceChangeUpdateQuery,
 				allowanceChange.Owner.String(),
 				allowanceChange.Beneficiary.String(),

diff --git a/analyzer/queries.go b/analyzer/queries.go
@@ -272,6 +272,13 @@ func (qf QueryFactory) ConsensusAllowanceChangeDeleteQuery() string {
 			WHERE owner = $1 AND beneficiary = $2`, qf.chainID)
 }
 
+func (qf QueryFactory) ConsensusAllowanceOwnerUpsertQuery() string {
+	return fmt.Sprintf(`
+		INSERT INTO %[1]s.accounts (address)
+			VALUES ($1)
+		ON CONFLICT (address) DO NOTHING`, qf.chainID)
+}
+
 func (qf QueryFactory) ConsensusAllowanceChangeUpdateQuery() string {
 	return fmt.Sprintf(`
 		INSERT INTO %s.allowances (owner, beneficiary, allowance)