@keep-network/tbtc-v2 0.1.1-dev.85 → 0.1.1-dev.88
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/artifacts/Bank.json +3 -3
- package/artifacts/Bridge.json +5 -5
- package/artifacts/Deposit.json +2 -2
- package/artifacts/DepositSweep.json +2 -2
- package/artifacts/EcdsaDkgValidator.json +1 -1
- package/artifacts/EcdsaInactivity.json +1 -1
- package/artifacts/EcdsaSortitionPool.json +2 -2
- package/artifacts/Fraud.json +2 -2
- package/artifacts/KeepRegistry.json +1 -1
- package/artifacts/KeepStake.json +2 -2
- package/artifacts/KeepToken.json +2 -2
- package/artifacts/KeepTokenStaking.json +1 -1
- package/artifacts/MovingFunds.json +2 -2
- package/artifacts/NuCypherStakingEscrow.json +1 -1
- package/artifacts/NuCypherToken.json +2 -2
- package/artifacts/RandomBeaconStub.json +1 -1
- package/artifacts/Redemption.json +2 -2
- package/artifacts/ReimbursementPool.json +2 -2
- package/artifacts/Relay.json +2 -2
- package/artifacts/T.json +2 -2
- package/artifacts/TBTC.json +3 -3
- package/artifacts/TBTCToken.json +3 -3
- package/artifacts/TBTCVault.json +252 -52
- package/artifacts/TokenStaking.json +1 -1
- package/artifacts/TokenholderGovernor.json +9 -9
- package/artifacts/TokenholderTimelock.json +8 -8
- package/artifacts/VendingMachine.json +3 -3
- package/artifacts/VendingMachineKeep.json +1 -1
- package/artifacts/VendingMachineNuCypher.json +1 -1
- package/artifacts/WalletRegistry.json +5 -5
- package/artifacts/WalletRegistryGovernance.json +2 -2
- package/artifacts/Wallets.json +2 -2
- package/artifacts/solcInputs/{0f79d51f4c2e0d6bf7d919933c677b91.json → 27ac4a57be279323111e8884efd59d76.json} +10 -10
- package/build/contracts/GovernanceUtils.sol/GovernanceUtils.dbg.json +1 -1
- package/build/contracts/bank/Bank.sol/Bank.dbg.json +1 -1
- package/build/contracts/bank/IReceiveBalanceApproval.sol/IReceiveBalanceApproval.dbg.json +1 -1
- package/build/contracts/bridge/BitcoinTx.sol/BitcoinTx.dbg.json +1 -1
- package/build/contracts/bridge/Bridge.sol/Bridge.dbg.json +1 -1
- package/build/contracts/bridge/BridgeState.sol/BridgeState.dbg.json +1 -1
- package/build/contracts/bridge/Deposit.sol/Deposit.dbg.json +1 -1
- package/build/contracts/bridge/DepositSweep.sol/DepositSweep.dbg.json +1 -1
- package/build/contracts/bridge/EcdsaLib.sol/EcdsaLib.dbg.json +1 -1
- package/build/contracts/bridge/Fraud.sol/Fraud.dbg.json +1 -1
- package/build/contracts/bridge/Heartbeat.sol/Heartbeat.dbg.json +1 -1
- package/build/contracts/bridge/IRelay.sol/IRelay.dbg.json +1 -1
- package/build/contracts/bridge/MovingFunds.sol/MovingFunds.dbg.json +1 -1
- package/build/contracts/bridge/Redemption.sol/OutboundTx.dbg.json +1 -1
- package/build/contracts/bridge/Redemption.sol/Redemption.dbg.json +1 -1
- package/build/contracts/bridge/VendingMachine.sol/VendingMachine.dbg.json +1 -1
- package/build/contracts/bridge/Wallets.sol/Wallets.dbg.json +1 -1
- package/build/contracts/token/TBTC.sol/TBTC.dbg.json +1 -1
- package/build/contracts/vault/DonationVault.sol/DonationVault.dbg.json +1 -1
- package/build/contracts/vault/IVault.sol/IVault.dbg.json +1 -1
- package/build/contracts/vault/TBTCVault.sol/TBTCVault.dbg.json +1 -1
- package/build/contracts/vault/TBTCVault.sol/TBTCVault.json +167 -18
- package/contracts/vault/TBTCVault.sol +120 -33
- package/deploy/{03_transfer_roles.ts → 03_transfer_vending_machine_roles.ts} +1 -1
- package/deploy/{08_transfer_ownership.ts → 08_transfer_bank_ownership.ts} +1 -1
- package/deploy/09_transfer_tbtc_vault_ownership.ts +15 -0
- package/deploy/{09_transfer_governance.ts → 10_transfer_bridge_governance.ts} +1 -1
- package/deploy/{10_transfer_proxy_admin_ownership.ts → 11_transfer_proxy_admin_ownership.ts} +0 -0
- package/deploy/{11_deploy_proxy_admin_with_deputy.ts → 12_deploy_proxy_admin_with_deputy.ts} +0 -0
- package/export.json +165 -16
- package/package.json +1 -1
|
@@ -23,19 +23,38 @@
|
|
|
23
23
|
"anonymous": false,
|
|
24
24
|
"inputs": [
|
|
25
25
|
{
|
|
26
|
-
"indexed":
|
|
26
|
+
"indexed": true,
|
|
27
27
|
"internalType": "address",
|
|
28
|
-
"name": "
|
|
28
|
+
"name": "to",
|
|
29
29
|
"type": "address"
|
|
30
30
|
},
|
|
31
31
|
{
|
|
32
32
|
"indexed": false,
|
|
33
|
+
"internalType": "uint256",
|
|
34
|
+
"name": "amount",
|
|
35
|
+
"type": "uint256"
|
|
36
|
+
}
|
|
37
|
+
],
|
|
38
|
+
"name": "Minted",
|
|
39
|
+
"type": "event"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"anonymous": false,
|
|
43
|
+
"inputs": [
|
|
44
|
+
{
|
|
45
|
+
"indexed": true,
|
|
33
46
|
"internalType": "address",
|
|
34
|
-
"name": "
|
|
47
|
+
"name": "previousOwner",
|
|
48
|
+
"type": "address"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"indexed": true,
|
|
52
|
+
"internalType": "address",
|
|
53
|
+
"name": "newOwner",
|
|
35
54
|
"type": "address"
|
|
36
55
|
}
|
|
37
56
|
],
|
|
38
|
-
"name": "
|
|
57
|
+
"name": "OwnershipTransferred",
|
|
39
58
|
"type": "event"
|
|
40
59
|
},
|
|
41
60
|
{
|
|
@@ -44,7 +63,7 @@
|
|
|
44
63
|
{
|
|
45
64
|
"indexed": true,
|
|
46
65
|
"internalType": "address",
|
|
47
|
-
"name": "
|
|
66
|
+
"name": "from",
|
|
48
67
|
"type": "address"
|
|
49
68
|
},
|
|
50
69
|
{
|
|
@@ -54,28 +73,54 @@
|
|
|
54
73
|
"type": "uint256"
|
|
55
74
|
}
|
|
56
75
|
],
|
|
57
|
-
"name": "
|
|
76
|
+
"name": "Unminted",
|
|
58
77
|
"type": "event"
|
|
59
78
|
},
|
|
60
79
|
{
|
|
61
80
|
"anonymous": false,
|
|
62
81
|
"inputs": [
|
|
63
82
|
{
|
|
64
|
-
"indexed":
|
|
83
|
+
"indexed": false,
|
|
65
84
|
"internalType": "address",
|
|
66
|
-
"name": "
|
|
85
|
+
"name": "newVault",
|
|
86
|
+
"type": "address"
|
|
87
|
+
}
|
|
88
|
+
],
|
|
89
|
+
"name": "UpgradeFinalized",
|
|
90
|
+
"type": "event"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"anonymous": false,
|
|
94
|
+
"inputs": [
|
|
95
|
+
{
|
|
96
|
+
"indexed": false,
|
|
97
|
+
"internalType": "address",
|
|
98
|
+
"name": "newVault",
|
|
67
99
|
"type": "address"
|
|
68
100
|
},
|
|
69
101
|
{
|
|
70
102
|
"indexed": false,
|
|
71
103
|
"internalType": "uint256",
|
|
72
|
-
"name": "
|
|
104
|
+
"name": "timestamp",
|
|
73
105
|
"type": "uint256"
|
|
74
106
|
}
|
|
75
107
|
],
|
|
76
|
-
"name": "
|
|
108
|
+
"name": "UpgradeInitiated",
|
|
77
109
|
"type": "event"
|
|
78
110
|
},
|
|
111
|
+
{
|
|
112
|
+
"inputs": [],
|
|
113
|
+
"name": "UPGRADE_GOVERNANCE_DELAY",
|
|
114
|
+
"outputs": [
|
|
115
|
+
{
|
|
116
|
+
"internalType": "uint256",
|
|
117
|
+
"name": "",
|
|
118
|
+
"type": "uint256"
|
|
119
|
+
}
|
|
120
|
+
],
|
|
121
|
+
"stateMutability": "view",
|
|
122
|
+
"type": "function"
|
|
123
|
+
},
|
|
79
124
|
{
|
|
80
125
|
"inputs": [],
|
|
81
126
|
"name": "bank",
|
|
@@ -91,15 +136,22 @@
|
|
|
91
136
|
},
|
|
92
137
|
{
|
|
93
138
|
"inputs": [],
|
|
94
|
-
"name": "
|
|
95
|
-
"outputs": [
|
|
139
|
+
"name": "finalizeUpgrade",
|
|
140
|
+
"outputs": [],
|
|
141
|
+
"stateMutability": "nonpayable",
|
|
142
|
+
"type": "function"
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
"inputs": [
|
|
96
146
|
{
|
|
97
147
|
"internalType": "address",
|
|
98
|
-
"name": "",
|
|
148
|
+
"name": "_newVault",
|
|
99
149
|
"type": "address"
|
|
100
150
|
}
|
|
101
151
|
],
|
|
102
|
-
"
|
|
152
|
+
"name": "initiateUpgrade",
|
|
153
|
+
"outputs": [],
|
|
154
|
+
"stateMutability": "nonpayable",
|
|
103
155
|
"type": "function"
|
|
104
156
|
},
|
|
105
157
|
{
|
|
@@ -115,6 +167,32 @@
|
|
|
115
167
|
"stateMutability": "nonpayable",
|
|
116
168
|
"type": "function"
|
|
117
169
|
},
|
|
170
|
+
{
|
|
171
|
+
"inputs": [],
|
|
172
|
+
"name": "newVault",
|
|
173
|
+
"outputs": [
|
|
174
|
+
{
|
|
175
|
+
"internalType": "address",
|
|
176
|
+
"name": "",
|
|
177
|
+
"type": "address"
|
|
178
|
+
}
|
|
179
|
+
],
|
|
180
|
+
"stateMutability": "view",
|
|
181
|
+
"type": "function"
|
|
182
|
+
},
|
|
183
|
+
{
|
|
184
|
+
"inputs": [],
|
|
185
|
+
"name": "owner",
|
|
186
|
+
"outputs": [
|
|
187
|
+
{
|
|
188
|
+
"internalType": "address",
|
|
189
|
+
"name": "",
|
|
190
|
+
"type": "address"
|
|
191
|
+
}
|
|
192
|
+
],
|
|
193
|
+
"stateMutability": "view",
|
|
194
|
+
"type": "function"
|
|
195
|
+
},
|
|
118
196
|
{
|
|
119
197
|
"inputs": [
|
|
120
198
|
{
|
|
@@ -207,6 +285,29 @@
|
|
|
207
285
|
"stateMutability": "nonpayable",
|
|
208
286
|
"type": "function"
|
|
209
287
|
},
|
|
288
|
+
{
|
|
289
|
+
"inputs": [
|
|
290
|
+
{
|
|
291
|
+
"internalType": "contract IERC20",
|
|
292
|
+
"name": "token",
|
|
293
|
+
"type": "address"
|
|
294
|
+
},
|
|
295
|
+
{
|
|
296
|
+
"internalType": "address",
|
|
297
|
+
"name": "recipient",
|
|
298
|
+
"type": "address"
|
|
299
|
+
},
|
|
300
|
+
{
|
|
301
|
+
"internalType": "uint256",
|
|
302
|
+
"name": "amount",
|
|
303
|
+
"type": "uint256"
|
|
304
|
+
}
|
|
305
|
+
],
|
|
306
|
+
"name": "recoverERC20FromToken",
|
|
307
|
+
"outputs": [],
|
|
308
|
+
"stateMutability": "nonpayable",
|
|
309
|
+
"type": "function"
|
|
310
|
+
},
|
|
210
311
|
{
|
|
211
312
|
"inputs": [
|
|
212
313
|
{
|
|
@@ -235,6 +336,41 @@
|
|
|
235
336
|
"stateMutability": "nonpayable",
|
|
236
337
|
"type": "function"
|
|
237
338
|
},
|
|
339
|
+
{
|
|
340
|
+
"inputs": [
|
|
341
|
+
{
|
|
342
|
+
"internalType": "contract IERC721",
|
|
343
|
+
"name": "token",
|
|
344
|
+
"type": "address"
|
|
345
|
+
},
|
|
346
|
+
{
|
|
347
|
+
"internalType": "address",
|
|
348
|
+
"name": "recipient",
|
|
349
|
+
"type": "address"
|
|
350
|
+
},
|
|
351
|
+
{
|
|
352
|
+
"internalType": "uint256",
|
|
353
|
+
"name": "tokenId",
|
|
354
|
+
"type": "uint256"
|
|
355
|
+
},
|
|
356
|
+
{
|
|
357
|
+
"internalType": "bytes",
|
|
358
|
+
"name": "data",
|
|
359
|
+
"type": "bytes"
|
|
360
|
+
}
|
|
361
|
+
],
|
|
362
|
+
"name": "recoverERC721FromToken",
|
|
363
|
+
"outputs": [],
|
|
364
|
+
"stateMutability": "nonpayable",
|
|
365
|
+
"type": "function"
|
|
366
|
+
},
|
|
367
|
+
{
|
|
368
|
+
"inputs": [],
|
|
369
|
+
"name": "renounceOwnership",
|
|
370
|
+
"outputs": [],
|
|
371
|
+
"stateMutability": "nonpayable",
|
|
372
|
+
"type": "function"
|
|
373
|
+
},
|
|
238
374
|
{
|
|
239
375
|
"inputs": [],
|
|
240
376
|
"name": "tbtcToken",
|
|
@@ -252,11 +388,11 @@
|
|
|
252
388
|
"inputs": [
|
|
253
389
|
{
|
|
254
390
|
"internalType": "address",
|
|
255
|
-
"name": "
|
|
391
|
+
"name": "newOwner",
|
|
256
392
|
"type": "address"
|
|
257
393
|
}
|
|
258
394
|
],
|
|
259
|
-
"name": "
|
|
395
|
+
"name": "transferOwnership",
|
|
260
396
|
"outputs": [],
|
|
261
397
|
"stateMutability": "nonpayable",
|
|
262
398
|
"type": "function"
|
|
@@ -291,10 +427,23 @@
|
|
|
291
427
|
"outputs": [],
|
|
292
428
|
"stateMutability": "nonpayable",
|
|
293
429
|
"type": "function"
|
|
430
|
+
},
|
|
431
|
+
{
|
|
432
|
+
"inputs": [],
|
|
433
|
+
"name": "upgradeInitiatedTimestamp",
|
|
434
|
+
"outputs": [
|
|
435
|
+
{
|
|
436
|
+
"internalType": "uint256",
|
|
437
|
+
"name": "",
|
|
438
|
+
"type": "uint256"
|
|
439
|
+
}
|
|
440
|
+
],
|
|
441
|
+
"stateMutability": "view",
|
|
442
|
+
"type": "function"
|
|
294
443
|
}
|
|
295
444
|
],
|
|
296
|
-
"bytecode": "0x60806040523480156200001157600080fd5b506040516200133c3803806200133c8339810160408190526200003491620001b4565b6001600160a01b038216620000905760405162461bcd60e51b815260206004820181905260248201527f42616e6b2063616e206e6f7420626520746865207a65726f206164647265737360448201526064015b60405180910390fd5b6001600160a01b038116620000f75760405162461bcd60e51b815260206004820152602660248201527f5442544320746f6b656e2063616e206e6f7420626520746865207a65726f206160448201526564647265737360d01b606482015260840162000087565b603280546001600160a01b038085166001600160a01b031992831617909255603380549284169290911691909117905562000132336200013a565b5050620001f3565b600080546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a15050565b6001600160a01b0381168114620001b157600080fd5b50565b60008060408385031215620001c857600080fd5b8251620001d5816200019b565b6020840151909250620001e8816200019b565b809150509250929050565b61113980620002036000396000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806376cdb03b11610081578063d38bfff41161005b578063d38bfff4146101a2578063e5d3d714146101b5578063fc4e51f6146101c857600080fd5b806376cdb03b146101695780638f4ffcb11461017c578063a0712d681461018f57600080fd5b806353dce4df116100b257806353dce4df146101145780635aa6e6751461012757806364e779b11461015657600080fd5b80631171bda9146100d9578063461c6373146100ee578063475d057014610101575b600080fd5b6100ec6100e7366004610d17565b6101db565b005b6100ec6100fc366004610da4565b6102c6565b6100ec61010f366004610e52565b6103d9565b6100ec610122366004610ea2565b610586565b60005461013a906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100ec610164366004610eee565b610597565b60325461013a906001600160a01b031681565b6100ec61018a366004610f07565b6105a4565b6100ec61019d366004610eee565b610679565b6100ec6101b0366004610f7a565b6107cd565b60335461013a906001600160a01b031681565b6100ec6101d6366004610f9e565b6108ac565b6000546001600160a01b0316331461023a5760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e63650000000060448201526064015b60405180910390fd5b6033546040517f1171bda90000000000000000000000000000000000000000000000000000000081526001600160a01b03858116600483015284811660248301526044820184905290911690631171bda990606401600060405180830381600087803b1580156102a957600080fd5b505af11580156102bd573d6000803e3d6000fd5b50505050505050565b6032546001600160a01b031633146103205760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610231565b8261036d5760405162461bcd60e51b815260206004820152601760248201527f4e6f206465706f7369746f7273207370656369666965640000000000000000006044820152606401610231565b60005b838110156103d2576103c085858381811061038d5761038d610ff4565b90506020020160208101906103a29190610f7a565b8484848181106103b4576103b4610ff4565b90506020020135610990565b806103ca8161100a565b915050610370565b5050505050565b6032546001600160a01b031633146104335760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610231565b6032546040516370a0823160e01b81526001600160a01b038681166004830152859216906370a082319060240160206040518083038186803b15801561047857600080fd5b505afa15801561048c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104b09190611033565b10156105095760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610231565b6105138484610990565b603254604051631f1b6d2760e21b81526001600160a01b0386811660048301523060248301526044820186905290911690637c6db49c906064015b600060405180830381600087803b15801561056857600080fd5b505af115801561057c573d6000803e3d6000fd5b5050505050505050565b61059233848484610a25565b505050565b6105a13382610b8e565b50565b6033546001600160a01b038481169116146106015760405162461bcd60e51b815260206004820152601160248201527f546f6b656e206973206e6f7420544254430000000000000000000000000000006044820152606401610231565b336001600160a01b038416146106595760405162461bcd60e51b815260206004820152601860248201527f4f6e6c7920544254432063616c6c657220616c6c6f77656400000000000000006044820152606401610231565b8061066d576106688585610b8e565b6103d2565b6103d285858484610a25565b6032546040516370a0823160e01b815233600482018190529183916001600160a01b03909116906370a082319060240160206040518083038186803b1580156106c157600080fd5b505afa1580156106d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106f99190611033565b10156107525760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610231565b61075c8183610990565b603254604051631f1b6d2760e21b81526001600160a01b0383811660048301523060248301526044820185905290911690637c6db49c906064015b600060405180830381600087803b1580156107b157600080fd5b505af11580156107c5573d6000803e3d6000fd5b505050505050565b6000546001600160a01b031633146108275760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e6365000000006044820152606401610231565b6001600160a01b0381166108a35760405162461bcd60e51b815260206004820152602260248201527f4e657720676f7665726e616e636520697320746865207a65726f20616464726560448201527f73730000000000000000000000000000000000000000000000000000000000006064820152608401610231565b6105a181610c89565b6000546001600160a01b031633146109065760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e6365000000006044820152606401610231565b6033546040517ffc4e51f60000000000000000000000000000000000000000000000000000000081526001600160a01b039091169063fc4e51f6906109579088908890889088908890600401611075565b600060405180830381600087803b15801561097157600080fd5b505af1158015610985573d6000803e3d6000fd5b505050505050505050565b816001600160a01b03167f30385c845b448a36257a6a1716e6ad2e1bc2cbe333cde1e69fe849ad6511adfe826040516109cb91815260200190565b60405180910390a26033546040517f40c10f190000000000000000000000000000000000000000000000000000000081526001600160a01b03848116600483015260248201849052909116906340c10f1990604401610797565b836001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b884604051610a6091815260200190565b60405180910390a260335460405163079cc67960e41b81526001600160a01b03868116600483015260248201869052909116906379cc679090604401600060405180830381600087803b158015610ab657600080fd5b505af1158015610aca573d6000803e3d6000fd5b5050603254604080517fe78cea9200000000000000000000000000000000000000000000000000000000815290516001600160a01b039092169350634a38757e9250839163e78cea9291600480820192602092909190829003018186803b158015610b3457600080fd5b505afa158015610b48573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b6c91906110b3565b8585856040518563ffffffff1660e01b815260040161054e94939291906110d0565b816001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b882604051610bc991815260200190565b60405180910390a260335460405163079cc67960e41b81526001600160a01b03848116600483015260248201849052909116906379cc679090604401600060405180830381600087803b158015610c1f57600080fd5b505af1158015610c33573d6000803e3d6000fd5b50506032546040517f56a6d9ef0000000000000000000000000000000000000000000000000000000081526001600160a01b0386811660048301526024820186905290911692506356a6d9ef9150604401610797565b600080546001600160a01b038381167fffffffffffffffffffffffff000000000000000000000000000000000000000083168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a15050565b6001600160a01b03811681146105a157600080fd5b600080600060608486031215610d2c57600080fd5b8335610d3781610d02565b92506020840135610d4781610d02565b929592945050506040919091013590565b60008083601f840112610d6a57600080fd5b50813567ffffffffffffffff811115610d8257600080fd5b6020830191508360208260051b8501011115610d9d57600080fd5b9250929050565b60008060008060408587031215610dba57600080fd5b843567ffffffffffffffff80821115610dd257600080fd5b610dde88838901610d58565b90965094506020870135915080821115610df757600080fd5b50610e0487828801610d58565b95989497509550505050565b60008083601f840112610e2257600080fd5b50813567ffffffffffffffff811115610e3a57600080fd5b602083019150836020828501011115610d9d57600080fd5b60008060008060608587031215610e6857600080fd5b8435610e7381610d02565b935060208501359250604085013567ffffffffffffffff811115610e9657600080fd5b610e0487828801610e10565b600080600060408486031215610eb757600080fd5b83359250602084013567ffffffffffffffff811115610ed557600080fd5b610ee186828701610e10565b9497909650939450505050565b600060208284031215610f0057600080fd5b5035919050565b600080600080600060808688031215610f1f57600080fd5b8535610f2a81610d02565b9450602086013593506040860135610f4181610d02565b9250606086013567ffffffffffffffff811115610f5d57600080fd5b610f6988828901610e10565b969995985093965092949392505050565b600060208284031215610f8c57600080fd5b8135610f9781610d02565b9392505050565b600080600080600060808688031215610fb657600080fd5b8535610fc181610d02565b94506020860135610fd181610d02565b935060408601359250606086013567ffffffffffffffff811115610f5d57600080fd5b634e487b7160e01b600052603260045260246000fd5b600060001982141561102c57634e487b7160e01b600052601160045260246000fd5b5060010190565b60006020828403121561104557600080fd5b5051919050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60006001600160a01b038088168352808716602084015250846040830152608060608301526110a860808301848661104c565b979650505050505050565b6000602082840312156110c557600080fd5b8151610f9781610d02565b6001600160a01b03851681528360208201526060604082015260006110f960608301848661104c565b969550505050505056fea2646970667358221220d2cfb91930afdd275bc94b23bee0885041e8e6f33971c1a8d00e04c1b5b1ccf064736f6c63430008090033",
|
|
297
|
-
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100d45760003560e01c806376cdb03b11610081578063d38bfff41161005b578063d38bfff4146101a2578063e5d3d714146101b5578063fc4e51f6146101c857600080fd5b806376cdb03b146101695780638f4ffcb11461017c578063a0712d681461018f57600080fd5b806353dce4df116100b257806353dce4df146101145780635aa6e6751461012757806364e779b11461015657600080fd5b80631171bda9146100d9578063461c6373146100ee578063475d057014610101575b600080fd5b6100ec6100e7366004610d17565b6101db565b005b6100ec6100fc366004610da4565b6102c6565b6100ec61010f366004610e52565b6103d9565b6100ec610122366004610ea2565b610586565b60005461013a906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b6100ec610164366004610eee565b610597565b60325461013a906001600160a01b031681565b6100ec61018a366004610f07565b6105a4565b6100ec61019d366004610eee565b610679565b6100ec6101b0366004610f7a565b6107cd565b60335461013a906001600160a01b031681565b6100ec6101d6366004610f9e565b6108ac565b6000546001600160a01b0316331461023a5760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e63650000000060448201526064015b60405180910390fd5b6033546040517f1171bda90000000000000000000000000000000000000000000000000000000081526001600160a01b03858116600483015284811660248301526044820184905290911690631171bda990606401600060405180830381600087803b1580156102a957600080fd5b505af11580156102bd573d6000803e3d6000fd5b50505050505050565b6032546001600160a01b031633146103205760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610231565b8261036d5760405162461bcd60e51b815260206004820152601760248201527f4e6f206465706f7369746f7273207370656369666965640000000000000000006044820152606401610231565b60005b838110156103d2576103c085858381811061038d5761038d610ff4565b90506020020160208101906103a29190610f7a565b8484848181106103b4576103b4610ff4565b90506020020135610990565b806103ca8161100a565b915050610370565b5050505050565b6032546001600160a01b031633146104335760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610231565b6032546040516370a0823160e01b81526001600160a01b038681166004830152859216906370a082319060240160206040518083038186803b15801561047857600080fd5b505afa15801561048c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104b09190611033565b10156105095760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610231565b6105138484610990565b603254604051631f1b6d2760e21b81526001600160a01b0386811660048301523060248301526044820186905290911690637c6db49c906064015b600060405180830381600087803b15801561056857600080fd5b505af115801561057c573d6000803e3d6000fd5b5050505050505050565b61059233848484610a25565b505050565b6105a13382610b8e565b50565b6033546001600160a01b038481169116146106015760405162461bcd60e51b815260206004820152601160248201527f546f6b656e206973206e6f7420544254430000000000000000000000000000006044820152606401610231565b336001600160a01b038416146106595760405162461bcd60e51b815260206004820152601860248201527f4f6e6c7920544254432063616c6c657220616c6c6f77656400000000000000006044820152606401610231565b8061066d576106688585610b8e565b6103d2565b6103d285858484610a25565b6032546040516370a0823160e01b815233600482018190529183916001600160a01b03909116906370a082319060240160206040518083038186803b1580156106c157600080fd5b505afa1580156106d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106f99190611033565b10156107525760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610231565b61075c8183610990565b603254604051631f1b6d2760e21b81526001600160a01b0383811660048301523060248301526044820185905290911690637c6db49c906064015b600060405180830381600087803b1580156107b157600080fd5b505af11580156107c5573d6000803e3d6000fd5b505050505050565b6000546001600160a01b031633146108275760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e6365000000006044820152606401610231565b6001600160a01b0381166108a35760405162461bcd60e51b815260206004820152602260248201527f4e657720676f7665726e616e636520697320746865207a65726f20616464726560448201527f73730000000000000000000000000000000000000000000000000000000000006064820152608401610231565b6105a181610c89565b6000546001600160a01b031633146109065760405162461bcd60e51b815260206004820152601c60248201527f43616c6c6572206973206e6f742074686520676f7665726e616e6365000000006044820152606401610231565b6033546040517ffc4e51f60000000000000000000000000000000000000000000000000000000081526001600160a01b039091169063fc4e51f6906109579088908890889088908890600401611075565b600060405180830381600087803b15801561097157600080fd5b505af1158015610985573d6000803e3d6000fd5b505050505050505050565b816001600160a01b03167f30385c845b448a36257a6a1716e6ad2e1bc2cbe333cde1e69fe849ad6511adfe826040516109cb91815260200190565b60405180910390a26033546040517f40c10f190000000000000000000000000000000000000000000000000000000081526001600160a01b03848116600483015260248201849052909116906340c10f1990604401610797565b836001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b884604051610a6091815260200190565b60405180910390a260335460405163079cc67960e41b81526001600160a01b03868116600483015260248201869052909116906379cc679090604401600060405180830381600087803b158015610ab657600080fd5b505af1158015610aca573d6000803e3d6000fd5b5050603254604080517fe78cea9200000000000000000000000000000000000000000000000000000000815290516001600160a01b039092169350634a38757e9250839163e78cea9291600480820192602092909190829003018186803b158015610b3457600080fd5b505afa158015610b48573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b6c91906110b3565b8585856040518563ffffffff1660e01b815260040161054e94939291906110d0565b816001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b882604051610bc991815260200190565b60405180910390a260335460405163079cc67960e41b81526001600160a01b03848116600483015260248201849052909116906379cc679090604401600060405180830381600087803b158015610c1f57600080fd5b505af1158015610c33573d6000803e3d6000fd5b50506032546040517f56a6d9ef0000000000000000000000000000000000000000000000000000000081526001600160a01b0386811660048301526024820186905290911692506356a6d9ef9150604401610797565b600080546001600160a01b038381167fffffffffffffffffffffffff000000000000000000000000000000000000000083168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce80910160405180910390a15050565b6001600160a01b03811681146105a157600080fd5b600080600060608486031215610d2c57600080fd5b8335610d3781610d02565b92506020840135610d4781610d02565b929592945050506040919091013590565b60008083601f840112610d6a57600080fd5b50813567ffffffffffffffff811115610d8257600080fd5b6020830191508360208260051b8501011115610d9d57600080fd5b9250929050565b60008060008060408587031215610dba57600080fd5b843567ffffffffffffffff80821115610dd257600080fd5b610dde88838901610d58565b90965094506020870135915080821115610df757600080fd5b50610e0487828801610d58565b95989497509550505050565b60008083601f840112610e2257600080fd5b50813567ffffffffffffffff811115610e3a57600080fd5b602083019150836020828501011115610d9d57600080fd5b60008060008060608587031215610e6857600080fd5b8435610e7381610d02565b935060208501359250604085013567ffffffffffffffff811115610e9657600080fd5b610e0487828801610e10565b600080600060408486031215610eb757600080fd5b83359250602084013567ffffffffffffffff811115610ed557600080fd5b610ee186828701610e10565b9497909650939450505050565b600060208284031215610f0057600080fd5b5035919050565b600080600080600060808688031215610f1f57600080fd5b8535610f2a81610d02565b9450602086013593506040860135610f4181610d02565b9250606086013567ffffffffffffffff811115610f5d57600080fd5b610f6988828901610e10565b969995985093965092949392505050565b600060208284031215610f8c57600080fd5b8135610f9781610d02565b9392505050565b600080600080600060808688031215610fb657600080fd5b8535610fc181610d02565b94506020860135610fd181610d02565b935060408601359250606086013567ffffffffffffffff811115610f5d57600080fd5b634e487b7160e01b600052603260045260246000fd5b600060001982141561102c57634e487b7160e01b600052601160045260246000fd5b5060010190565b60006020828403121561104557600080fd5b5051919050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60006001600160a01b038088168352808716602084015250846040830152608060608301526110a860808301848661104c565b979650505050505050565b6000602082840312156110c557600080fd5b8151610f9781610d02565b6001600160a01b03851681528360208201526060604082015260006110f960608301848661104c565b969550505050505056fea2646970667358221220d2cfb91930afdd275bc94b23bee0885041e8e6f33971c1a8d00e04c1b5b1ccf064736f6c63430008090033",
|
|
445
|
+
"bytecode": "0x60806040523480156200001157600080fd5b5060405162001c5d38038062001c5d83398101604081905262000034916200019d565b6200003f3362000134565b6001600160a01b0382166200009b5760405162461bcd60e51b815260206004820181905260248201527f42616e6b2063616e206e6f7420626520746865207a65726f206164647265737360448201526064015b60405180910390fd5b6001600160a01b038116620001025760405162461bcd60e51b815260206004820152602660248201527f5442544320746f6b656e2063616e206e6f7420626520746865207a65726f206160448201526564647265737360d01b606482015260840162000092565b600180546001600160a01b039384166001600160a01b03199182161790915560028054929093169116179055620001dc565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146200019a57600080fd5b50565b60008060408385031215620001b157600080fd5b8251620001be8162000184565b6020840151909250620001d18162000184565b809150509250929050565b611a7180620001ec6000396000f3fe608060405234801561001057600080fd5b506004361061016c5760003560e01c806388aaf0c8116100cd578063a0712d6811610081578063e5d3d71411610066578063e5d3d714146102b6578063f2fde38b146102c9578063fc4e51f6146102dc57600080fd5b8063a0712d6814610299578063cfce0816146102ac57600080fd5b80638f4ffcb1116100b25780638f4ffcb114610267578063951315261461027a5780639a508c8e1461029157600080fd5b806388aaf0c8146102435780638da5cb5b1461025657600080fd5b8063479aa9271161012457806364e779b11161010957806364e779b1146101f8578063715018a61461020b57806376cdb03b1461021357600080fd5b8063479aa927146101d257806353dce4df146101e557600080fd5b8063317dfa7611610155578063317dfa7614610199578063461c6373146101ac578063475d0570146101bf57600080fd5b80631171bda9146101715780632e73e39814610186575b600080fd5b61018461017f3660046115a1565b6102ef565b005b61018461019436600461162b565b610367565b6101846101a73660046115a1565b61044b565b6101846101ba3660046116e3565b610531565b6101846101cd36600461174f565b610644565b6101846101e036600461179f565b6107f1565b6101846101f33660046117bc565b610915565b610184610206366004611808565b610921565b61018461092e565b600154610226906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b600354610226906001600160a01b031681565b6000546001600160a01b0316610226565b610184610275366004611821565b610994565b61028360045481565b60405190815260200161023a565b610184610a69565b6101846102a7366004611808565b610bb0565b6102836201518081565b600254610226906001600160a01b031681565b6101846102d736600461179f565b610d04565b6101846102ea36600461162b565b610de3565b6000546001600160a01b0316331461034e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b6103626001600160a01b0384168383610e8a565b505050565b6000546001600160a01b031633146103c15760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6002546040517ffc4e51f60000000000000000000000000000000000000000000000000000000081526001600160a01b039091169063fc4e51f69061041290889088908890889088906004016118a0565b600060405180830381600087803b15801561042c57600080fd5b505af1158015610440573d6000803e3d6000fd5b505050505050505050565b6000546001600160a01b031633146104a55760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6002546040517f1171bda90000000000000000000000000000000000000000000000000000000081526001600160a01b03858116600483015284811660248301526044820184905290911690631171bda990606401600060405180830381600087803b15801561051457600080fd5b505af1158015610528573d6000803e3d6000fd5b50505050505050565b6001546001600160a01b0316331461058b5760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610345565b826105d85760405162461bcd60e51b815260206004820152601760248201527f4e6f206465706f7369746f7273207370656369666965640000000000000000006044820152606401610345565b60005b8381101561063d5761062b8585838181106105f8576105f86118d3565b905060200201602081019061060d919061179f565b84848481811061061f5761061f6118d3565b90506020020135610f0a565b80610635816118ff565b9150506105db565b5050505050565b6001546001600160a01b0316331461069e5760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610345565b6001546040516370a0823160e01b81526001600160a01b038681166004830152859216906370a082319060240160206040518083038186803b1580156106e357600080fd5b505afa1580156106f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061071b919061191a565b10156107745760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610345565b61077e8484610f0a565b600154604051631f1b6d2760e21b81526001600160a01b0386811660048301523060248301526044820186905290911690637c6db49c906064015b600060405180830381600087803b1580156107d357600080fd5b505af11580156107e7573d6000803e3d6000fd5b5050505050505050565b6000546001600160a01b0316331461084b5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6001600160a01b0381166108a15760405162461bcd60e51b815260206004820181905260248201527f4e6577207661756c7420616464726573732063616e6e6f74206265207a65726f6044820152606401610345565b604080516001600160a01b03831681524260208201527f5cc842cab066489e13292128663547c68705dbf476f0131e0107f155719c6124910160405180910390a1426004556003805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392909216919091179055565b61036233848484610f9f565b61092b3382611108565b50565b6000546001600160a01b031633146109885760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6109926000611203565b565b6002546001600160a01b038481169116146109f15760405162461bcd60e51b815260206004820152601160248201527f546f6b656e206973206e6f7420544254430000000000000000000000000000006044820152606401610345565b336001600160a01b03841614610a495760405162461bcd60e51b815260206004820152601860248201527f4f6e6c7920544254432063616c6c657220616c6c6f77656400000000000000006044820152606401610345565b80610a5d57610a588585611108565b61063d565b61063d85858484610f9f565b6000546001600160a01b03163314610ac35760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b610ad260045462015180611260565b6003546040516001600160a01b0390911681527f81a9bb8030ed4116b405800280e065110a37afb57b69948e714c97fab23475ec9060200160405180910390a16002546003546040517ff2fde38b0000000000000000000000000000000000000000000000000000000081526001600160a01b03918216600482015291169063f2fde38b90602401600060405180830381600087803b158015610b7457600080fd5b505af1158015610b88573d6000803e3d6000fd5b50506003805473ffffffffffffffffffffffffffffffffffffffff1916905550506000600455565b6001546040516370a0823160e01b815233600482018190529183916001600160a01b03909116906370a082319060240160206040518083038186803b158015610bf857600080fd5b505afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061191a565b1015610c895760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610345565b610c938183610f0a565b600154604051631f1b6d2760e21b81526001600160a01b0383811660048301523060248301526044820185905290911690637c6db49c906064015b600060405180830381600087803b158015610ce857600080fd5b505af1158015610cfc573d6000803e3d6000fd5b505050505050565b6000546001600160a01b03163314610d5e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6001600160a01b038116610dda5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610345565b61092b81611203565b6000546001600160a01b03163314610e3d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6040517fb88d4fde0000000000000000000000000000000000000000000000000000000081526001600160a01b0386169063b88d4fde9061041290309088908890889088906004016118a0565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb0000000000000000000000000000000000000000000000000000000017905261036290849061130d565b816001600160a01b03167f30385c845b448a36257a6a1716e6ad2e1bc2cbe333cde1e69fe849ad6511adfe82604051610f4591815260200190565b60405180910390a26002546040517f40c10f190000000000000000000000000000000000000000000000000000000081526001600160a01b03848116600483015260248201849052909116906340c10f1990604401610cce565b836001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b884604051610fda91815260200190565b60405180910390a260025460405163079cc67960e41b81526001600160a01b03868116600483015260248201869052909116906379cc679090604401600060405180830381600087803b15801561103057600080fd5b505af1158015611044573d6000803e3d6000fd5b5050600154604080517fe78cea9200000000000000000000000000000000000000000000000000000000815290516001600160a01b039092169350634a38757e9250839163e78cea9291600480820192602092909190829003018186803b1580156110ae57600080fd5b505afa1580156110c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110e69190611933565b8585856040518563ffffffff1660e01b81526004016107b99493929190611950565b816001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b88260405161114391815260200190565b60405180910390a260025460405163079cc67960e41b81526001600160a01b03848116600483015260248201849052909116906379cc679090604401600060405180830381600087803b15801561119957600080fd5b505af11580156111ad573d6000803e3d6000fd5b50506001546040517f56a6d9ef0000000000000000000000000000000000000000000000000000000081526001600160a01b0386811660048301526024820186905290911692506356a6d9ef9150604401610cce565b600080546001600160a01b0383811673ffffffffffffffffffffffffffffffffffffffff19831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600082116112b05760405162461bcd60e51b815260206004820152601460248201527f4368616e6765206e6f7420696e697469617465640000000000000000000000006044820152606401610345565b806112bb8342611983565b10156113095760405162461bcd60e51b815260206004820181905260248201527f476f7665726e616e63652064656c617920686173206e6f7420656c61707365646044820152606401610345565b5050565b6000611362826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166113f29092919063ffffffff16565b8051909150156103625780806020019051810190611380919061199a565b6103625760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152608401610345565b6060611401848460008561140b565b90505b9392505050565b6060824710156114835760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f60448201527f722063616c6c00000000000000000000000000000000000000000000000000006064820152608401610345565b6001600160a01b0385163b6114da5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610345565b600080866001600160a01b031685876040516114f691906119ec565b60006040518083038185875af1925050503d8060008114611533576040519150601f19603f3d011682016040523d82523d6000602084013e611538565b606091505b5091509150611548828286611553565b979650505050505050565b60608315611562575081611404565b8251156115725782518084602001fd5b8160405162461bcd60e51b81526004016103459190611a08565b6001600160a01b038116811461092b57600080fd5b6000806000606084860312156115b657600080fd5b83356115c18161158c565b925060208401356115d18161158c565b929592945050506040919091013590565b60008083601f8401126115f457600080fd5b50813567ffffffffffffffff81111561160c57600080fd5b60208301915083602082850101111561162457600080fd5b9250929050565b60008060008060006080868803121561164357600080fd5b853561164e8161158c565b9450602086013561165e8161158c565b935060408601359250606086013567ffffffffffffffff81111561168157600080fd5b61168d888289016115e2565b969995985093965092949392505050565b60008083601f8401126116b057600080fd5b50813567ffffffffffffffff8111156116c857600080fd5b6020830191508360208260051b850101111561162457600080fd5b600080600080604085870312156116f957600080fd5b843567ffffffffffffffff8082111561171157600080fd5b61171d8883890161169e565b9096509450602087013591508082111561173657600080fd5b506117438782880161169e565b95989497509550505050565b6000806000806060858703121561176557600080fd5b84356117708161158c565b935060208501359250604085013567ffffffffffffffff81111561179357600080fd5b611743878288016115e2565b6000602082840312156117b157600080fd5b81356114048161158c565b6000806000604084860312156117d157600080fd5b83359250602084013567ffffffffffffffff8111156117ef57600080fd5b6117fb868287016115e2565b9497909650939450505050565b60006020828403121561181a57600080fd5b5035919050565b60008060008060006080868803121561183957600080fd5b85356118448161158c565b945060208601359350604086013561185b8161158c565b9250606086013567ffffffffffffffff81111561168157600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60006001600160a01b03808816835280871660208401525084604083015260806060830152611548608083018486611877565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000600019821415611913576119136118e9565b5060010190565b60006020828403121561192c57600080fd5b5051919050565b60006020828403121561194557600080fd5b81516114048161158c565b6001600160a01b0385168152836020820152606060408201526000611979606083018486611877565b9695505050505050565b600082821015611995576119956118e9565b500390565b6000602082840312156119ac57600080fd5b8151801515811461140457600080fd5b60005b838110156119d75781810151838201526020016119bf565b838111156119e6576000848401525b50505050565b600082516119fe8184602087016119bc565b9190910192915050565b6020815260008251806020840152611a278160408501602087016119bc565b601f01601f1916919091016040019291505056fea2646970667358221220b25f70f065fa45b053182561fc58e689b52346977f98f6199f89521a9050ab6964736f6c63430008090033",
|
|
446
|
+
"deployedBytecode": "0x608060405234801561001057600080fd5b506004361061016c5760003560e01c806388aaf0c8116100cd578063a0712d6811610081578063e5d3d71411610066578063e5d3d714146102b6578063f2fde38b146102c9578063fc4e51f6146102dc57600080fd5b8063a0712d6814610299578063cfce0816146102ac57600080fd5b80638f4ffcb1116100b25780638f4ffcb114610267578063951315261461027a5780639a508c8e1461029157600080fd5b806388aaf0c8146102435780638da5cb5b1461025657600080fd5b8063479aa9271161012457806364e779b11161010957806364e779b1146101f8578063715018a61461020b57806376cdb03b1461021357600080fd5b8063479aa927146101d257806353dce4df146101e557600080fd5b8063317dfa7611610155578063317dfa7614610199578063461c6373146101ac578063475d0570146101bf57600080fd5b80631171bda9146101715780632e73e39814610186575b600080fd5b61018461017f3660046115a1565b6102ef565b005b61018461019436600461162b565b610367565b6101846101a73660046115a1565b61044b565b6101846101ba3660046116e3565b610531565b6101846101cd36600461174f565b610644565b6101846101e036600461179f565b6107f1565b6101846101f33660046117bc565b610915565b610184610206366004611808565b610921565b61018461092e565b600154610226906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b600354610226906001600160a01b031681565b6000546001600160a01b0316610226565b610184610275366004611821565b610994565b61028360045481565b60405190815260200161023a565b610184610a69565b6101846102a7366004611808565b610bb0565b6102836201518081565b600254610226906001600160a01b031681565b6101846102d736600461179f565b610d04565b6101846102ea36600461162b565b610de3565b6000546001600160a01b0316331461034e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064015b60405180910390fd5b6103626001600160a01b0384168383610e8a565b505050565b6000546001600160a01b031633146103c15760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6002546040517ffc4e51f60000000000000000000000000000000000000000000000000000000081526001600160a01b039091169063fc4e51f69061041290889088908890889088906004016118a0565b600060405180830381600087803b15801561042c57600080fd5b505af1158015610440573d6000803e3d6000fd5b505050505050505050565b6000546001600160a01b031633146104a55760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6002546040517f1171bda90000000000000000000000000000000000000000000000000000000081526001600160a01b03858116600483015284811660248301526044820184905290911690631171bda990606401600060405180830381600087803b15801561051457600080fd5b505af1158015610528573d6000803e3d6000fd5b50505050505050565b6001546001600160a01b0316331461058b5760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610345565b826105d85760405162461bcd60e51b815260206004820152601760248201527f4e6f206465706f7369746f7273207370656369666965640000000000000000006044820152606401610345565b60005b8381101561063d5761062b8585838181106105f8576105f86118d3565b905060200201602081019061060d919061179f565b84848481811061061f5761061f6118d3565b90506020020135610f0a565b80610635816118ff565b9150506105db565b5050505050565b6001546001600160a01b0316331461069e5760405162461bcd60e51b815260206004820152601660248201527f43616c6c6572206973206e6f74207468652042616e6b000000000000000000006044820152606401610345565b6001546040516370a0823160e01b81526001600160a01b038681166004830152859216906370a082319060240160206040518083038186803b1580156106e357600080fd5b505afa1580156106f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061071b919061191a565b10156107745760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610345565b61077e8484610f0a565b600154604051631f1b6d2760e21b81526001600160a01b0386811660048301523060248301526044820186905290911690637c6db49c906064015b600060405180830381600087803b1580156107d357600080fd5b505af11580156107e7573d6000803e3d6000fd5b5050505050505050565b6000546001600160a01b0316331461084b5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6001600160a01b0381166108a15760405162461bcd60e51b815260206004820181905260248201527f4e6577207661756c7420616464726573732063616e6e6f74206265207a65726f6044820152606401610345565b604080516001600160a01b03831681524260208201527f5cc842cab066489e13292128663547c68705dbf476f0131e0107f155719c6124910160405180910390a1426004556003805473ffffffffffffffffffffffffffffffffffffffff19166001600160a01b0392909216919091179055565b61036233848484610f9f565b61092b3382611108565b50565b6000546001600160a01b031633146109885760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6109926000611203565b565b6002546001600160a01b038481169116146109f15760405162461bcd60e51b815260206004820152601160248201527f546f6b656e206973206e6f7420544254430000000000000000000000000000006044820152606401610345565b336001600160a01b03841614610a495760405162461bcd60e51b815260206004820152601860248201527f4f6e6c7920544254432063616c6c657220616c6c6f77656400000000000000006044820152606401610345565b80610a5d57610a588585611108565b61063d565b61063d85858484610f9f565b6000546001600160a01b03163314610ac35760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b610ad260045462015180611260565b6003546040516001600160a01b0390911681527f81a9bb8030ed4116b405800280e065110a37afb57b69948e714c97fab23475ec9060200160405180910390a16002546003546040517ff2fde38b0000000000000000000000000000000000000000000000000000000081526001600160a01b03918216600482015291169063f2fde38b90602401600060405180830381600087803b158015610b7457600080fd5b505af1158015610b88573d6000803e3d6000fd5b50506003805473ffffffffffffffffffffffffffffffffffffffff1916905550506000600455565b6001546040516370a0823160e01b815233600482018190529183916001600160a01b03909116906370a082319060240160206040518083038186803b158015610bf857600080fd5b505afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061191a565b1015610c895760405162461bcd60e51b815260206004820152602260248201527f416d6f756e7420657863656564732062616c616e636520696e207468652062616044820152616e6b60f01b6064820152608401610345565b610c938183610f0a565b600154604051631f1b6d2760e21b81526001600160a01b0383811660048301523060248301526044820185905290911690637c6db49c906064015b600060405180830381600087803b158015610ce857600080fd5b505af1158015610cfc573d6000803e3d6000fd5b505050505050565b6000546001600160a01b03163314610d5e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6001600160a01b038116610dda5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610345565b61092b81611203565b6000546001600160a01b03163314610e3d5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610345565b6040517fb88d4fde0000000000000000000000000000000000000000000000000000000081526001600160a01b0386169063b88d4fde9061041290309088908890889088906004016118a0565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb0000000000000000000000000000000000000000000000000000000017905261036290849061130d565b816001600160a01b03167f30385c845b448a36257a6a1716e6ad2e1bc2cbe333cde1e69fe849ad6511adfe82604051610f4591815260200190565b60405180910390a26002546040517f40c10f190000000000000000000000000000000000000000000000000000000081526001600160a01b03848116600483015260248201849052909116906340c10f1990604401610cce565b836001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b884604051610fda91815260200190565b60405180910390a260025460405163079cc67960e41b81526001600160a01b03868116600483015260248201869052909116906379cc679090604401600060405180830381600087803b15801561103057600080fd5b505af1158015611044573d6000803e3d6000fd5b5050600154604080517fe78cea9200000000000000000000000000000000000000000000000000000000815290516001600160a01b039092169350634a38757e9250839163e78cea9291600480820192602092909190829003018186803b1580156110ae57600080fd5b505afa1580156110c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110e69190611933565b8585856040518563ffffffff1660e01b81526004016107b99493929190611950565b816001600160a01b03167f68751a4c3821398cb63d11609eca2440742ef19446f0c0261bfa8a13dd0748b88260405161114391815260200190565b60405180910390a260025460405163079cc67960e41b81526001600160a01b03848116600483015260248201849052909116906379cc679090604401600060405180830381600087803b15801561119957600080fd5b505af11580156111ad573d6000803e3d6000fd5b50506001546040517f56a6d9ef0000000000000000000000000000000000000000000000000000000081526001600160a01b0386811660048301526024820186905290911692506356a6d9ef9150604401610cce565b600080546001600160a01b0383811673ffffffffffffffffffffffffffffffffffffffff19831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b600082116112b05760405162461bcd60e51b815260206004820152601460248201527f4368616e6765206e6f7420696e697469617465640000000000000000000000006044820152606401610345565b806112bb8342611983565b10156113095760405162461bcd60e51b815260206004820181905260248201527f476f7665726e616e63652064656c617920686173206e6f7420656c61707365646044820152606401610345565b5050565b6000611362826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166113f29092919063ffffffff16565b8051909150156103625780806020019051810190611380919061199a565b6103625760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f742073756363656564000000000000000000000000000000000000000000006064820152608401610345565b6060611401848460008561140b565b90505b9392505050565b6060824710156114835760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f60448201527f722063616c6c00000000000000000000000000000000000000000000000000006064820152608401610345565b6001600160a01b0385163b6114da5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610345565b600080866001600160a01b031685876040516114f691906119ec565b60006040518083038185875af1925050503d8060008114611533576040519150601f19603f3d011682016040523d82523d6000602084013e611538565b606091505b5091509150611548828286611553565b979650505050505050565b60608315611562575081611404565b8251156115725782518084602001fd5b8160405162461bcd60e51b81526004016103459190611a08565b6001600160a01b038116811461092b57600080fd5b6000806000606084860312156115b657600080fd5b83356115c18161158c565b925060208401356115d18161158c565b929592945050506040919091013590565b60008083601f8401126115f457600080fd5b50813567ffffffffffffffff81111561160c57600080fd5b60208301915083602082850101111561162457600080fd5b9250929050565b60008060008060006080868803121561164357600080fd5b853561164e8161158c565b9450602086013561165e8161158c565b935060408601359250606086013567ffffffffffffffff81111561168157600080fd5b61168d888289016115e2565b969995985093965092949392505050565b60008083601f8401126116b057600080fd5b50813567ffffffffffffffff8111156116c857600080fd5b6020830191508360208260051b850101111561162457600080fd5b600080600080604085870312156116f957600080fd5b843567ffffffffffffffff8082111561171157600080fd5b61171d8883890161169e565b9096509450602087013591508082111561173657600080fd5b506117438782880161169e565b95989497509550505050565b6000806000806060858703121561176557600080fd5b84356117708161158c565b935060208501359250604085013567ffffffffffffffff81111561179357600080fd5b611743878288016115e2565b6000602082840312156117b157600080fd5b81356114048161158c565b6000806000604084860312156117d157600080fd5b83359250602084013567ffffffffffffffff8111156117ef57600080fd5b6117fb868287016115e2565b9497909650939450505050565b60006020828403121561181a57600080fd5b5035919050565b60008060008060006080868803121561183957600080fd5b85356118448161158c565b945060208601359350604086013561185b8161158c565b9250606086013567ffffffffffffffff81111561168157600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60006001600160a01b03808816835280871660208401525084604083015260806060830152611548608083018486611877565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000600019821415611913576119136118e9565b5060010190565b60006020828403121561192c57600080fd5b5051919050565b60006020828403121561194557600080fd5b81516114048161158c565b6001600160a01b0385168152836020820152606060408201526000611979606083018486611877565b9695505050505050565b600082821015611995576119956118e9565b500390565b6000602082840312156119ac57600080fd5b8151801515811461140457600080fd5b60005b838110156119d75781810151838201526020016119bf565b838111156119e6576000848401525b50505050565b600082516119fe8184602087016119bc565b9190910192915050565b6020815260008251806020840152611a278160408501602087016119bc565b601f01601f1916919091016040019291505056fea2646970667358221220b25f70f065fa45b053182561fc58e689b52346977f98f6199f89521a9050ab6964736f6c63430008090033",
|
|
298
447
|
"linkReferences": {},
|
|
299
448
|
"deployedLinkReferences": {}
|
|
300
449
|
}
|
|
@@ -15,11 +15,12 @@
|
|
|
15
15
|
|
|
16
16
|
pragma solidity ^0.8.9;
|
|
17
17
|
|
|
18
|
-
import "@
|
|
18
|
+
import "@openzeppelin/contracts/access/Ownable.sol";
|
|
19
19
|
|
|
20
20
|
import "./IVault.sol";
|
|
21
21
|
import "../bank/Bank.sol";
|
|
22
22
|
import "../token/TBTC.sol";
|
|
23
|
+
import "../GovernanceUtils.sol";
|
|
23
24
|
|
|
24
25
|
/// @title TBTC application vault
|
|
25
26
|
/// @notice TBTC is a fully Bitcoin-backed ERC-20 token pegged to the price of
|
|
@@ -29,19 +30,46 @@ import "../token/TBTC.sol";
|
|
|
29
30
|
/// Bank.
|
|
30
31
|
/// @dev TBTC Vault is the owner of TBTC token contract and is the only contract
|
|
31
32
|
/// minting the token.
|
|
32
|
-
contract TBTCVault is IVault,
|
|
33
|
+
contract TBTCVault is IVault, Ownable {
|
|
34
|
+
using SafeERC20 for IERC20;
|
|
35
|
+
|
|
36
|
+
/// @notice The time delay that needs to pass between initializing and
|
|
37
|
+
/// finalizing upgrade to a new vault. The time delay forces the
|
|
38
|
+
/// upgrading party to reflect on the vault address it is upgrading
|
|
39
|
+
/// to and lets all TBTC holders notice the planned
|
|
40
|
+
/// upgrade.
|
|
41
|
+
uint256 public constant UPGRADE_GOVERNANCE_DELAY = 24 hours;
|
|
42
|
+
|
|
33
43
|
Bank public bank;
|
|
34
44
|
TBTC public tbtcToken;
|
|
35
45
|
|
|
36
|
-
|
|
46
|
+
/// @notice The address of a new TBTC vault. Set only when the upgrade
|
|
47
|
+
/// process is pending. Once the upgrade gets finalized, the new
|
|
48
|
+
/// TBTC vault will become an owner of TBTC token.
|
|
49
|
+
address public newVault;
|
|
50
|
+
/// @notice The timestamp at which an upgrade to a new TBTC vault was
|
|
51
|
+
/// initiated. Set only when the upgrade process is pending.
|
|
52
|
+
uint256 public upgradeInitiatedTimestamp;
|
|
37
53
|
|
|
54
|
+
event Minted(address indexed to, uint256 amount);
|
|
38
55
|
event Unminted(address indexed from, uint256 amount);
|
|
39
56
|
|
|
57
|
+
event UpgradeInitiated(address newVault, uint256 timestamp);
|
|
58
|
+
event UpgradeFinalized(address newVault);
|
|
59
|
+
|
|
40
60
|
modifier onlyBank() {
|
|
41
61
|
require(msg.sender == address(bank), "Caller is not the Bank");
|
|
42
62
|
_;
|
|
43
63
|
}
|
|
44
64
|
|
|
65
|
+
modifier onlyAfterUpgradeGovernanceDelay() {
|
|
66
|
+
GovernanceUtils.onlyAfterGovernanceDelay(
|
|
67
|
+
upgradeInitiatedTimestamp,
|
|
68
|
+
UPGRADE_GOVERNANCE_DELAY
|
|
69
|
+
);
|
|
70
|
+
_;
|
|
71
|
+
}
|
|
72
|
+
|
|
45
73
|
constructor(Bank _bank, TBTC _tbtcToken) {
|
|
46
74
|
require(
|
|
47
75
|
address(_bank) != address(0),
|
|
@@ -55,36 +83,6 @@ contract TBTCVault is IVault, Governable {
|
|
|
55
83
|
|
|
56
84
|
bank = _bank;
|
|
57
85
|
tbtcToken = _tbtcToken;
|
|
58
|
-
|
|
59
|
-
_transferGovernance(msg.sender);
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
/// @notice Allows the governance of the TBTCVault to recover any ERC20
|
|
63
|
-
/// token sent mistakenly to the TBTC token contract address.
|
|
64
|
-
/// @param token Address of the recovered ERC20 token contract.
|
|
65
|
-
/// @param recipient Address the recovered token should be sent to.
|
|
66
|
-
/// @param amount Recovered amount.
|
|
67
|
-
function recoverERC20(
|
|
68
|
-
IERC20 token,
|
|
69
|
-
address recipient,
|
|
70
|
-
uint256 amount
|
|
71
|
-
) external onlyGovernance {
|
|
72
|
-
tbtcToken.recoverERC20(token, recipient, amount);
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
/// @notice Allows the governance of the TBTCVault to recover any ERC721
|
|
76
|
-
/// token sent mistakenly to the TBTC token contract address.
|
|
77
|
-
/// @param token Address of the recovered ERC721 token contract.
|
|
78
|
-
/// @param recipient Address the recovered token should be sent to.
|
|
79
|
-
/// @param tokenId Identifier of the recovered token.
|
|
80
|
-
/// @param data Additional data.
|
|
81
|
-
function recoverERC721(
|
|
82
|
-
IERC721 token,
|
|
83
|
-
address recipient,
|
|
84
|
-
uint256 tokenId,
|
|
85
|
-
bytes calldata data
|
|
86
|
-
) external onlyGovernance {
|
|
87
|
-
tbtcToken.recoverERC721(token, recipient, tokenId, data);
|
|
88
86
|
}
|
|
89
87
|
|
|
90
88
|
/// @notice Transfers the given `amount` of the Bank balance from caller
|
|
@@ -192,6 +190,95 @@ contract TBTCVault is IVault, Governable {
|
|
|
192
190
|
}
|
|
193
191
|
}
|
|
194
192
|
|
|
193
|
+
/// @notice Initiates vault upgrade process. The upgrade process needs to be
|
|
194
|
+
/// finalized with a call to `finalizeUpgrade` function after the
|
|
195
|
+
/// `UPGRADE_GOVERNANCE_DELAY` passes. Only the governance can
|
|
196
|
+
/// initiate the upgrade.
|
|
197
|
+
/// @param _newVault The new vault address.
|
|
198
|
+
function initiateUpgrade(address _newVault) external onlyOwner {
|
|
199
|
+
require(_newVault != address(0), "New vault address cannot be zero");
|
|
200
|
+
/* solhint-disable-next-line not-rely-on-time */
|
|
201
|
+
emit UpgradeInitiated(_newVault, block.timestamp);
|
|
202
|
+
/* solhint-disable-next-line not-rely-on-time */
|
|
203
|
+
upgradeInitiatedTimestamp = block.timestamp;
|
|
204
|
+
newVault = _newVault;
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/// @notice Allows the governance to finalize vault upgrade process. The
|
|
208
|
+
/// upgrade process needs to be first initiated with a call to
|
|
209
|
+
/// `initiateUpgrade` and the `UPGRADE_GOVERNANCE_DELAY` needs to
|
|
210
|
+
/// pass. Once the upgrade is finalized, the new vault will become
|
|
211
|
+
/// an owner of TBTC token.
|
|
212
|
+
function finalizeUpgrade()
|
|
213
|
+
external
|
|
214
|
+
onlyOwner
|
|
215
|
+
onlyAfterUpgradeGovernanceDelay
|
|
216
|
+
{
|
|
217
|
+
emit UpgradeFinalized(newVault);
|
|
218
|
+
// slither-disable-next-line reentrancy-no-eth
|
|
219
|
+
tbtcToken.transferOwnership(newVault);
|
|
220
|
+
newVault = address(0);
|
|
221
|
+
upgradeInitiatedTimestamp = 0;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/// @notice Allows the governance of the TBTCVault to recover any ERC20
|
|
225
|
+
/// token sent mistakenly to the TBTC token contract address.
|
|
226
|
+
/// @param token Address of the recovered ERC20 token contract.
|
|
227
|
+
/// @param recipient Address the recovered token should be sent to.
|
|
228
|
+
/// @param amount Recovered amount.
|
|
229
|
+
function recoverERC20FromToken(
|
|
230
|
+
IERC20 token,
|
|
231
|
+
address recipient,
|
|
232
|
+
uint256 amount
|
|
233
|
+
) external onlyOwner {
|
|
234
|
+
tbtcToken.recoverERC20(token, recipient, amount);
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
/// @notice Allows the governance of the TBTCVault to recover any ERC721
|
|
238
|
+
/// token sent mistakenly to the TBTC token contract address.
|
|
239
|
+
/// @param token Address of the recovered ERC721 token contract.
|
|
240
|
+
/// @param recipient Address the recovered token should be sent to.
|
|
241
|
+
/// @param tokenId Identifier of the recovered token.
|
|
242
|
+
/// @param data Additional data.
|
|
243
|
+
function recoverERC721FromToken(
|
|
244
|
+
IERC721 token,
|
|
245
|
+
address recipient,
|
|
246
|
+
uint256 tokenId,
|
|
247
|
+
bytes calldata data
|
|
248
|
+
) external onlyOwner {
|
|
249
|
+
tbtcToken.recoverERC721(token, recipient, tokenId, data);
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
/// @notice Allows the governance of the TBTCVault to recover any ERC20
|
|
253
|
+
/// token sent - mistakenly or not - to the vault address. This
|
|
254
|
+
/// function should be used to withdraw TBTC v1 tokens transferred
|
|
255
|
+
/// to TBTCVault as a result of VendingMachine > TBTCVault upgrade.
|
|
256
|
+
/// @param token Address of the recovered ERC20 token contract.
|
|
257
|
+
/// @param recipient Address the recovered token should be sent to.
|
|
258
|
+
/// @param amount Recovered amount.
|
|
259
|
+
function recoverERC20(
|
|
260
|
+
IERC20 token,
|
|
261
|
+
address recipient,
|
|
262
|
+
uint256 amount
|
|
263
|
+
) external onlyOwner {
|
|
264
|
+
token.safeTransfer(recipient, amount);
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
/// @notice Allows the governance of the TBTCVault to recover any ERC721
|
|
268
|
+
/// token sent mistakenly to the vault address.
|
|
269
|
+
/// @param token Address of the recovered ERC721 token contract.
|
|
270
|
+
/// @param recipient Address the recovered token should be sent to.
|
|
271
|
+
/// @param tokenId Identifier of the recovered token.
|
|
272
|
+
/// @param data Additional data.
|
|
273
|
+
function recoverERC721(
|
|
274
|
+
IERC721 token,
|
|
275
|
+
address recipient,
|
|
276
|
+
uint256 tokenId,
|
|
277
|
+
bytes calldata data
|
|
278
|
+
) external onlyOwner {
|
|
279
|
+
token.safeTransferFrom(address(this), recipient, tokenId, data);
|
|
280
|
+
}
|
|
281
|
+
|
|
195
282
|
// slither-disable-next-line calls-loop
|
|
196
283
|
function _mint(address minter, uint256 amount) internal {
|
|
197
284
|
emit Minted(minter, amount);
|
|
@@ -38,7 +38,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
|
|
|
38
38
|
|
|
39
39
|
export default func
|
|
40
40
|
|
|
41
|
-
func.tags = ["
|
|
41
|
+
func.tags = ["TransferVendingMachineRoles"]
|
|
42
42
|
func.dependencies = ["TBTC", "VendingMachine"]
|
|
43
43
|
func.runAtTheEnd = true
|
|
44
44
|
func.skip = async function (hre: HardhatRuntimeEnvironment): Promise<boolean> {
|