@keep-network/tbtc-v2 0.1.1-ropsten.2 → 0.1.1-ropsten.6
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/TBTC.json +26 -26
- package/artifacts/VendingMachine.json +28 -28
- package/artifacts/solcInputs/{7cc3eda3cb3ff2522d18b5e7b31ea228.json → 02b9e185d8beb23545e98201d474fc6b.json} +5 -2
- package/build/contracts/GovernanceUtils.sol/GovernanceUtils.dbg.json +1 -1
- package/build/contracts/bridge/Bridge.sol/Bridge.dbg.json +4 -0
- package/build/contracts/bridge/Bridge.sol/Bridge.json +176 -0
- package/build/contracts/bridge/VendingMachine.sol/VendingMachine.dbg.json +1 -1
- package/build/contracts/bridge/VendingMachine.sol/VendingMachine.json +2 -2
- package/build/contracts/token/TBTC.sol/TBTC.dbg.json +1 -1
- package/build/contracts/token/TBTC.sol/TBTC.json +4 -4
- package/contracts/bridge/Bridge.sol +161 -0
- package/deploy/00_resolve_tbtc_v1_token.ts +1 -1
- package/export.json +27 -27
- package/package.json +24 -15
package/export.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"abi": []
|
|
7
7
|
},
|
|
8
8
|
"BTCUtils": {
|
|
9
|
-
"address": "
|
|
9
|
+
"address": "0x28EB60eBc44Dc188ed98f52536028be36C00FED9",
|
|
10
10
|
"abi": [
|
|
11
11
|
{
|
|
12
12
|
"constant": true,
|
|
@@ -71,11 +71,11 @@
|
|
|
71
71
|
]
|
|
72
72
|
},
|
|
73
73
|
"BytesLib": {
|
|
74
|
-
"address": "
|
|
74
|
+
"address": "0x135216D3aa3f4B3DfB79d214B5feB3De7197f12c",
|
|
75
75
|
"abi": []
|
|
76
76
|
},
|
|
77
77
|
"CheckBitcoinSigs": {
|
|
78
|
-
"address": "
|
|
78
|
+
"address": "0xDFdbB2C00D1199077a5A2ABF80050427bd515F1a",
|
|
79
79
|
"abi": []
|
|
80
80
|
},
|
|
81
81
|
"CloneFactory": {
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
"abi": []
|
|
150
150
|
},
|
|
151
151
|
"Deposit": {
|
|
152
|
-
"address": "
|
|
152
|
+
"address": "0xFF22150163105ea8C9dFa697139C607bACfD9900",
|
|
153
153
|
"abi": [
|
|
154
154
|
{
|
|
155
155
|
"inputs": [],
|
|
@@ -866,7 +866,7 @@
|
|
|
866
866
|
]
|
|
867
867
|
},
|
|
868
868
|
"DepositFactory": {
|
|
869
|
-
"address": "
|
|
869
|
+
"address": "0xa51052cCbc4C61677B6Ba635532195a8741E1BD1",
|
|
870
870
|
"abi": [
|
|
871
871
|
{
|
|
872
872
|
"inputs": [
|
|
@@ -1051,11 +1051,11 @@
|
|
|
1051
1051
|
]
|
|
1052
1052
|
},
|
|
1053
1053
|
"DepositFunding": {
|
|
1054
|
-
"address": "
|
|
1054
|
+
"address": "0xb652dC25672eAfB64031b582FFC05f8999C79430",
|
|
1055
1055
|
"abi": []
|
|
1056
1056
|
},
|
|
1057
1057
|
"DepositLiquidation": {
|
|
1058
|
-
"address": "
|
|
1058
|
+
"address": "0xd89Ca98F4F082c27C62E03B4329b8be5505fdebd",
|
|
1059
1059
|
"abi": []
|
|
1060
1060
|
},
|
|
1061
1061
|
"DepositLog": {
|
|
@@ -1620,15 +1620,15 @@
|
|
|
1620
1620
|
]
|
|
1621
1621
|
},
|
|
1622
1622
|
"DepositRedemption": {
|
|
1623
|
-
"address": "
|
|
1623
|
+
"address": "0x81b059C421Efe82550C2E89F36Bc0bD7A5165565",
|
|
1624
1624
|
"abi": []
|
|
1625
1625
|
},
|
|
1626
1626
|
"DepositStates": {
|
|
1627
|
-
"address": "
|
|
1627
|
+
"address": "0x04eDe515f2f9e9e506ac4FEFC92dC757B28943d7",
|
|
1628
1628
|
"abi": []
|
|
1629
1629
|
},
|
|
1630
1630
|
"DepositUtils": {
|
|
1631
|
-
"address": "
|
|
1631
|
+
"address": "0x1b741136C734af16A5FA54Dd7023b67648Fb1bc0",
|
|
1632
1632
|
"abi": [
|
|
1633
1633
|
{
|
|
1634
1634
|
"constant": true,
|
|
@@ -3437,7 +3437,7 @@
|
|
|
3437
3437
|
]
|
|
3438
3438
|
},
|
|
3439
3439
|
"ETHBTCPriceFeedMock": {
|
|
3440
|
-
"address": "
|
|
3440
|
+
"address": "0x4092bCa1AE337839a830945D692dE54aE3117E92",
|
|
3441
3441
|
"abi": [
|
|
3442
3442
|
{
|
|
3443
3443
|
"anonymous": false,
|
|
@@ -3565,7 +3565,7 @@
|
|
|
3565
3565
|
]
|
|
3566
3566
|
},
|
|
3567
3567
|
"FeeRebateToken": {
|
|
3568
|
-
"address": "
|
|
3568
|
+
"address": "0x84D9857fb0bca2eCEEd6438A818C0e5917BaC6ec",
|
|
3569
3569
|
"abi": [
|
|
3570
3570
|
{
|
|
3571
3571
|
"inputs": [
|
|
@@ -3979,7 +3979,7 @@
|
|
|
3979
3979
|
]
|
|
3980
3980
|
},
|
|
3981
3981
|
"FundingScript": {
|
|
3982
|
-
"address": "
|
|
3982
|
+
"address": "0x35453c2EEc71B82dA496AfE0d3E133812A8e7496",
|
|
3983
3983
|
"abi": [
|
|
3984
3984
|
{
|
|
3985
3985
|
"inputs": [
|
|
@@ -6207,7 +6207,7 @@
|
|
|
6207
6207
|
]
|
|
6208
6208
|
},
|
|
6209
6209
|
"KeepFactorySelection": {
|
|
6210
|
-
"address": "
|
|
6210
|
+
"address": "0x10f3B4FE37cca9b0d0cf907415a5fb2f63e20e9e",
|
|
6211
6211
|
"abi": []
|
|
6212
6212
|
},
|
|
6213
6213
|
"KeepFactorySelectionStub": {
|
|
@@ -6441,7 +6441,7 @@
|
|
|
6441
6441
|
]
|
|
6442
6442
|
},
|
|
6443
6443
|
"Migrations": {
|
|
6444
|
-
"address": "
|
|
6444
|
+
"address": "0xd744098b998B61a82450726057fEF6edCF8093D5",
|
|
6445
6445
|
"abi": [
|
|
6446
6446
|
{
|
|
6447
6447
|
"inputs": [],
|
|
@@ -7407,7 +7407,7 @@
|
|
|
7407
7407
|
]
|
|
7408
7408
|
},
|
|
7409
7409
|
"OutsourceDepositLogging": {
|
|
7410
|
-
"address": "
|
|
7410
|
+
"address": "0x71f59478d31b95c2e13133EF58705b2300c2b7dA",
|
|
7411
7411
|
"abi": []
|
|
7412
7412
|
},
|
|
7413
7413
|
"Ownable": {
|
|
@@ -7494,7 +7494,7 @@
|
|
|
7494
7494
|
]
|
|
7495
7495
|
},
|
|
7496
7496
|
"RedemptionScript": {
|
|
7497
|
-
"address": "
|
|
7497
|
+
"address": "0x9619BC117F9Dab71262ecaF7C67b679f816adA74",
|
|
7498
7498
|
"abi": [
|
|
7499
7499
|
{
|
|
7500
7500
|
"inputs": [
|
|
@@ -7885,7 +7885,7 @@
|
|
|
7885
7885
|
"abi": []
|
|
7886
7886
|
},
|
|
7887
7887
|
"SatWeiPriceFeed": {
|
|
7888
|
-
"address": "
|
|
7888
|
+
"address": "0xD73566C6B325E5eC40B6a23561c513D27415c946",
|
|
7889
7889
|
"abi": [
|
|
7890
7890
|
{
|
|
7891
7891
|
"inputs": [],
|
|
@@ -8034,7 +8034,7 @@
|
|
|
8034
8034
|
]
|
|
8035
8035
|
},
|
|
8036
8036
|
"TBTCConstants": {
|
|
8037
|
-
"address": "
|
|
8037
|
+
"address": "0x19aE030a64e1B94406Bd642550B491E463E13f36",
|
|
8038
8038
|
"abi": [
|
|
8039
8039
|
{
|
|
8040
8040
|
"constant": true,
|
|
@@ -8399,7 +8399,7 @@
|
|
|
8399
8399
|
]
|
|
8400
8400
|
},
|
|
8401
8401
|
"TBTCDepositToken": {
|
|
8402
|
-
"address": "
|
|
8402
|
+
"address": "0xDcc1bc97789c44AA7DE187Ea2845828A738D788f",
|
|
8403
8403
|
"abi": [
|
|
8404
8404
|
{
|
|
8405
8405
|
"inputs": [
|
|
@@ -9223,7 +9223,7 @@
|
|
|
9223
9223
|
]
|
|
9224
9224
|
},
|
|
9225
9225
|
"TBTCSystem": {
|
|
9226
|
-
"address": "
|
|
9226
|
+
"address": "0x1a0683B452b3A9ac4Bb392b6E67A27cf4351aCE6",
|
|
9227
9227
|
"abi": [
|
|
9228
9228
|
{
|
|
9229
9229
|
"inputs": [
|
|
@@ -13863,7 +13863,7 @@
|
|
|
13863
13863
|
]
|
|
13864
13864
|
},
|
|
13865
13865
|
"TBTCToken": {
|
|
13866
|
-
"address": "
|
|
13866
|
+
"address": "0x210c5af4f0e356B5957Bd1b854ADBebb05196d30",
|
|
13867
13867
|
"abi": [
|
|
13868
13868
|
{
|
|
13869
13869
|
"inputs": [
|
|
@@ -21796,11 +21796,11 @@
|
|
|
21796
21796
|
]
|
|
21797
21797
|
},
|
|
21798
21798
|
"ValidateSPV": {
|
|
21799
|
-
"address": "
|
|
21799
|
+
"address": "0xafb34743795a4f76534c7117d18A36534d803B6F",
|
|
21800
21800
|
"abi": []
|
|
21801
21801
|
},
|
|
21802
21802
|
"VendingMachine": {
|
|
21803
|
-
"address": "
|
|
21803
|
+
"address": "0x6f099678894630aCAFdED3e63d856911Ca9304F5",
|
|
21804
21804
|
"abi": [
|
|
21805
21805
|
{
|
|
21806
21806
|
"inputs": [
|
|
@@ -22328,7 +22328,7 @@
|
|
|
22328
22328
|
]
|
|
22329
22329
|
},
|
|
22330
22330
|
"TBTC": {
|
|
22331
|
-
"address": "
|
|
22331
|
+
"address": "0xA1D2BCA722efD426dCB1Ffa4d638C9594836FF85",
|
|
22332
22332
|
"abi": [
|
|
22333
22333
|
{
|
|
22334
22334
|
"inputs": [],
|
|
@@ -22635,7 +22635,7 @@
|
|
|
22635
22635
|
"type": "address"
|
|
22636
22636
|
}
|
|
22637
22637
|
],
|
|
22638
|
-
"name": "
|
|
22638
|
+
"name": "nonce",
|
|
22639
22639
|
"outputs": [
|
|
22640
22640
|
{
|
|
22641
22641
|
"internalType": "uint256",
|
|
@@ -22814,7 +22814,7 @@
|
|
|
22814
22814
|
"inputs": [
|
|
22815
22815
|
{
|
|
22816
22816
|
"internalType": "address",
|
|
22817
|
-
"name": "
|
|
22817
|
+
"name": "spender",
|
|
22818
22818
|
"type": "address"
|
|
22819
22819
|
},
|
|
22820
22820
|
{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keep-network/tbtc-v2",
|
|
3
|
-
"version": "0.1.1-ropsten.
|
|
3
|
+
"version": "0.1.1-ropsten.6+main.f1e973362e57e2749005254202db8ab46acf0b5f",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"artifacts/",
|
|
@@ -11,45 +11,54 @@
|
|
|
11
11
|
"export.json"
|
|
12
12
|
],
|
|
13
13
|
"scripts": {
|
|
14
|
+
"clean": "hardhat clean",
|
|
14
15
|
"build": "hardhat compile",
|
|
15
16
|
"deploy": "hardhat deploy --export export.json",
|
|
16
17
|
"format": "npm run lint && prettier --check .",
|
|
17
18
|
"format:fix": "npm run lint:fix && prettier --write .",
|
|
18
|
-
"lint": "npm run lint:
|
|
19
|
-
"lint:
|
|
19
|
+
"lint": "npm run lint:eslint && npm run lint:sol",
|
|
20
|
+
"lint:fix": "npm run lint:fix:eslint && npm run lint:fix:sol",
|
|
21
|
+
"lint:eslint": "eslint .",
|
|
22
|
+
"lint:fix:eslint": "eslint . --fix",
|
|
20
23
|
"lint:sol": "solhint 'contracts/**/*.sol'",
|
|
21
|
-
"lint:fix": "npm run lint:fix:js && npm run lint:fix:sol",
|
|
22
|
-
"lint:fix:js": "eslint . --fix",
|
|
23
24
|
"lint:fix:sol": "solhint 'contracts/**/*.sol' --fix",
|
|
24
25
|
"test": "hardhat test",
|
|
25
26
|
"prepublishOnly": "./scripts/prepare-artifacts.sh --network $npm_config_network"
|
|
26
27
|
},
|
|
27
28
|
"dependencies": {
|
|
28
|
-
"@keep-network/tbtc": "1.1.2-ropsten.
|
|
29
|
+
"@keep-network/tbtc": "1.1.2-ropsten.14",
|
|
29
30
|
"@openzeppelin/contracts": "^4.1.0",
|
|
30
31
|
"@tenderly/hardhat-tenderly": "^1.0.12",
|
|
31
|
-
"@thesis/solidity-contracts": "github:thesis/solidity-contracts#
|
|
32
|
+
"@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf"
|
|
32
33
|
},
|
|
33
34
|
"devDependencies": {
|
|
34
|
-
"@keep-network/hardhat-helpers": "^0.2.0-pre",
|
|
35
|
+
"@keep-network/hardhat-helpers": "^0.2.0-pre.4",
|
|
35
36
|
"@keep-network/hardhat-local-networks-config": "^0.1.0-pre.0",
|
|
36
37
|
"@nomiclabs/hardhat-ethers": "^2.0.2",
|
|
37
38
|
"@nomiclabs/hardhat-etherscan": "^2.1.4",
|
|
38
39
|
"@nomiclabs/hardhat-waffle": "^2.0.1",
|
|
40
|
+
"@thesis-co/eslint-config": "github:thesis/eslint-config",
|
|
41
|
+
"@typechain/ethers-v5": "^7.2.0",
|
|
42
|
+
"@typechain/hardhat": "^2.3.1",
|
|
43
|
+
"@types/chai": "^4.2.22",
|
|
44
|
+
"@types/mocha": "^9.0.0",
|
|
45
|
+
"@types/node": "^16.10.5",
|
|
39
46
|
"chai": "^4.3.4",
|
|
40
|
-
"eslint": "^7.
|
|
41
|
-
"eslint-config-keep": "github:keep-network/eslint-config-keep#
|
|
42
|
-
"
|
|
43
|
-
"
|
|
44
|
-
"
|
|
47
|
+
"eslint": "^7.30.0",
|
|
48
|
+
"eslint-config-keep": "github:keep-network/eslint-config-keep#0c27ade",
|
|
49
|
+
"eslint-plugin-import": "^2.18.2",
|
|
50
|
+
"ethereum-waffle": "^3.4.0",
|
|
51
|
+
"ethers": "^5.4.7",
|
|
52
|
+
"hardhat": "^2.6.4",
|
|
45
53
|
"hardhat-deploy": "^0.8.11",
|
|
46
54
|
"hardhat-gas-reporter": "^1.0.4",
|
|
47
55
|
"prettier": "^2.3.0",
|
|
48
56
|
"prettier-plugin-solidity": "^1.0.0-beta.11 ",
|
|
49
57
|
"solhint": "^3.3.6",
|
|
50
58
|
"solhint-config-keep": "github:keep-network/solhint-config-keep",
|
|
51
|
-
"ts-node": "^10.1
|
|
52
|
-
"
|
|
59
|
+
"ts-node": "^10.2.1",
|
|
60
|
+
"typechain": "^5.2.0",
|
|
61
|
+
"typescript": "^4.4.3"
|
|
53
62
|
},
|
|
54
63
|
"engines": {
|
|
55
64
|
"node": ">= 14.0.0"
|