@keep-network/tbtc-v2 0.1.1-dev.53 → 0.1.1-dev.56

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.
Files changed (72) hide show
  1. package/artifacts/Bank.json +3 -3
  2. package/artifacts/Bridge.json +626 -254
  3. package/artifacts/Deposit.json +7 -7
  4. package/artifacts/DepositSweep.json +76 -0
  5. package/artifacts/EcdsaDkgValidator.json +1 -1
  6. package/artifacts/EcdsaInactivity.json +1 -1
  7. package/artifacts/Fraud.json +8 -8
  8. package/artifacts/KeepRegistry.json +1 -1
  9. package/artifacts/KeepStake.json +2 -2
  10. package/artifacts/KeepToken.json +2 -2
  11. package/artifacts/KeepTokenStaking.json +1 -1
  12. package/artifacts/MovingFunds.json +44 -13
  13. package/artifacts/NuCypherStakingEscrow.json +1 -1
  14. package/artifacts/NuCypherToken.json +2 -2
  15. package/artifacts/RandomBeaconStub.json +1 -1
  16. package/artifacts/Redemption.json +11 -11
  17. package/artifacts/ReimbursementPool.json +2 -2
  18. package/artifacts/Relay.json +9 -9
  19. package/artifacts/SortitionPool.json +2 -2
  20. package/artifacts/T.json +2 -2
  21. package/artifacts/TBTC.json +3 -3
  22. package/artifacts/TBTCToken.json +3 -3
  23. package/artifacts/TokenStaking.json +1 -1
  24. package/artifacts/TokenholderGovernor.json +9 -9
  25. package/artifacts/TokenholderTimelock.json +8 -8
  26. package/artifacts/VendingMachine.json +10 -10
  27. package/artifacts/VendingMachineKeep.json +1 -1
  28. package/artifacts/VendingMachineNuCypher.json +1 -1
  29. package/artifacts/WalletRegistry.json +2 -2
  30. package/artifacts/WalletRegistryGovernance.json +2 -2
  31. package/artifacts/Wallets.json +7 -7
  32. package/artifacts/solcInputs/{fa22a04615b4037761340d27e55c86ee.json → 5dd2a7c685770548b7ea9ce25e179326.json} +11 -11
  33. package/build/contracts/GovernanceUtils.sol/GovernanceUtils.dbg.json +1 -1
  34. package/build/contracts/bank/Bank.sol/Bank.dbg.json +1 -1
  35. package/build/contracts/bridge/BitcoinTx.sol/BitcoinTx.dbg.json +1 -1
  36. package/build/contracts/bridge/BitcoinTx.sol/BitcoinTx.json +2 -2
  37. package/build/contracts/bridge/Bridge.sol/Bridge.dbg.json +1 -1
  38. package/build/contracts/bridge/Bridge.sol/Bridge.json +328 -128
  39. package/build/contracts/bridge/BridgeState.sol/BridgeState.dbg.json +1 -1
  40. package/build/contracts/bridge/BridgeState.sol/BridgeState.json +29 -11
  41. package/build/contracts/bridge/Deposit.sol/Deposit.dbg.json +1 -1
  42. package/build/contracts/bridge/Deposit.sol/Deposit.json +2 -2
  43. package/build/contracts/bridge/DepositSweep.sol/DepositSweep.dbg.json +4 -0
  44. package/build/contracts/bridge/{Sweep.sol/Sweep.json → DepositSweep.sol/DepositSweep.json} +4 -4
  45. package/build/contracts/bridge/EcdsaLib.sol/EcdsaLib.dbg.json +1 -1
  46. package/build/contracts/bridge/Fraud.sol/Fraud.dbg.json +1 -1
  47. package/build/contracts/bridge/Fraud.sol/Fraud.json +2 -2
  48. package/build/contracts/bridge/IRelay.sol/IRelay.dbg.json +1 -1
  49. package/build/contracts/bridge/MovingFunds.sol/MovingFunds.dbg.json +1 -1
  50. package/build/contracts/bridge/MovingFunds.sol/MovingFunds.json +21 -2
  51. package/build/contracts/bridge/Redemption.sol/OutboundTx.dbg.json +1 -1
  52. package/build/contracts/bridge/Redemption.sol/OutboundTx.json +2 -2
  53. package/build/contracts/bridge/Redemption.sol/Redemption.dbg.json +1 -1
  54. package/build/contracts/bridge/Redemption.sol/Redemption.json +2 -2
  55. package/build/contracts/bridge/VendingMachine.sol/VendingMachine.dbg.json +1 -1
  56. package/build/contracts/bridge/Wallets.sol/Wallets.dbg.json +1 -1
  57. package/build/contracts/bridge/Wallets.sol/Wallets.json +2 -2
  58. package/build/contracts/token/TBTC.sol/TBTC.dbg.json +1 -1
  59. package/build/contracts/vault/IVault.sol/IVault.dbg.json +1 -1
  60. package/build/contracts/vault/TBTCVault.sol/TBTCVault.dbg.json +1 -1
  61. package/contracts/bridge/BitcoinTx.sol +69 -0
  62. package/contracts/bridge/Bridge.sol +176 -55
  63. package/contracts/bridge/BridgeState.sol +107 -44
  64. package/contracts/bridge/{Sweep.sol → DepositSweep.sol} +30 -18
  65. package/contracts/bridge/Fraud.sol +1 -1
  66. package/contracts/bridge/MovingFunds.sol +485 -79
  67. package/contracts/bridge/Redemption.sol +4 -4
  68. package/deploy/05_deploy_bridge.ts +5 -2
  69. package/export.json +375 -94
  70. package/package.json +1 -1
  71. package/artifacts/Sweep.json +0 -76
  72. package/build/contracts/bridge/Sweep.sol/Sweep.dbg.json +0 -4
