Skip to content

Commit 82ce8fa

Browse files
hieblmihieblmi
committed
staticaddr: expose addresses in deposit listings
Include the owning static address in every deposit RPC response and CLI listing. Users can distinguish deposits created by different receive and change addresses without reconstructing scripts externally. Update generated RPC artifacts and command replay fixtures for the new field.
1 parent f000b38 commit 82ce8fa

17 files changed

Lines changed: 159 additions & 69 deletions

‎cmd/loop/testdata/sessions/static-filters/02_loop-static-listdeposits-withdrawing.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
" \"id\": \"bb7f050df0b7c3e1fe61010e10ad45e30ddf7acd301fa6e05a2ddb825b5c2efb\",\n",
6666
" \"outpoint\": \"56cd081a3a6eadf25b7d3fe0b61207389352ed69a622d2ec28c5d669bf6a5313:0\",\n",
6767
" \"state\": \"WITHDRAWING\",\n",
68+
" \"static_address\": \"\",\n",
6869
" \"swap_hash\": \"\",\n",
6970
" \"value\": \"500000\"\n",
7071
" }\n",

‎cmd/loop/testdata/sessions/static-filters/03_loop-static-listdeposits-withdrawn.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
" \"id\": \"68262a104c9ec325de6bec37b8e31bd875bbd2f5f0b9ce2da20cf0bd636fc448\",\n",
9393
" \"outpoint\": \"edcdab8f0b1138d853a453b8b7a5ac3c694bd53ad38b7ccf062e45f99440e6e6:0\",\n",
9494
" \"state\": \"WITHDRAWN\",\n",
95+
" \"static_address\": \"\",\n",
9596
" \"swap_hash\": \"\",\n",
9697
" \"value\": \"500000\"\n",
9798
" },\n",
@@ -101,6 +102,7 @@
101102
" \"id\": \"86b5e2cdf9694c8e7398e42afde109766d7cd2142203905ba63fbd0eb1370ef3\",\n",
102103
" \"outpoint\": \"bb358e4f73ae97c4e2d99c6d64e852bba7cf56e13105b05d1200b8ae1796665e:0\",\n",
103104
" \"state\": \"WITHDRAWN\",\n",
105+
" \"static_address\": \"\",\n",
104106
" \"swap_hash\": \"\",\n",
105107
" \"value\": \"500000\"\n",
106108
" },\n",
@@ -110,6 +112,7 @@
110112
" \"id\": \"6c290f7536ea5097946afffac6a69906a26d775823ebbacedfe6f2d69c0745e4\",\n",
111113
" \"outpoint\": \"5eaa7dd7a291665393eddf5dece91feef901f22665933cce7a0732a9b81c3001:0\",\n",
112114
" \"state\": \"WITHDRAWN\",\n",
115+
" \"static_address\": \"\",\n",
113116
" \"swap_hash\": \"\",\n",
114117
" \"value\": \"500000\"\n",
115118
" },\n",
@@ -119,6 +122,7 @@
119122
" \"id\": \"0182b4d895b1c467290ae7b5c6c42ff76b2a4225807a94211c973170d5a883eb\",\n",
120123
" \"outpoint\": \"7e6360d6e6a394cfd096adf0bfe1275c5a83541eb573e90e463a78dc715f8894:0\",\n",
121124
" \"state\": \"WITHDRAWN\",\n",
125+
" \"static_address\": \"\",\n",
122126
" \"swap_hash\": \"\",\n",
123127
" \"value\": \"500000\"\n",
124128
" }\n",

‎cmd/loop/testdata/sessions/static-filters/05_loop-static-listdeposits-looped_in.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
" \"id\": \"8fbd6da2f945de2905aa7fa93860744d9387d3464484360e96e467a51de3bc9d\",\n",
6666
" \"outpoint\": \"9fa0d5dd5348794aa0541dd2729497f0907890606d044e1c4757bdc848f38df8:0\",\n",
6767
" \"state\": \"LOOPED_IN\",\n",
68+
" \"static_address\": \"\",\n",
6869
" \"swap_hash\": \"84302337424036419396ab7964dd78b85b1a481a9f1db73db5cddee57c2443e7\",\n",
6970
" \"value\": \"500000\"\n",
7071
" }\n",

