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.

Sign up for GitHub

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

Jump to bottom

Fix TokenIdentifier encode/decode bug #7 #8

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix TokenIdentifier encode/decode bug #7 #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions motoko/ext/Core.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ module ExtCore = {
};

public module TokenIdentifier = {
private let CANISTER_ID_HASH_LEN_IN_BYTES: Nat8 = 10;
private let tds : [Nat8] = [10, 116, 105, 100]; //b"\x0Atid"
public let equal = Text.equal;
public let hash = Text.hash;
Expand Down Expand Up @@ -130,7 +131,7 @@ module ExtCore = {
for (b in bytes.vals()) {
index += 1;
if (index >= 5) {
if (index <= (length - 4)) {
if (index <= CANISTER_ID_HASH_LEN_IN_BYTES + 4) {
_canister := Array.append(_canister, [b]);
} else {
_token_index := Array.append(_token_index, [b]);
Expand All @@ -153,23 +154,20 @@ module ExtCore = {
};
private func nat32tobytes(n : Nat32) : [Nat8] {
if (n < 256) {
return [1, Nat8.fromNat(Nat32.toNat(n))];
return [Nat8.fromNat(Nat32.toNat(n))];
} else if (n < 65536) {
return [
2,
Nat8.fromNat(Nat32.toNat((n >> 8) & 0xFF)),
Nat8.fromNat(Nat32.toNat((n) & 0xFF))
];
} else if (n < 16777216) {
return [
3,
Nat8.fromNat(Nat32.toNat((n >> 16) & 0xFF)),
Nat8.fromNat(Nat32.toNat((n >> 8) & 0xFF)),
Nat8.fromNat(Nat32.toNat((n) & 0xFF))
];
} else {
return [
4,
Nat8.fromNat(Nat32.toNat((n >> 24) & 0xFF)),
Nat8.fromNat(Nat32.toNat((n >> 16) & 0xFF)),
Nat8.fromNat(Nat32.toNat((n >> 8) & 0xFF)),
Expand Down