package/export.json CHANGED
@@ -13619,7 +13619,7 @@
13619
13619
  }
13620
13620
  ]
13621
13621
  },
13622
- "Sweep": {
13622
+ "DepositSweep": {
13623
13623
  "address": "0x55cb3b67D9E65F0Cf4eABCAC84564a1bE6E3b06A",
13624
13624
  "abi": [
13625
13625
  {
@@ -13918,6 +13918,25 @@
13918
13918
  "MovingFunds": {
13919
13919
  "address": "0x1a6a3e7Bb246158dF31d8f924B84D961669Ba4e5",
13920
13920
  "abi": [
13921
+ {
13922
+ "anonymous": false,
13923
+ "inputs": [
13924
+ {
13925
+ "indexed": false,
13926
+ "internalType": "bytes20",
13927
+ "name": "walletPubKeyHash",
13928
+ "type": "bytes20"
13929
+ },
13930
+ {
13931
+ "indexed": false,
13932
+ "internalType": "bytes32",
13933
+ "name": "sweepTxHash",
13934
+ "type": "bytes32"
13935
+ }
13936
+ ],
13937
+ "name": "MovedFundsSwept",
13938
+ "type": "event"
13939
+ },
13921
13940
  {
13922
13941
  "anonymous": false,
13923
13942
  "inputs": [
@@ -14207,16 +14226,10 @@
14207
14226
  {
14208
14227
  "anonymous": false,
14209
14228
  "inputs": [
14210
- {
14211
- "indexed": false,
14212
- "internalType": "uint96",
14213
- "name": "fraudSlashingAmount",
14214
- "type": "uint96"
14215
- },
14216
14229
  {
14217
14230
  "indexed": false,
14218
14231
  "internalType": "uint256",
14219
- "name": "fraudNotifierRewardMultiplier",
14232
+ "name": "fraudChallengeDepositAmount",
14220
14233
  "type": "uint256"
14221
14234
  },
14222
14235
  {
@@ -14225,10 +14238,16 @@
14225
14238
  "name": "fraudChallengeDefeatTimeout",
14226
14239
  "type": "uint256"
14227
14240
  },
14241
+ {
14242
+ "indexed": false,
14243
+ "internalType": "uint96",
14244
+ "name": "fraudSlashingAmount",
14245
+ "type": "uint96"
14246
+ },
14228
14247
  {
14229
14248
  "indexed": false,
14230
14249
  "internalType": "uint256",
14231
- "name": "fraudChallengeDepositAmount",
14250
+ "name": "fraudNotifierRewardMultiplier",
14232
14251
  "type": "uint256"
14233
14252
  }
14234
14253
  ],
@@ -14254,6 +14273,25 @@
14254
14273
  "name": "GovernanceTransferred",
14255
14274
  "type": "event"
14256
14275
  },
14276
+ {
14277
+ "anonymous": false,
14278
+ "inputs": [
14279
+ {
14280
+ "indexed": false,
14281
+ "internalType": "bytes20",
14282
+ "name": "walletPubKeyHash",
14283
+ "type": "bytes20"
14284
+ },
14285
+ {
14286
+ "indexed": false,
14287
+ "internalType": "bytes32",
14288
+ "name": "sweepTxHash",
14289
+ "type": "bytes32"
14290
+ }
14291
+ ],
14292
+ "name": "MovedFundsSwept",
14293
+ "type": "event"
14294
+ },
14257
14295
  {
14258
14296
  "anonymous": false,
14259
14297
  "inputs": [
@@ -14320,16 +14358,34 @@
14320
14358
  "name": "movingFundsTxMaxTotalFee",
14321
14359
  "type": "uint64"
14322
14360
  },
14361
+ {
14362
+ "indexed": false,
14363
+ "internalType": "uint64",
14364
+ "name": "movingFundsDustThreshold",
14365
+ "type": "uint64"
14366
+ },
14323
14367
  {
14324
14368
  "indexed": false,
14325
14369
  "internalType": "uint32",
14326
14370
  "name": "movingFundsTimeout",
14327
14371
  "type": "uint32"
14328
14372
  },
14373
+ {
14374
+ "indexed": false,
14375
+ "internalType": "uint96",
14376
+ "name": "movingFundsTimeoutSlashingAmount",
14377
+ "type": "uint96"
14378
+ },
14379
+ {
14380
+ "indexed": false,
14381
+ "internalType": "uint256",
14382
+ "name": "movingFundsTimeoutNotifierRewardMultiplier",
14383
+ "type": "uint256"
14384
+ },
14329
14385
  {
14330
14386
  "indexed": false,
14331
14387
  "internalType": "uint64",
14332
- "name": "movingFundsDustThreshold",
14388
+ "name": "movedFundsSweepTxMaxTotalFee",
14333
14389
  "type": "uint64"
14334
14390
  }
14335
14391
  ],
@@ -14866,14 +14922,9 @@
14866
14922
  "inputs": [],
14867
14923
  "name": "fraudParameters",
14868
14924
  "outputs": [
14869
- {
14870
- "internalType": "uint96",
14871
- "name": "fraudSlashingAmount",
14872
- "type": "uint96"
14873
- },
14874
14925
  {
14875
14926
  "internalType": "uint256",
14876
- "name": "fraudNotifierRewardMultiplier",
14927
+ "name": "fraudChallengeDepositAmount",
14877
14928
  "type": "uint256"
14878
14929
  },
14879
14930
  {
@@ -14881,9 +14932,14 @@
14881
14932
  "name": "fraudChallengeDefeatTimeout",
14882
14933
  "type": "uint256"
14883
14934
  },
14935
+ {
14936
+ "internalType": "uint96",
14937
+ "name": "fraudSlashingAmount",
14938
+ "type": "uint96"
14939
+ },
14884
14940
  {
14885
14941
  "internalType": "uint256",
14886
- "name": "fraudChallengeDepositAmount",
14942
+ "name": "fraudNotifierRewardMultiplier",
14887
14943
  "type": "uint256"
14888
14944
  }
14889
14945
  ],
@@ -14935,6 +14991,47 @@
14935
14991
  "stateMutability": "view",
14936
14992
  "type": "function"
14937
14993
  },
14994
+ {
14995
+ "inputs": [
14996
+ {
14997
+ "internalType": "uint256",
14998
+ "name": "requestKey",
14999
+ "type": "uint256"
15000
+ }
15001
+ ],
15002
+ "name": "movedFundsSweepRequests",
15003
+ "outputs": [
15004
+ {
15005
+ "components": [
15006
+ {
15007
+ "internalType": "bytes20",
15008
+ "name": "walletPubKeyHash",
15009
+ "type": "bytes20"
15010
+ },
15011
+ {
15012
+ "internalType": "uint64",
15013
+ "name": "value",
15014
+ "type": "uint64"
15015
+ },
15016
+ {
15017
+ "internalType": "uint32",
15018
+ "name": "createdAt",
15019
+ "type": "uint32"
15020
+ },
15021
+ {
15022
+ "internalType": "uint32",
15023
+ "name": "sweptAt",
15024
+ "type": "uint32"
15025
+ }
15026
+ ],
15027
+ "internalType": "struct MovingFunds.MovedFundsSweepRequest",
15028
+ "name": "",
15029
+ "type": "tuple"
15030
+ }
15031
+ ],
15032
+ "stateMutability": "view",
15033
+ "type": "function"
15034
+ },
14938
15035
  {
14939
15036
  "inputs": [],
14940
15037
  "name": "movingFundsParameters",
@@ -14944,14 +15041,29 @@
14944
15041
  "name": "movingFundsTxMaxTotalFee",
14945
15042
  "type": "uint64"
14946
15043
  },
15044
+ {
15045
+ "internalType": "uint64",
15046
+ "name": "movingFundsDustThreshold",
15047
+ "type": "uint64"
15048
+ },
14947
15049
  {
14948
15050
  "internalType": "uint32",
14949
15051
  "name": "movingFundsTimeout",
14950
15052
  "type": "uint32"
14951
15053
  },
15054
+ {
15055
+ "internalType": "uint96",
15056
+ "name": "movingFundsTimeoutSlashingAmount",
15057
+ "type": "uint96"
15058
+ },
15059
+ {
15060
+ "internalType": "uint256",
15061
+ "name": "movingFundsTimeoutNotifierRewardMultiplier",
15062
+ "type": "uint256"
15063
+ },
14952
15064
  {
14953
15065
  "internalType": "uint64",
14954
- "name": "movingFundsDustThreshold",
15066
+ "name": "movedFundsSweepTxMaxTotalFee",
14955
15067
  "type": "uint64"
14956
15068
  }
14957
15069
  ],
@@ -15057,6 +15169,11 @@
15057
15169
  "internalType": "bytes20",
15058
15170
  "name": "walletPubKeyHash",
15059
15171
  "type": "bytes20"
15172
+ },
15173
+ {
15174
+ "internalType": "uint32[]",
15175
+ "name": "walletMembersIDs",
15176
+ "type": "uint32[]"
15060
15177
  }
15061
15178
  ],
15062
15179
  "name": "notifyMovingFundsTimeout",
@@ -15375,6 +15492,54 @@
15375
15492
  "stateMutability": "nonpayable",
15376
15493
  "type": "function"
15377
15494
  },
15495
+ {
15496
+ "inputs": [
15497
+ {
15498
+ "internalType": "bytes20",
15499
+ "name": "walletPubKeyHash",
15500
+ "type": "bytes20"
15501
+ },
15502
+ {
15503
+ "components": [
15504
+ {
15505
+ "internalType": "bytes32",
15506
+ "name": "txHash",
15507
+ "type": "bytes32"
15508
+ },
15509
+ {
15510
+ "internalType": "uint32",
15511
+ "name": "txOutputIndex",
15512
+ "type": "uint32"
15513
+ },
15514
+ {
15515
+ "internalType": "uint64",
15516
+ "name": "txOutputValue",
15517
+ "type": "uint64"
15518
+ }
15519
+ ],
15520
+ "internalType": "struct BitcoinTx.UTXO",
15521
+ "name": "utxo",
15522
+ "type": "tuple"
15523
+ }
15524
+ ],
15525
+ "name": "setMovedFundsSweepRequest",
15526
+ "outputs": [],
15527
+ "stateMutability": "nonpayable",
15528
+ "type": "function"
15529
+ },
15530
+ {
15531
+ "inputs": [
15532
+ {
15533
+ "internalType": "uint64",
15534
+ "name": "_movedFundsSweepTxMaxTotalFee",
15535
+ "type": "uint64"
15536
+ }
15537
+ ],
15538
+ "name": "setMovedFundsSweepTxMaxTotalFee",
15539
+ "outputs": [],
15540
+ "stateMutability": "nonpayable",
15541
+ "type": "function"
15542
+ },
15378
15543
  {
15379
15544
  "inputs": [
15380
15545
  {
@@ -15388,6 +15553,41 @@
15388
15553
  "stateMutability": "nonpayable",
15389
15554
  "type": "function"
15390
15555
  },
15556
+ {
15557
+ "inputs": [
15558
+ {
15559
+ "internalType": "bytes20",
15560
+ "name": "walletPubKeyHash",
15561
+ "type": "bytes20"
15562
+ },
15563
+ {
15564
+ "components": [
15565
+ {
15566
+ "internalType": "bytes32",
15567
+ "name": "txHash",
15568
+ "type": "bytes32"
15569
+ },
15570
+ {
15571
+ "internalType": "uint32",
15572
+ "name": "txOutputIndex",
15573
+ "type": "uint32"
15574
+ },
15575
+ {
15576
+ "internalType": "uint64",
15577
+ "name": "txOutputValue",
15578
+ "type": "uint64"
15579
+ }
15580
+ ],
15581
+ "internalType": "struct BitcoinTx.UTXO",
15582
+ "name": "utxo",
15583
+ "type": "tuple"
15584
+ }
15585
+ ],
15586
+ "name": "setProcessedMovedFundsSweepRequest",
15587
+ "outputs": [],
15588
+ "stateMutability": "nonpayable",
15589
+ "type": "function"
15590
+ },
15391
15591
  {
15392
15592
  "inputs": [
15393
15593
  {
@@ -15609,49 +15809,53 @@
15609
15809
  {
15610
15810
  "inputs": [
15611
15811
  {
15612
- "internalType": "bytes",
15613
- "name": "walletPublicKey",
15614
- "type": "bytes"
15615
- },
15616
- {
15617
- "internalType": "bytes32",
15618
- "name": "sighash",
15619
- "type": "bytes32"
15812
+ "components": [
15813
+ {
15814
+ "internalType": "bytes4",
15815
+ "name": "version",
15816
+ "type": "bytes4"
15817
+ },
15818
+ {
15819
+ "internalType": "bytes",
15820
+ "name": "inputVector",
15821
+ "type": "bytes"
15822
+ },
15823
+ {
15824
+ "internalType": "bytes",
15825
+ "name": "outputVector",
15826
+ "type": "bytes"
15827
+ },
15828
+ {
15829
+ "internalType": "bytes4",
15830
+ "name": "locktime",
15831
+ "type": "bytes4"
15832
+ }
15833
+ ],
15834
+ "internalType": "struct BitcoinTx.Info",
15835
+ "name": "sweepTx",
15836
+ "type": "tuple"
15620
15837
  },
15621
15838
  {
15622
15839
  "components": [
15623
15840
  {
15624
- "internalType": "bytes32",
15625
- "name": "r",
15626
- "type": "bytes32"
15841
+ "internalType": "bytes",
15842
+ "name": "merkleProof",
15843
+ "type": "bytes"
15627
15844
  },
15628
15845
  {
15629
- "internalType": "bytes32",
15630
- "name": "s",
15631
- "type": "bytes32"
15846
+ "internalType": "uint256",
15847
+ "name": "txIndexInBlock",
15848
+ "type": "uint256"
15632
15849
  },
15633
15850
  {
15634
- "internalType": "uint8",
15635
- "name": "v",
15636
- "type": "uint8"
15851
+ "internalType": "bytes",
15852
+ "name": "bitcoinHeaders",
15853
+ "type": "bytes"
15637
15854
  }
15638
15855
  ],
15639
- "internalType": "struct BitcoinTx.RSVSignature",
15640
- "name": "signature",
15856
+ "internalType": "struct BitcoinTx.Proof",
15857
+ "name": "sweepProof",
15641
15858
  "type": "tuple"
15642
- }
15643
- ],
15644
- "name": "submitFraudChallenge",
15645
- "outputs": [],
15646
- "stateMutability": "payable",
15647
- "type": "function"
15648
- },
15649
- {
15650
- "inputs": [
15651
- {
15652
- "internalType": "bytes20",
15653
- "name": "walletPubKeyHash",
15654
- "type": "bytes20"
15655
15859
  },
15656
15860
  {
15657
15861
  "components": [
@@ -15672,28 +15876,53 @@
15672
15876
  }
15673
15877
  ],
15674
15878
  "internalType": "struct BitcoinTx.UTXO",
15675
- "name": "walletMainUtxo",
15879
+ "name": "mainUtxo",
15676
15880
  "type": "tuple"
15677
- },
15881
+ }
15882
+ ],
15883
+ "name": "submitDepositSweepProof",
15884
+ "outputs": [],
15885
+ "stateMutability": "nonpayable",
15886
+ "type": "function"
15887
+ },
15888
+ {
15889
+ "inputs": [
15678
15890
  {
15679
- "internalType": "uint32[]",
15680
- "name": "walletMembersIDs",
15681
- "type": "uint32[]"
15891
+ "internalType": "bytes",
15892
+ "name": "walletPublicKey",
15893
+ "type": "bytes"
15682
15894
  },
15683
15895
  {
15684
- "internalType": "uint256",
15685
- "name": "walletMemberIndex",
15686
- "type": "uint256"
15896
+ "internalType": "bytes32",
15897
+ "name": "sighash",
15898
+ "type": "bytes32"
15687
15899
  },
15688
15900
  {
15689
- "internalType": "bytes20[]",
15690
- "name": "targetWallets",
15691
- "type": "bytes20[]"
15901
+ "components": [
15902
+ {
15903
+ "internalType": "bytes32",
15904
+ "name": "r",
15905
+ "type": "bytes32"
15906
+ },
15907
+ {
15908
+ "internalType": "bytes32",
15909
+ "name": "s",
15910
+ "type": "bytes32"
15911
+ },
15912
+ {
15913
+ "internalType": "uint8",
15914
+ "name": "v",
15915
+ "type": "uint8"
15916
+ }
15917
+ ],
15918
+ "internalType": "struct BitcoinTx.RSVSignature",
15919
+ "name": "signature",
15920
+ "type": "tuple"
15692
15921
  }
15693
15922
  ],
15694
- "name": "submitMovingFundsCommitment",
15923
+ "name": "submitFraudChallenge",
15695
15924
  "outputs": [],
15696
- "stateMutability": "nonpayable",
15925
+ "stateMutability": "payable",
15697
15926
  "type": "function"
15698
15927
  },
15699
15928
  {
@@ -15722,7 +15951,7 @@
15722
15951
  }
15723
15952
  ],
15724
15953
  "internalType": "struct BitcoinTx.Info",
15725
- "name": "movingFundsTx",
15954
+ "name": "sweepTx",
15726
15955
  "type": "tuple"
15727
15956
  },
15728
15957
  {
@@ -15744,7 +15973,7 @@
15744
15973
  }
15745
15974
  ],
15746
15975
  "internalType": "struct BitcoinTx.Proof",
15747
- "name": "movingFundsProof",
15976
+ "name": "sweepProof",
15748
15977
  "type": "tuple"
15749
15978
  },
15750
15979
  {
@@ -15768,14 +15997,59 @@
15768
15997
  "internalType": "struct BitcoinTx.UTXO",
15769
15998
  "name": "mainUtxo",
15770
15999
  "type": "tuple"
15771
- },
16000
+ }
16001
+ ],
16002
+ "name": "submitMovedFundsSweepProof",
16003
+ "outputs": [],
16004
+ "stateMutability": "nonpayable",
16005
+ "type": "function"
16006
+ },
16007
+ {
16008
+ "inputs": [
15772
16009
  {
15773
16010
  "internalType": "bytes20",
15774
16011
  "name": "walletPubKeyHash",
15775
16012
  "type": "bytes20"
16013
+ },
16014
+ {
16015
+ "components": [
16016
+ {
16017
+ "internalType": "bytes32",
16018
+ "name": "txHash",
16019
+ "type": "bytes32"
16020
+ },
16021
+ {
16022
+ "internalType": "uint32",
16023
+ "name": "txOutputIndex",
16024
+ "type": "uint32"
16025
+ },
16026
+ {
16027
+ "internalType": "uint64",
16028
+ "name": "txOutputValue",
16029
+ "type": "uint64"
16030
+ }
16031
+ ],
16032
+ "internalType": "struct BitcoinTx.UTXO",
16033
+ "name": "walletMainUtxo",
16034
+ "type": "tuple"
16035
+ },
16036
+ {
16037
+ "internalType": "uint32[]",
16038
+ "name": "walletMembersIDs",
16039
+ "type": "uint32[]"
16040
+ },
16041
+ {
16042
+ "internalType": "uint256",
16043
+ "name": "walletMemberIndex",
16044
+ "type": "uint256"
16045
+ },
16046
+ {
16047
+ "internalType": "bytes20[]",
16048
+ "name": "targetWallets",
16049
+ "type": "bytes20[]"
15776
16050
  }
15777
16051
  ],
15778
- "name": "submitMovingFundsProof",
16052
+ "name": "submitMovingFundsCommitment",
15779
16053
  "outputs": [],
15780
16054
  "stateMutability": "nonpayable",
15781
16055
  "type": "function"
@@ -15806,7 +16080,7 @@
15806
16080
  }
