Skip to content

Commit

Permalink
Standardise datatypes of amount parameters to accept u64s across the …
Browse files Browse the repository at this point in the history
…board in the token program JS client. (solana-labs#594)
  • Loading branch information
dankelleher authored Oct 9, 2020
1 parent 423d8b1 commit 2fb7df6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions token/js/client/token.js
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ export class Token {
dest: PublicKey,
authority: any,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void> {
let ownerPublicKey;
let signers;
Expand Down Expand Up @@ -934,7 +934,7 @@ export class Token {
account: PublicKey,
owner: any,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void> {
let ownerPublicKey;
let signers;
Expand Down Expand Up @@ -1187,7 +1187,7 @@ export class Token {
dest: PublicKey,
authority: any,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
decimals: number,
): Promise<void> {
let ownerPublicKey;
Expand Down Expand Up @@ -1231,7 +1231,7 @@ export class Token {
account: PublicKey,
owner: any,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
decimals: number,
): Promise<void> {
let ownerPublicKey;
Expand Down Expand Up @@ -1583,7 +1583,7 @@ export class Token {
dest: PublicKey,
authority: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction {
const dataLayout = BufferLayout.struct([
BufferLayout.u8('instruction'),
Expand Down Expand Up @@ -1643,7 +1643,7 @@ export class Token {
account: PublicKey,
owner: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction {
const dataLayout = BufferLayout.struct([
BufferLayout.u8('instruction'),
Expand Down Expand Up @@ -1980,7 +1980,7 @@ export class Token {
dest: PublicKey,
authority: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
decimals: number,
): TransactionInstruction {
const dataLayout = BufferLayout.struct([
Expand Down Expand Up @@ -2043,7 +2043,7 @@ export class Token {
account: PublicKey,
owner: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
decimals: number,
): TransactionInstruction {
const dataLayout = BufferLayout.struct([
Expand Down
8 changes: 4 additions & 4 deletions token/js/module.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ declare module '@solana/spl-token' {
dest: PublicKey,
authority: Account | PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void>;
burn(
account: PublicKey,
owner: Account | PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void>;
closeAccount(
account: PublicKey,
Expand Down Expand Up @@ -180,15 +180,15 @@ declare module '@solana/spl-token' {
dest: PublicKey,
authority: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction;
static createBurnInstruction(
programId: PublicKey,
mint: PublicKey,
account: PublicKey,
owner: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction;
static createCloseAccountInstruction(
programId: PublicKey,
Expand Down
8 changes: 4 additions & 4 deletions token/js/module.flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ declare module '@solana/spl-token' {
dest: PublicKey,
authority: Account | PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void>;
burn(
account: PublicKey,
owner: Account | PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): Promise<void>;
closeAccount(
account: PublicKey,
Expand Down Expand Up @@ -173,15 +173,15 @@ declare module '@solana/spl-token' {
dest: PublicKey,
authority: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction;
static createBurnInstruction(
programId: PublicKey,
mint: PublicKey,
account: PublicKey,
owner: PublicKey,
multiSigners: Array<Account>,
amount: number,
amount: number | u64,
): TransactionInstruction;
static createCloseAccountInstruction(
programId: PublicKey,
Expand Down

0 comments on commit 2fb7df6

Please sign in to comment.