Upgrade borsh and base58 libraries

packages/js/package.json

@@ -15,10 +15,10 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
+    "@scure/base": "^1.2.0",
     "base64url": "^3.0.1",
     "bn.js": "^5.2.0",
-    "borsh": "^0.5.0",
-    "bs58": "^4.0.1",
+    "borsh": "^2.0.0",
     "callsites": "^4.0.0",
     "fs-extra": "^10.0.0",
     "js-sha256": "^0.9.0",
@@ -55,7 +55,6 @@
     "npm": ">= 6.0.0"
   },
   "devDependencies": {
-    "@types/bs58": "^4.0.1",
     "@types/proper-lockfile": "^4.1.2"
   },
   "gitHead": "20b58f0acd60d76517479f3b295f4c7ab938061f"

packages/js/src/contract-state.ts

@@ -1,5 +1,5 @@
 import {Buffer} from 'buffer';
-import * as borsh from 'borsh';
+import {Schema, deserialize} from 'borsh';
 
 export class ContractState {
   private readonly data: Map<string, Buffer>;
@@ -14,10 +14,10 @@ export class ContractState {
     return this.data.get(key) ?? Buffer.from('');
   }
 
-  get(key: string, borshSchema?: {type: any; schema: any}): any {
+  get(key: string, borshSchema: Schema): any {
     const value = this.getRaw(key);
     if (borshSchema) {
-      return borsh.deserialize(borshSchema.schema, borshSchema.type, value);
+      return deserialize(borshSchema, Uint8Array.from(value));
     }
 
     return value.toJSON();

packages/js/src/utils.ts

@@ -4,7 +4,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as nearAPI from 'near-api-js';
 import sha256 from 'js-sha256';
-import bs58 from 'bs58';
+import {base58} from '@scure/base';
 import {Gas, NEAR} from 'near-units';
 import {NamedAccount, KeyPair, ClientConfig, KeyStore, BN} from './types';
 
@@ -105,7 +105,7 @@ export function urlConfigFromNetwork(network: string | {network: string; rpcAddr
 export function hashContract(contract: string | Buffer): string {
   const bytes = typeof contract === 'string' ? Buffer.from(contract, 'base64') : contract;
   const buffer = Buffer.from(sha256.sha256(bytes), 'hex');
-  return bs58.encode(buffer);
+  return base58.encode(Uint8Array.from(buffer));
 }
 
 export const EMPTY_CONTRACT_HASH = '11111111111111111111111111111111';