From 04436e9a05260c620981bd901474fb8f9e8cbc6e Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 11 Jun 2024 10:08:57 +0200 Subject: [PATCH 1/2] A-1207537672759448: change utxo format (#164) --- src/services/Crypto/Mintlayer/Mintlayer.js | 8 ++++---- src/utils/Helpers/ML/MLTransaction.js | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/services/Crypto/Mintlayer/Mintlayer.js b/src/services/Crypto/Mintlayer/Mintlayer.js index 7acc6d85..1695c3ed 100644 --- a/src/services/Crypto/Mintlayer/Mintlayer.js +++ b/src/services/Crypto/Mintlayer/Mintlayer.js @@ -183,11 +183,11 @@ export const getOutputs = ({ } if (type === 'LockThenTransfer') { let lockEncoded - if (lock.UntilTime) { - lockEncoded = encode_lock_until_time(BigInt(lock.UntilTime.timestamp)) + if (lock.type === 'UntilTime') { + lockEncoded = encode_lock_until_time(BigInt(lock.content.timestamp)) } - if (lock.ForBlockCount) { - lockEncoded = encode_lock_for_block_count(BigInt(lock.ForBlockCount)) + if (lock.type === 'ForBlockCount') { + lockEncoded = encode_lock_for_block_count(BigInt(lock.content)) } return encode_output_lock_then_transfer( amountInstace, diff --git a/src/utils/Helpers/ML/MLTransaction.js b/src/utils/Helpers/ML/MLTransaction.js index 7070c18e..5da6c8b7 100644 --- a/src/utils/Helpers/ML/MLTransaction.js +++ b/src/utils/Helpers/ML/MLTransaction.js @@ -318,7 +318,8 @@ const calculateSpenDelegFee = async ( networkType: network, type: 'spendFromDelegation', lock: { - ForBlockCount: 7200, + content: 7200, + type: 'ForBlockCount', }, chainTip, }) @@ -511,7 +512,8 @@ const spendFromDelegation = async ( networkType: network, type: 'spendFromDelegation', lock: { - ForBlockCount: 7200, + content: 7200, + type: 'ForBlockCount', }, chainTip, }) From 5a974022403264a25ab0bd39d019514165523052 Mon Sep 17 00:00:00 2001 From: owlsua Date: Tue, 11 Jun 2024 10:20:36 +0200 Subject: [PATCH 2/2] update version --- package-lock.json | 4 ++-- package.json | 2 +- public/manifestDefault.json | 2 +- public/manifestFirefox.json | 2 +- src/pages/CreateRestore/CreateRestore.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6738ad30..c92fcb38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "browser-extension", - "version": "1.2.4", + "version": "1.2.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "browser-extension", - "version": "1.2.4", + "version": "1.2.5", "dependencies": { "@mintlayer/entropy-generator": "^1.0.2", "@testing-library/jest-dom": "^6.1.4", diff --git a/package.json b/package.json index 92ac6c7c..8cb6a4d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "browser-extension", - "version": "1.2.4", + "version": "1.2.5", "private": true, "dependencies": { "@mintlayer/entropy-generator": "^1.0.2", diff --git a/public/manifestDefault.json b/public/manifestDefault.json index 9a73305a..1f9a2cb6 100644 --- a/public/manifestDefault.json +++ b/public/manifestDefault.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Mojito - A Mintlayer Wallet", - "version": "1.2.4", + "version": "1.2.5", "short_name": "Mojito", "description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.", "homepage_url": "https://www.mintlayer.org/", diff --git a/public/manifestFirefox.json b/public/manifestFirefox.json index 9556a682..5e33cd92 100644 --- a/public/manifestFirefox.json +++ b/public/manifestFirefox.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Mojito - A Mintlayer Wallet", - "version": "1.2.4", + "version": "1.2.5", "description": "Mojito is a non-custodial decentralized crypto wallet that lets you send and receive BTC and ML from any other address.", "homepage_url": "https://www.mintlayer.org/", "icons": { diff --git a/src/pages/CreateRestore/CreateRestore.js b/src/pages/CreateRestore/CreateRestore.js index c53c6aaf..8276a6bb 100644 --- a/src/pages/CreateRestore/CreateRestore.js +++ b/src/pages/CreateRestore/CreateRestore.js @@ -76,7 +76,7 @@ const CreateRestorePage = () => { className="footnote-version" data-testid="footnote-name" > - v1.2.3 + v1.2.5