‎cmd/loop/testdata/sessions/static-filters/11_loop-static-listdeposits-failed.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
" \"id\": \"68262a104c9ec325de6bec37b8e31bd875bbd2f5f0b9ce2da20cf0bd636fc448\",\n",
111111
" \"outpoint\": \"edcdab8f0b1138d853a453b8b7a5ac3c694bd53ad38b7ccf062e45f99440e6e6:0\",\n",
112112
" \"state\": \"WITHDRAWN\",\n",
113+
" \"static_address\": \"\",\n",
113114
" \"swap_hash\": \"\",\n",
114115
" \"value\": \"500000\"\n",
115116
" },\n",
@@ -119,6 +120,7 @@
119120
" \"id\": \"86b5e2cdf9694c8e7398e42afde109766d7cd2142203905ba63fbd0eb1370ef3\",\n",
120121
" \"outpoint\": \"bb358e4f73ae97c4e2d99c6d64e852bba7cf56e13105b05d1200b8ae1796665e:0\",\n",
121122
" \"state\": \"WITHDRAWN\",\n",
123+
" \"static_address\": \"\",\n",
122124
" \"swap_hash\": \"\",\n",
123125
" \"value\": \"500000\"\n",
124126
" },\n",
@@ -128,6 +130,7 @@
128130
" \"id\": \"6c290f7536ea5097946afffac6a69906a26d775823ebbacedfe6f2d69c0745e4\",\n",
129131
" \"outpoint\": \"5eaa7dd7a291665393eddf5dece91feef901f22665933cce7a0732a9b81c3001:0\",\n",
130132
" \"state\": \"WITHDRAWN\",\n",
133+
" \"static_address\": \"\",\n",
131134
" \"swap_hash\": \"\",\n",
132135
" \"value\": \"500000\"\n",
133136
" },\n",
@@ -137,6 +140,7 @@
137140
" \"id\": \"0182b4d895b1c467290ae7b5c6c42ff76b2a4225807a94211c973170d5a883eb\",\n",
138141
" \"outpoint\": \"7e6360d6e6a394cfd096adf0bfe1275c5a83541eb573e90e463a78dc715f8894:0\",\n",
139142
" \"state\": \"WITHDRAWN\",\n",
143+
" \"static_address\": \"\",\n",
140144
" \"swap_hash\": \"\",\n",
141145
" \"value\": \"500000\"\n",
142146
" },\n",
@@ -146,6 +150,7 @@
146150
" \"id\": \"8fbd6da2f945de2905aa7fa93860744d9387d3464484360e96e467a51de3bc9d\",\n",
147151
" \"outpoint\": \"9fa0d5dd5348794aa0541dd2729497f0907890606d044e1c4757bdc848f38df8:0\",\n",
148152
" \"state\": \"LOOPED_IN\",\n",
153+
" \"static_address\": \"\",\n",
149154
" \"swap_hash\": \"84302337424036419396ab7964dd78b85b1a481a9f1db73db5cddee57c2443e7\",\n",
150155
" \"value\": \"500000\"\n",
151156
" },\n",
@@ -155,6 +160,7 @@
155160
" \"id\": \"bb7f050df0b7c3e1fe61010e10ad45e30ddf7acd301fa6e05a2ddb825b5c2efb\",\n",
156161
" \"outpoint\": \"56cd081a3a6eadf25b7d3fe0b61207389352ed69a622d2ec28c5d669bf6a5313:0\",\n",
157162
" \"state\": \"WITHDRAWING\",\n",
163+
" \"static_address\": \"\",\n",
158164
" \"swap_hash\": \"\",\n",
159165
" \"value\": \"500000\"\n",
160166
" }\n",

