@keep-network/tbtc-v2 0.1.1-dev.55 → 0.1.1-dev.58

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 +716 -197
  3. package/artifacts/Deposit.json +9 -9
  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 +9 -9
  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 +77 -11
  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 +9 -9
  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 +9 -9
  32. package/artifacts/solcInputs/{6d69fc514efd874ebb1cb86b04981772.json → 452e42f1afe94d8639a5bf98bed9e151.json} +10 -10
  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 +375 -103
  39. package/build/contracts/bridge/BridgeState.sol/BridgeState.dbg.json +1 -1
  40. package/build/contracts/bridge/BridgeState.sol/BridgeState.json +26 -2
  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/DepositSweep.sol/DepositSweep.json +30 -0
  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 +46 -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 +175 -8
  63. package/contracts/bridge/BridgeState.sol +85 -3
  64. package/contracts/bridge/{Sweep.sol → DepositSweep.sol} +30 -18
  65. package/contracts/bridge/MovingFunds.sol +586 -76
  66. package/contracts/bridge/Wallets.sol +2 -0
  67. package/deploy/05_deploy_bridge.ts +5 -2
  68. package/export.json +479 -56
  69. package/package.json +1 -1
  70. package/artifacts/Sweep.json +0 -76
  71. package/build/contracts/bridge/Sweep.sol/Sweep.dbg.json +0 -4
  72. package/build/contracts/bridge/Sweep.sol/Sweep.json +0 -30
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,50 @@
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": "movingFundsTxHash",
13934
+ "type": "bytes32"
13935
+ },
13936
+ {
13937
+ "indexed": false,
13938
+ "internalType": "uint32",
13939
+ "name": "movingFundsTxOutputIndex",
13940
+ "type": "uint32"
13941
+ }
13942
+ ],
13943
+ "name": "MovedFundsSweepTimedOut",
13944
+ "type": "event"
13945
+ },
13946
+ {
13947
+ "anonymous": false,
13948
+ "inputs": [
13949
+ {
13950
+ "indexed": false,
13951
+ "internalType": "bytes20",
13952
+ "name": "walletPubKeyHash",
13953
+ "type": "bytes20"
13954
+ },
13955
+ {
13956
+ "indexed": false,
13957
+ "internalType": "bytes32",
13958
+ "name": "sweepTxHash",
13959
+ "type": "bytes32"
13960
+ }
13961
+ ],
13962
+ "name": "MovedFundsSwept",
13963
+ "type": "event"
13964
+ },
13921
13965
  {
13922
13966
  "anonymous": false,
13923
13967
  "inputs": [
@@ -14254,6 +14298,50 @@
14254
14298
  "name": "GovernanceTransferred",
14255
14299
  "type": "event"
14256
14300
  },
14301
+ {
14302
+ "anonymous": false,
14303
+ "inputs": [
14304
+ {
14305
+ "indexed": false,
14306
+ "internalType": "bytes20",
14307
+ "name": "walletPubKeyHash",
14308
+ "type": "bytes20"
14309
+ },
14310
+ {
14311
+ "indexed": false,
14312
+ "internalType": "bytes32",
14313
+ "name": "movingFundsTxHash",
14314
+ "type": "bytes32"
14315
+ },
14316
+ {
14317
+ "indexed": false,
14318
+ "internalType": "uint32",
14319
+ "name": "movingFundsTxOutputIndex",
14320
+ "type": "uint32"
14321
+ }
14322
+ ],
14323
+ "name": "MovedFundsSweepTimedOut",
14324
+ "type": "event"
14325
+ },
14326
+ {
14327
+ "anonymous": false,
14328
+ "inputs": [
14329
+ {
14330
+ "indexed": false,
14331
+ "internalType": "bytes20",
14332
+ "name": "walletPubKeyHash",
14333
+ "type": "bytes20"
14334
+ },
14335
+ {
14336
+ "indexed": false,
14337
+ "internalType": "bytes32",
14338
+ "name": "sweepTxHash",
14339
+ "type": "bytes32"
14340
+ }
14341
+ ],
14342
+ "name": "MovedFundsSwept",
14343
+ "type": "event"
14344
+ },
14257
14345
  {
14258
14346
  "anonymous": false,
14259
14347
  "inputs": [
@@ -14343,6 +14431,30 @@
14343
14431
  "internalType": "uint256",
14344
14432
  "name": "movingFundsTimeoutNotifierRewardMultiplier",
14345
14433
  "type": "uint256"
14434
+ },
14435
+ {
14436
+ "indexed": false,
14437
+ "internalType": "uint64",
14438
+ "name": "movedFundsSweepTxMaxTotalFee",
14439
+ "type": "uint64"
14440
+ },
14441
+ {
14442
+ "indexed": false,
14443
+ "internalType": "uint32",
14444
+ "name": "movedFundsSweepTimeout",
14445
+ "type": "uint32"
14446
+ },
14447
+ {
14448
+ "indexed": false,
14449
+ "internalType": "uint96",
14450
+ "name": "movedFundsSweepTimeoutSlashingAmount",
14451
+ "type": "uint96"
14452
+ },
14453
+ {
14454
+ "indexed": false,
14455
+ "internalType": "uint256",
14456
+ "name": "movedFundsSweepTimeoutNotifierRewardMultiplier",
14457
+ "type": "uint256"
14346
14458
  }
14347
14459
  ],
14348
14460
  "name": "MovingFundsParametersUpdated",
@@ -14947,6 +15059,47 @@
14947
15059
  "stateMutability": "view",
14948
15060
  "type": "function"
14949
15061
  },