15807
16081
  ],
15808
16082
  "internalType": "struct BitcoinTx.Info",
15809
- "name": "redemptionTx",
16083
+ "name": "movingFundsTx",
15810
16084
  "type": "tuple"
15811
16085
  },
15812
16086
  {
@@ -15828,7 +16102,7 @@
15828
16102
  }
15829
16103
  ],
15830
16104
  "internalType": "struct BitcoinTx.Proof",
15831
- "name": "redemptionProof",
16105
+ "name": "movingFundsProof",
15832
16106
  "type": "tuple"
15833
16107
  },
15834
16108
  {
@@ -15859,7 +16133,7 @@
15859
16133
  "type": "bytes20"
15860
16134
  }
15861
16135
  ],
15862
- "name": "submitRedemptionProof",
16136
+ "name": "submitMovingFundsProof",
15863
16137
  "outputs": [],
15864
16138
  "stateMutability": "nonpayable",
15865
16139
  "type": "function"
@@ -15890,7 +16164,7 @@
15890
16164
  }
15891
16165
  ],
15892
16166
  "internalType": "struct BitcoinTx.Info",
15893
- "name": "sweepTx",
16167
+ "name": "redemptionTx",
15894
16168
  "type": "tuple"
15895
16169
  },
15896
16170
  {
@@ -15912,7 +16186,7 @@
15912
16186
  }
