loopdb: load static address params as part of deposits

Author: hieblmi

loopd/swapclient_server_test.go

@@ -921,6 +921,12 @@ func (s *mockAddressStore) GetStaticAddress(_ context.Context, _ []byte) (
 	return s.params[0], nil
 }
 
+func (s *mockAddressStore) GetStaticAddressID(_ context.Context,
+	_ []byte) (int32, error) {
+
+	return 1, nil
+}
+
 func (s *mockAddressStore) GetAllStaticAddresses(_ context.Context) (
 	[]*address.Parameters, error) {
 

loopdb/sqlc/querier.go

@@ -7,7 +7,9 @@ INSERT INTO deposits (
     confirmation_height,
     timeout_sweep_pk_script,
     expiry_sweep_txid,
-    finalized_withdrawal_tx
+    finalized_withdrawal_tx,
+                      static_address_id
+
 ) VALUES (
              $1,
              $2,
@@ -16,7 +18,8 @@ INSERT INTO deposits (
              $5,
              $6,
              $7,
-             $8
+             $8,
+             $9
          );
 
 -- name: UpdateDeposit :exec
@@ -43,29 +46,52 @@ INSERT INTO deposit_updates (
 
 -- name: GetDeposit :one
 SELECT
-    *
-FROM
-    deposits
+    d.*,
+    sa.client_pubkey     client_pubkey,
+    sa.server_pubkey     server_pubkey,
+    sa.expiry            expiry,
+    sa.client_key_family client_key_family,
+    sa.client_key_index  client_key_index,
+    sa.pkscript          pkscript,
+    sa.protocol_version  protocol_version,
+    sa.initiation_height initiation_height
+FROM deposits d
+         LEFT JOIN static_addresses sa ON sa.id = d.static_address_id
 WHERE
     deposit_id = $1;
 
 -- name: DepositForOutpoint :one
 SELECT
-    *
-FROM
-    deposits
+    d.*,
+    sa.client_pubkey     client_pubkey,
+    sa.server_pubkey     server_pubkey,
+    sa.expiry            expiry,
+    sa.client_key_family client_key_family,
+    sa.client_key_index  client_key_index,
+    sa.pkscript          pkscript,
+    sa.protocol_version  protocol_version,
+    sa.initiation_height initiation_height
+FROM deposits d
+         LEFT JOIN static_addresses sa ON sa.id = d.static_address_id
 WHERE
     tx_hash = $1
 AND
     out_index = $2;
 
 -- name: AllDeposits :many
 SELECT
-    *
-FROM
-    deposits
-ORDER BY
-    id ASC;
+    d.*,
+    sa.client_pubkey     client_pubkey,
+    sa.server_pubkey     server_pubkey,
+    sa.expiry            expiry,
+    sa.client_key_family client_key_family,
+    sa.client_key_index  client_key_index,
+    sa.pkscript          pkscript,
+    sa.protocol_version  protocol_version,
+    sa.initiation_height initiation_height
+FROM deposits d
+         LEFT JOIN static_addresses sa ON sa.id = d.static_address_id
+ORDER BY d.id ASC;
 
 -- name: GetLatestDepositUpdate :one
 SELECT

loopdb/sqlc/queries/static_address_deposits.sql

@@ -121,10 +121,19 @@ WHERE
 -- name: DepositsForSwapHash :many
 SELECT
     d.*,
+    sa.client_pubkey     client_pubkey,
+    sa.server_pubkey     server_pubkey,
+    sa.expiry            expiry,
+    sa.client_key_family client_key_family,
+    sa.client_key_index  client_key_index,
+    sa.pkscript          pkscript,
+    sa.protocol_version  protocol_version,
+    sa.initiation_height initiation_height,
     u.update_state,
     u.update_timestamp
 FROM
     deposits d
+        LEFT JOIN static_addresses sa ON sa.id = d.static_address_id
         LEFT JOIN
     deposit_updates u ON u.id = (
         SELECT id