15062
+ {
15063
+ "inputs": [
15064
+ {
15065
+ "internalType": "uint256",
15066
+ "name": "requestKey",
15067
+ "type": "uint256"
15068
+ }
15069
+ ],
15070
+ "name": "movedFundsSweepRequests",
15071
+ "outputs": [
15072
+ {
15073
+ "components": [
15074
+ {
15075
+ "internalType": "bytes20",
15076
+ "name": "walletPubKeyHash",
15077
+ "type": "bytes20"
15078
+ },
15079
+ {
15080
+ "internalType": "uint64",
15081
+ "name": "value",
15082
+ "type": "uint64"
15083
+ },
15084
+ {
15085
+ "internalType": "uint32",
15086
+ "name": "createdAt",
15087
+ "type": "uint32"
15088
+ },
15089
+ {
15090
+ "internalType": "enum MovingFunds.MovedFundsSweepRequestState",
15091
+ "name": "state",
15092
+ "type": "uint8"
15093
+ }
15094
+ ],
15095
+ "internalType": "struct MovingFunds.MovedFundsSweepRequest",
15096
+ "name": "",
15097
+ "type": "tuple"
15098
+ }
15099
+ ],
15100
+ "stateMutability": "view",
15101
+ "type": "function"
15102
+ },
14950
15103
  {
14951
15104
  "inputs": [],
14952
15105
  "name": "movingFundsParameters",
@@ -14975,6 +15128,26 @@
14975
15128
  "internalType": "uint256",
14976
15129
  "name": "movingFundsTimeoutNotifierRewardMultiplier",
14977
15130
  "type": "uint256"
15131
+ },
15132
+ {
15133
+ "internalType": "uint64",
15134
+ "name": "movedFundsSweepTxMaxTotalFee",
15135
+ "type": "uint64"
15136
+ },
15137
+ {
15138
+ "internalType": "uint32",
15139
+ "name": "movedFundsSweepTimeout",
15140
+ "type": "uint32"
15141
+ },
15142
+ {
15143
+ "internalType": "uint96",
15144
+ "name": "movedFundsSweepTimeoutSlashingAmount",
15145
+ "type": "uint96"
15146
+ },
15147
+ {
15148
+ "internalType": "uint256",
15149
+ "name": "movedFundsSweepTimeoutNotifierRewardMultiplier",
15150
+ "type": "uint256"
14978
15151
  }
14979
15152
  ],
14980
15153
  "stateMutability": "view",
@@ -15038,6 +15211,29 @@
15038
15211
  "stateMutability": "nonpayable",
15039
15212
  "type": "function"
15040
15213
  },
