@alephium/web3 0.2.0-rc.34 → 0.2.0-rc.35

package/dist/src/api/types.d.ts

@@ -1,5 +1,5 @@
 import * as node from './api-alephium';
-export declare type Number256 = number | bigint | string;
+export declare type Number256 = bigint;
 export declare type Val = Number256 | boolean | string | Val[];
 export declare type NamedVals = Record<string, Val>;
 export interface Token {
@@ -13,7 +13,7 @@ export declare function fromApiTokens(tokens?: node.Token[]): Token[] | undefine
 export declare function toApiBoolean(v: Val): boolean;
 export declare function toApiNumber256(v: Val): string;
 export declare function toApiNumber256Optional(v?: Val): string | undefined;
-export declare function fromApiNumber256(n: string): Number256;
+export declare function fromApiNumber256(n: string): bigint;
 export declare function toApiByteVec(v: Val): string;
 export declare function toApiAddress(v: Val): string;
 export declare function toApiArray(tpe: string, v: Val): node.Val;

package/dist/src/api/types.js

@@ -63,12 +63,7 @@ function toApiNumber256Optional(v) {
 }
 exports.toApiNumber256Optional = toApiNumber256Optional;
 function fromApiNumber256(n) {
-    if (Number.isSafeInteger(Number.parseInt(n))) {
-        return Number(n);
-    }
-    else {
-        return BigInt(n);
-    }
+    return BigInt(n);
 }
 exports.fromApiNumber256 = fromApiNumber256;
 // TODO: check hex string

package/dist/src/contract/contract.d.ts

@@ -213,7 +213,7 @@ export interface DeployContractTransaction {
 export interface BuildDeployContractTx {
     signerAddress: string;
     initialFields?: Fields;
-    initialAttoAlphAmount?: string;
+    initialAttoAlphAmount?: Number256;
     initialTokenAmounts?: Token[];
     issueTokenAmount?: Number256;
     gasAmount?: number;

package/dist/src/contract/contract.js

@@ -587,11 +587,11 @@ class Contract extends Artifact {
         const signerParams = {
             signerAddress: (await signer.getSelectedAccount()).address,
             bytecode: bytecode,
-            initialAttoAlphAmount: extractOptionalNumber256(params.initialAttoAlphAmount),
-            issueTokenAmount: extractOptionalNumber256(params.issueTokenAmount),
-            initialTokenAmounts: (0, api_1.toApiTokens)(params.initialTokenAmounts),
+            initialAttoAlphAmount: params.initialAttoAlphAmount,
+            issueTokenAmount: params.issueTokenAmount,
+            initialTokenAmounts: params.initialTokenAmounts,
             gasAmount: params.gasAmount,
-            gasPrice: extractOptionalNumber256(params.gasPrice)
+            gasPrice: params.gasPrice
         };
         return signerParams;
     }
@@ -652,10 +652,10 @@ class Script extends Artifact {
         const signerParams = {
             signerAddress: (await signer.getSelectedAccount()).address,
             bytecode: this.buildByteCodeToDeploy(params.initialFields ? params.initialFields : {}),
-            attoAlphAmount: extractOptionalNumber256(params.attoAlphAmount),
-            tokens: (0, api_1.toApiTokens)(params.tokens),
+            attoAlphAmount: params.attoAlphAmount,
+            tokens: params.tokens,
             gasAmount: params.gasAmount,
-            gasPrice: extractOptionalNumber256(params.gasPrice)
+            gasPrice: params.gasPrice
         };
         return signerParams;
     }
@@ -668,9 +668,6 @@ class Script extends Artifact {
     }
 }
 exports.Script = Script;
-function extractOptionalNumber256(v) {
-    return typeof v !== 'undefined' ? (0, api_1.toApiNumber256)(v) : undefined;
-}
 function fromApiFields(vals, fieldsSig) {
     return (0, api_1.fromApiVals)(vals, fieldsSig.names, fieldsSig.types);
 }

package/dist/src/signer/signer.d.ts

@@ -48,10 +48,10 @@ export interface SignDeployContractTxResult {
 export interface SignExecuteScriptTxParams {
     signerAddress: string;
     bytecode: string;
-    attoAlphAmount?: string;
+    attoAlphAmount?: Number256;
     tokens?: Token[];
     gasAmount?: number;
-    gasPrice?: string;
+    gasPrice?: Number256;
 }
 export interface SignExecuteScriptTxResult {
     fromGroup: number;

package/dist/src/signer/signer.js

@@ -137,7 +137,9 @@ class SignerProviderSimple {
     async buildScriptTx(params) {
         const data = {
             ...(await this.usePublicKey(params)),
-            tokens: (0, api_1.toApiTokens)(params.tokens)
+            attoAlphAmount: (0, api_1.toApiNumber256Optional)(params.attoAlphAmount),
+            tokens: (0, api_1.toApiTokens)(params.tokens),
+            gasPrice: (0, api_1.toApiNumber256Optional)(params.gasPrice)
         };
         return this.getNodeProvider().contracts.postContractsUnsignedTxExecuteScript(data);
     }

package/package.json

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

package/src/api/types.ts

@@ -19,7 +19,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 import { assertType, bs58, Eq } from '../utils'
 import * as node from './api-alephium'
 
-export type Number256 = number | bigint | string
+export type Number256 = bigint
 export type Val = Number256 | boolean | string | Val[]
 export type NamedVals = Record<string, Val>
 
@@ -68,12 +68,8 @@ export function toApiNumber256Optional(v?: Val): string | undefined {
   return v === undefined ? undefined : toApiNumber256(v)
 }
 
-export function fromApiNumber256(n: string): Number256 {
-  if (Number.isSafeInteger(Number.parseInt(n))) {
-    return Number(n)
-  } else {
-    return BigInt(n)
-  }
+export function fromApiNumber256(n: string): bigint {
+  return BigInt(n)
 }
 
 // TODO: check hex string

package/src/contract/contract.ts

@@ -32,7 +32,6 @@ import {
   toApiVal,
   Token,
   Val,
-  toApiTokens,
   fromApiTokens,
   fromApiVals
 } from '../api'
@@ -816,11 +815,11 @@ export class Contract extends Artifact {
     const signerParams: SignDeployContractTxParams = {
       signerAddress: (await signer.getSelectedAccount()).address,
       bytecode: bytecode,
-      initialAttoAlphAmount: extractOptionalNumber256(params.initialAttoAlphAmount),
-      issueTokenAmount: extractOptionalNumber256(params.issueTokenAmount),
-      initialTokenAmounts: toApiTokens(params.initialTokenAmounts),
+      initialAttoAlphAmount: params.initialAttoAlphAmount,
+      issueTokenAmount: params.issueTokenAmount,
+      initialTokenAmounts: params.initialTokenAmounts,
       gasAmount: params.gasAmount,
-      gasPrice: extractOptionalNumber256(params.gasPrice)
+      gasPrice: params.gasPrice
     }
     return signerParams
   }
@@ -902,10 +901,10 @@ export class Script extends Artifact {
     const signerParams: SignExecuteScriptTxParams = {
       signerAddress: (await signer.getSelectedAccount()).address,
       bytecode: this.buildByteCodeToDeploy(params.initialFields ? params.initialFields : {}),
-      attoAlphAmount: extractOptionalNumber256(params.attoAlphAmount),
-      tokens: toApiTokens(params.tokens),
+      attoAlphAmount: params.attoAlphAmount,
+      tokens: params.tokens,
       gasAmount: params.gasAmount,
-      gasPrice: extractOptionalNumber256(params.gasPrice)
+      gasPrice: params.gasPrice
     }
     return signerParams
   }
@@ -923,10 +922,6 @@ export class Script extends Artifact {
   }
 }
 
-function extractOptionalNumber256(v?: Val): string | undefined {
-  return typeof v !== 'undefined' ? toApiNumber256(v) : undefined
-}
-
 function fromApiFields(vals: node.Val[], fieldsSig: node.FieldsSig): Fields {
   return fromApiVals(vals, fieldsSig.names, fieldsSig.types)
 }
@@ -1102,7 +1097,7 @@ type BuildTxParams<T> = Omit<T, 'bytecode'> & { initialFields?: Val[] }
 export interface BuildDeployContractTx {
   signerAddress: string
   initialFields?: Fields
-  initialAttoAlphAmount?: string
+  initialAttoAlphAmount?: Number256
   initialTokenAmounts?: Token[]
   issueTokenAmount?: Number256
   gasAmount?: number

package/src/signer/signer.ts

@@ -91,10 +91,10 @@ assertType<Eq<SignDeployContractTxResult, SignResult<node.BuildDeployContractTxR
 export interface SignExecuteScriptTxParams {
   signerAddress: string
   bytecode: string
-  attoAlphAmount?: string
+  attoAlphAmount?: Number256
   tokens?: Token[]
   gasAmount?: number
-  gasPrice?: string
+  gasPrice?: Number256
 }
 assertType<Eq<keyof SignExecuteScriptTxParams, keyof TxBuildParams<node.BuildExecuteScriptTx>>>()
 export interface SignExecuteScriptTxResult {
@@ -250,7 +250,9 @@ export abstract class SignerProviderSimple implements SignerProvider {
   async buildScriptTx(params: SignExecuteScriptTxParams): Promise<node.BuildExecuteScriptTxResult> {
     const data: node.BuildExecuteScriptTx = {
       ...(await this.usePublicKey(params)),
-      tokens: toApiTokens(params.tokens)
+      attoAlphAmount: toApiNumber256Optional(params.attoAlphAmount),
+      tokens: toApiTokens(params.tokens),
+      gasPrice: toApiNumber256Optional(params.gasPrice)
     }
     return this.getNodeProvider().contracts.postContractsUnsignedTxExecuteScript(data)
   }