@alephium/web3 0.31.1 → 0.32.0

package/dist/src/api/api-alephium.d.ts

@@ -995,7 +995,7 @@ export declare class HttpClient<SecurityDataType = unknown> {
 }
 /**
  * @title Alephium API
- * @version 2.8.5
+ * @version 2.9.0
  * @baseUrl ../
  */
 export declare class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/dist/src/api/api-alephium.js

@@ -151,7 +151,7 @@ class HttpClient {
 exports.HttpClient = HttpClient;
 /**
  * @title Alephium API
- * @version 2.8.5
+ * @version 2.9.0
  * @baseUrl ../
  */
 class Api extends HttpClient {

package/dist/src/api/node-provider.js

@@ -90,7 +90,7 @@ class NodeProvider {
             }
             else {
                 const failedCollectionIndexResult = result.results[1];
-                if (failedCollectionIndexResult.error.startsWith('VM execution error: InvalidMethodIndex')) {
+                if (failedCollectionIndexResult.error.startsWith('VM execution error: Invalid method index')) {
                     throw new Error('Deprecated NFT contract');
                 }
                 else {

package/dist/src/contract/contract.js

@@ -221,6 +221,22 @@ class ProjectArtifact {
 }
 exports.ProjectArtifact = ProjectArtifact;
 ProjectArtifact.artifactFileName = '.project.json';
+function removeOldArtifacts(dir) {
+    const files = fs_1.default.readdirSync(dir);
+    files.forEach((file) => {
+        const filePath = path.join(dir, file);
+        const stat = fs_1.default.statSync(filePath);
+        if (stat.isDirectory()) {
+            removeOldArtifacts(filePath);
+        }
+        else if (filePath.endsWith('.ral.json') || filePath.endsWith('.ral')) {
+            fs_1.default.unlinkSync(filePath);
+        }
+    });
+    if (fs_1.default.readdirSync(dir).length === 0) {
+        fs_1.default.rmdirSync(dir);
+    }
+}
 class Project {
     static buildProjectArtifact(fullNodeVersion, sourceInfos, contracts, scripts, compilerOptions) {
         const files = new Map();
@@ -491,6 +507,9 @@ class Project {
         const projectArtifact = await ProjectArtifact.from(projectRootDir);
         if (projectArtifact === undefined ||
             projectArtifact.needToReCompile(nodeCompilerOptions, sourceFiles, fullNodeVersion)) {
+            if (fs_1.default.existsSync(artifactsRootDir)) {
+                removeOldArtifacts(artifactsRootDir);
+            }
             console.log(`Compiling contracts in folder "${contractsRootDir}"`);
             Project.currentProject = await Project.compile(fullNodeVersion, provider, sourceFiles, projectRootDir, contractsRootDir, artifactsRootDir, errorOnWarnings, nodeCompilerOptions);
         }

package/dist/src/contract/ralph.d.ts

@@ -7,6 +7,11 @@ export declare function encodeByteVec(bytes: string): Uint8Array;
 export declare function encodeAddress(address: string): Uint8Array;
 export declare function encodeScriptFieldAsString(tpe: string, value: Val): string;
 export declare function encodeScriptField(tpe: string, value: Val): Uint8Array;
+export declare function falttenFields(fields: Fields, fieldsSig: FieldsSig): {
+    name: string;
+    type: string;
+    value: Val;
+}[];
 export declare function buildScriptByteCode(bytecodeTemplate: string, fields: Fields, fieldsSig: FieldsSig): string;
 export declare function buildContractByteCode(bytecode: string, fields: Fields, fieldsSig: FieldsSig): string;
 export declare function encodeContractField(tpe: string, value: Val): Uint8Array[];

package/dist/src/contract/ralph.js

@@ -18,7 +18,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDebugBytecode = exports.encodeContractField = exports.buildContractByteCode = exports.buildScriptByteCode = exports.encodeScriptField = exports.encodeScriptFieldAsString = exports.encodeAddress = exports.encodeByteVec = exports.encodeU256 = exports.encodeI256 = exports.encodeBool = void 0;
+exports.buildDebugBytecode = exports.encodeContractField = exports.buildContractByteCode = exports.buildScriptByteCode = exports.falttenFields = exports.encodeScriptField = exports.encodeScriptFieldAsString = exports.encodeAddress = exports.encodeByteVec = exports.encodeU256 = exports.encodeI256 = exports.encodeBool = void 0;
 const buffer_1 = require("buffer/");
 const api_1 = require("../api");
 const utils_1 = require("../utils");
@@ -201,7 +201,6 @@ function encodeScriptFieldAsString(tpe, value) {
     return buffer_1.Buffer.from(encodeScriptField(tpe, value)).toString('hex');
 }
 exports.encodeScriptFieldAsString = encodeScriptFieldAsString;
-// TODO: support array type
 function encodeScriptField(tpe, value) {
     switch (tpe) {
         case 'Bool':
@@ -223,20 +222,53 @@ function encodeScriptField(tpe, value) {
     throw invalidScriptField(tpe, value);
 }
 exports.encodeScriptField = encodeScriptField;
-const scriptFieldRegex = /\{([0-9]*)\}/g;
-function buildScriptByteCode(bytecodeTemplate, fields, fieldsSig) {
-    return bytecodeTemplate.replace(scriptFieldRegex, (_, fieldIndex) => {
-        const fieldName = fieldsSig.names[`${fieldIndex}`];
-        const fieldType = fieldsSig.types[`${fieldIndex}`];
-        if (fieldName in fields) {
-            const fieldValue = fields[`${fieldName}`];
-            return _encodeField(fieldName, () => encodeScriptFieldAsString(fieldType, fieldValue));
+function flattenArray(name, type, val, acc) {
+    const semiColonIndex = type.lastIndexOf(';');
+    if (semiColonIndex == -1) {
+        throw new Error(`Invalid array type: ${type}`);
+    }
+    const subType = type.slice(1, semiColonIndex);
+    val.forEach((v, index) => {
+        const isArrayType = subType.includes(';');
+        const isArrayValue = Array.isArray(v);
+        if (isArrayType && isArrayValue) {
+            flattenArray(`${name}[${index}]`, subType, v, acc);
+        }
+        else if (!isArrayType && !isArrayValue) {
+            acc.push({ name: `${name}[${index}]`, type: subType, value: v });
         }
         else {
-            throw new Error(`The value of field ${fieldName} is not provided`);
+            const value = isArrayValue ? `[` + v.join(', ') + `]` : v.toString();
+            throw new Error(`Invalid field, expected type is ${subType}, but value is ${value}`);
         }
     });
 }
+function falttenFields(fields, fieldsSig) {
+    const allFields = [];
+    fieldsSig.names.forEach((name, index) => {
+        const field = fields[`${name}`];
+        if (!(name in fields)) {
+            throw new Error(`The value of field ${name} is not provided`);
+        }
+        const type = fieldsSig.types[`${index}`];
+        if (Array.isArray(field)) {
+            flattenArray(name, type, field, allFields);
+        }
+        else {
+            allFields.push({ name, type, value: field });
+        }
+    });
+    return allFields;
+}
+exports.falttenFields = falttenFields;
+const scriptFieldRegex = /\{([0-9]*)\}/g;
+function buildScriptByteCode(bytecodeTemplate, fields, fieldsSig) {
+    const allFields = falttenFields(fields, fieldsSig);
+    return bytecodeTemplate.replace(scriptFieldRegex, (_, fieldIndex) => {
+        const field = allFields[`${fieldIndex}`];
+        return _encodeField(field.name, () => encodeScriptFieldAsString(field.type, field.value));
+    });
+}
 exports.buildScriptByteCode = buildScriptByteCode;
 function _encodeField(fieldName, encodeFunc) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.31.1",
+  "version": "0.32.0",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,7 +27,7 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "2.8.5",
+    "alephium_version": "2.9.0",
     "explorer_backend_version": "1.16.1"
   },
   "type": "commonjs",

package/src/api/api-alephium.ts

@@ -1292,7 +1292,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 2.8.5
+ * @version 2.9.0
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/api/node-provider.ts

@@ -173,7 +173,7 @@ export class NodeProvider implements NodeProviderApis {
       return { tokenUri, collectionId, nftIndex }
     } else {
       const failedCollectionIndexResult = result.results[1] as CallContractFailed
-      if (failedCollectionIndexResult.error.startsWith('VM execution error: InvalidMethodIndex')) {
+      if (failedCollectionIndexResult.error.startsWith('VM execution error: Invalid method index')) {
         throw new Error('Deprecated NFT contract')
       } else {
         throw new Error(`Failed to call contract, error: ${failedCollectionIndexResult.error}`)

package/src/contract/contract.ts

@@ -309,6 +309,23 @@ export class ProjectArtifact {
   }
 }
 
+function removeOldArtifacts(dir: string) {
+  const files = fs.readdirSync(dir)
+  files.forEach((file) => {
+    const filePath = path.join(dir, file)
+    const stat = fs.statSync(filePath)
+    if (stat.isDirectory()) {
+      removeOldArtifacts(filePath)
+    } else if (filePath.endsWith('.ral.json') || filePath.endsWith('.ral')) {
+      fs.unlinkSync(filePath)
+    }
+  })
+
+  if (fs.readdirSync(dir).length === 0) {
+    fs.rmdirSync(dir)
+  }
+}
+
 export class Project {
   sourceInfos: SourceInfo[]
   contracts: Map<string, Compiled<Contract>>
@@ -731,6 +748,9 @@ export class Project {
       projectArtifact === undefined ||
       projectArtifact.needToReCompile(nodeCompilerOptions, sourceFiles, fullNodeVersion)
     ) {
+      if (fs.existsSync(artifactsRootDir)) {
+        removeOldArtifacts(artifactsRootDir)
+      }
       console.log(`Compiling contracts in folder "${contractsRootDir}"`)
       Project.currentProject = await Project.compile(
         fullNodeVersion,

package/src/contract/ralph.ts

@@ -197,7 +197,6 @@ export function encodeScriptFieldAsString(tpe: string, value: Val): string {
   return Buffer.from(encodeScriptField(tpe, value)).toString('hex')
 }
 
-// TODO: support array type
 export function encodeScriptField(tpe: string, value: Val): Uint8Array {
   switch (tpe) {
     case 'Bool':
@@ -220,18 +219,50 @@ export function encodeScriptField(tpe: string, value: Val): Uint8Array {
   throw invalidScriptField(tpe, value)
 }
 
+function flattenArray(name: string, type: string, val: Val[], acc: { name: string; type: string; value: Val }[]) {
+  const semiColonIndex = type.lastIndexOf(';')
+  if (semiColonIndex == -1) {
+    throw new Error(`Invalid array type: ${type}`)
+  }
+  const subType = type.slice(1, semiColonIndex)
+  val.forEach((v, index) => {
+    const isArrayType = subType.includes(';')
+    const isArrayValue = Array.isArray(v)
+    if (isArrayType && isArrayValue) {
+      flattenArray(`${name}[${index}]`, subType, v, acc)
+    } else if (!isArrayType && !isArrayValue) {
+      acc.push({ name: `${name}[${index}]`, type: subType, value: v })
+    } else {
+      const value = isArrayValue ? `[` + v.join(', ') + `]` : v.toString()
+      throw new Error(`Invalid field, expected type is ${subType}, but value is ${value}`)
+    }
+  })
+}
+
+export function falttenFields(fields: Fields, fieldsSig: FieldsSig): { name: string; type: string; value: Val }[] {
+  const allFields: { name: string; type: string; value: Val }[] = []
+  fieldsSig.names.forEach((name, index) => {
+    const field = fields[`${name}`]
+    if (!(name in fields)) {
+      throw new Error(`The value of field ${name} is not provided`)
+    }
+    const type = fieldsSig.types[`${index}`]
+    if (Array.isArray(field)) {
+      flattenArray(name, type, field, allFields)
+    } else {
+      allFields.push({ name, type, value: field })
+    }
+  })
+  return allFields
+}
+
 const scriptFieldRegex = /\{([0-9]*)\}/g
 
 export function buildScriptByteCode(bytecodeTemplate: string, fields: Fields, fieldsSig: FieldsSig): string {
+  const allFields = falttenFields(fields, fieldsSig)
   return bytecodeTemplate.replace(scriptFieldRegex, (_, fieldIndex: string) => {
-    const fieldName = fieldsSig.names[`${fieldIndex}`]
-    const fieldType = fieldsSig.types[`${fieldIndex}`]
-    if (fieldName in fields) {
-      const fieldValue = fields[`${fieldName}`]
-      return _encodeField(fieldName, () => encodeScriptFieldAsString(fieldType, fieldValue))
-    } else {
-      throw new Error(`The value of field ${fieldName} is not provided`)
-    }
+    const field = allFields[`${fieldIndex}`]
+    return _encodeField(field.name, () => encodeScriptFieldAsString(field.type, field.value))
   })
 }