@alephium/web3 0.5.0-rc.10 → 0.5.0-rc.11

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

@@ -1,6 +1,6 @@
 import { ExplorerProvider, NodeProvider } from '../api';
 import { node } from '../api';
-import { Account, EnableOptionsBase, Destination, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignMessageParams, SignMessageResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SubmissionResult, SubmitTransactionParams, ExtSignTransferTxParams, ExtSignDeployContractTxParams, ExtSignExecuteScriptTxParams, ExtSignUnsignedTxParams, ExtSignMessageParams, KeyType } from './types';
+import { Account, EnableOptionsBase, Destination, SignDeployContractTxParams, SignDeployContractTxResult, SignExecuteScriptTxParams, SignExecuteScriptTxResult, SignMessageParams, SignMessageResult, SignTransferTxParams, SignTransferTxResult, SignUnsignedTxParams, SignUnsignedTxResult, SubmissionResult, SubmitTransactionParams, KeyType } from './types';
 export declare abstract class SignerProvider {
     abstract get nodeProvider(): NodeProvider | undefined;
     abstract get explorerProvider(): ExplorerProvider | undefined;
@@ -18,12 +18,6 @@ export declare abstract class InteractiveSignerProvider<EnableOptions extends En
     protected abstract unsafeEnable(opt?: EnableOptions): Promise<Account>;
     enable(opt?: EnableOptions): Promise<Account>;
     abstract disconnect(): Promise<void>;
-    abstract signAndSubmitTransferTx(params: ExtSignTransferTxParams): Promise<SignTransferTxResult>;
-    abstract signAndSubmitDeployContractTx(params: ExtSignDeployContractTxParams): Promise<SignDeployContractTxResult>;
-    abstract signAndSubmitExecuteScriptTx(params: ExtSignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult>;
-    abstract signAndSubmitUnsignedTx(params: ExtSignUnsignedTxParams): Promise<SignUnsignedTxResult>;
-    abstract signUnsignedTx(params: ExtSignUnsignedTxParams): Promise<SignUnsignedTxResult>;
-    abstract signMessage(params: ExtSignMessageParams): Promise<SignMessageResult>;
 }
 export declare abstract class SignerProviderSimple extends SignerProvider {
     abstract get nodeProvider(): NodeProvider;
@@ -58,7 +52,7 @@ export declare abstract class SignerProviderWithCachedAccounts<T extends Account
     getAccounts(): Promise<T[]>;
     getAccount(address: string): Promise<T>;
 }
-export declare function verifySignedMessage(message: string, publicKey: string, signature: string, keyType: KeyType): boolean;
+export declare function verifySignedMessage(message: string, publicKey: string, signature: string, keyType?: KeyType): boolean;
 export declare function toApiDestination(data: Destination): node.Destination;
 export declare function toApiDestinations(data: Destination[]): node.Destination[];
 export declare function fromApiDestination(data: node.Destination): Destination;

package/dist/src/signer/tx-builder.js

@@ -38,7 +38,7 @@ class TransactionBuilder {
         }
     }
     async buildTransferTx(params, publicKey) {
-        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default');
+        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType);
         const { destinations, gasPrice, ...rest } = params;
         const data = {
             fromPublicKey: publicKey,
@@ -51,7 +51,7 @@ class TransactionBuilder {
         return { ...response, gasPrice: (0, api_1.fromApiNumber256)(response.gasPrice) };
     }
     async buildDeployContractTx(params, publicKey) {
-        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default');
+        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType);
         const { initialAttoAlphAmount, initialTokenAmounts, issueTokenAmount, gasPrice, ...rest } = params;
         const data = {
             fromPublicKey: publicKey,
@@ -67,7 +67,7 @@ class TransactionBuilder {
         return { ...response, groupIndex: response.fromGroup, contractId, gasPrice: (0, api_1.fromApiNumber256)(response.gasPrice) };
     }
     async buildExecuteScriptTx(params, publicKey) {
-        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default');
+        TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType);
         const { attoAlphAmount, tokens, gasPrice, ...rest } = params;
         const data = {
             fromPublicKey: publicKey,

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

@@ -110,18 +110,3 @@ export interface EnableOptionsBase {
     networkId: string;
     onDisconnected: () => Promise<void>;
 }
-export declare type ExtSignTransferTxParams = SignTransferTxParams & {
-    networkId: string;
-};
-export declare type ExtSignDeployContractTxParams = SignDeployContractTxParams & {
-    networkId: string;
-};
-export declare type ExtSignExecuteScriptTxParams = SignExecuteScriptTxParams & {
-    networkId: string;
-};
-export declare type ExtSignUnsignedTxParams = SignUnsignedTxParams & {
-    networkId: string;
-};
-export declare type ExtSignMessageParams = SignMessageParams & {
-    networkId: string;
-};

package/dist/src/transaction/sign-verify.d.ts

@@ -1,3 +1,3 @@
 import { KeyType } from '../signer';
-export declare function transactionSign(txId: string, privateKey: string, keyType: KeyType): string;
-export declare function transactionVerifySignature(txId: string, publicKey: string, signature: string, keyType: KeyType): boolean;
+export declare function transactionSign(txId: string, privateKey: string, keyType?: KeyType): string;
+export declare function transactionVerifySignature(txId: string, publicKey: string, signature: string, keyType?: KeyType): boolean;

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

@@ -1,3 +1,3 @@
 import { KeyType } from '../signer';
-export declare function sign(hash: string, privateKey: string, _keyType: KeyType): string;
-export declare function verifySignature(hash: string, publicKey: string, signature: string, _keyType: KeyType): boolean;
+export declare function sign(hash: string, privateKey: string, _keyType?: KeyType): string;
+export declare function verifySignature(hash: string, publicKey: string, signature: string, _keyType?: KeyType): boolean;

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

@@ -14,9 +14,9 @@ export declare function contractIdFromAddress(address: string): Uint8Array;
 export declare function tokenIdFromAddress(address: string): Uint8Array;
 export declare function hexToBinUnsafe(hex: string): Uint8Array;
 export declare function binToHex(bin: Uint8Array): string;
-export declare function groupOfPrivateKey(privateKey: string, keyType: KeyType): number;
-export declare function publicKeyFromPrivateKey(privateKey: string, _keyType: KeyType): string;
-export declare function addressFromPublicKey(publicKey: string, _keyType: KeyType): string;
+export declare function groupOfPrivateKey(privateKey: string, keyType?: KeyType): number;
+export declare function publicKeyFromPrivateKey(privateKey: string, _keyType?: KeyType): string;
+export declare function addressFromPublicKey(publicKey: string, _keyType?: KeyType): string;
 export declare function addressFromContractId(contractId: string): string;
 export declare function contractIdFromTx(txId: string, outputIndex: number): string;
 export declare function subContractId(parentContractId: string, pathInHex: string, group: number): string;

package/package.json

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

package/src/signer/signer.ts

@@ -38,11 +38,6 @@ import {
   SignUnsignedTxResult,
   SubmissionResult,
   SubmitTransactionParams,
-  ExtSignTransferTxParams,
-  ExtSignDeployContractTxParams,
-  ExtSignExecuteScriptTxParams,
-  ExtSignUnsignedTxParams,
-  ExtSignMessageParams,
   KeyType
 } from './types'
 import { TransactionBuilder } from './tx-builder'
@@ -90,18 +85,6 @@ export abstract class InteractiveSignerProvider<
   }
 
   abstract disconnect(): Promise<void>
-
-  // Methods inherited from SignerProvider, but require networkId in the params
-  abstract override signAndSubmitTransferTx(params: ExtSignTransferTxParams): Promise<SignTransferTxResult>
-  abstract override signAndSubmitDeployContractTx(
-    params: ExtSignDeployContractTxParams
-  ): Promise<SignDeployContractTxResult>
-  abstract override signAndSubmitExecuteScriptTx(
-    params: ExtSignExecuteScriptTxParams
-  ): Promise<SignExecuteScriptTxResult>
-  abstract override signAndSubmitUnsignedTx(params: ExtSignUnsignedTxParams): Promise<SignUnsignedTxResult>
-  abstract override signUnsignedTx(params: ExtSignUnsignedTxParams): Promise<SignUnsignedTxResult>
-  abstract override signMessage(params: ExtSignMessageParams): Promise<SignMessageResult>
 }
 
 export abstract class SignerProviderSimple extends SignerProvider {
@@ -263,7 +246,7 @@ function extendMessage(message: string): string {
   return 'Alephium Signed Message: ' + message
 }
 
-export function verifySignedMessage(message: string, publicKey: string, signature: string, keyType: KeyType): boolean {
+export function verifySignedMessage(message: string, publicKey: string, signature: string, keyType?: KeyType): boolean {
   const extendedMessage = extendMessage(message)
   const messageHash = blake.blake2b(extendedMessage, undefined, 32)
   return utils.verifySignature(utils.binToHex(messageHash), publicKey, signature, keyType)

package/src/signer/tx-builder.ts

@@ -47,7 +47,7 @@ export abstract class TransactionBuilder {
     })()
   }
 
-  private static validatePublicKey(params: SignerAddress, publicKey: string, keyType: KeyType) {
+  private static validatePublicKey(params: SignerAddress, publicKey: string, keyType?: KeyType) {
     const address = addressFromPublicKey(publicKey, keyType)
     if (address !== params.signerAddress) {
       throw new Error('Unmatched public key')
@@ -58,7 +58,7 @@ export abstract class TransactionBuilder {
     params: SignTransferTxParams,
     publicKey: string
   ): Promise<Omit<SignTransferTxResult, 'signature'>> {
-    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default')
+    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType)
 
     const { destinations, gasPrice, ...rest } = params
     const data: node.BuildTransaction = {
@@ -76,7 +76,7 @@ export abstract class TransactionBuilder {
     params: SignDeployContractTxParams,
     publicKey: string
   ): Promise<Omit<SignDeployContractTxResult, 'signature'>> {
-    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default')
+    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType)
 
     const { initialAttoAlphAmount, initialTokenAmounts, issueTokenAmount, gasPrice, ...rest } = params
     const data: node.BuildDeployContractTx = {
@@ -97,7 +97,7 @@ export abstract class TransactionBuilder {
     params: SignExecuteScriptTxParams,
     publicKey: string
   ): Promise<Omit<SignExecuteScriptTxResult, 'signature'>> {
-    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType ?? 'default')
+    TransactionBuilder.validatePublicKey(params, publicKey, params.signerKeyType)
 
     const { attoAlphAmount, tokens, gasPrice, ...rest } = params
     const data: node.BuildExecuteScriptTx = {

package/src/signer/types.ts

@@ -162,10 +162,3 @@ export interface EnableOptionsBase {
   networkId: string
   onDisconnected: () => Promise<void>
 }
-
-// Transaction Params for InteractiveSignerProvider
-export type ExtSignTransferTxParams = SignTransferTxParams & { networkId: string }
-export type ExtSignDeployContractTxParams = SignDeployContractTxParams & { networkId: string }
-export type ExtSignExecuteScriptTxParams = SignExecuteScriptTxParams & { networkId: string }
-export type ExtSignUnsignedTxParams = SignUnsignedTxParams & { networkId: string }
-export type ExtSignMessageParams = SignMessageParams & { networkId: string }

package/src/transaction/sign-verify.ts

@@ -19,7 +19,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 import * as utils from '../utils'
 import { KeyType } from '../signer'
 
-export function transactionSign(txId: string, privateKey: string, keyType: KeyType): string {
+export function transactionSign(txId: string, privateKey: string, keyType?: KeyType): string {
   return utils.sign(txId, privateKey, keyType)
 }
 
@@ -27,7 +27,7 @@ export function transactionVerifySignature(
   txId: string,
   publicKey: string,
   signature: string,
-  keyType: KeyType
+  keyType?: KeyType
 ): boolean {
   return utils.verifySignature(txId, publicKey, signature, keyType)
 }

package/src/utils/sign.ts

@@ -37,7 +37,7 @@ necc.utils.hmacSha256Sync = (key: Uint8Array, ...messages: Uint8Array[]): Uint8A
 }
 
 // hash has to be 32 bytes
-export function sign(hash: string, privateKey: string, _keyType: KeyType): string {
+export function sign(hash: string, privateKey: string, _keyType?: KeyType): string {
   const keyType = _keyType ?? 'default'
 
   if (keyType === 'default') {
@@ -50,7 +50,7 @@ export function sign(hash: string, privateKey: string, _keyType: KeyType): strin
   }
 }
 
-export function verifySignature(hash: string, publicKey: string, signature: string, _keyType: KeyType): boolean {
+export function verifySignature(hash: string, publicKey: string, signature: string, _keyType?: KeyType): boolean {
   const keyType = _keyType ?? 'default'
 
   try {

package/src/utils/utils.ts

@@ -158,11 +158,11 @@ export function binToHex(bin: Uint8Array): string {
   return Buffer.from(bin).toString('hex')
 }
 
-export function groupOfPrivateKey(privateKey: string, keyType: KeyType): number {
+export function groupOfPrivateKey(privateKey: string, keyType?: KeyType): number {
   return groupOfAddress(addressFromPublicKey(publicKeyFromPrivateKey(privateKey, keyType), keyType))
 }
 
-export function publicKeyFromPrivateKey(privateKey: string, _keyType: KeyType): string {
+export function publicKeyFromPrivateKey(privateKey: string, _keyType?: KeyType): string {
   const keyType = _keyType ?? 'default'
 
   if (keyType === 'default') {
@@ -173,7 +173,7 @@ export function publicKeyFromPrivateKey(privateKey: string, _keyType: KeyType):
   }
 }
 
-export function addressFromPublicKey(publicKey: string, _keyType: KeyType): string {
+export function addressFromPublicKey(publicKey: string, _keyType?: KeyType): string {
   const keyType = _keyType ?? 'default'
 
   if (keyType === 'default') {