15214
+ {
15215
+ "inputs": [
15216
+ {
15217
+ "internalType": "bytes32",
15218
+ "name": "movingFundsTxHash",
15219
+ "type": "bytes32"
15220
+ },
15221
+ {
15222
+ "internalType": "uint32",
15223
+ "name": "movingFundsTxOutputIndex",
15224
+ "type": "uint32"
15225
+ },
15226
+ {
15227
+ "internalType": "uint32[]",
15228
+ "name": "walletMembersIDs",
15229
+ "type": "uint32[]"
15230
+ }
15231
+ ],
15232
+ "name": "notifyMovedFundsSweepTimeout",
15233
+ "outputs": [],
15234
+ "stateMutability": "nonpayable",
15235
+ "type": "function"
15236
+ },
15041
15237
  {
15042
15238
  "inputs": [
15043
15239
  {
@@ -15173,6 +15369,41 @@
15173
15369
  "stateMutability": "view",
15174
15370
  "type": "function"
15175
15371
  },
15372
+ {
15373
+ "inputs": [
15374
+ {
15375
+ "internalType": "bytes20",
15376
+ "name": "walletPubKeyHash",
15377
+ "type": "bytes20"
15378
+ },
15379
+ {
15380
+ "components": [
15381
+ {
15382
+ "internalType": "bytes32",
15383
+ "name": "txHash",
15384
+ "type": "bytes32"
15385
+ },
15386
+ {
15387
+ "internalType": "uint32",
15388
+ "name": "txOutputIndex",
15389
+ "type": "uint32"
15390
+ },
15391
+ {
15392
+ "internalType": "uint64",
15393
+ "name": "txOutputValue",
15394
+ "type": "uint64"
15395
+ }
15396
+ ],
15397
+ "internalType": "struct BitcoinTx.UTXO",
15398
+ "name": "utxo",
15399
+ "type": "tuple"
15400
+ }
15401
+ ],
15402
+ "name": "processPendingMovedFundsSweepRequest",
15403
+ "outputs": [],
15404
+ "stateMutability": "nonpayable",
15405
+ "type": "function"
15406
+ },
15176
15407
  {
15177
15408
  "inputs": [],
15178
15409
  "name": "redemptionParameters",
@@ -15402,6 +15633,19 @@
15402
15633
  "stateMutability": "nonpayable",
15403
15634
  "type": "function"
15404
15635
  },
15636
+ {
15637
+ "inputs": [
15638
+ {
15639
+ "internalType": "uint64",
15640
+ "name": "_movedFundsSweepTxMaxTotalFee",
15641
+ "type": "uint64"
15642
+ }
15643
+ ],
15644
+ "name": "setMovedFundsSweepTxMaxTotalFee",
15645
+ "outputs": [],
15646
+ "stateMutability": "nonpayable",
15647
+ "type": "function"
15648
+ },
15405
15649
  {
15406
15650
  "inputs": [
15407
15651
  {
@@ -15415,6 +15659,41 @@
15415
15659
  "stateMutability": "nonpayable",
15416
15660
  "type": "function"
15417
15661
  },
15662
+ {
15663
+ "inputs": [
15664
+ {
15665
+ "internalType": "bytes20",
15666
+ "name": "walletPubKeyHash",
15667
+ "type": "bytes20"
15668
+ },
15669
+ {
15670
+ "components": [
15671
+ {
15672
+ "internalType": "bytes32",
15673
+ "name": "txHash",
15674
+ "type": "bytes32"
15675
+ },
15676
+ {
15677
+ "internalType": "uint32",
15678
+ "name": "txOutputIndex",
15679
+ "type": "uint32"
15680
+ },
15681
+ {
15682
+ "internalType": "uint64",
15683
+ "name": "txOutputValue",
15684
+ "type": "uint64"
15685
+ }
15686
+ ],
15687
+ "internalType": "struct BitcoinTx.UTXO",
15688
+ "name": "utxo",
15689
+ "type": "tuple"
15690
+ }
15691
+ ],
15692
+ "name": "setPendingMovedFundsSweepRequest",
15693
+ "outputs": [],
15694
+ "stateMutability": "nonpayable",
15695
+ "type": "function"
15696
+ },
15418
15697
  {
15419
15698
  "inputs": [
15420
15699
  {
@@ -15558,6 +15837,11 @@
15558
15837
  "name": "closingStartedAt",
15559
15838
  "type": "uint32"
15560
15839
  },
15840
+ {
15841
+ "internalType": "uint32",
15842
+ "name": "pendingMovedFundsSweepRequestsCount",
15843
+ "type": "uint32"
15844
+ },
15561
15845
  {
15562
15846
  "internalType": "enum Wallets.WalletState",
15563
15847
  "name": "state",
@@ -15636,49 +15920,53 @@
15636
15920
  {
15637
15921
  "inputs": [
15638
15922
  {
15639
- "internalType": "bytes",
15640
- "name": "walletPublicKey",
15641
- "type": "bytes"
15642
- },
15643
- {
15644
- "internalType": "bytes32",
15645
- "name": "sighash",
15646
- "type": "bytes32"
15923
+ "components": [
15924
+ {
15925
+ "internalType": "bytes4",
15926
+ "name": "version",
15927
+ "type": "bytes4"
15928
+ },
15929
+ {
15930
+ "internalType": "bytes",
15931
+ "name": "inputVector",
15932
+ "type": "bytes"
15933
+ },
15934
+ {
15935
+ "internalType": "bytes",
15936
+ "name": "outputVector",
15937
+ "type": "bytes"
15938
+ },
15939
+ {
15940
+ "internalType": "bytes4",
15941
+ "name": "locktime",
15942
+ "type": "bytes4"
15943
+ }
15944
+ ],
15945
+ "internalType": "struct BitcoinTx.Info",
15946
+ "name": "sweepTx",
15947
+ "type": "tuple"
15647
15948
  },
15648
15949
  {
15649
15950
  "components": [
15650
15951
  {
15651
- "internalType": "bytes32",
15652
- "name": "r",
15653
- "type": "bytes32"
15952
+ "internalType": "bytes",
15953
+ "name": "merkleProof",
15954
+ "type": "bytes"
15654
15955
  },
15655
15956
  {
15656
- "internalType": "bytes32",
15657
- "name": "s",
15658
- "type": "bytes32"
15957
+ "internalType": "uint256",
15958
+ "name": "txIndexInBlock",
15959
+ "type": "uint256"
15659
15960
  },
15660
15961
  {
15661
- "internalType": "uint8",
15662
- "name": "v",
15663
- "type": "uint8"
15962
+ "internalType": "bytes",
15963
+ "name": "bitcoinHeaders",
15964
+ "type": "bytes"
15664
15965
  }
15665
15966
  ],
15666
- "internalType": "struct BitcoinTx.RSVSignature",
15667
- "name": "signature",
15967
+ "internalType": "struct BitcoinTx.Proof",
15968
+ "name": "sweepProof",
15668
15969
  "type": "tuple"
15669
- }
15670
- ],
15671
- "name": "submitFraudChallenge",
15672
- "outputs": [],
15673
- "stateMutability": "payable",
15674
- "type": "function"
15675
- },
15676
- {
15677
- "inputs": [
15678
- {
15679
- "internalType": "bytes20",
15680
- "name": "walletPubKeyHash",
15681
- "type": "bytes20"
15682
15970
  },
15683
15971
  {
15684
15972
  "components": [
@@ -15699,28 +15987,53 @@
15699
15987
  }
15700
15988
  ],
15701
15989
  "internalType": "struct BitcoinTx.UTXO",
15702
- "name": "walletMainUtxo",
15990
+ "name": "mainUtxo",
15703
15991
  "type": "tuple"
15704
- },
15992
+ }
15993
+ ],
15994
+ "name": "submitDepositSweepProof",
15995
+ "outputs": [],
15996
+ "stateMutability": "nonpayable",
15997
+ "type": "function"
15998
+ },
15999
+ {
16000
+ "inputs": [
15705
16001
  {
15706
- "internalType": "uint32[]",
15707
- "name": "walletMembersIDs",
15708
- "type": "uint32[]"
16002
+ "internalType": "bytes",
16003
+ "name": "walletPublicKey",
16004
+ "type": "bytes"
15709
16005
  },
15710
16006
  {
15711
- "internalType": "uint256",
15712
- "name": "walletMemberIndex",
15713
- "type": "uint256"
16007
+ "internalType": "bytes32",
16008
+ "name": "sighash",
16009
+ "type": "bytes32"
15714
16010
  },
15715
16011
  {
15716
- "internalType": "bytes20[]",
15717
- "name": "targetWallets",
15718
- "type": "bytes20[]"
16012
+ "components": [
16013
+ {
16014
+ "internalType": "bytes32",
16015
+ "name": "r",
16016
+ "type": "bytes32"
16017
+ },
16018
+ {
16019
+ "internalType": "bytes32",
16020
+ "name": "s",
16021
+ "type": "bytes32"
16022
+ },
16023
+ {
16024
+ "internalType": "uint8",
16025
+ "name": "v",
16026
+ "type": "uint8"
16027
+ }
16028
+ ],
16029
+ "internalType": "struct BitcoinTx.RSVSignature",
16030
+ "name": "signature",
16031
+ "type": "tuple"
15719
16032
  }
15720
16033
  ],
15721
- "name": "submitMovingFundsCommitment",
16034
+ "name": "submitFraudChallenge",
15722
16035
  "outputs": [],
15723
- "stateMutability": "nonpayable",
16036
+ "stateMutability": "payable",
15724
16037
  "type": "function"
15725
16038
  },
15726
16039
  {
@@ -15749,7 +16062,7 @@
15749
16062
  }
15750
16063
  ],
15751
16064
  "internalType": "struct BitcoinTx.Info",
15752
- "name": "movingFundsTx",
16065
+ "name": "sweepTx",
15753
16066
  "type": "tuple"
15754
16067
  },
15755
16068
  {
@@ -15771,7 +16084,7 @@
15771
16084
  }
15772
16085
  ],
15773
16086
  "internalType": "struct BitcoinTx.Proof",
15774
- "name": "movingFundsProof",
16087
+ "name": "sweepProof",
15775
16088
  "type": "tuple"
15776
16089
  },
15777
16090
  {
@@ -15795,14 +16108,59 @@
15795
16108
  "internalType": "struct BitcoinTx.UTXO",
15796
16109
  "name": "mainUtxo",
15797
16110
  "type": "tuple"
15798
- },
16111
+ }
16112
+ ],
16113
+ "name": "submitMovedFundsSweepProof",
16114
+ "outputs": [],
16115
+ "stateMutability": "nonpayable",
16116
+ "type": "function"
16117
+ },
16118
+ {
16119
+ "inputs": [
15799
16120
  {
15800
16121
  "internalType": "bytes20",
15801
16122
  "name": "walletPubKeyHash",
15802
16123
  "type": "bytes20"
16124
+ },
16125
+ {
16126
+ "components": [
16127
+ {
16128
+ "internalType": "bytes32",
16129
+ "name": "txHash",
16130
+ "type": "bytes32"
16131
+ },
16132
+ {
16133
+ "internalType": "uint32",
16134
+ "name": "txOutputIndex",
16135
+ "type": "uint32"
16136
+ },
16137
+ {
16138
+ "internalType": "uint64",
16139
+ "name": "txOutputValue",
16140
+ "type": "uint64"
16141
+ }
16142
+ ],
16143
+ "internalType": "struct BitcoinTx.UTXO",
16144
+ "name": "walletMainUtxo",
16145
+ "type": "tuple"
16146
+ },
16147
+ {
16148
+ "internalType": "uint32[]",
16149
+ "name": "walletMembersIDs",
16150
+ "type": "uint32[]"
16151
+ },
16152
+ {
16153
+ "internalType": "uint256",
16154
+ "name": "walletMemberIndex",
16155
+ "type": "uint256"
16156
+ },
16157
+ {
16158
+ "internalType": "bytes20[]",
16159
+ "name": "targetWallets",
16160
+ "type": "bytes20[]"
15803
16161
  }
15804
16162
  ],
15805
- "name": "submitMovingFundsProof",
16163
+ "name": "submitMovingFundsCommitment",
15806
16164
  "outputs": [],
15807
16165
  "stateMutability": "nonpayable",
15808
16166
  "type": "function"
@@ -15833,7 +16191,7 @@
15833
16191
  }