‎cmd/loop/testdata/sessions/static-filters/14_loop-static-listdeposits-channel_published-nonempty.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
" \"id\": \"7a7cbe9b90f23d47aa92eb10a9d323f7ace6e9eaab5b77379c63422c15da19c8\",\n",
7878
" \"outpoint\": \"0e70673c1da3343648c26f779555346f30d235314838b1160826d0d5c29b4fba:1\",\n",
7979
" \"state\": \"CHANNEL_PUBLISHED\",\n",
80+
" \"static_address\": \"\",\n",
8081
" \"swap_hash\": \"\",\n",
8182
" \"value\": \"500000\"\n",
8283
" },\n",
@@ -86,6 +87,7 @@
8687
" \"id\": \"ff9a43b2082f906a2e2758934220c4ce32393eb2823b292517ae081e16daded9\",\n",
8788
" \"outpoint\": \"d2d6e50f157f0d31b8688a4af4f064edf3454714e92369b2c8c4d82477edbaca:0\",\n",
8889
" \"state\": \"CHANNEL_PUBLISHED\",\n",
90+
" \"static_address\": \"\",\n",
8991
" \"swap_hash\": \"\",\n",
9092
" \"value\": \"1000000\"\n",
9193
" }\n",

‎cmd/loop/testdata/sessions/static-loop-in/10_loop-static-listdeposits.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
" \"id\": \"ea6abbf0571c0ba82117ae9f2086614eacea8b2913dc0544b70c00de78353e71\",\n",
6262
" \"outpoint\": \"188f55042e49cfa9942cc1f8e216c5e8679a7036e9ee6449d0fcc6c6b81561be:0\",\n",
6363
" \"state\": \"DEPOSITED\",\n",
64+
" \"static_address\": \"\",\n",
6465
" \"swap_hash\": \"\",\n",
6566
" \"value\": \"2500000\"\n",
6667
" }\n",

‎cmd/loop/testdata/sessions/static-loop-in/15_loop-static-in.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
" \"id\": \"ea6abbf0571c0ba82117ae9f2086614eacea8b2913dc0544b70c00de78353e71\",\n",
229229
" \"outpoint\": \"188f55042e49cfa9942cc1f8e216c5e8679a7036e9ee6449d0fcc6c6b81561be:0\",\n",
230230
" \"state\": \"LOOPING_IN\",\n",
231+
" \"static_address\": \"\",\n",
231232
" \"swap_hash\": \"\",\n",
232233
" \"value\": \"2500000\"\n",
233234
" }\n",

‎cmd/loop/testdata/sessions/static-loop-in/18_loop-static-in-positional-payment-timeout.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
" \"id\": \"8fbd6da2f945de2905aa7fa93860744d9387d3464484360e96e467a51de3bc9d\",\n",
210210
" \"outpoint\": \"9fa0d5dd5348794aa0541dd2729497f0907890606d044e1c4757bdc848f38df8:0\",\n",
211211
" \"state\": \"LOOPING_IN\",\n",
212+
" \"static_address\": \"\",\n",
212213
" \"swap_hash\": \"\",\n",
213214
" \"value\": \"500000\"\n",
214215
" }\n",

‎cmd/loop/testdata/sessions/static-loop-in/23_loop-static-in-max-swap-fee-both.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@
244244
" \"id\": \"82771323e95dca403d966f70a88be39ef0a475ef6aa78694044ba9b87304ac63\",\n",
245245
" \"outpoint\": \"da52bf383c4fe5c684221c311fc5756ccaee211b6c6e6f5ccc159622a6039271:1\",\n",
246246
" \"state\": \"LOOPING_IN\",\n",
247+
" \"static_address\": \"\",\n",
247248
" \"swap_hash\": \"\",\n",
248249
" \"value\": \"500000\"\n",
249250
" }\n",

‎cmd/loop/testdata/sessions/static-loop-in/24_loop-static-in-max-swap-fee-sat-success.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
" \"id\": \"d8a58536d8472873b9e2e1657468328360fda0b94231cfc5e29900cab735da84\",\n",
236236
" \"outpoint\": \"f2280f0f086273be73bde92fd9b982208338a5ecebbe93b83b00c77c4d2f8d1b:0\",\n",
237237
" \"state\": \"LOOPING_IN\",\n",
238+
" \"static_address\": \"\",\n",
238239
" \"swap_hash\": \"\",\n",
239240
" \"value\": \"550000\"\n",
240241
" }\n",

0 commit comments

Comments
 (0)