@alephium/web3 0.5.0-rc.17 → 0.5.0-rc.18

package/dist/src/contract/contract.js

@@ -140,7 +140,7 @@ class ProjectArtifact {
             compilerOptionsUsed: this.compilerOptionsUsed,
             infos: Object.fromEntries(new Map([...this.infos].sort()))
         };
-        const content = JSON.stringify(artifact, null, 2);
+        const content = (0, utils_1.stringifyJsonWithBigint)(artifact, 2);
         return fs_2.promises.writeFile(filepath, content);
     }
     needToReCompile(compilerOptions, sourceInfos) {
@@ -169,7 +169,7 @@ class ProjectArtifact {
             return undefined;
         }
         const content = await fs_2.promises.readFile(filepath);
-        const json = JSON.parse(content.toString());
+        const json = (0, utils_1.parseJsonWithBigint)(content.toString());
         const compilerOptionsUsed = json.compilerOptionsUsed;
         const files = new Map(Object.entries(json.infos));
         return new ProjectArtifact(compilerOptionsUsed, files);
@@ -480,7 +480,7 @@ class Contract extends Artifact {
     // support both 'code.ral' and 'code.ral.json'
     static async fromArtifactFile(path, bytecodeDebugPatch, codeHashDebug) {
         const content = await fs_2.promises.readFile(path);
-        const artifact = JSON.parse(content.toString());
+        const artifact = (0, utils_1.parseJsonWithBigint)(content.toString());
         return Contract.fromJson(artifact, bytecodeDebugPatch, codeHashDebug);
     }
     toString() {
@@ -493,7 +493,7 @@ class Contract extends Artifact {
             eventsSig: this.eventsSig,
             functions: this.functions
         };
-        return JSON.stringify(object, null, 2);
+        return (0, utils_1.stringifyJsonWithBigint)(object, 2);
     }
     toState(fields, asset, address) {
         const addressDef = typeof address !== 'undefined' ? address : Contract.randomAddress();
@@ -718,7 +718,7 @@ class Script extends Artifact {
     }
     static async fromArtifactFile(path, bytecodeDebugPatch) {
         const content = await fs_2.promises.readFile(path);
-        const artifact = JSON.parse(content.toString());
+        const artifact = (0, utils_1.parseJsonWithBigint)(content.toString());
         return this.fromJson(artifact, bytecodeDebugPatch);
     }
     toString() {
@@ -729,7 +729,7 @@ class Script extends Artifact {
             fieldsSig: this.fieldsSig,
             functions: this.functions
         };
-        return JSON.stringify(object, null, 2);
+        return (0, utils_1.stringifyJsonWithBigint)(object, 2);
     }
     async txParamsForExecution(signer, params) {
         const selectedAccount = await signer.getSelectedAccount();

package/dist/src/index.js

@@ -44,9 +44,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.utils = exports.web3 = void 0;
-BigInt.prototype['toJSON'] = function () {
-    return this.toString();
-};
 __exportStar(require("./api"), exports);
 __exportStar(require("./contract"), exports);
 __exportStar(require("./signer"), exports);

package/dist/src/signer/signer.js

@@ -61,7 +61,7 @@ class SignerProvider {
         const derivedAddress = (0, utils_1.addressFromPublicKey)(account.publicKey, account.keyType);
         const derivedGroup = (0, utils_1.groupOfAddress)(derivedAddress);
         if (derivedAddress !== account.address || derivedGroup !== account.group) {
-            throw Error(`Invalid accounot data: ${JSON.stringify(account)}`);
+            throw Error(`Invalid account data: ${JSON.stringify(account)}`);
         }
     }
 }

package/dist/src/utils/number.d.ts

@@ -14,3 +14,5 @@ export declare function prettifyExactAmount(amount: bigint, decimals: number): s
 export declare function prettifyNumber(amount: bigint, decimals: number, config: IPrettifyNumberConfig): string | undefined;
 export declare function convertAmountWithDecimals(amount: string | number, decimals: number): bigint | undefined;
 export declare function convertAlphAmount(amount: string | number): bigint | undefined;
+export declare function stringifyJsonWithBigint(obj: any, space?: string | number): string;
+export declare function parseJsonWithBigint(text: string): any;

package/dist/src/utils/number.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertAlphAmount = exports.convertAmountWithDecimals = exports.prettifyNumber = exports.prettifyExactAmount = exports.prettifyTokenAmount = exports.prettifyAttoAlphAmount = exports.prettifyNumberConfig = exports.isNumeric = void 0;
+exports.parseJsonWithBigint = exports.stringifyJsonWithBigint = exports.convertAlphAmount = exports.convertAmountWithDecimals = exports.prettifyNumber = exports.prettifyExactAmount = exports.prettifyTokenAmount = exports.prettifyAttoAlphAmount = exports.prettifyNumberConfig = exports.isNumeric = void 0;
 // Credits:
 // 1. https://github.com/argentlabs/argent-x/blob/e63affa7f28b27333dca4081a3dcd375bb2da40b/packages/extension/src/shared/utils/number.ts
 // 2. https://github.com/ethers-io/ethers.js/blob/724881f34d428406488a1c9f9dbebe54b6edecda/src.ts/utils/fixednumber.ts
@@ -142,3 +142,31 @@ function convertAlphAmount(amount) {
     return convertAmountWithDecimals(amount, 18);
 }
 exports.convertAlphAmount = convertAlphAmount;
+function replacer(key, value) {
+    if (typeof value === 'bigint') {
+        return { __bigintval__: value.toString() };
+    }
+    return value;
+}
+function reviver(key, value) {
+    if (value != null && typeof value === 'object' && '__bigintval__' in value) {
+        return BigInt(value['__bigintval__']);
+    }
+    return value;
+}
+function stringifyJsonWithBigint(obj, space) {
+    const bigintToString = BigInt.prototype['toJSON'];
+    BigInt.prototype['toJSON'] = undefined;
+    const result = JSON.stringify(obj, replacer, space);
+    BigInt.prototype['toJSON'] = bigintToString;
+    return result;
+}
+exports.stringifyJsonWithBigint = stringifyJsonWithBigint;
+function parseJsonWithBigint(text) {
+    const bigintToString = BigInt.prototype['toJSON'];
+    BigInt.prototype['toJSON'] = undefined;
+    const result = JSON.parse(text, reviver);
+    BigInt.prototype['toJSON'] = bigintToString;
+    return result;
+}
+exports.parseJsonWithBigint = parseJsonWithBigint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.5.0-rc.17",
+  "version": "0.5.0-rc.18",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/contract/contract.ts

@@ -54,7 +54,9 @@ import {
   Eq,
   Optional,
   groupOfAddress,
-  addressFromContractId
+  addressFromContractId,
+  stringifyJsonWithBigint,
+  parseJsonWithBigint
 } from '../utils'
 import { getCurrentNodeProvider } from '../global'
 import * as path from 'path'
@@ -207,7 +209,7 @@ class ProjectArtifact {
       compilerOptionsUsed: this.compilerOptionsUsed,
       infos: Object.fromEntries(new Map([...this.infos].sort()))
     }
-    const content = JSON.stringify(artifact, null, 2)
+    const content = stringifyJsonWithBigint(artifact, 2)
     return fsPromises.writeFile(filepath, content)
   }
 
@@ -241,7 +243,7 @@ class ProjectArtifact {
       return undefined
     }
     const content = await fsPromises.readFile(filepath)
-    const json = JSON.parse(content.toString())
+    const json = parseJsonWithBigint(content.toString())
     const compilerOptionsUsed = json.compilerOptionsUsed as node.CompilerOptions
     const files = new Map(Object.entries<CodeInfo>(json.infos))
     return new ProjectArtifact(compilerOptionsUsed, files)
@@ -737,7 +739,7 @@ export class Contract extends Artifact {
   // support both 'code.ral' and 'code.ral.json'
   static async fromArtifactFile(path: string, bytecodeDebugPatch: string, codeHashDebug: string): Promise<Contract> {
     const content = await fsPromises.readFile(path)
-    const artifact = JSON.parse(content.toString())
+    const artifact = parseJsonWithBigint(content.toString())
     return Contract.fromJson(artifact, bytecodeDebugPatch, codeHashDebug)
   }
 
@@ -751,7 +753,7 @@ export class Contract extends Artifact {
       eventsSig: this.eventsSig,
       functions: this.functions
     }
-    return JSON.stringify(object, null, 2)
+    return stringifyJsonWithBigint(object, 2)
   }
 
   toState<T extends Fields>(fields: T, asset: Asset, address?: string): ContractState<T> {
@@ -1047,7 +1049,7 @@ export class Script extends Artifact {
 
   static async fromArtifactFile(path: string, bytecodeDebugPatch: string): Promise<Script> {
     const content = await fsPromises.readFile(path)
-    const artifact = JSON.parse(content.toString())
+    const artifact = parseJsonWithBigint(content.toString())
     return this.fromJson(artifact, bytecodeDebugPatch)
   }
 
@@ -1059,7 +1061,7 @@ export class Script extends Artifact {
       fieldsSig: this.fieldsSig,
       functions: this.functions
     }
-    return JSON.stringify(object, null, 2)
+    return stringifyJsonWithBigint(object, 2)
   }
 
   async txParamsForExecution<P extends Fields>(

package/src/index.ts

@@ -16,10 +16,6 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
-BigInt.prototype['toJSON'] = function () {
-  return this.toString()
-}
-
 export * from './api'
 export * from './contract'
 export * from './signer'

package/src/signer/signer.ts

@@ -61,7 +61,7 @@ export abstract class SignerProvider {
     const derivedAddress = addressFromPublicKey(account.publicKey, account.keyType)
     const derivedGroup = groupOfAddress(derivedAddress)
     if (derivedAddress !== account.address || derivedGroup !== account.group) {
-      throw Error(`Invalid accounot data: ${JSON.stringify(account)}`)
+      throw Error(`Invalid account data: ${JSON.stringify(account)}`)
     }
   }
 

package/src/utils/number.ts

@@ -155,3 +155,37 @@ export function convertAmountWithDecimals(amount: string | number, decimals: num
 export function convertAlphAmount(amount: string | number): bigint | undefined {
   return convertAmountWithDecimals(amount, 18)
 }
+
+function replacer(key: string, value: any): any {
+  if (typeof value === 'bigint') {
+    return { __bigintval__: value.toString() }
+  }
+  return value
+}
+
+function reviver(key: string, value: any): any {
+  if (value != null && typeof value === 'object' && '__bigintval__' in value) {
+    return BigInt(value['__bigintval__'])
+  }
+  return value
+}
+
+export function stringifyJsonWithBigint(obj: any, space?: string | number): string {
+  const bigintToString = BigInt.prototype['toJSON']
+  BigInt.prototype['toJSON'] = undefined
+
+  const result = JSON.stringify(obj, replacer, space)
+
+  BigInt.prototype['toJSON'] = bigintToString
+  return result
+}
+
+export function parseJsonWithBigint(text: string): any {
+  const bigintToString = BigInt.prototype['toJSON']
+  BigInt.prototype['toJSON'] = undefined
+
+  const result = JSON.parse(text, reviver)
+
+  BigInt.prototype['toJSON'] = bigintToString
+  return result
+}