diff --git a/packages/core/src/service/ton-blockchain/encoder/two-fa-encoder.ts b/packages/core/src/service/ton-blockchain/encoder/two-fa-encoder.ts index 113803b9..08bbbdf6 100644 --- a/packages/core/src/service/ton-blockchain/encoder/two-fa-encoder.ts +++ b/packages/core/src/service/ton-blockchain/encoder/two-fa-encoder.ts @@ -155,13 +155,13 @@ export class TwoFAEncoder { private pluginStateInitByCounter(findShardCounter: number) { /** - * https://github.com/tonkeeper/2fa-extension/blob/49d79c4f60484081cb29c931f991d480378c6f05/compiled/TFAExtension.compiled.json + * https://raw.githubusercontent.com/tonkeeper/2fa-extension/063456fa55c54e8c96d0ec01f28bbee63b8ea12e/build/TFAExtension.compiled.json */ return { data: this.stateInitDataCell(findShardCounter), code: Cell.fromBase64( Buffer.from( - 'b5ee9c724102190100047f000114ff00f4a413f4bcf2c80b01020120021202014803070202cb040601afd0831c02456f8007434c0cc7e900c0074c7fb513434c7fe9034fff4fff4c017c108e08410d58c5d2eb8c09b0840608430b5fc8aeea386d9b1c17cb8285c3220040072c15633c5887e80b2dab26040283ec03816e103fcbc20500ca33c000f2e0a05321c705f2e0a1d3ffd3ff3010237071c8cb1f5004cf1612cbffcbffcb40c9ed54f828fa4430c8801001cb0558cf1681315b58f836fa027f7082106578746ec8cb1fcb3f6d01f400ca00706d745003cb07cb00f400c97158cb6accc971fb00005fa0826a00e841846b8c6890fc80b3027c887970522099fc8879705140106b90e98f815d797052e99f80fc11df79705340020120080f020120090e0201200a0d0201200b0c0027b365bb513434c7fe9034fff4fff4c0041157c1600027b20bbb513434c7fe9034fff4fff4c0040d57c1600023b605fda89a1a63ff481a7ffa7ffa600be0b0004bbb06e81298b8102cd5003a812a08107d058a8a070f83601812710f9406fa56fa15b70f838a080201201011003fb9ea0ed44d0d31ffa40d3ffd3ffd3006c42d33f2296d4fa00306f02e0306f0080027bba2ded44d0d31ffa40d3ffd3ffd30010255f05803e2f28308d71820d70b1fed44d0d31f20fa40d3ffd3ffd300278210b15f2c8cba8e2430333501f2d0a75e22541045f011f80002a4c8cb1f01cf16c9ed54f80fd307d4d101fb00e0352682109d8084d6bae30226821023d9c15cbae30234258210de82b501bae30210575f07fe2030840ff2f013151801ee34355e234056f011d101f2d0a7f8008210c2d7f22b70c8801001cb05f828cf16810ac322f836fa02cb6acb1fc9c8801001cb0558cf16813bf870f836fa027f7082106578746ec8cb1fcb3fc8c973580582100ec3c86d03c8cc13cb1fcb07ccc91301f40012ca0071c8f8286d735003cb0701cf16f400c9140026745003cb07cb00f400c97158cb6accc971fb0001c8365416772523f9015af910f2e0a4018020d721d31f02baf2e0a5d33f01f823bef2e0a602d33f01f823bbf2e0aa04e30233d4fa00d1f800f8238208127500a0c8cb3f12cc01fa02c9d001a44344710105c8cb1f5004cf1612cbffcbffcb0001cf16c9ed541601fc03d4fa003021f90003d401f90014baf2e0ab02fa005232baf2e0abd1f80002a47020c8cb3fc9d0251035041037488805c8cb1f5004cf1612cbffcbffcb0001cf16c9ed547022f90074c8cb0212ca07cbffc9d076c8801001cb0522cf165005fa0214cb6b12ccc98210c2d7f22b70c8801001cb05f828cf16810ac322f8361700eafa02cb6acb1fc9c8801001cb055003cf16813ec570f836fa02717082106578746ec8cb1fcb3fc8c972580582100ec3c86d03c8cc13cb1fcb07ccc973580582100ec3c86d03c8cc13cb1fcb07ccc91201f40012cb00c8f8287358cb0701cf16c94130725003cb0701cf16ccc97158cb6accc971fb0000a0355415642423f9015af910f2e0a4018020d721d31f02baf2e0a5d33f01f823bef2e0a6d1f2e0aef800a470f82382015180a0c8cb3fc9d01025102305c8cb1f5004cf1612cbffcbffcb0001cf16c9ed544dcff569', + 'b5ee9c7241021b01000509000114ff00f4a413f4bcf2c80b01020120021402014803090202cb040802f3d0831c02456f8007434c0cc7e900c0074c7c8608414da100deea3b35b085c0860c235c880a0c235c8c835c2c7fb513434c7c83e9034fff4fff4c009e0842c57cb232ea3888c0ccd4dbcb429d151493c047e0000693232c7d633c5b27b553e03f4c1f534407ec038c3b83b513434c7fe9034fff4fff4c017c108e150502fc821043563174ba8e6533c000f2e0a05321c705f2e0a1d3ffd3ff3010237071c8cb1f5004cf1612cbffcbffcb40c9ed54f828fa4430c8801001cb0558cf1681315b58f836fa027f7082106578746ec8cb1fcb3f6d01f400ca00706d745003cb07cb00f400c97158cb6accc971fb00e06c21018210c2d7f22bbae3025b840f0607003666c705f2e0a170c8801001cb0558cf1621fa02cb6ac98100a0fb000004f2f000a5a0826a00e81041846b9100c1846b9190699fe9ffe8817c80a01b7c88797051fc11df7970536a00e841846b8c6890fc80b3027c887970522099fc8879705140106b90e98f815d797052e99f80fc11df797053400201200a110201200b0e0201200c0d0027b5b2dda89a1a63ff481a7ffa7ffa600208abe0b00023b605fda89a1a63ff481a7ffa7ffa600be0b00201580f100027b1227b513434c7fe9034fff4fff4c0040d57c160004bb01ba04a62e040b35400ea04a82041f4162a281c3e0d806049c43e501be95be856dc3e0e28200201201213003fb9ea0ed44d0d31ffa40d3ffd3ffd3006c42d33f2296d4fa00306f02e0306f0080027bba2ded44d0d31ffa40d3ffd3ffd30010255f0580198f271218308d722028308d72320d70b1fed44d0d31f20fa40d3ffd3ffd300278210b15f2c8cba8e2230333536f2d0a7454524f011f80001a4c8cb1f58cf16c9ed54f80fd307d4d101fb00e30e1503fe3508f2e0af2582109d8084d6bae30225821023d9c15cba8ee6355415742423f9015af910f2e0a4018020d721d31f02baf2e0a5d33f01f823bef2e0a601d33f01f823bbf2e0aa05e3023403d4fa00d1f800f8238208127500a0c8cb3f12cc01fa02c9d003a4441403710105c8cb1f5004cf1612cbffcbffcb0001cf16c9ed5416181a01fe3334064313f011d1f2d0a7f8008210c2d7f22b70c8801001cb05f828cf16810be222f836fa02cb6acb1fc9c8801001cb0558cf16813bf870f836fa027f7082106578746ec8cb1fcb3fc8c973580582100ec3c86d03c8cc13cb1fcb07ccc91301f40012ca0071c8f8286d735003cb0701cf16f400c9745003cb07cb00f400c91700127158cb6accc971fb0001fe04d4fa003021f90006d401f90017baf2e0ab05fa005262baf2e0abd1f80001a47020c8cb3fc9d02510350408552005c8cb1f5004cf1612cbffcbffcb0001cf16c9ed547023f90074c8cb0212ca07cbffc9d076c8801001cb0522cf165004fa0213cb6b13ccc98210c2d7f22b70c8801001cb05f828cf16810be222f836fa021900e4cb6acb1fc9c8801001cb055004cf16813ec570f836fa02717082106578746ec8cb1fcb3fc8c972580582100ec3c86d03c8cc13cb1fcb07ccc973580682100ec3c86d03c8cc13cb1fcb07ccc91201f40013cb00c8f8287358cb0701cf16c912725003cb0701cf16ccc97158cb6accc971fb0000cce033048210de82b501ba8e535414642323f9015af910f2e0a4018020d721d31f02baf2e0a5d33f01f823bef2e0a6d103f2e0aef80002a470f82382015180a0c8cb3fc9d010251024102305c8cb1f5004cf1612cbffcbffcb0001cf16c9ed54e05f07840ff2f0034e07ef', 'hex' ).toString('base64') ) diff --git a/packages/core/src/service/ton-blockchain/sender/two-fa-message-sender.ts b/packages/core/src/service/ton-blockchain/sender/two-fa-message-sender.ts index 19e7b34b..aea930a7 100644 --- a/packages/core/src/service/ton-blockchain/sender/two-fa-message-sender.ts +++ b/packages/core/src/service/ton-blockchain/sender/two-fa-message-sender.ts @@ -191,8 +191,8 @@ export class TwoFAMessageSender implements ISender { const signature = await this.signer(dataToSign); const body = beginCell() - .storeBuffer(signature) .storeSlice(dataToSign.beginParse()) + .storeBuffer(signature) .endCell(); const ext = beginCell() diff --git a/packages/uikit/src/pages/settings/Dev.tsx b/packages/uikit/src/pages/settings/Dev.tsx index 85d61e0f..f3541d71 100644 --- a/packages/uikit/src/pages/settings/Dev.tsx +++ b/packages/uikit/src/pages/settings/Dev.tsx @@ -60,8 +60,6 @@ const EnableTwoFASettings = () => { const { mutate: mutateSettings } = useMutateDevSettings(); const { data: devSettings } = useDevSettings(); - return null; // TODO force disable 2fa on frontend. SC must be improved - const config = useActiveConfig(); if (config.flags?.disable_2fa) { return null; diff --git a/packages/uikit/src/state/two-fa.ts b/packages/uikit/src/state/two-fa.ts index f6ccaa31..e86447aa 100644 --- a/packages/uikit/src/state/two-fa.ts +++ b/packages/uikit/src/state/two-fa.ts @@ -91,9 +91,7 @@ export const useTwoFAServiceConfig = () => { throw new Error('2fa_public_key not found'); } - const servicePubKey = BigInt( - '0x' + Buffer.from(config['2fa_public_key'], 'base64').toString('hex') - ); + const servicePubKey = BigInt('0x' + config['2fa_public_key']); return { baseUrl: config['2fa_api_url'],