Flatten calls (#1200)

This commit is contained in:
Jaco
2021-11-18 08:48:15 +02:00
committed by GitHub
parent 93fb633ea6
commit 6f0aa35098
5 changed files with 69 additions and 72 deletions
+8 -8
View File
@@ -20,24 +20,24 @@ import { u8aToBn, u8aToU8a } from '../u8a';
* console.log('value offset=', offset, 'length=', length); // 4, 0xffff
* ```
*/
export function compactFromU8a (_input: U8aLike): [number, BN] {
const input = u8aToU8a(_input);
const flag = input[0] & 0b11;
export function compactFromU8a (input: U8aLike): [number, BN] {
const u8a = u8aToU8a(input);
const flag = u8a[0] & 0b11;
if (flag === 0b00) {
return [1, new BN(input[0]).ishrn(2)];
return [1, new BN(u8a[0]).ishrn(2)];
} else if (flag === 0b01) {
return [2, u8aToBn(input.subarray(0, 2), true).ishrn(2)];
return [2, u8aToBn(u8a.subarray(0, 2), true).ishrn(2)];
} else if (flag === 0b10) {
return [4, u8aToBn(input.subarray(0, 4), true).ishrn(2)];
return [4, u8aToBn(u8a.subarray(0, 4), true).ishrn(2)];
}
const offset = 1 + (
new BN(input[0])
new BN(u8a[0])
.ishrn(2) // clear flag
.iadd(BN_FOUR) // add 4 for base length
.toNumber()
);
return [offset, u8aToBn(input.subarray(1, offset), true)];
return [offset, u8aToBn(u8a.subarray(1, offset), true)];
}
+9 -9
View File
@@ -21,18 +21,18 @@ const MAX_U32 = BN_TWO.pow(new BN(32 - 2)).isub(BN_ONE);
* console.log(compactToU8a(511, 32)); // Uint8Array([0b11111101, 0b00000111])
* ```
*/
export function compactToU8a (_value: BN | bigint | number): Uint8Array {
const value = bnToBn(_value);
export function compactToU8a (value: BN | bigint | number): Uint8Array {
const bn = bnToBn(value);
if (value.lte(MAX_U8)) {
return new Uint8Array([value.toNumber() << 2]);
} else if (value.lte(MAX_U16)) {
return bnToU8a(value.shln(2).iadd(BN_ONE), 16, true);
} else if (value.lte(MAX_U32)) {
return bnToU8a(value.shln(2).iadd(BN_TWO), 32, true);
if (bn.lte(MAX_U8)) {
return new Uint8Array([bn.toNumber() << 2]);
} else if (bn.lte(MAX_U16)) {
return bnToU8a(bn.shln(2).iadd(BN_ONE), 16, true);
} else if (bn.lte(MAX_U32)) {
return bnToU8a(bn.shln(2).iadd(BN_TWO), 32, true);
}
const u8a = bnToU8a(value);
const u8a = bnToU8a(bn);
let length = u8a.length;
// adjust to the minimum number of bytes