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

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') {