Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: IDL edge case involving Math.log2 function on BigInt bit count #598

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/candid/src/idl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
writeIntLE,
writeUIntLE,
} from './utils/leb128';
import { ilog2 } from './utils/ilog2';

// tslint:disable:max-line-length
/**
Expand Down Expand Up @@ -647,7 +648,7 @@ export class FixedIntClass extends PrimitiveType<bigint | number> {
}

public encodeType() {
const offset = Math.log2(this._bits) - 3;
const offset = ilog2(this._bits) - 3;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the right place for the fix? this._bits can only be 8,16,32,64. I would expect the problem comes from taking log2 of the actual number, not _bits?

return slebEncode(-9 - offset);
}

Expand Down Expand Up @@ -699,7 +700,7 @@ export class FixedNatClass extends PrimitiveType<bigint | number> {
}

public encodeType() {
const offset = Math.log2(this._bits) - 3;
const offset = ilog2(this._bits) - 3;
return slebEncode(-5 - offset);
}

Expand Down
15 changes: 15 additions & 0 deletions packages/candid/src/utils/ilog2.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ilog2 } from './ilog2';

test('ilog2', () => {
for (let n = -10; n < 100; n++) {
expect(ilog2(n)).toBe(n > 0 ? Math.floor(Math.log2(n)) : NaN);
}
for (const p of [0, 1, 3, 55, 10000]) {
expect(ilog2(BigInt(2) ** BigInt(p))).toBe(p);
}

expect(() => ilog2(1.5)).toThrow(
'The number 1.5 cannot be converted to a BigInt because it is not an integer',
);
expect(() => (ilog2 as (string) => number)('abc')).toThrow('Cannot convert abc to a BigInt');
});
9 changes: 9 additions & 0 deletions packages/candid/src/utils/ilog2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* Equivalent to `Math.log2` with support for `BigInt` values
*
* @param n number or bigint
*/
export function ilog2(n: bigint | number) {
const nBig = BigInt(n);
return nBig > 0 ? nBig.toString(2).length - 1 : NaN;
}