@alephium/web3 1.12.0-beta.0 → 1.12.0-danube.1

package/src/signer/types.ts

@@ -34,18 +34,18 @@ export interface Destination {
 }
 assertType<Eq<keyof Destination, keyof node.Destination>>
 
-export type KeyType = 'default' | 'bip340-schnorr' | 'groupless'
+export type KeyType = 'default' | 'bip340-schnorr' | 'gl-secp256k1' | 'gl-secp256r1' | 'gl-ed25519' | 'gl-webauthn'
 
 export interface Account {
   keyType: KeyType
   address: string
-  group: number
+  group: number // TODO: optional for groupless address
   publicKey: string
 }
 
 export type SignerAddress = { signerAddress: string; signerKeyType?: KeyType }
 type TxBuildParams<T> = Omit<T, 'fromPublicKey' | 'fromPublicKeyType' | 'targetBlockHash'> & SignerAddress
-type SignResult<T> = Omit<T, 'gasPrice'> & { signature: string; gasPrice: Number256 }
+type SignResult<T> = Omit<T, 'gasPrice' | 'type'> & { signature: string; gasPrice: Number256 }
 
 export interface SignTransferTxParams {
   signerAddress: string
@@ -54,6 +54,7 @@ export interface SignTransferTxParams {
   utxos?: OutputRef[]
   gasAmount?: number
   gasPrice?: Number256
+  group?: number
 }
 assertType<Eq<keyof SignTransferTxParams, keyof TxBuildParams<node.BuildTransferTx>>>()
 export interface SignTransferTxResult {
@@ -65,7 +66,7 @@ export interface SignTransferTxResult {
   gasAmount: number
   gasPrice: Number256
 }
-assertType<Eq<SignTransferTxResult, SignResult<node.BuildTransferTxResult>>>()
+assertType<Eq<SignTransferTxResult, SignResult<node.BuildSimpleTransferTxResult>>>()
 
 export interface SignDeployContractTxParams {
   signerAddress: string
@@ -77,6 +78,7 @@ export interface SignDeployContractTxParams {
   issueTokenTo?: string
   gasAmount?: number
   gasPrice?: Number256
+  group?: number
 }
 assertType<Eq<keyof SignDeployContractTxParams, keyof TxBuildParams<node.BuildDeployContractTx>>>()
 export interface SignDeployContractTxResult {
@@ -92,7 +94,7 @@ export interface SignDeployContractTxResult {
 assertType<
   Eq<
     Omit<SignDeployContractTxResult, 'groupIndex'>,
-    Omit<SignResult<node.BuildDeployContractTxResult> & { contractId: string }, 'fromGroup' | 'toGroup'>
+    Omit<SignResult<node.BuildSimpleDeployContractTxResult> & { contractId: string }, 'fromGroup' | 'toGroup'>
   >
 >()
 
@@ -105,6 +107,7 @@ export interface SignExecuteScriptTxParams {
   gasAmount?: number
   gasPrice?: Number256
   gasEstimationMultiplier?: number
+  group?: number
 }
 assertType<Eq<keyof SignExecuteScriptTxParams, keyof TxBuildParams<node.BuildExecuteScriptTx>>>()
 export interface SignExecuteScriptTxResult {
@@ -119,10 +122,32 @@ export interface SignExecuteScriptTxResult {
 assertType<
   Eq<
     Omit<SignExecuteScriptTxResult, 'groupIndex'>,
-    Omit<SignResult<node.BuildExecuteScriptTxResult>, 'fromGroup' | 'toGroup'>
+    Omit<SignResult<node.BuildSimpleExecuteScriptTxResult>, 'fromGroup' | 'toGroup'>
   >
 >()
 
+export interface GrouplessBuildTxResult<
+  T extends SignExecuteScriptTxResult | SignDeployContractTxResult | SignTransferTxResult
+> {
+  transferTxs: Omit<SignTransferTxResult, 'signature'>[]
+  tx: Omit<T, 'signature'>
+}
+
+export type BuildTxResult<T extends SignExecuteScriptTxResult | SignDeployContractTxResult | SignTransferTxResult> =
+  | GrouplessBuildTxResult<T>
+  | Omit<T, 'signature'>
+
+export interface GrouplessSignTxResult<
+  T extends SignExecuteScriptTxResult | SignDeployContractTxResult | SignTransferTxResult
+> {
+  transferTxs: SignTransferTxResult[]
+  tx: T
+}
+
+export type SignTxResult<T extends SignExecuteScriptTxResult | SignDeployContractTxResult | SignTransferTxResult> =
+  | GrouplessSignTxResult<T>
+  | T
+
 export interface SignUnsignedTxParams {
   signerAddress: string
   signerKeyType?: KeyType
@@ -160,39 +185,6 @@ export type SignChainedTxResult =
   | SignDeployContractChainedTxResult
   | SignExecuteScriptChainedTxResult
 
-export interface SignGrouplessTransferTxParams {
-  fromAddress: string
-  destinations: Destination[]
-  gasPrice?: Number256
-  targetBlockHash?: string
-}
-assertType<Eq<keyof SignGrouplessTransferTxParams, keyof node.BuildGrouplessTransferTx>>()
-export interface SignGrouplessDeployContractTxParams {
-  fromAddress: string
-  bytecode: string
-  initialAttoAlphAmount?: Number256
-  initialTokenAmounts?: Token[]
-  issueTokenAmount?: Number256
-  issueTokenTo?: string
-  gasPrice?: Number256
-  targetBlockHash?: string
-}
-assertType<Eq<keyof SignGrouplessDeployContractTxParams, keyof node.BuildGrouplessDeployContractTx>>()
-export interface SignGrouplessExecuteScriptTxParams {
-  fromAddress: string
-  bytecode: string
-  attoAlphAmount?: Number256
-  tokens?: Token[]
-  gasPrice?: Number256
-  targetBlockHash?: string
-  gasEstimationMultiplier?: number
-}
-assertType<Eq<keyof SignGrouplessExecuteScriptTxParams, keyof node.BuildGrouplessExecuteScriptTx>>()
-export type SignGrouplessTxParams =
-  | SignGrouplessTransferTxParams
-  | SignGrouplessDeployContractTxParams
-  | SignGrouplessExecuteScriptTxParams
-
 export type MessageHasher =
   | 'alephium' // Message is prefixed with 'Alephium signed message: ' before hashed with blake2b
   | 'sha256'

package/src/utils/sign.ts

@@ -40,7 +40,7 @@ necc.utils.hmacSha256Sync = (key: Uint8Array, ...messages: Uint8Array[]): Uint8A
 export function sign(hash: string, privateKey: string, _keyType?: KeyType): string {
   const keyType = _keyType ?? 'default'
 
-  if (keyType === 'default' || keyType === 'groupless') {
+  if (keyType === 'default' || keyType === 'gl-secp256k1') {
     const key = ec.keyFromPrivate(privateKey)
     const signature = key.sign(hash)
     return encodeSignature(signature)
@@ -54,7 +54,7 @@ export function verifySignature(hash: string, publicKey: string, signature: stri
   const keyType = _keyType ?? 'default'
 
   try {
-    if (keyType === 'default' || keyType === 'groupless') {
+    if (keyType === 'default' || keyType === 'gl-secp256k1') {
       const key = ec.keyFromPublic(publicKey, 'hex')
       return key.verify(hash, signatureDecode(ec, signature))
     } else {