15913
16187
  ],
15914
16188
  "internalType": "struct BitcoinTx.Proof",
15915
- "name": "sweepProof",
16189
+ "name": "redemptionProof",
15916
16190
  "type": "tuple"
15917
16191
  },
15918
16192
  {
@@ -15936,9 +16210,14 @@
15936
16210
  "internalType": "struct BitcoinTx.UTXO",
15937
16211
  "name": "mainUtxo",
15938
16212
  "type": "tuple"
16213
+ },
16214
+ {
16215
+ "internalType": "bytes20",
16216
+ "name": "walletPubKeyHash",
16217
+ "type": "bytes20"
15939
16218
  }
15940
16219
  ],
15941
- "name": "submitSweepProof",
16220
+ "name": "submitRedemptionProof",
15942
16221
  "outputs": [],
15943
16222
  "stateMutability": "nonpayable",
15944
16223
  "type": "function"
@@ -16028,19 +16307,6 @@
16028
16307
  "stateMutability": "view",
16029
16308
  "type": "function"
16030
16309
  },
16031
- {
16032
- "inputs": [
16033
- {
16034
- "internalType": "bytes20",
16035
- "name": "walletPubKeyHash",
16036
- "type": "bytes20"
16037
- }
16038
- ],
16039
- "name": "unsetWalletMainUtxo",
16040
- "outputs": [],
16041
- "stateMutability": "nonpayable",
16042
- "type": "function"
16043
- },
16044
16310
  {
16045
16311
  "inputs": [
16046
16312
  {
@@ -16066,14 +16332,9 @@
16066
16332
  },
16067
16333
  {
16068
16334
  "inputs": [
16069
- {
16070
- "internalType": "uint96",
16071
- "name": "fraudSlashingAmount",
16072
- "type": "uint96"
16073
- },
16074
16335
  {
16075
16336
  "internalType": "uint256",
16076
- "name": "fraudNotifierRewardMultiplier",
16337
+ "name": "fraudChallengeDepositAmount",
16077
16338
  "type": "uint256"
16078
16339
  },
16079
16340
  {
@@ -16081,9 +16342,14 @@
16081
16342
  "name": "fraudChallengeDefeatTimeout",
16082
16343
  "type": "uint256"
16083
16344
  },
16345
+ {
16346
+ "internalType": "uint96",
16347
+ "name": "fraudSlashingAmount",
16348
+ "type": "uint96"
16349
+ },
16084
16350
  {
16085
16351
  "internalType": "uint256",
16086
- "name": "fraudChallengeDepositAmount",
16352
+ "name": "fraudNotifierRewardMultiplier",
16087
16353
  "type": "uint256"
16088
16354
  }
16089
16355
  ],
@@ -16099,14 +16365,29 @@
16099
16365
  "name": "movingFundsTxMaxTotalFee",
16100
16366
  "type": "uint64"
16101
16367
  },
16368
+ {
16369
+ "internalType": "uint64",
16370
+ "name": "movingFundsDustThreshold",
16371
+ "type": "uint64"
16372
+ },
16102
16373
  {
16103
16374
  "internalType": "uint32",
16104
16375
  "name": "movingFundsTimeout",
16105
16376
  "type": "uint32"
16106
16377
  },
16378
+ {
16379
+ "internalType": "uint96",
16380
+ "name": "movingFundsTimeoutSlashingAmount",
16381
+ "type": "uint96"
16382
+ },
16383
+ {
16384
+ "internalType": "uint256",
16385
+ "name": "movingFundsTimeoutNotifierRewardMultiplier",
16386
+ "type": "uint256"
16387
+ },
16107
16388
  {
16108
16389
  "internalType": "uint64",
16109
- "name": "movingFundsDustThreshold",
16390
+ "name": "movedFundsSweepTxMaxTotalFee",
16110
16391
  "type": "uint64"
16111
16392
  }
16112
16393
  ],