Int32ArrayConstant support. (#25)

spectrum-finance · Nov 17, 2022 · dbdd341 · dbdd341
1 parent e7a3344
commit dbdd341
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ergolabs/ergo-sdk",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Ergo SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",

diff --git a/src/entities/constant.ts b/src/entities/constant.ts
@@ -16,17 +16,22 @@ export class ByteaConstant {
   constructor(public readonly value: Uint8Array) {}
 }
 
+export class Int32ArrayConstant {
+  constructor(public readonly value: Int32Array) {}
+}
+
 export class SigmaPropConstant {
   constructor(public readonly value: PublicKey) {}
 }
 
-export type Constant = Int32Constant | Int64Constant | ByteaConstant | SigmaPropConstant
+export type Constant = Int32Constant | Int64Constant | ByteaConstant | Int32ArrayConstant | SigmaPropConstant
 
 export function serializeConstant(c: Constant): HexString {
   let constant: WasmConstant
   if (c instanceof Int32Constant) constant = RustModule.SigmaRust.Constant.from_i32(c.value)
   else if (c instanceof Int64Constant)
     constant = RustModule.SigmaRust.Constant.from_i64(RustModule.SigmaRust.I64.from_str(c.value.toString()))
+  else if (c instanceof Int32ArrayConstant) constant = RustModule.SigmaRust.Constant.from_i32_array(c.value)
   else if (c instanceof SigmaPropConstant)
     constant = RustModule.SigmaRust.Constant.decode_from_base16(SigmaPropConstPrefixHex + c.value)
   else constant = RustModule.SigmaRust.Constant.from_byte_array(c.value)
@@ -47,9 +52,13 @@ export function deserializeConstant(r: HexString): Constant | undefined {
         return new SigmaPropConstant(hex.slice(SigmaPropConstPrefixHex.length))
       } else {
         try {
-          return new ByteaConstant(constant.to_byte_array())
+          return new Int32ArrayConstant(constant.to_i32_array())
         } catch (e) {
-          return undefined
+          try {
+            return new ByteaConstant(constant.to_byte_array())
+          } catch (e) {
+            return undefined
+          }
         }
       }
     }

diff --git a/src/ergoWasmInterop.ts b/src/ergoWasmInterop.ts
@@ -30,8 +30,8 @@ export function txRequestToWasmTransaction(req: TxRequest, ctx: NetworkContext):
 }
 
 export function ergoBoxesFromWasmUtx(wutx: UnsignedTransaction): ErgoBox[] {
-  const mackTxInputs = Array(wutx.inputs().len()).fill([]);
-  const unsignedTxId = wutx.id().to_str();
+  const mackTxInputs = Array(wutx.inputs().len()).fill([])
+  const unsignedTxId = wutx.id().to_str()
   const mockTx = RustModule.SigmaRust.Transaction.from_unsigned_tx(wutx, mackTxInputs)
   const outputs = []
   for (let i = 0; i < mockTx.outputs().len(); i++) {

diff --git a/src/network/ergoNetwork.ts b/src/network/ergoNetwork.ts
@@ -95,11 +95,11 @@ export interface ErgoNetwork {
 
   /** Get UTXo by address
    */
-  searchUnspentBoxesByAddress(address: Address): Promise<ErgoBoxProxy[]>;
+  searchUnspentBoxesByAddress(address: Address): Promise<ErgoBoxProxy[]>
 
   /** Get UTXo by addresses
    */
-  searchUnspentBoxesByAddresses(addresses: Address[]): Promise<ErgoBoxProxy[]>;
+  searchUnspentBoxesByAddresses(addresses: Address[]): Promise<ErgoBoxProxy[]>
 }
 
 export class Explorer implements ErgoNetwork {
@@ -238,38 +238,41 @@ export class Explorer implements ErgoNetwork {
   }
 
   async searchUnspentBoxesByAddress(address: Address): Promise<ErgoBoxProxy[]> {
-    return  this.backend
+    return this.backend
       .request<network.Items<network.ExplorerErgoBox>>({
         url: `/api/v1/boxes/unspent/byAddress/${address}`,
         transformResponse: data => JSONBI.parse(data)
       })
       .then(res => res.data.items)
-      .then(items => items.map(item => ({
-        boxId: item.boxId,
-        transactionId: item.transactionId,
-        index: item.index,
-        ergoTree: item.ergoTree,
-        creationHeight: item.creationHeight,
-        value: item.value.toString(),
-        assets: item.assets.map(a => ({
-          tokenId: a.tokenId,
-          amount: a.amount.toString(),
-          name: a.name,
-          decimals: a.decimals
-        })),
-        additionalRegisters:   Object
-                                 .entries(item.additionalRegisters)
-                                 .reduce<Registers>((acc, [key, value]) => ({
-                                   ...acc,
-                                   [key]: value.serializedValue
-                                 }), {})
-      })))
+      .then(items =>
+        items.map(item => ({
+          boxId: item.boxId,
+          transactionId: item.transactionId,
+          index: item.index,
+          ergoTree: item.ergoTree,
+          creationHeight: item.creationHeight,
+          value: item.value.toString(),
+          assets: item.assets.map(a => ({
+            tokenId: a.tokenId,
+            amount: a.amount.toString(),
+            name: a.name,
+            decimals: a.decimals
+          })),
+          additionalRegisters: Object.entries(item.additionalRegisters).reduce<Registers>(
+            (acc, [key, value]) => ({
+              ...acc,
+              [key]: value.serializedValue
+            }),
+            {}
+          )
+        }))
+      )
   }
 
   async searchUnspentBoxesByAddresses(addresses: Address[]): Promise<ErgoBoxProxy[]> {
-    return Promise
-      .all(addresses.map(a => this.searchUnspentBoxesByAddress(a)))
-      .then(boxesSets => boxesSets.flatMap(bs => bs))
+    return Promise.all(addresses.map(a => this.searchUnspentBoxesByAddress(a))).then(boxesSets =>
+      boxesSets.flatMap(bs => bs)
+    )
   }
 
   async getFullTokenInfo(tokenId: TokenId): Promise<AugAssetInfo | undefined> {