ts: Remove `base64-js` dependency (#2635)
This commit is contained in:
parent
99b75a905b
commit
28adaf2343
|
@ -36,7 +36,6 @@
|
|||
"@coral-xyz/borsh": "^0.28.0",
|
||||
"@noble/hashes": "^1.3.1",
|
||||
"@solana/web3.js": "^1.68.0",
|
||||
"base64-js": "^1.5.1",
|
||||
"bn.js": "^5.1.2",
|
||||
"bs58": "^4.0.1",
|
||||
"buffer-layout": "^1.2.2",
|
||||
|
|
|
@ -33,7 +33,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Buffer } from "buffer";
|
||||
import * as base64 from "base64-js";
|
||||
import { Layout } from "buffer-layout";
|
||||
import * as base64 from "../../utils/bytes/base64.js";
|
||||
import { Idl, IdlEvent, IdlTypeDef } from "../../idl.js";
|
||||
import { Event, EventData } from "../../program/event.js";
|
||||
import { IdlCoder } from "./idl.js";
|
||||
|
@ -41,7 +41,7 @@ export class BorshEventCoder implements EventCoder {
|
|||
idl.events === undefined
|
||||
? []
|
||||
: idl.events.map((e) => [
|
||||
base64.fromByteArray(eventDiscriminator(e.name)),
|
||||
base64.encode(eventDiscriminator(e.name)),
|
||||
e.name,
|
||||
])
|
||||
);
|
||||
|
@ -53,11 +53,11 @@ export class BorshEventCoder implements EventCoder {
|
|||
let logArr: Buffer;
|
||||
// This will throw if log length is not a multiple of 4.
|
||||
try {
|
||||
logArr = Buffer.from(base64.toByteArray(log));
|
||||
logArr = base64.decode(log);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
const disc = base64.fromByteArray(logArr.slice(0, 8));
|
||||
const disc = base64.encode(logArr.slice(0, 8));
|
||||
|
||||
// Only deserialize if the discriminator implies a proper event.
|
||||
const eventName = this.discriminators.get(disc);
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
import { Buffer } from "buffer";
|
||||
import * as base64 from "base64-js";
|
||||
|
||||
export function encode(data: Buffer): string {
|
||||
return base64.fromByteArray(data);
|
||||
return data.toString("base64");
|
||||
}
|
||||
|
||||
export function decode(data: string): Buffer {
|
||||
return Buffer.from(base64.toByteArray(data));
|
||||
return Buffer.from(data, "base64");
|
||||
}
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -35,7 +35,6 @@ export default {
|
|||
external: [
|
||||
"@coral-xyz/borsh",
|
||||
"@solana/web3.js",
|
||||
"base64-js",
|
||||
"bn.js",
|
||||
"bs58",
|
||||
"buffer",
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"typescript": "*"
|
||||
},
|
||||
"dependencies": {
|
||||
"@coral-xyz/anchor": "*",
|
||||
"@coral-xyz/anchor": "=0.28.1-beta.2",
|
||||
"@solana/web3.js": "*"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1417,7 +1417,7 @@ base-x@^3.0.2, base-x@^3.0.6:
|
|||
dependencies:
|
||||
safe-buffer "^5.0.1"
|
||||
|
||||
base64-js@^1.3.1, base64-js@^1.5.1:
|
||||
base64-js@^1.3.1:
|
||||
version "1.5.1"
|
||||
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
|
||||
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
|
||||
|
|
Loading…
Reference in New Issue