@glamsystems/glam-sdk 1.0.14-alpha.2 → 1.0.14-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.cjs.js +580 -518
- package/index.esm.js +580 -518
- package/package.json +1 -1
- package/src/client/bridge.d.ts +45 -44
- package/src/client/jupiter.d.ts +4 -1
- package/src/client/price.d.ts +3 -1
- package/src/models/state.d.ts +2 -0
- package/target/types/ext_bridge.d.ts +427 -442
package/index.cjs.js
CHANGED
|
@@ -18838,37 +18838,6 @@ var instructions$8 = [
|
|
|
18838
18838
|
}
|
|
18839
18839
|
]
|
|
18840
18840
|
},
|
|
18841
|
-
{
|
|
18842
|
-
name: "cleanup_transfer_record",
|
|
18843
|
-
docs: [
|
|
18844
|
-
"Closes a finalized transfer record and returns its rent."
|
|
18845
|
-
],
|
|
18846
|
-
discriminator: [
|
|
18847
|
-
65,
|
|
18848
|
-
224,
|
|
18849
|
-
219,
|
|
18850
|
-
143,
|
|
18851
|
-
99,
|
|
18852
|
-
204,
|
|
18853
|
-
215,
|
|
18854
|
-
6
|
|
18855
|
-
],
|
|
18856
|
-
accounts: [
|
|
18857
|
-
{
|
|
18858
|
-
name: "glam_state"
|
|
18859
|
-
},
|
|
18860
|
-
{
|
|
18861
|
-
name: "glam_signer",
|
|
18862
|
-
writable: true,
|
|
18863
|
-
signer: true
|
|
18864
|
-
},
|
|
18865
|
-
{
|
|
18866
|
-
name: "transfer_record",
|
|
18867
|
-
writable: true
|
|
18868
|
-
}
|
|
18869
|
-
],
|
|
18870
|
-
args: []
|
|
18871
|
-
},
|
|
18872
18841
|
{
|
|
18873
18842
|
name: "commit_oft_transfer",
|
|
18874
18843
|
docs: [
|
|
@@ -18920,39 +18889,6 @@ var instructions$8 = [
|
|
|
18920
18889
|
writable: true,
|
|
18921
18890
|
signer: true
|
|
18922
18891
|
},
|
|
18923
|
-
{
|
|
18924
|
-
name: "integration_authority",
|
|
18925
|
-
pda: {
|
|
18926
|
-
seeds: [
|
|
18927
|
-
{
|
|
18928
|
-
kind: "const",
|
|
18929
|
-
value: [
|
|
18930
|
-
105,
|
|
18931
|
-
110,
|
|
18932
|
-
116,
|
|
18933
|
-
101,
|
|
18934
|
-
103,
|
|
18935
|
-
114,
|
|
18936
|
-
97,
|
|
18937
|
-
116,
|
|
18938
|
-
105,
|
|
18939
|
-
111,
|
|
18940
|
-
110,
|
|
18941
|
-
45,
|
|
18942
|
-
97,
|
|
18943
|
-
117,
|
|
18944
|
-
116,
|
|
18945
|
-
104,
|
|
18946
|
-
111,
|
|
18947
|
-
114,
|
|
18948
|
-
105,
|
|
18949
|
-
116,
|
|
18950
|
-
121
|
|
18951
|
-
]
|
|
18952
|
-
}
|
|
18953
|
-
]
|
|
18954
|
-
}
|
|
18955
|
-
},
|
|
18956
18892
|
{
|
|
18957
18893
|
name: "cpi_program"
|
|
18958
18894
|
},
|
|
@@ -18960,10 +18896,6 @@ var instructions$8 = [
|
|
|
18960
18896
|
name: "glam_protocol_program",
|
|
18961
18897
|
address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
|
|
18962
18898
|
},
|
|
18963
|
-
{
|
|
18964
|
-
name: "system_program",
|
|
18965
|
-
address: "11111111111111111111111111111111"
|
|
18966
|
-
},
|
|
18967
18899
|
{
|
|
18968
18900
|
name: "instructions",
|
|
18969
18901
|
address: "Sysvar1nstructions1111111111111111111111111"
|
|
@@ -19036,58 +18968,52 @@ var instructions$8 = [
|
|
|
19036
18968
|
}
|
|
19037
18969
|
},
|
|
19038
18970
|
{
|
|
19039
|
-
name: "
|
|
19040
|
-
writable: true
|
|
18971
|
+
name: "source_token_account",
|
|
18972
|
+
writable: true
|
|
18973
|
+
},
|
|
18974
|
+
{
|
|
18975
|
+
name: "source_mint"
|
|
18976
|
+
},
|
|
18977
|
+
{
|
|
18978
|
+
name: "auxiliary_token_account",
|
|
18979
|
+
writable: true
|
|
18980
|
+
},
|
|
18981
|
+
{
|
|
18982
|
+
name: "integration_authority",
|
|
19041
18983
|
pda: {
|
|
19042
18984
|
seeds: [
|
|
19043
18985
|
{
|
|
19044
18986
|
kind: "const",
|
|
19045
18987
|
value: [
|
|
19046
|
-
98,
|
|
19047
|
-
114,
|
|
19048
18988
|
105,
|
|
19049
|
-
|
|
19050
|
-
103,
|
|
19051
|
-
101,
|
|
19052
|
-
45,
|
|
18989
|
+
110,
|
|
19053
18990
|
116,
|
|
18991
|
+
101,
|
|
18992
|
+
103,
|
|
19054
18993
|
114,
|
|
19055
18994
|
97,
|
|
18995
|
+
116,
|
|
18996
|
+
105,
|
|
18997
|
+
111,
|
|
19056
18998
|
110,
|
|
19057
|
-
115,
|
|
19058
|
-
102,
|
|
19059
|
-
101,
|
|
19060
|
-
114,
|
|
19061
18999
|
45,
|
|
19062
|
-
|
|
19063
|
-
|
|
19064
|
-
|
|
19000
|
+
97,
|
|
19001
|
+
117,
|
|
19002
|
+
116,
|
|
19003
|
+
104,
|
|
19065
19004
|
111,
|
|
19066
19005
|
114,
|
|
19067
|
-
|
|
19006
|
+
105,
|
|
19007
|
+
116,
|
|
19008
|
+
121
|
|
19068
19009
|
]
|
|
19069
|
-
},
|
|
19070
|
-
{
|
|
19071
|
-
kind: "account",
|
|
19072
|
-
path: "glam_state"
|
|
19073
|
-
},
|
|
19074
|
-
{
|
|
19075
|
-
kind: "arg",
|
|
19076
|
-
path: "args.transfer_id"
|
|
19077
19010
|
}
|
|
19078
19011
|
]
|
|
19079
19012
|
}
|
|
19080
19013
|
},
|
|
19081
19014
|
{
|
|
19082
|
-
name: "
|
|
19083
|
-
|
|
19084
|
-
},
|
|
19085
|
-
{
|
|
19086
|
-
name: "source_mint"
|
|
19087
|
-
},
|
|
19088
|
-
{
|
|
19089
|
-
name: "auxiliary_token_account",
|
|
19090
|
-
writable: true
|
|
19015
|
+
name: "system_program",
|
|
19016
|
+
address: "11111111111111111111111111111111"
|
|
19091
19017
|
}
|
|
19092
19018
|
],
|
|
19093
19019
|
args: [
|
|
@@ -19139,141 +19065,6 @@ var instructions$8 = [
|
|
|
19139
19065
|
}
|
|
19140
19066
|
]
|
|
19141
19067
|
},
|
|
19142
|
-
{
|
|
19143
|
-
name: "fail_or_cancel_managed_transfer",
|
|
19144
|
-
docs: [
|
|
19145
|
-
"Marks a managed inflight transfer as failed or cancelled."
|
|
19146
|
-
],
|
|
19147
|
-
discriminator: [
|
|
19148
|
-
39,
|
|
19149
|
-
37,
|
|
19150
|
-
213,
|
|
19151
|
-
118,
|
|
19152
|
-
191,
|
|
19153
|
-
18,
|
|
19154
|
-
194,
|
|
19155
|
-
119
|
|
19156
|
-
],
|
|
19157
|
-
accounts: [
|
|
19158
|
-
{
|
|
19159
|
-
name: "glam_state",
|
|
19160
|
-
writable: true
|
|
19161
|
-
},
|
|
19162
|
-
{
|
|
19163
|
-
name: "glam_vault",
|
|
19164
|
-
writable: true,
|
|
19165
|
-
pda: {
|
|
19166
|
-
seeds: [
|
|
19167
|
-
{
|
|
19168
|
-
kind: "const",
|
|
19169
|
-
value: [
|
|
19170
|
-
118,
|
|
19171
|
-
97,
|
|
19172
|
-
117,
|
|
19173
|
-
108,
|
|
19174
|
-
116
|
|
19175
|
-
]
|
|
19176
|
-
},
|
|
19177
|
-
{
|
|
19178
|
-
kind: "account",
|
|
19179
|
-
path: "glam_state"
|
|
19180
|
-
}
|
|
19181
|
-
],
|
|
19182
|
-
program: {
|
|
19183
|
-
kind: "account",
|
|
19184
|
-
path: "glam_protocol_program"
|
|
19185
|
-
}
|
|
19186
|
-
}
|
|
19187
|
-
},
|
|
19188
|
-
{
|
|
19189
|
-
name: "glam_signer",
|
|
19190
|
-
signer: true
|
|
19191
|
-
},
|
|
19192
|
-
{
|
|
19193
|
-
name: "integration_authority",
|
|
19194
|
-
pda: {
|
|
19195
|
-
seeds: [
|
|
19196
|
-
{
|
|
19197
|
-
kind: "const",
|
|
19198
|
-
value: [
|
|
19199
|
-
105,
|
|
19200
|
-
110,
|
|
19201
|
-
116,
|
|
19202
|
-
101,
|
|
19203
|
-
103,
|
|
19204
|
-
114,
|
|
19205
|
-
97,
|
|
19206
|
-
116,
|
|
19207
|
-
105,
|
|
19208
|
-
111,
|
|
19209
|
-
110,
|
|
19210
|
-
45,
|
|
19211
|
-
97,
|
|
19212
|
-
117,
|
|
19213
|
-
116,
|
|
19214
|
-
104,
|
|
19215
|
-
111,
|
|
19216
|
-
114,
|
|
19217
|
-
105,
|
|
19218
|
-
116,
|
|
19219
|
-
121
|
|
19220
|
-
]
|
|
19221
|
-
}
|
|
19222
|
-
]
|
|
19223
|
-
}
|
|
19224
|
-
},
|
|
19225
|
-
{
|
|
19226
|
-
name: "glam_protocol_program",
|
|
19227
|
-
address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
|
|
19228
|
-
},
|
|
19229
|
-
{
|
|
19230
|
-
name: "system_program",
|
|
19231
|
-
address: "11111111111111111111111111111111"
|
|
19232
|
-
},
|
|
19233
|
-
{
|
|
19234
|
-
name: "bridge_registry",
|
|
19235
|
-
writable: true,
|
|
19236
|
-
pda: {
|
|
19237
|
-
seeds: [
|
|
19238
|
-
{
|
|
19239
|
-
kind: "const",
|
|
19240
|
-
value: [
|
|
19241
|
-
98,
|
|
19242
|
-
114,
|
|
19243
|
-
105,
|
|
19244
|
-
100,
|
|
19245
|
-
103,
|
|
19246
|
-
101,
|
|
19247
|
-
45,
|
|
19248
|
-
114,
|
|
19249
|
-
101,
|
|
19250
|
-
103,
|
|
19251
|
-
105,
|
|
19252
|
-
115,
|
|
19253
|
-
116,
|
|
19254
|
-
114,
|
|
19255
|
-
121
|
|
19256
|
-
]
|
|
19257
|
-
},
|
|
19258
|
-
{
|
|
19259
|
-
kind: "account",
|
|
19260
|
-
path: "glam_state"
|
|
19261
|
-
}
|
|
19262
|
-
]
|
|
19263
|
-
}
|
|
19264
|
-
},
|
|
19265
|
-
{
|
|
19266
|
-
name: "transfer_record",
|
|
19267
|
-
writable: true
|
|
19268
|
-
}
|
|
19269
|
-
],
|
|
19270
|
-
args: [
|
|
19271
|
-
{
|
|
19272
|
-
name: "failure_reason",
|
|
19273
|
-
type: "u8"
|
|
19274
|
-
}
|
|
19275
|
-
]
|
|
19276
|
-
},
|
|
19277
19068
|
{
|
|
19278
19069
|
name: "prepare_oft_transfer",
|
|
19279
19070
|
docs: [
|
|
@@ -19464,19 +19255,19 @@ var instructions$8 = [
|
|
|
19464
19255
|
]
|
|
19465
19256
|
},
|
|
19466
19257
|
{
|
|
19467
|
-
name: "
|
|
19258
|
+
name: "price_managed_transfers",
|
|
19468
19259
|
docs: [
|
|
19469
|
-
"
|
|
19260
|
+
"Prices managed inflight transfers and publishes aggregated amount."
|
|
19470
19261
|
],
|
|
19471
19262
|
discriminator: [
|
|
19472
|
-
|
|
19473
|
-
|
|
19474
|
-
|
|
19475
|
-
|
|
19476
|
-
|
|
19477
|
-
|
|
19478
|
-
|
|
19479
|
-
|
|
19263
|
+
77,
|
|
19264
|
+
76,
|
|
19265
|
+
20,
|
|
19266
|
+
48,
|
|
19267
|
+
41,
|
|
19268
|
+
168,
|
|
19269
|
+
205,
|
|
19270
|
+
81
|
|
19480
19271
|
],
|
|
19481
19272
|
accounts: [
|
|
19482
19273
|
{
|
|
@@ -19484,35 +19275,36 @@ var instructions$8 = [
|
|
|
19484
19275
|
writable: true
|
|
19485
19276
|
},
|
|
19486
19277
|
{
|
|
19487
|
-
name: "
|
|
19488
|
-
writable: true,
|
|
19278
|
+
name: "bridge_registry",
|
|
19489
19279
|
pda: {
|
|
19490
19280
|
seeds: [
|
|
19491
19281
|
{
|
|
19492
19282
|
kind: "const",
|
|
19493
19283
|
value: [
|
|
19494
|
-
|
|
19495
|
-
|
|
19496
|
-
|
|
19497
|
-
|
|
19498
|
-
|
|
19284
|
+
98,
|
|
19285
|
+
114,
|
|
19286
|
+
105,
|
|
19287
|
+
100,
|
|
19288
|
+
103,
|
|
19289
|
+
101,
|
|
19290
|
+
45,
|
|
19291
|
+
114,
|
|
19292
|
+
101,
|
|
19293
|
+
103,
|
|
19294
|
+
105,
|
|
19295
|
+
115,
|
|
19296
|
+
116,
|
|
19297
|
+
114,
|
|
19298
|
+
121
|
|
19499
19299
|
]
|
|
19500
19300
|
},
|
|
19501
19301
|
{
|
|
19502
19302
|
kind: "account",
|
|
19503
19303
|
path: "glam_state"
|
|
19504
19304
|
}
|
|
19505
|
-
]
|
|
19506
|
-
program: {
|
|
19507
|
-
kind: "account",
|
|
19508
|
-
path: "glam_protocol_program"
|
|
19509
|
-
}
|
|
19305
|
+
]
|
|
19510
19306
|
}
|
|
19511
19307
|
},
|
|
19512
|
-
{
|
|
19513
|
-
name: "glam_signer",
|
|
19514
|
-
signer: true
|
|
19515
|
-
},
|
|
19516
19308
|
{
|
|
19517
19309
|
name: "integration_authority",
|
|
19518
19310
|
pda: {
|
|
@@ -19551,44 +19343,69 @@ var instructions$8 = [
|
|
|
19551
19343
|
address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
|
|
19552
19344
|
},
|
|
19553
19345
|
{
|
|
19554
|
-
name: "
|
|
19555
|
-
address: "11111111111111111111111111111111"
|
|
19556
|
-
},
|
|
19557
|
-
{
|
|
19558
|
-
name: "bridge_registry",
|
|
19559
|
-
writable: true,
|
|
19346
|
+
name: "glam_config",
|
|
19560
19347
|
pda: {
|
|
19561
19348
|
seeds: [
|
|
19562
19349
|
{
|
|
19563
19350
|
kind: "const",
|
|
19564
19351
|
value: [
|
|
19565
|
-
98,
|
|
19566
|
-
114,
|
|
19567
|
-
105,
|
|
19568
|
-
100,
|
|
19569
19352
|
103,
|
|
19570
|
-
|
|
19353
|
+
108,
|
|
19354
|
+
111,
|
|
19355
|
+
98,
|
|
19356
|
+
97,
|
|
19357
|
+
108,
|
|
19571
19358
|
45,
|
|
19572
|
-
|
|
19573
|
-
|
|
19574
|
-
|
|
19359
|
+
99,
|
|
19360
|
+
111,
|
|
19361
|
+
110,
|
|
19362
|
+
102,
|
|
19575
19363
|
105,
|
|
19576
|
-
|
|
19577
|
-
116,
|
|
19578
|
-
114,
|
|
19579
|
-
121
|
|
19364
|
+
103
|
|
19580
19365
|
]
|
|
19581
|
-
},
|
|
19582
|
-
{
|
|
19583
|
-
kind: "account",
|
|
19584
|
-
path: "glam_state"
|
|
19585
19366
|
}
|
|
19586
|
-
]
|
|
19367
|
+
],
|
|
19368
|
+
program: {
|
|
19369
|
+
kind: "const",
|
|
19370
|
+
value: [
|
|
19371
|
+
10,
|
|
19372
|
+
11,
|
|
19373
|
+
0,
|
|
19374
|
+
83,
|
|
19375
|
+
72,
|
|
19376
|
+
16,
|
|
19377
|
+
46,
|
|
19378
|
+
144,
|
|
19379
|
+
46,
|
|
19380
|
+
42,
|
|
19381
|
+
79,
|
|
19382
|
+
22,
|
|
19383
|
+
157,
|
|
19384
|
+
123,
|
|
19385
|
+
21,
|
|
19386
|
+
242,
|
|
19387
|
+
192,
|
|
19388
|
+
146,
|
|
19389
|
+
1,
|
|
19390
|
+
78,
|
|
19391
|
+
88,
|
|
19392
|
+
59,
|
|
19393
|
+
102,
|
|
19394
|
+
9,
|
|
19395
|
+
190,
|
|
19396
|
+
226,
|
|
19397
|
+
92,
|
|
19398
|
+
189,
|
|
19399
|
+
187,
|
|
19400
|
+
232,
|
|
19401
|
+
83,
|
|
19402
|
+
220
|
|
19403
|
+
]
|
|
19404
|
+
}
|
|
19587
19405
|
}
|
|
19588
19406
|
},
|
|
19589
19407
|
{
|
|
19590
|
-
name: "
|
|
19591
|
-
writable: true
|
|
19408
|
+
name: "base_asset_oracle"
|
|
19592
19409
|
}
|
|
19593
19410
|
],
|
|
19594
19411
|
args: []
|
|
@@ -19596,7 +19413,7 @@ var instructions$8 = [
|
|
|
19596
19413
|
{
|
|
19597
19414
|
name: "settle_managed_transfer",
|
|
19598
19415
|
docs: [
|
|
19599
|
-
"
|
|
19416
|
+
"Settles a managed inflight transfer and removes it from the registry."
|
|
19600
19417
|
],
|
|
19601
19418
|
discriminator: [
|
|
19602
19419
|
197,
|
|
@@ -19610,18 +19427,124 @@ var instructions$8 = [
|
|
|
19610
19427
|
],
|
|
19611
19428
|
accounts: [
|
|
19612
19429
|
{
|
|
19613
|
-
name: "glam_state"
|
|
19430
|
+
name: "glam_state",
|
|
19431
|
+
writable: true
|
|
19432
|
+
},
|
|
19433
|
+
{
|
|
19434
|
+
name: "glam_vault",
|
|
19435
|
+
writable: true,
|
|
19436
|
+
pda: {
|
|
19437
|
+
seeds: [
|
|
19438
|
+
{
|
|
19439
|
+
kind: "const",
|
|
19440
|
+
value: [
|
|
19441
|
+
118,
|
|
19442
|
+
97,
|
|
19443
|
+
117,
|
|
19444
|
+
108,
|
|
19445
|
+
116
|
|
19446
|
+
]
|
|
19447
|
+
},
|
|
19448
|
+
{
|
|
19449
|
+
kind: "account",
|
|
19450
|
+
path: "glam_state"
|
|
19451
|
+
}
|
|
19452
|
+
],
|
|
19453
|
+
program: {
|
|
19454
|
+
kind: "account",
|
|
19455
|
+
path: "glam_protocol_program"
|
|
19456
|
+
}
|
|
19457
|
+
}
|
|
19614
19458
|
},
|
|
19615
19459
|
{
|
|
19616
19460
|
name: "glam_signer",
|
|
19461
|
+
writable: true,
|
|
19617
19462
|
signer: true
|
|
19618
19463
|
},
|
|
19619
19464
|
{
|
|
19620
|
-
name: "
|
|
19621
|
-
|
|
19465
|
+
name: "glam_protocol_program",
|
|
19466
|
+
address: "GLAMpaME8wdTEzxtiYEAa5yD8fZbxZiz2hNtV58RZiEz"
|
|
19467
|
+
},
|
|
19468
|
+
{
|
|
19469
|
+
name: "bridge_registry",
|
|
19470
|
+
writable: true,
|
|
19471
|
+
pda: {
|
|
19472
|
+
seeds: [
|
|
19473
|
+
{
|
|
19474
|
+
kind: "const",
|
|
19475
|
+
value: [
|
|
19476
|
+
98,
|
|
19477
|
+
114,
|
|
19478
|
+
105,
|
|
19479
|
+
100,
|
|
19480
|
+
103,
|
|
19481
|
+
101,
|
|
19482
|
+
45,
|
|
19483
|
+
114,
|
|
19484
|
+
101,
|
|
19485
|
+
103,
|
|
19486
|
+
105,
|
|
19487
|
+
115,
|
|
19488
|
+
116,
|
|
19489
|
+
114,
|
|
19490
|
+
121
|
|
19491
|
+
]
|
|
19492
|
+
},
|
|
19493
|
+
{
|
|
19494
|
+
kind: "account",
|
|
19495
|
+
path: "glam_state"
|
|
19496
|
+
}
|
|
19497
|
+
]
|
|
19498
|
+
}
|
|
19499
|
+
},
|
|
19500
|
+
{
|
|
19501
|
+
name: "integration_authority",
|
|
19502
|
+
pda: {
|
|
19503
|
+
seeds: [
|
|
19504
|
+
{
|
|
19505
|
+
kind: "const",
|
|
19506
|
+
value: [
|
|
19507
|
+
105,
|
|
19508
|
+
110,
|
|
19509
|
+
116,
|
|
19510
|
+
101,
|
|
19511
|
+
103,
|
|
19512
|
+
114,
|
|
19513
|
+
97,
|
|
19514
|
+
116,
|
|
19515
|
+
105,
|
|
19516
|
+
111,
|
|
19517
|
+
110,
|
|
19518
|
+
45,
|
|
19519
|
+
97,
|
|
19520
|
+
117,
|
|
19521
|
+
116,
|
|
19522
|
+
104,
|
|
19523
|
+
111,
|
|
19524
|
+
114,
|
|
19525
|
+
105,
|
|
19526
|
+
116,
|
|
19527
|
+
121
|
|
19528
|
+
]
|
|
19529
|
+
}
|
|
19530
|
+
]
|
|
19531
|
+
}
|
|
19532
|
+
},
|
|
19533
|
+
{
|
|
19534
|
+
name: "system_program",
|
|
19535
|
+
address: "11111111111111111111111111111111"
|
|
19622
19536
|
}
|
|
19623
19537
|
],
|
|
19624
|
-
args: [
|
|
19538
|
+
args: [
|
|
19539
|
+
{
|
|
19540
|
+
name: "args",
|
|
19541
|
+
type: {
|
|
19542
|
+
defined: {
|
|
19543
|
+
name: "SettleManagedTransferArgs"
|
|
19544
|
+
}
|
|
19545
|
+
}
|
|
19546
|
+
}
|
|
19547
|
+
]
|
|
19625
19548
|
},
|
|
19626
19549
|
{
|
|
19627
19550
|
name: "update_layerzero_oft_route",
|
|
@@ -19660,6 +19583,74 @@ var instructions$8 = [
|
|
|
19660
19583
|
}
|
|
19661
19584
|
}
|
|
19662
19585
|
]
|
|
19586
|
+
},
|
|
19587
|
+
{
|
|
19588
|
+
name: "validate_managed_transfer",
|
|
19589
|
+
docs: [
|
|
19590
|
+
"Validates a managed inflight transfer so that it becomes priceable."
|
|
19591
|
+
],
|
|
19592
|
+
discriminator: [
|
|
19593
|
+
47,
|
|
19594
|
+
86,
|
|
19595
|
+
129,
|
|
19596
|
+
235,
|
|
19597
|
+
30,
|
|
19598
|
+
249,
|
|
19599
|
+
248,
|
|
19600
|
+
42
|
|
19601
|
+
],
|
|
19602
|
+
accounts: [
|
|
19603
|
+
{
|
|
19604
|
+
name: "glam_state",
|
|
19605
|
+
writable: true
|
|
19606
|
+
},
|
|
19607
|
+
{
|
|
19608
|
+
name: "glam_signer",
|
|
19609
|
+
signer: true
|
|
19610
|
+
},
|
|
19611
|
+
{
|
|
19612
|
+
name: "bridge_registry",
|
|
19613
|
+
writable: true,
|
|
19614
|
+
pda: {
|
|
19615
|
+
seeds: [
|
|
19616
|
+
{
|
|
19617
|
+
kind: "const",
|
|
19618
|
+
value: [
|
|
19619
|
+
98,
|
|
19620
|
+
114,
|
|
19621
|
+
105,
|
|
19622
|
+
100,
|
|
19623
|
+
103,
|
|
19624
|
+
101,
|
|
19625
|
+
45,
|
|
19626
|
+
114,
|
|
19627
|
+
101,
|
|
19628
|
+
103,
|
|
19629
|
+
105,
|
|
19630
|
+
115,
|
|
19631
|
+
116,
|
|
19632
|
+
114,
|
|
19633
|
+
121
|
|
19634
|
+
]
|
|
19635
|
+
},
|
|
19636
|
+
{
|
|
19637
|
+
kind: "account",
|
|
19638
|
+
path: "glam_state"
|
|
19639
|
+
}
|
|
19640
|
+
]
|
|
19641
|
+
}
|
|
19642
|
+
}
|
|
19643
|
+
],
|
|
19644
|
+
args: [
|
|
19645
|
+
{
|
|
19646
|
+
name: "args",
|
|
19647
|
+
type: {
|
|
19648
|
+
defined: {
|
|
19649
|
+
name: "ValidateManagedTransferArgs"
|
|
19650
|
+
}
|
|
19651
|
+
}
|
|
19652
|
+
}
|
|
19653
|
+
]
|
|
19663
19654
|
}
|
|
19664
19655
|
];
|
|
19665
19656
|
var accounts$8 = [
|
|
@@ -19689,19 +19680,6 @@ var accounts$8 = [
|
|
|
19689
19680
|
184
|
|
19690
19681
|
]
|
|
19691
19682
|
},
|
|
19692
|
-
{
|
|
19693
|
-
name: "BridgeTransferRecord",
|
|
19694
|
-
discriminator: [
|
|
19695
|
-
46,
|
|
19696
|
-
131,
|
|
19697
|
-
253,
|
|
19698
|
-
32,
|
|
19699
|
-
218,
|
|
19700
|
-
137,
|
|
19701
|
-
45,
|
|
19702
|
-
96
|
|
19703
|
-
]
|
|
19704
|
-
},
|
|
19705
19683
|
{
|
|
19706
19684
|
name: "StateAccount",
|
|
19707
19685
|
discriminator: [
|
|
@@ -19821,6 +19799,26 @@ var errors$2 = [
|
|
|
19821
19799
|
code: 6020,
|
|
19822
19800
|
name: "InvalidOftAuxiliaryBalance",
|
|
19823
19801
|
msg: "The OFT auxiliary token balance did not change as expected"
|
|
19802
|
+
},
|
|
19803
|
+
{
|
|
19804
|
+
code: 6021,
|
|
19805
|
+
name: "InvalidRemainingAccounts",
|
|
19806
|
+
msg: "The remaining accounts are invalid"
|
|
19807
|
+
},
|
|
19808
|
+
{
|
|
19809
|
+
code: 6022,
|
|
19810
|
+
name: "DuplicateTransferRecord",
|
|
19811
|
+
msg: "Duplicate transfer record found"
|
|
19812
|
+
},
|
|
19813
|
+
{
|
|
19814
|
+
code: 6023,
|
|
19815
|
+
name: "TooManyManagedTransfers",
|
|
19816
|
+
msg: "Too many managed transfers are inflight for this vault"
|
|
19817
|
+
},
|
|
19818
|
+
{
|
|
19819
|
+
code: 6024,
|
|
19820
|
+
name: "InvalidBridgeRegistry",
|
|
19821
|
+
msg: "The bridge registry does not belong to this vault"
|
|
19824
19822
|
}
|
|
19825
19823
|
];
|
|
19826
19824
|
var types$8 = [
|
|
@@ -19885,61 +19883,24 @@ var types$8 = [
|
|
|
19885
19883
|
}
|
|
19886
19884
|
},
|
|
19887
19885
|
{
|
|
19888
|
-
name: "
|
|
19889
|
-
|
|
19890
|
-
|
|
19891
|
-
|
|
19892
|
-
|
|
19893
|
-
name: "glam_state",
|
|
19894
|
-
type: "pubkey"
|
|
19895
|
-
},
|
|
19896
|
-
{
|
|
19897
|
-
name: "managed_transfer_count",
|
|
19898
|
-
type: "u64"
|
|
19899
|
-
},
|
|
19900
|
-
{
|
|
19901
|
-
name: "bump",
|
|
19902
|
-
type: "u8"
|
|
19903
|
-
}
|
|
19904
|
-
]
|
|
19905
|
-
}
|
|
19906
|
-
},
|
|
19907
|
-
{
|
|
19908
|
-
name: "BridgeSession",
|
|
19886
|
+
name: "BridgeManagedTransfer",
|
|
19887
|
+
serialization: "bytemuckunsafe",
|
|
19888
|
+
repr: {
|
|
19889
|
+
kind: "c"
|
|
19890
|
+
},
|
|
19909
19891
|
type: {
|
|
19910
19892
|
kind: "struct",
|
|
19911
19893
|
fields: [
|
|
19912
|
-
{
|
|
19913
|
-
name: "glam_state",
|
|
19914
|
-
type: "pubkey"
|
|
19915
|
-
},
|
|
19916
|
-
{
|
|
19917
|
-
name: "signer",
|
|
19918
|
-
type: "pubkey"
|
|
19919
|
-
},
|
|
19920
19894
|
{
|
|
19921
19895
|
name: "transfer_id",
|
|
19922
|
-
type:
|
|
19923
|
-
array: [
|
|
19924
|
-
"u8",
|
|
19925
|
-
32
|
|
19926
|
-
]
|
|
19927
|
-
}
|
|
19928
|
-
},
|
|
19929
|
-
{
|
|
19930
|
-
name: "protocol",
|
|
19931
|
-
type: "u16"
|
|
19932
|
-
},
|
|
19933
|
-
{
|
|
19934
|
-
name: "managed",
|
|
19935
|
-
type: "bool"
|
|
19896
|
+
type: "pubkey"
|
|
19936
19897
|
},
|
|
19937
19898
|
{
|
|
19938
19899
|
name: "source_mint",
|
|
19939
19900
|
type: "pubkey"
|
|
19940
19901
|
},
|
|
19941
19902
|
{
|
|
19942
|
-
name: "
|
|
19903
|
+
name: "destination_recipient",
|
|
19943
19904
|
type: "pubkey"
|
|
19944
19905
|
},
|
|
19945
19906
|
{
|
|
@@ -19951,30 +19912,9 @@ var types$8 = [
|
|
|
19951
19912
|
type: "pubkey"
|
|
19952
19913
|
},
|
|
19953
19914
|
{
|
|
19954
|
-
name: "
|
|
19955
|
-
type: "pubkey"
|
|
19956
|
-
},
|
|
19957
|
-
{
|
|
19958
|
-
name: "provider_delegate",
|
|
19959
|
-
type: "pubkey"
|
|
19960
|
-
},
|
|
19961
|
-
{
|
|
19962
|
-
name: "provider_receipt",
|
|
19915
|
+
name: "provider_emitter",
|
|
19963
19916
|
type: "pubkey"
|
|
19964
19917
|
},
|
|
19965
|
-
{
|
|
19966
|
-
name: "provider_instruction_hash",
|
|
19967
|
-
type: {
|
|
19968
|
-
array: [
|
|
19969
|
-
"u8",
|
|
19970
|
-
32
|
|
19971
|
-
]
|
|
19972
|
-
}
|
|
19973
|
-
},
|
|
19974
|
-
{
|
|
19975
|
-
name: "provider_instruction_count",
|
|
19976
|
-
type: "u16"
|
|
19977
|
-
},
|
|
19978
19918
|
{
|
|
19979
19919
|
name: "source_amount",
|
|
19980
19920
|
type: "u64"
|
|
@@ -19984,38 +19924,47 @@ var types$8 = [
|
|
|
19984
19924
|
type: "u64"
|
|
19985
19925
|
},
|
|
19986
19926
|
{
|
|
19987
|
-
name: "
|
|
19927
|
+
name: "provider_sequence",
|
|
19988
19928
|
type: "u64"
|
|
19989
19929
|
},
|
|
19990
19930
|
{
|
|
19991
|
-
name: "
|
|
19931
|
+
name: "committed_slot",
|
|
19992
19932
|
type: "u64"
|
|
19993
19933
|
},
|
|
19994
19934
|
{
|
|
19995
|
-
name: "
|
|
19935
|
+
name: "protocol",
|
|
19996
19936
|
type: "u16"
|
|
19997
19937
|
},
|
|
19998
19938
|
{
|
|
19999
|
-
name: "
|
|
20000
|
-
type: "
|
|
19939
|
+
name: "destination_chain",
|
|
19940
|
+
type: "u16"
|
|
20001
19941
|
},
|
|
20002
19942
|
{
|
|
20003
|
-
name: "
|
|
20004
|
-
type: "
|
|
19943
|
+
name: "source_decimals",
|
|
19944
|
+
type: "u8"
|
|
20005
19945
|
},
|
|
20006
19946
|
{
|
|
20007
|
-
name: "
|
|
20008
|
-
type: "
|
|
19947
|
+
name: "status",
|
|
19948
|
+
type: "u8"
|
|
20009
19949
|
},
|
|
20010
19950
|
{
|
|
20011
|
-
name: "
|
|
20012
|
-
type:
|
|
19951
|
+
name: "reserved",
|
|
19952
|
+
type: {
|
|
19953
|
+
array: [
|
|
19954
|
+
"u8",
|
|
19955
|
+
2
|
|
19956
|
+
]
|
|
19957
|
+
}
|
|
20013
19958
|
}
|
|
20014
19959
|
]
|
|
20015
19960
|
}
|
|
20016
19961
|
},
|
|
20017
19962
|
{
|
|
20018
|
-
name: "
|
|
19963
|
+
name: "BridgeRegistry",
|
|
19964
|
+
serialization: "bytemuckunsafe",
|
|
19965
|
+
repr: {
|
|
19966
|
+
kind: "c"
|
|
19967
|
+
},
|
|
20019
19968
|
type: {
|
|
20020
19969
|
kind: "struct",
|
|
20021
19970
|
fields: [
|
|
@@ -20024,38 +19973,67 @@ var types$8 = [
|
|
|
20024
19973
|
type: "pubkey"
|
|
20025
19974
|
},
|
|
20026
19975
|
{
|
|
20027
|
-
name: "
|
|
19976
|
+
name: "managed_transfer_count",
|
|
19977
|
+
type: "u8"
|
|
19978
|
+
},
|
|
19979
|
+
{
|
|
19980
|
+
name: "reserved",
|
|
20028
19981
|
type: {
|
|
20029
19982
|
array: [
|
|
20030
19983
|
"u8",
|
|
20031
|
-
|
|
19984
|
+
7
|
|
20032
19985
|
]
|
|
20033
19986
|
}
|
|
20034
19987
|
},
|
|
20035
19988
|
{
|
|
20036
|
-
name: "
|
|
20037
|
-
type: "u16"
|
|
20038
|
-
},
|
|
20039
|
-
{
|
|
20040
|
-
name: "status",
|
|
19989
|
+
name: "transfers",
|
|
20041
19990
|
type: {
|
|
20042
|
-
|
|
20043
|
-
|
|
20044
|
-
|
|
19991
|
+
array: [
|
|
19992
|
+
{
|
|
19993
|
+
defined: {
|
|
19994
|
+
name: "BridgeManagedTransfer"
|
|
19995
|
+
}
|
|
19996
|
+
},
|
|
19997
|
+
16
|
|
19998
|
+
]
|
|
20045
19999
|
}
|
|
20000
|
+
}
|
|
20001
|
+
]
|
|
20002
|
+
}
|
|
20003
|
+
},
|
|
20004
|
+
{
|
|
20005
|
+
name: "BridgeSession",
|
|
20006
|
+
type: {
|
|
20007
|
+
kind: "struct",
|
|
20008
|
+
fields: [
|
|
20009
|
+
{
|
|
20010
|
+
name: "glam_state",
|
|
20011
|
+
type: "pubkey"
|
|
20046
20012
|
},
|
|
20047
20013
|
{
|
|
20048
|
-
name: "
|
|
20049
|
-
type: "
|
|
20014
|
+
name: "signer",
|
|
20015
|
+
type: "pubkey"
|
|
20050
20016
|
},
|
|
20051
20017
|
{
|
|
20052
|
-
name: "
|
|
20018
|
+
name: "transfer_id",
|
|
20019
|
+
type: "pubkey"
|
|
20020
|
+
},
|
|
20021
|
+
{
|
|
20022
|
+
name: "protocol",
|
|
20023
|
+
type: "u16"
|
|
20024
|
+
},
|
|
20025
|
+
{
|
|
20026
|
+
name: "managed",
|
|
20053
20027
|
type: "bool"
|
|
20054
20028
|
},
|
|
20055
20029
|
{
|
|
20056
20030
|
name: "source_mint",
|
|
20057
20031
|
type: "pubkey"
|
|
20058
20032
|
},
|
|
20033
|
+
{
|
|
20034
|
+
name: "source_decimals",
|
|
20035
|
+
type: "u8"
|
|
20036
|
+
},
|
|
20059
20037
|
{
|
|
20060
20038
|
name: "source_token_account",
|
|
20061
20039
|
type: "pubkey"
|
|
@@ -20069,23 +20047,19 @@ var types$8 = [
|
|
|
20069
20047
|
type: "pubkey"
|
|
20070
20048
|
},
|
|
20071
20049
|
{
|
|
20072
|
-
name: "
|
|
20073
|
-
type: "
|
|
20074
|
-
},
|
|
20075
|
-
{
|
|
20076
|
-
name: "quoted_out_amount",
|
|
20077
|
-
type: "u64"
|
|
20050
|
+
name: "provider_sender",
|
|
20051
|
+
type: "pubkey"
|
|
20078
20052
|
},
|
|
20079
20053
|
{
|
|
20080
|
-
name: "
|
|
20081
|
-
type: "
|
|
20054
|
+
name: "provider_delegate",
|
|
20055
|
+
type: "pubkey"
|
|
20082
20056
|
},
|
|
20083
20057
|
{
|
|
20084
|
-
name: "
|
|
20058
|
+
name: "provider_receipt",
|
|
20085
20059
|
type: "pubkey"
|
|
20086
20060
|
},
|
|
20087
20061
|
{
|
|
20088
|
-
name: "
|
|
20062
|
+
name: "provider_instruction_hash",
|
|
20089
20063
|
type: {
|
|
20090
20064
|
array: [
|
|
20091
20065
|
"u8",
|
|
@@ -20094,52 +20068,44 @@ var types$8 = [
|
|
|
20094
20068
|
}
|
|
20095
20069
|
},
|
|
20096
20070
|
{
|
|
20097
|
-
name: "
|
|
20098
|
-
type: "
|
|
20071
|
+
name: "provider_instruction_count",
|
|
20072
|
+
type: "u16"
|
|
20099
20073
|
},
|
|
20100
20074
|
{
|
|
20101
|
-
name: "
|
|
20075
|
+
name: "source_amount",
|
|
20102
20076
|
type: "u64"
|
|
20103
20077
|
},
|
|
20104
20078
|
{
|
|
20105
|
-
name: "
|
|
20079
|
+
name: "quoted_out_amount",
|
|
20106
20080
|
type: "u64"
|
|
20107
20081
|
},
|
|
20108
20082
|
{
|
|
20109
|
-
name: "
|
|
20083
|
+
name: "initial_source_balance",
|
|
20110
20084
|
type: "u64"
|
|
20111
20085
|
},
|
|
20112
20086
|
{
|
|
20113
|
-
name: "
|
|
20087
|
+
name: "initial_provider_sequence",
|
|
20114
20088
|
type: "u64"
|
|
20115
20089
|
},
|
|
20116
20090
|
{
|
|
20117
|
-
name: "
|
|
20118
|
-
type: "
|
|
20091
|
+
name: "destination_chain",
|
|
20092
|
+
type: "u16"
|
|
20119
20093
|
},
|
|
20120
20094
|
{
|
|
20121
|
-
name: "
|
|
20122
|
-
type: "
|
|
20123
|
-
}
|
|
20124
|
-
]
|
|
20125
|
-
}
|
|
20126
|
-
},
|
|
20127
|
-
{
|
|
20128
|
-
name: "BridgeTransferStatus",
|
|
20129
|
-
type: {
|
|
20130
|
-
kind: "enum",
|
|
20131
|
-
variants: [
|
|
20132
|
-
{
|
|
20133
|
-
name: "Committed"
|
|
20095
|
+
name: "destination_recipient",
|
|
20096
|
+
type: "pubkey"
|
|
20134
20097
|
},
|
|
20135
20098
|
{
|
|
20136
|
-
name: "
|
|
20099
|
+
name: "quote_expires_at",
|
|
20100
|
+
type: "i64"
|
|
20137
20101
|
},
|
|
20138
20102
|
{
|
|
20139
|
-
name: "
|
|
20103
|
+
name: "prepared_slot",
|
|
20104
|
+
type: "u64"
|
|
20140
20105
|
},
|
|
20141
20106
|
{
|
|
20142
|
-
name: "
|
|
20107
|
+
name: "bump",
|
|
20108
|
+
type: "u8"
|
|
20143
20109
|
}
|
|
20144
20110
|
]
|
|
20145
20111
|
}
|
|
@@ -20151,12 +20117,7 @@ var types$8 = [
|
|
|
20151
20117
|
fields: [
|
|
20152
20118
|
{
|
|
20153
20119
|
name: "transfer_id",
|
|
20154
|
-
type:
|
|
20155
|
-
array: [
|
|
20156
|
-
"u8",
|
|
20157
|
-
32
|
|
20158
|
-
]
|
|
20159
|
-
}
|
|
20120
|
+
type: "pubkey"
|
|
20160
20121
|
}
|
|
20161
20122
|
]
|
|
20162
20123
|
}
|
|
@@ -20860,12 +20821,7 @@ var types$8 = [
|
|
|
20860
20821
|
fields: [
|
|
20861
20822
|
{
|
|
20862
20823
|
name: "transfer_id",
|
|
20863
|
-
type:
|
|
20864
|
-
array: [
|
|
20865
|
-
"u8",
|
|
20866
|
-
32
|
|
20867
|
-
]
|
|
20868
|
-
}
|
|
20824
|
+
type: "pubkey"
|
|
20869
20825
|
},
|
|
20870
20826
|
{
|
|
20871
20827
|
name: "middle_instruction_hash",
|
|
@@ -21001,6 +20957,18 @@ var types$8 = [
|
|
|
21001
20957
|
]
|
|
21002
20958
|
}
|
|
21003
20959
|
},
|
|
20960
|
+
{
|
|
20961
|
+
name: "SettleManagedTransferArgs",
|
|
20962
|
+
type: {
|
|
20963
|
+
kind: "struct",
|
|
20964
|
+
fields: [
|
|
20965
|
+
{
|
|
20966
|
+
name: "transfer_id",
|
|
20967
|
+
type: "pubkey"
|
|
20968
|
+
}
|
|
20969
|
+
]
|
|
20970
|
+
}
|
|
20971
|
+
},
|
|
21004
20972
|
{
|
|
21005
20973
|
name: "StateAccount",
|
|
21006
20974
|
type: {
|
|
@@ -21147,6 +21115,18 @@ var types$8 = [
|
|
|
21147
21115
|
]
|
|
21148
21116
|
}
|
|
21149
21117
|
},
|
|
21118
|
+
{
|
|
21119
|
+
name: "ValidateManagedTransferArgs",
|
|
21120
|
+
type: {
|
|
21121
|
+
kind: "struct",
|
|
21122
|
+
fields: [
|
|
21123
|
+
{
|
|
21124
|
+
name: "transfer_id",
|
|
21125
|
+
type: "pubkey"
|
|
21126
|
+
}
|
|
21127
|
+
]
|
|
21128
|
+
}
|
|
21129
|
+
},
|
|
21150
21130
|
{
|
|
21151
21131
|
name: "ValuationModel",
|
|
21152
21132
|
type: {
|
|
@@ -21164,14 +21144,19 @@ var types$8 = [
|
|
|
21164
21144
|
];
|
|
21165
21145
|
var constants$8 = [
|
|
21166
21146
|
{
|
|
21167
|
-
name: "
|
|
21147
|
+
name: "PROTO_BRIDGE_PERM_SEND",
|
|
21168
21148
|
type: "u64",
|
|
21169
|
-
value: "
|
|
21149
|
+
value: "1"
|
|
21170
21150
|
},
|
|
21171
21151
|
{
|
|
21172
|
-
name: "
|
|
21152
|
+
name: "PROTO_BRIDGE_PERM_SETTLE",
|
|
21173
21153
|
type: "u64",
|
|
21174
|
-
value: "
|
|
21154
|
+
value: "4"
|
|
21155
|
+
},
|
|
21156
|
+
{
|
|
21157
|
+
name: "PROTO_BRIDGE_PERM_VALIDATE",
|
|
21158
|
+
type: "u64",
|
|
21159
|
+
value: "2"
|
|
21175
21160
|
},
|
|
21176
21161
|
{
|
|
21177
21162
|
name: "PROTO_LAYERZERO_OFT",
|
|
@@ -46267,6 +46252,7 @@ class JupiterApiClient {
|
|
|
46267
46252
|
this.name = data.name ?? null;
|
|
46268
46253
|
this.uri = data.uri ?? null;
|
|
46269
46254
|
this.enabled = data.enabled ?? null;
|
|
46255
|
+
this.oracleConfigs = data.oracleConfigs ?? null;
|
|
46270
46256
|
this.assets = data.assets ?? null;
|
|
46271
46257
|
this.created = data.created ?? null;
|
|
46272
46258
|
this.owner = data.owner ?? null;
|
|
@@ -47374,7 +47360,11 @@ let TxBuilder$g = class TxBuilder extends BaseTxBuilder {
|
|
|
47374
47360
|
const inputStakePool = STAKE_POOLS_MAP.get(inputMint.toBase58())?.poolState || null;
|
|
47375
47361
|
const outputStakePool = STAKE_POOLS_MAP.get(outputMint.toBase58())?.poolState || null;
|
|
47376
47362
|
const preInstructions = await this.getPreInstructions(glamSigner, inputMint, outputMint, amount, outputTokenProgram);
|
|
47377
|
-
|
|
47363
|
+
if (oracleAccounts?.kaminoReservesToRefresh && oracleAccounts.kaminoReservesToRefresh.length > 0) {
|
|
47364
|
+
const reserves = await this.client.klend.fetchAndParseReserves(oracleAccounts.kaminoReservesToRefresh);
|
|
47365
|
+
const refreshReservesIx = this.client.klend.txBuilder.refreshReservesBatchIx(reserves, false);
|
|
47366
|
+
preInstructions.push(refreshReservesIx);
|
|
47367
|
+
}
|
|
47378
47368
|
const ix = await this.client.base.protocolProgram.methods.jupiterSwapV2(skipQuotePriceCheck, swapIx.data).accounts({
|
|
47379
47369
|
glamState: this.client.base.statePda,
|
|
47380
47370
|
glamSigner,
|
|
@@ -47444,9 +47434,10 @@ class JupiterSwapClient {
|
|
|
47444
47434
|
const tx = await this.txBuilder.swapV2Tx(options, txOptions);
|
|
47445
47435
|
return await this.base.sendAndConfirm(tx);
|
|
47446
47436
|
}
|
|
47447
|
-
constructor(base, vault){
|
|
47437
|
+
constructor(base, vault, klend){
|
|
47448
47438
|
this.base = base;
|
|
47449
47439
|
this.vault = vault;
|
|
47440
|
+
this.klend = klend;
|
|
47450
47441
|
this.txBuilder = new TxBuilder$g(this);
|
|
47451
47442
|
this.jupApi = this.base.jupiterApiClient || new JupiterApiClient({
|
|
47452
47443
|
apiKey: this.base.jupiterApiKey
|
|
@@ -51581,6 +51572,8 @@ class PriceClient {
|
|
|
51581
51572
|
}
|
|
51582
51573
|
const epiRefreshIx = await this.priceEpiValidatedPositionsIx();
|
|
51583
51574
|
if (epiRefreshIx) pricingIxs.push(epiRefreshIx);
|
|
51575
|
+
const priceBridgeIxs = await this.bridge.txBuilder.priceManagedTransfersIxs();
|
|
51576
|
+
if (priceBridgeIxs) pricingIxs.push(...priceBridgeIxs);
|
|
51584
51577
|
return pricingIxs.filter(Boolean);
|
|
51585
51578
|
}
|
|
51586
51579
|
async validateAumIx() {
|
|
@@ -51620,10 +51613,11 @@ class PriceClient {
|
|
|
51620
51613
|
kaminoReserves
|
|
51621
51614
|
];
|
|
51622
51615
|
}
|
|
51623
|
-
constructor(base, klend, kvaults, getJupiterApi){
|
|
51616
|
+
constructor(base, klend, kvaults, bridge, getJupiterApi){
|
|
51624
51617
|
this.base = base;
|
|
51625
51618
|
this.klend = klend;
|
|
51626
51619
|
this.kvaults = kvaults;
|
|
51620
|
+
this.bridge = bridge;
|
|
51627
51621
|
this.getJupiterApi = getJupiterApi;
|
|
51628
51622
|
this._stateModel = null;
|
|
51629
51623
|
this._lookupTables = new PkSet();
|
|
@@ -53309,13 +53303,6 @@ function resolveCanonicalLayerzeroOftRouteProfile(params) {
|
|
|
53309
53303
|
}
|
|
53310
53304
|
|
|
53311
53305
|
const LAYERZERO_OFT_PROTOCOL = 1 << 2;
|
|
53312
|
-
function toFixedArray32$1(value, label) {
|
|
53313
|
-
const bytes = Array.from(Buffer.from(value));
|
|
53314
|
-
if (bytes.length !== 32) {
|
|
53315
|
-
throw new Error(`${label} must be exactly 32 bytes`);
|
|
53316
|
-
}
|
|
53317
|
-
return bytes;
|
|
53318
|
-
}
|
|
53319
53306
|
function appendU16Le(parts, value) {
|
|
53320
53307
|
const out = Buffer.alloc(2);
|
|
53321
53308
|
out.writeUInt16LE(value, 0);
|
|
@@ -53414,15 +53401,53 @@ function getBridgeSessionPda(glamState, transferId, bridgeProgramId) {
|
|
|
53414
53401
|
return web3_js.PublicKey.findProgramAddressSync([
|
|
53415
53402
|
Buffer.from(SEED_BRIDGE_SESSION),
|
|
53416
53403
|
glamState.toBuffer(),
|
|
53417
|
-
|
|
53404
|
+
transferId.toBuffer()
|
|
53418
53405
|
], bridgeProgramId)[0];
|
|
53419
53406
|
}
|
|
53420
|
-
function
|
|
53421
|
-
return
|
|
53422
|
-
|
|
53423
|
-
|
|
53424
|
-
|
|
53425
|
-
|
|
53407
|
+
function toCount(value) {
|
|
53408
|
+
return anchor.BN.isBN(value) ? value.toNumber() : value;
|
|
53409
|
+
}
|
|
53410
|
+
function toBridgeTransferStatus(status) {
|
|
53411
|
+
switch(status){
|
|
53412
|
+
case 0:
|
|
53413
|
+
return {
|
|
53414
|
+
committed: {}
|
|
53415
|
+
};
|
|
53416
|
+
case 1:
|
|
53417
|
+
return {
|
|
53418
|
+
validated: {}
|
|
53419
|
+
};
|
|
53420
|
+
case 2:
|
|
53421
|
+
return {
|
|
53422
|
+
settled: {}
|
|
53423
|
+
};
|
|
53424
|
+
default:
|
|
53425
|
+
throw new Error(`Unsupported bridge transfer status: ${status}`);
|
|
53426
|
+
}
|
|
53427
|
+
}
|
|
53428
|
+
function getActiveRegistryTransfers(registry) {
|
|
53429
|
+
return registry.transfers.slice(0, toCount(registry.managedTransferCount));
|
|
53430
|
+
}
|
|
53431
|
+
function registryTransferToRecord(transfer, glamState) {
|
|
53432
|
+
return {
|
|
53433
|
+
glamState,
|
|
53434
|
+
transferId: transfer.transferId,
|
|
53435
|
+
protocol: transfer.protocol,
|
|
53436
|
+
status: toBridgeTransferStatus(transfer.status),
|
|
53437
|
+
managed: true,
|
|
53438
|
+
receiptVerified: true,
|
|
53439
|
+
sourceMint: transfer.sourceMint,
|
|
53440
|
+
sourceDecimals: transfer.sourceDecimals,
|
|
53441
|
+
providerProgram: transfer.providerProgram,
|
|
53442
|
+
providerConfig: transfer.providerConfig,
|
|
53443
|
+
sourceAmount: transfer.sourceAmount,
|
|
53444
|
+
quotedOutAmount: transfer.quotedOutAmount,
|
|
53445
|
+
destinationChain: transfer.destinationChain,
|
|
53446
|
+
destinationRecipient: transfer.destinationRecipient,
|
|
53447
|
+
providerEmitter: transfer.providerEmitter,
|
|
53448
|
+
providerSequence: transfer.providerSequence,
|
|
53449
|
+
committedSlot: transfer.committedSlot
|
|
53450
|
+
};
|
|
53426
53451
|
}
|
|
53427
53452
|
function toRouteManagementModeArg(managementMode) {
|
|
53428
53453
|
if (managementMode && typeof managementMode === "object" && ("unmanagedOnly" in managementMode || "managedOnly" in managementMode || "either" in managementMode)) {
|
|
@@ -53468,7 +53493,7 @@ async function deriveOftAuxiliaryAccountSeed(glamState, transferId) {
|
|
|
53468
53493
|
const digest = await sha256(Buffer.concat([
|
|
53469
53494
|
Buffer.from("oft-auxiliary-account"),
|
|
53470
53495
|
glamState.toBuffer(),
|
|
53471
|
-
|
|
53496
|
+
transferId.toBuffer()
|
|
53472
53497
|
]));
|
|
53473
53498
|
return digest.subarray(0, 16).toString("hex");
|
|
53474
53499
|
}
|
|
@@ -53541,10 +53566,9 @@ let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
|
|
|
53541
53566
|
if (params.providerInstructions.length !== 1) {
|
|
53542
53567
|
throw new Error("OFT transfers require exactly one provider instruction");
|
|
53543
53568
|
}
|
|
53544
|
-
const transferId =
|
|
53569
|
+
const transferId = params.transferId;
|
|
53545
53570
|
const registryPda = getBridgeRegistryPda(this.client.base.statePda, this.client.base.extBridgeProgram.programId);
|
|
53546
53571
|
const sessionPda = getBridgeSessionPda(this.client.base.statePda, transferId, this.client.base.extBridgeProgram.programId);
|
|
53547
|
-
const transferRecordPda = getBridgeTransferRecordPda(this.client.base.statePda, transferId, this.client.base.extBridgeProgram.programId);
|
|
53548
53572
|
const integrationAuthority = web3_js.PublicKey.findProgramAddressSync([
|
|
53549
53573
|
Buffer.from(SEED_INTEGRATION_AUTHORITY)
|
|
53550
53574
|
], this.client.base.extBridgeProgram.programId)[0];
|
|
@@ -53597,17 +53621,16 @@ let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
|
|
|
53597
53621
|
glamState: this.client.base.statePda,
|
|
53598
53622
|
glamVault: this.client.base.vaultPda,
|
|
53599
53623
|
glamSigner: txOptions.signer || this.client.base.signer,
|
|
53600
|
-
integrationAuthority,
|
|
53601
53624
|
cpiProgram: tokenProgram,
|
|
53602
53625
|
glamProtocolProgram: this.client.base.protocolProgram.programId,
|
|
53603
|
-
systemProgram: web3_js.SystemProgram.programId,
|
|
53604
53626
|
instructions: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
|
|
53605
53627
|
bridgeRegistry: registryPda,
|
|
53606
53628
|
bridgeSession: sessionPda,
|
|
53607
|
-
transferRecord: transferRecordPda,
|
|
53608
53629
|
sourceTokenAccount,
|
|
53609
53630
|
sourceMint: params.sourceMint,
|
|
53610
|
-
auxiliaryTokenAccount
|
|
53631
|
+
auxiliaryTokenAccount,
|
|
53632
|
+
integrationAuthority,
|
|
53633
|
+
systemProgram: web3_js.SystemProgram.programId
|
|
53611
53634
|
});
|
|
53612
53635
|
commitMethod.remainingAccounts(commitRemainingAccounts);
|
|
53613
53636
|
const commitIx = await commitMethod.instruction();
|
|
@@ -53620,11 +53643,65 @@ let TxBuilder$1 = class TxBuilder extends BaseTxBuilder {
|
|
|
53620
53643
|
tx,
|
|
53621
53644
|
additionalSigners: params.providerSigners || [],
|
|
53622
53645
|
sessionPda,
|
|
53623
|
-
transferRecordPda,
|
|
53624
53646
|
auxiliaryTokenAccount,
|
|
53625
53647
|
sourceTokenAccount
|
|
53626
53648
|
};
|
|
53627
53649
|
}
|
|
53650
|
+
async priceManagedTransfersIxs() {
|
|
53651
|
+
const [stateAccount, registry] = await Promise.all([
|
|
53652
|
+
this.client.base.fetchStateAccount(),
|
|
53653
|
+
this.client.fetchRegistry()
|
|
53654
|
+
]);
|
|
53655
|
+
if (!registry) {
|
|
53656
|
+
throw new Error("Managed bridge registry not initialized");
|
|
53657
|
+
}
|
|
53658
|
+
const transfers = getActiveRegistryTransfers(registry);
|
|
53659
|
+
const [baseAssetMeta, assetMetas] = await Promise.all([
|
|
53660
|
+
this.client.base.getAssetMeta(stateAccount.baseAssetMint),
|
|
53661
|
+
Promise.all(transfers.map(async (transfer)=>({
|
|
53662
|
+
transfer,
|
|
53663
|
+
assetMeta: await this.client.base.getAssetMeta(transfer.sourceMint)
|
|
53664
|
+
})))
|
|
53665
|
+
]);
|
|
53666
|
+
const integrationAuthority = web3_js.PublicKey.findProgramAddressSync([
|
|
53667
|
+
Buffer.from(SEED_INTEGRATION_AUTHORITY)
|
|
53668
|
+
], this.client.base.extBridgeProgram.programId)[0];
|
|
53669
|
+
const ixs = [];
|
|
53670
|
+
const kaminoReserveKeys = new Map();
|
|
53671
|
+
[
|
|
53672
|
+
baseAssetMeta,
|
|
53673
|
+
...assetMetas.map(({ assetMeta })=>assetMeta)
|
|
53674
|
+
].forEach((assetMeta)=>{
|
|
53675
|
+
if (assetMeta.oracleSource === "KaminoReserve") {
|
|
53676
|
+
kaminoReserveKeys.set(assetMeta.oracle.toBase58(), assetMeta.oracle);
|
|
53677
|
+
}
|
|
53678
|
+
});
|
|
53679
|
+
if (kaminoReserveKeys.size > 0) {
|
|
53680
|
+
const klend = new KaminoLendingClient(this.client.base, new VaultClient(this.client.base));
|
|
53681
|
+
const reserves = await klend.fetchAndParseReserves(Array.from(kaminoReserveKeys.values()));
|
|
53682
|
+
ixs.push(klend.txBuilder.refreshReservesBatchIx(reserves, false));
|
|
53683
|
+
}
|
|
53684
|
+
const remainingAccounts = assetMetas.map(({ assetMeta })=>({
|
|
53685
|
+
pubkey: assetMeta.oracle,
|
|
53686
|
+
isSigner: false,
|
|
53687
|
+
isWritable: false
|
|
53688
|
+
}));
|
|
53689
|
+
const priceMethod = this.client.base.extBridgeProgram.methods.priceManagedTransfers().accountsPartial({
|
|
53690
|
+
glamState: this.client.base.statePda,
|
|
53691
|
+
bridgeRegistry: this.client.getRegistryPda(),
|
|
53692
|
+
integrationAuthority,
|
|
53693
|
+
glamProtocolProgram: this.client.base.protocolProgram.programId,
|
|
53694
|
+
glamConfig: getGlobalConfigPda(),
|
|
53695
|
+
baseAssetOracle: baseAssetMeta.oracle
|
|
53696
|
+
});
|
|
53697
|
+
priceMethod.remainingAccounts(remainingAccounts);
|
|
53698
|
+
ixs.push(await priceMethod.instruction());
|
|
53699
|
+
return ixs;
|
|
53700
|
+
}
|
|
53701
|
+
async priceManagedTransfersTx(txOptions = {}) {
|
|
53702
|
+
const ixs = await this.priceManagedTransfersIxs();
|
|
53703
|
+
return await this.buildVersionedTx(ixs, txOptions);
|
|
53704
|
+
}
|
|
53628
53705
|
};
|
|
53629
53706
|
let LayerzeroOftBridgeProtocolClient = class LayerzeroOftBridgeProtocolClient {
|
|
53630
53707
|
async buildSendTx(params, txOptions = {}) {
|
|
@@ -53645,9 +53722,6 @@ class BridgeClient {
|
|
|
53645
53722
|
getSessionPda(transferId) {
|
|
53646
53723
|
return getBridgeSessionPda(this.base.statePda, transferId, this.base.extBridgeProgram.programId);
|
|
53647
53724
|
}
|
|
53648
|
-
getTransferRecordPda(transferId) {
|
|
53649
|
-
return getBridgeTransferRecordPda(this.base.statePda, transferId, this.base.extBridgeProgram.programId);
|
|
53650
|
-
}
|
|
53651
53725
|
getLayerzeroNoncePda(endpointProgram, sender, destinationChain, destinationRecipient) {
|
|
53652
53726
|
return deriveLayerzeroNoncePda(endpointProgram, sender, destinationChain, destinationRecipient);
|
|
53653
53727
|
}
|
|
@@ -53795,7 +53869,19 @@ class BridgeClient {
|
|
|
53795
53869
|
return await this.base.extBridgeProgram.account.bridgeSession.fetchNullable(this.getSessionPda(transferId));
|
|
53796
53870
|
}
|
|
53797
53871
|
async fetchTransferRecord(transferId) {
|
|
53798
|
-
|
|
53872
|
+
const record = await this.fetchTransferRecordNullable(transferId);
|
|
53873
|
+
if (!record) {
|
|
53874
|
+
throw new Error(`Managed bridge transfer not found for transferId ${transferId.toBase58()}`);
|
|
53875
|
+
}
|
|
53876
|
+
return record;
|
|
53877
|
+
}
|
|
53878
|
+
async fetchTransferRecordNullable(transferId) {
|
|
53879
|
+
const registry = await this.fetchRegistry();
|
|
53880
|
+
if (!registry) {
|
|
53881
|
+
return null;
|
|
53882
|
+
}
|
|
53883
|
+
const transfer = getActiveRegistryTransfers(registry).find((candidate)=>candidate.transferId.equals(transferId));
|
|
53884
|
+
return transfer ? registryTransferToRecord(transfer, this.base.statePda) : null;
|
|
53799
53885
|
}
|
|
53800
53886
|
async addLayerzeroOftRoute(route, txOptions = {}) {
|
|
53801
53887
|
const glamSigner = txOptions.signer || this.base.signer;
|
|
@@ -53828,7 +53914,7 @@ class BridgeClient {
|
|
|
53828
53914
|
return await this.txBuilder.buildOftTransferTx(params, txOptions);
|
|
53829
53915
|
}
|
|
53830
53916
|
async buildLayerzeroOftSendTx(params, txOptions = {}) {
|
|
53831
|
-
const resolvedTransferId = params.transferId || web3_js.Keypair.generate().publicKey
|
|
53917
|
+
const resolvedTransferId = params.transferId || web3_js.Keypair.generate().publicKey;
|
|
53832
53918
|
const { tokenProgram } = await fetchMintAndTokenProgram(this.base.connection, params.sourceMint);
|
|
53833
53919
|
const signer = txOptions.signer || this.base.signer;
|
|
53834
53920
|
const sourceTokenAccount = params.sourceTokenAccount || this.base.getVaultAta(params.sourceMint, tokenProgram);
|
|
@@ -53901,63 +53987,39 @@ class BridgeClient {
|
|
|
53901
53987
|
};
|
|
53902
53988
|
}
|
|
53903
53989
|
async settleManagedTransfer(transferId, txOptions = {}) {
|
|
53904
|
-
const
|
|
53905
|
-
glamState: this.base.statePda,
|
|
53906
|
-
glamSigner: txOptions.signer || this.base.signer,
|
|
53907
|
-
transferRecord: this.getTransferRecordPda(transferId)
|
|
53908
|
-
}).instruction();
|
|
53909
|
-
const tx = await this.txBuilder.buildVersionedTx([
|
|
53910
|
-
ix
|
|
53911
|
-
], txOptions);
|
|
53912
|
-
return await this.base.sendAndConfirm(tx);
|
|
53913
|
-
}
|
|
53914
|
-
async reconcileManagedTransfer(transferId, txOptions = {}) {
|
|
53915
|
-
web3_js.PublicKey.findProgramAddressSync([
|
|
53990
|
+
const integrationAuthority = web3_js.PublicKey.findProgramAddressSync([
|
|
53916
53991
|
Buffer.from(SEED_INTEGRATION_AUTHORITY)
|
|
53917
53992
|
], this.base.extBridgeProgram.programId)[0];
|
|
53918
|
-
const ix = await this.base.extBridgeProgram.methods.
|
|
53993
|
+
const ix = await this.base.extBridgeProgram.methods.settleManagedTransfer({
|
|
53994
|
+
transferId
|
|
53995
|
+
}).accountsPartial({
|
|
53919
53996
|
glamState: this.base.statePda,
|
|
53920
|
-
|
|
53997
|
+
glamVault: this.base.vaultPda,
|
|
53921
53998
|
glamSigner: txOptions.signer || this.base.signer,
|
|
53922
|
-
|
|
53923
|
-
|
|
53924
|
-
|
|
53925
|
-
|
|
53926
|
-
transferRecord: this.getTransferRecordPda(transferId)
|
|
53999
|
+
glamProtocolProgram: this.base.protocolProgram.programId,
|
|
54000
|
+
bridgeRegistry: this.getRegistryPda(),
|
|
54001
|
+
integrationAuthority,
|
|
54002
|
+
systemProgram: web3_js.SystemProgram.programId
|
|
53927
54003
|
}).instruction();
|
|
53928
54004
|
const tx = await this.txBuilder.buildVersionedTx([
|
|
53929
54005
|
ix
|
|
53930
54006
|
], txOptions);
|
|
53931
54007
|
return await this.base.sendAndConfirm(tx);
|
|
53932
54008
|
}
|
|
53933
|
-
async
|
|
53934
|
-
|
|
53935
|
-
|
|
53936
|
-
|
|
53937
|
-
const ix = await this.base.extBridgeProgram.methods.failOrCancelManagedTransfer(failureReason).accounts({
|
|
54009
|
+
async validateManagedTransfer(transferId, txOptions = {}) {
|
|
54010
|
+
const ix = await this.base.extBridgeProgram.methods.validateManagedTransfer({
|
|
54011
|
+
transferId
|
|
54012
|
+
}).accounts({
|
|
53938
54013
|
glamState: this.base.statePda,
|
|
53939
|
-
|
|
53940
|
-
glamSigner: txOptions.signer || this.base.signer,
|
|
53941
|
-
// integrationAuthority,
|
|
53942
|
-
// glamProtocolProgram: this.base.protocolProgram.programId,
|
|
53943
|
-
// systemProgram: SystemProgram.programId,
|
|
53944
|
-
// bridgeRegistry: this.getRegistryPda(),
|
|
53945
|
-
transferRecord: this.getTransferRecordPda(transferId)
|
|
54014
|
+
glamSigner: txOptions.signer || this.base.signer
|
|
53946
54015
|
}).instruction();
|
|
53947
54016
|
const tx = await this.txBuilder.buildVersionedTx([
|
|
53948
54017
|
ix
|
|
53949
54018
|
], txOptions);
|
|
53950
54019
|
return await this.base.sendAndConfirm(tx);
|
|
53951
54020
|
}
|
|
53952
|
-
async
|
|
53953
|
-
const
|
|
53954
|
-
glamState: this.base.statePda,
|
|
53955
|
-
glamSigner: txOptions.signer || this.base.signer,
|
|
53956
|
-
transferRecord: this.getTransferRecordPda(transferId)
|
|
53957
|
-
}).instruction();
|
|
53958
|
-
const tx = await this.txBuilder.buildVersionedTx([
|
|
53959
|
-
ix
|
|
53960
|
-
], txOptions);
|
|
54021
|
+
async priceManagedTransfers(txOptions = {}) {
|
|
54022
|
+
const tx = await this.txBuilder.priceManagedTransfersTx(txOptions);
|
|
53961
54023
|
return await this.base.sendAndConfirm(tx);
|
|
53962
54024
|
}
|
|
53963
54025
|
constructor(base){
|
|
@@ -54113,7 +54175,7 @@ class EpiClient {
|
|
|
54113
54175
|
}
|
|
54114
54176
|
get jupiterSwap() {
|
|
54115
54177
|
if (!this._jupiterSwap) {
|
|
54116
|
-
this._jupiterSwap = new JupiterSwapClient(this, this.vault);
|
|
54178
|
+
this._jupiterSwap = new JupiterSwapClient(this, this.vault, this.kaminoLending);
|
|
54117
54179
|
}
|
|
54118
54180
|
return this._jupiterSwap;
|
|
54119
54181
|
}
|
|
@@ -54143,7 +54205,7 @@ class EpiClient {
|
|
|
54143
54205
|
}
|
|
54144
54206
|
get price() {
|
|
54145
54207
|
if (!this._price) {
|
|
54146
|
-
this._price = new PriceClient(this, this.kaminoLending, this.kaminoVaults, ()=>this.jupiterSwap.jupApi);
|
|
54208
|
+
this._price = new PriceClient(this, this.kaminoLending, this.kaminoVaults, this.bridge, ()=>this.jupiterSwap.jupApi);
|
|
54147
54209
|
}
|
|
54148
54210
|
return this._price;
|
|
54149
54211
|
}
|