15834
16192
  ],
15835
16193
  "internalType": "struct BitcoinTx.Info",
15836
- "name": "redemptionTx",
16194
+ "name": "movingFundsTx",
15837
16195
  "type": "tuple"
15838
16196
  },
15839
16197
  {
@@ -15855,7 +16213,7 @@
15855
16213
  }
15856
16214
  ],
15857
16215
  "internalType": "struct BitcoinTx.Proof",
15858
- "name": "redemptionProof",
16216
+ "name": "movingFundsProof",
15859
16217
  "type": "tuple"
15860
16218
  },
15861
16219
  {
@@ -15886,7 +16244,7 @@
15886
16244
  "type": "bytes20"
15887
16245
  }
15888
16246
  ],
15889
- "name": "submitRedemptionProof",
16247
+ "name": "submitMovingFundsProof",
15890
16248
  "outputs": [],
15891
16249
  "stateMutability": "nonpayable",
15892
16250
  "type": "function"
@@ -15917,7 +16275,7 @@
15917
16275
  }
15918
16276
  ],
15919
16277
  "internalType": "struct BitcoinTx.Info",
15920
- "name": "sweepTx",
16278
+ "name": "redemptionTx",
15921
16279
  "type": "tuple"
15922
16280
  },
15923
16281
  {
@@ -15939,7 +16297,7 @@
15939
16297
  }
