@alephium/web3 0.39.3 → 0.41.0

package/src/utils/exchange.ts

@@ -16,9 +16,20 @@ 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/>.
 */
 
-import { AddressType, addressFromPublicKey, addressFromScript, binToHex, bs58, hexToBinUnsafe } from '..'
+import {
+  AddressType,
+  addressFromPublicKey,
+  addressFromScript,
+  binToHex,
+  bs58,
+  hexToBinUnsafe,
+  isHexString
+} from '../utils'
 import { Transaction } from '../api/api-alephium'
 import { Address } from '../signer'
+import { P2SH, unlockScriptCodec } from '../codec/unlock-script-codec'
+import { Buffer } from 'buffer/'
+import { scriptCodec } from '../codec/script-codec'
 
 export function validateExchangeAddress(address: string) {
   let decoded: Uint8Array
@@ -80,24 +91,35 @@ enum UnlockScriptType {
 }
 
 export function getAddressFromUnlockScript(unlockScript: string): Address {
+  if (!isHexString(unlockScript)) {
+    throw new Error(`Invalid unlock script ${unlockScript}, expected a hex string`)
+  }
   const decoded = hexToBinUnsafe(unlockScript)
   if (decoded.length === 0) throw new Error('UnlockScript is empty')
   const unlockScriptType = decoded[0]
   const unlockScriptBody = decoded.slice(1)
 
   if (unlockScriptType === UnlockScriptType.P2PKH) {
+    if (unlockScriptBody.length !== 33) {
+      throw new Error(`Invalid p2pkh unlock script: ${unlockScript}`)
+    }
     return addressFromPublicKey(binToHex(unlockScriptBody))
-  } else if (unlockScriptType === UnlockScriptType.P2MPKH) {
+  }
+
+  if (unlockScriptType === UnlockScriptType.P2MPKH) {
     throw new Error('Naive multi-sig address is not supported for exchanges as it will be replaced by P2SH')
-  } else if (unlockScriptType === UnlockScriptType.P2SH) {
-    // FIXEME: for now we assume that the params is empty, so we need to
-    // remove the last byte from the `unlockScriptBody`, we can decode
-    // the unlock script once the codec PR is merged
-    const script = unlockScriptBody.slice(0, -1)
-    return addressFromScript(script)
-  } else {
-    throw new Error('Invalid unlock script type')
   }
+
+  if (unlockScriptType === UnlockScriptType.P2SH) {
+    let p2sh: P2SH
+    try {
+      p2sh = unlockScriptCodec.decode(Buffer.from(decoded)).script as P2SH
+    } catch (_) {
+      throw new Error(`Invalid p2sh unlock script: ${unlockScript}`)
+    }
+    return addressFromScript(scriptCodec.encode(p2sh.script))
+  }
+  throw new Error('Invalid unlock script type')
 }
 
 function checkALPHOutput(tx: Transaction): boolean {

package/src/utils/number.ts

@@ -21,7 +21,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 // 2. https://github.com/ethers-io/ethers.js/blob/724881f34d428406488a1c9f9dbebe54b6edecda/src.ts/utils/fixednumber.ts
 
 import BigNumber from 'bignumber.js'
-import { Number256 } from '..'
+import { Number256 } from '../api/types'
 
 export const isNumeric = (numToCheck: any): boolean => !isNaN(parseFloat(numToCheck)) && isFinite(numToCheck)
 

package/src/utils/sign.ts

@@ -17,7 +17,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { ec as EC } from 'elliptic'
-import { binToHex, encodeSignature, hexToBinUnsafe, signatureDecode } from '..'
+import { binToHex, encodeSignature, hexToBinUnsafe, signatureDecode } from '../utils'
 import { KeyType } from '../signer'
 import * as necc from '@noble/secp256k1'
 import { createHash, createHmac } from 'crypto'

package/src/utils/subscription.ts

@@ -18,8 +18,8 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 
 import EventEmitter from 'eventemitter3'
 
-type MessageCallback<Message> = (message: Message) => Promise<void>
-type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void>
+type MessageCallback<Message> = (message: Message) => Promise<void> | void
+type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void> | void
 
 export interface SubscribeOptions<Message> {
   pollingInterval: number
@@ -45,7 +45,7 @@ export abstract class Subscription<Message> {
     this.eventEmitter = new EventEmitter()
   }
 
-  startPolling(): void {
+  subscribe(): void {
     this.eventEmitter.on('tick', async () => {
       await this.polling()
 
@@ -68,5 +68,5 @@ export abstract class Subscription<Message> {
     return this.cancelled
   }
 
-  abstract polling(): Promise<void>
+  protected abstract polling(): Promise<void>
 }

package/std/fungible_token_interface.ral

@@ -1,4 +1,5 @@
 @std(id = #0001)
+@using(methodSelector = false)
 Interface IFungibleToken {
   pub fn getSymbol() -> ByteVec
 

package/std/nft_collection_interface.ral

@@ -1,6 +1,7 @@
 import "std/nft_interface"
 
 @std(id = #0002)
+@using(methodSelector = false)
 Interface INFTCollection {
    // Collection Uri points to a json file containing metadata for the NFT collection.
    //

package/std/nft_collection_with_royalty_interface.ral

@@ -1,6 +1,7 @@
 import "std/nft_collection_interface"
 
 @std(id = #000201)
+@using(methodSelector = false)
 Interface INFTCollectionWithRoyalty extends INFTCollection {
     pub fn royaltyAmount(tokenId: ByteVec, salePrice: U256) -> (U256)
 

package/std/nft_interface.ral

@@ -1,4 +1,5 @@
 @std(id = #0003)
+@using(methodSelector = false)
 Interface INFT {
    // Token Uri points to a json file containing metadata for the NFT.
    //