From 54c4650eb85b753ec3bbafc4675fbffa215e9a10 Mon Sep 17 00:00:00 2001 From: michalsmiarowski Date: Thu, 5 Oct 2023 15:15:07 +0200 Subject: [PATCH 1/3] Revert changes in mock-bitcoin-client We've decided that we don't have to apply the newest changes from `tbtc-v2.ts` yet, so we are reverting the changes made in the commit 5d3587f27f58f22662f335db9956d72d681eba65. In the next commit we will install the dev dependency of that library in the `package.json`. This should fix all the build errors that happened before applying the changes (that we are reverting in this commit). --- src/tbtc/mock-bitcoin-client.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/tbtc/mock-bitcoin-client.ts b/src/tbtc/mock-bitcoin-client.ts index 988669d0c..57d9e39d7 100644 --- a/src/tbtc/mock-bitcoin-client.ts +++ b/src/tbtc/mock-bitcoin-client.ts @@ -38,7 +38,6 @@ export const testnetUTXO: UnspentTransactionOutput & RawTransaction = { ...testnetTransaction, } const testnetPrivateKey = "cRJvyxtoggjAm9A94cB86hZ7Y62z2ei5VNJHLksFi2xdnz1GJ6xt" -const fee = BigNumber.from(1520) export class MockBitcoinClient implements Client { private _unspentTransactionOutputs = new Map< @@ -169,12 +168,10 @@ export class MockBitcoinClient implements Client { depositUtxo, rawTransaction: transaction, } = await assembleDepositTransaction( - network, deposit, - testnetPrivateKey, - true, [testnetUTXO], - fee + testnetPrivateKey, + true ) // mock second deposit transaction @@ -195,12 +192,10 @@ export class MockBitcoinClient implements Client { depositUtxo: depositUtxo2, rawTransaction: transaction2, } = await assembleDepositTransaction( - network, deposit2, - testnetPrivateKey, - true, [testnetUtxo2], - fee + testnetPrivateKey, + true ) const utxos = new Map() From 015050d4cdc542d928a463512667189ee8e20fe3 Mon Sep 17 00:00:00 2001 From: michalsmiarowski Date: Thu, 5 Oct 2023 16:48:07 +0200 Subject: [PATCH 2/3] Set `tbtc-v2.ts` package version to dev Set `tbtc-v2.ts` package version to `1.3.0-dev.9` version in package.json. This is the closest dev version to the last goerli version (which is `1.3.0-goerli.1`. There is a newer one - `1.4.0-goerli.0`, but it will be deprecated). --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a95d3e815..02854bdc0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@keep-network/random-beacon": "development", "@keep-network/tbtc": "development", "@keep-network/tbtc-v2": "development", - "@keep-network/tbtc-v2.ts": "development", + "@keep-network/tbtc-v2.ts": "1.3.0-dev.9", "@ledgerhq/connect-kit-loader": "^1.1.2", "@reduxjs/toolkit": "^1.6.1", "@rehooks/local-storage": "^2.4.4", diff --git a/yarn.lock b/yarn.lock index a5d80305e..8daff56ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3193,10 +3193,10 @@ "@openzeppelin/contracts" "^4.3.2" "@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf" -"@keep-network/tbtc-v2.ts@development": - version "1.3.0-dev.8" - resolved "https://registry.yarnpkg.com/@keep-network/tbtc-v2.ts/-/tbtc-v2.ts-1.3.0-dev.8.tgz#08fb1a06dbe6d78a9c7b0d610363c68a135a6741" - integrity sha512-Y5fej8YhBbTZesE+87LNLHGt7I/G97f75J+15ieYyb2nqsJ/CcvMscIEAE/hNgxpnq4IWv/8qwYoldrHY4ix8w== +"@keep-network/tbtc-v2.ts@1.3.0-dev.9": + version "1.3.0-dev.9" + resolved "https://registry.yarnpkg.com/@keep-network/tbtc-v2.ts/-/tbtc-v2.ts-1.3.0-dev.9.tgz#b8961e2701ec1395da747269fea8cb6b236c4b77" + integrity sha512-cGtylB9Rc1Mltltl9NQJ1YKvTcs8HYTRRDsXlqf1VVtZcntngrl5Mu/OymuH84PlmpZpYMS95ZldEH9QoEMaeQ== dependencies: "@keep-network/ecdsa" "2.1.0-dev.15" "@keep-network/tbtc-v2" "1.6.0-dev.0" From 6a017af9a2804dfcdd9dd421e734bc5077987245 Mon Sep 17 00:00:00 2001 From: michalsmiarowski Date: Thu, 5 Oct 2023 16:53:53 +0200 Subject: [PATCH 3/3] Remove unnecessary slash from README Becuase of the slash it's not possilbe to run the command given in README file. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8b3c04af..d8ca59b2c 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ yarn upgrade @keep-network/coverage-pools@goerli \ @keep-network/tbtc-v2@goerli \ @keep-network/tbtc-v2.ts@goerli \ @threshold-network/coverage-pools@npm:@keep-network/coverage-pools@goerli \ - @threshold-network/solidity-contracts@goerli \ + @threshold-network/solidity-contracts@goerli ``` **NOTE 1:** We use the same Goerli versions for both