File tree Expand file tree Collapse file tree 2 files changed +19
-10
lines changed Expand file tree Collapse file tree 2 files changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -3232,10 +3232,17 @@ mod slow {
3232
3232
// 5 Shield transparent and sapling to orchard
3233
3233
// # Expected Fees:
3234
3234
// - legacy: 10_000
3235
- // - 317: 5_000 for transparent + 10_000 for orchard + 10_000 for sapling == 25_000
3236
- from_inputs:: shield ( & pool_migration_client, & [ PoolType :: Transparent ] , None )
3237
- . await
3238
- . unwrap ( ) ;
3235
+ // - 317: disallowed (not *precisely*) BY 317...
3236
+ from_inputs:: shield (
3237
+ & pool_migration_client,
3238
+ & [
3239
+ PoolType :: Transparent ,
3240
+ PoolType :: Shielded ( ShieldedProtocol :: Sapling ) ,
3241
+ ] ,
3242
+ None ,
3243
+ )
3244
+ . await
3245
+ . unwrap ( ) ;
3239
3246
bump_and_check_pmc ! ( o: 50_000 s: 0 t: 0 ) ;
3240
3247
3241
3248
// 6 self send orchard to orchard
Original file line number Diff line number Diff line change @@ -124,12 +124,14 @@ pub mod decrypt_transaction {
124
124
. recipient_address ( )
125
125
. map ( |raw_taddr| address_from_pubkeyhash ( & self . config , raw_taddr) )
126
126
{
127
- outgoing_metadatas. push ( OutgoingTxData {
128
- recipient_address : taddr,
129
- value : u64:: from ( vout. value ) ,
130
- memo : Memo :: Empty ,
131
- recipient_ua : None ,
132
- } ) ;
127
+ if !taddrs_set. contains ( & taddr) {
128
+ outgoing_metadatas. push ( OutgoingTxData {
129
+ recipient_address : taddr,
130
+ value : u64:: from ( vout. value ) ,
131
+ memo : Memo :: Empty ,
132
+ recipient_ua : None ,
133
+ } ) ;
134
+ }
133
135
}
134
136
}
135
137
}
You can’t perform that action at this time.
0 commit comments