15940
16298
  ],
15941
16299
  "internalType": "struct BitcoinTx.Proof",
15942
- "name": "sweepProof",
16300
+ "name": "redemptionProof",
15943
16301
  "type": "tuple"
15944
16302
  },
15945
16303
  {
@@ -15963,9 +16321,14 @@
15963
16321
  "internalType": "struct BitcoinTx.UTXO",
15964
16322
  "name": "mainUtxo",
15965
16323
  "type": "tuple"
16324
+ },
16325
+ {
16326
+ "internalType": "bytes20",
16327
+ "name": "walletPubKeyHash",
16328
+ "type": "bytes20"
15966
16329
  }
15967
16330
  ],
15968
- "name": "submitSweepProof",
16331
+ "name": "submitRedemptionProof",
15969
16332
  "outputs": [],
15970
16333
  "stateMutability": "nonpayable",
15971
16334
  "type": "function"
@@ -16016,6 +16379,41 @@
16016
16379
  "stateMutability": "view",
16017
16380
  "type": "function"
16018
16381
  },
16382
+ {
16383
+ "inputs": [
16384
+ {
16385
+ "internalType": "bytes20",
16386
+ "name": "walletPubKeyHash",
16387
+ "type": "bytes20"
16388
+ },
16389
+ {
16390
+ "components": [
16391
+ {
16392
+ "internalType": "bytes32",
16393
+ "name": "txHash",
16394
+ "type": "bytes32"
16395
+ },
16396
+ {
16397
+ "internalType": "uint32",
16398
+ "name": "txOutputIndex",
16399
+ "type": "uint32"
16400
+ },
16401
+ {
16402
+ "internalType": "uint64",
16403
+ "name": "txOutputValue",
16404
+ "type": "uint64"
16405
+ }
16406
+ ],
16407
+ "internalType": "struct BitcoinTx.UTXO",
16408
+ "name": "utxo",
16409
+ "type": "tuple"
16410
+ }
16411
+ ],
16412
+ "name": "timeoutPendingMovedFundsSweepRequest",
16413
+ "outputs": [],
16414
+ "stateMutability": "nonpayable",
16415
+ "type": "function"
16416
+ },
16019
16417
  {
16020
16418
  "inputs": [
16021
16419
  {
@@ -16132,6 +16530,26 @@
16132
16530
  "internalType": "uint256",
16133
16531
  "name": "movingFundsTimeoutNotifierRewardMultiplier",
16134
16532
  "type": "uint256"
16533
+ },
16534
+ {
16535
+ "internalType": "uint64",
16536
+ "name": "movedFundsSweepTxMaxTotalFee",
16537
+ "type": "uint64"
16538
+ },
16539
+ {
16540
+ "internalType": "uint32",
16541
+ "name": "movedFundsSweepTimeout",
16542
+ "type": "uint32"
16543
+ },
16544
+ {
16545
+ "internalType": "uint96",
16546
+ "name": "movedFundsSweepTimeoutSlashingAmount",
16547
+ "type": "uint96"
16548
+ },
16549
+ {
16550
+ "internalType": "uint256",
16551
+ "name": "movedFundsSweepTimeoutNotifierRewardMultiplier",
16552
+ "type": "uint256"
16135
16553
  }
16136
16554
  ],
16137
16555
  "name": "updateMovingFundsParameters",
@@ -16305,6 +16723,11 @@
16305
16723
  "name": "closingStartedAt",
16306
16724
  "type": "uint32"
16307
16725
  },
16726
+ {
16727
+ "internalType": "uint32",
16728
+ "name": "pendingMovedFundsSweepRequestsCount",
16729
+ "type": "uint32"
16730
+ },
16308
16731
  {
16309
16732
  "internalType": "enum Wallets.WalletState",
16310
16733
  "name": "state",