added network property to AleoNetworkManager. changed use of Object::entries in wasm/src/programs/execution.rs to Object::keys (#1027)

Author: alexpitsikoulis

sdk/src/network-client.ts

@@ -33,12 +33,14 @@ interface AleoNetworkClientOptions {
  * const publicNetworkClient = new AleoNetworkClient("http://api.explorer.provable.com/v1", undefined, account);
  */
 class AleoNetworkClient {
-    host: string;
-    headers: { [key: string]: string };
-    account: Account | undefined;
-
-    constructor(host: string, options?: AleoNetworkClientOptions | undefined) {
-        this.host = host + "/%%NETWORK%%";
+  host: string;
+  headers: { [key: string]: string };
+  account: Account | undefined;
+  readonly network: string;
+
+  constructor(host: string, options?: AleoNetworkClientOptions) {
+    this.host = host + "/%%NETWORK%%";
+    this.network = "%%NETWORK%%";
 
         if (options && options.headers) {
             this.headers = options.headers;

sdk/src/program-manager.ts

@@ -1,5 +1,5 @@
 import { Account } from "./account";
-import { AleoNetworkClient, ProgramImports } from "./network-client";
+import { AleoNetworkClient, AleoNetworkClientOptions, ProgramImports } from "./network-client";
 import { ImportedPrograms, ImportedVerifyingKeys } from "./models/imports";
 import { RecordProvider, RecordSearchParams } from "./record-provider";
 

sdk/tests/network-client.test.ts

@@ -35,21 +35,11 @@ async function expectThrows(f: () => Promise<any>): Promise<void> {
 
 describe("NodeConnection", () => {
     let connection: AleoNetworkClient;
-    let network: string;
     let windowFetchSpy: sinon.SinonSpy;
 
     beforeEach(() => {
-        connection = new AleoNetworkClient(
-            "https://api.explorer.provable.com/v1",
-        );
-        if (
-            connection.host === "https://api.explorer.provable.com/v1/testnet"
-        ) {
-            network = "testnet";
-        } else {
-            network = "mainnet";
-        }
-        windowFetchSpy = sinon.spy(globalThis, "fetch");
+        connection = new AleoNetworkClient("https://api.explorer.provable.com/v1");
+        windowFetchSpy = sinon.spy(globalThis, 'fetch');
     });
 
     afterEach(() => {
@@ -381,9 +371,9 @@ describe("NodeConnection", () => {
         });
     });
 
-    describe("Test API methods that return wasm objects", () => {
-        it("Plaintext returned from the API should have expected properties", async () => {
-            if (network === "testnet") {
+    describe('Test API methods that return wasm objects', () => {
+        it('Plaintext returned from the API should have expected properties', async () => {
+            if (connection.network === "testnet") {
                 // Check a struct variant of a plaintext object.
                 let plaintext = await connection.getProgramMappingPlaintext(
                     "credits.aleo",
@@ -414,10 +404,8 @@ describe("NodeConnection", () => {
 
         it("should have correct data within the wasm object and summary object for an execution transaction", async () => {
             // Get the first transaction at block 24700 on testnet.
-            if (network === "testnet") {
-                const transaction = await connection.getTransactionObject(
-                    "at1fjy6s9md2v4rgcn3j3q4qndtfaa2zvg58a4uha0rujvrn4cumu9qfazxdd",
-                );
+            if (connection.network === "testnet") {
+                const transaction = await connection.getTransactionObject("at1fjy6s9md2v4rgcn3j3q4qndtfaa2zvg58a4uha0rujvrn4cumu9qfazxdd");
                 const transition = <Transition>transaction.transitions()[0];
                 const summary = <TransactionObject>transaction.summary(true);
 
@@ -527,10 +515,8 @@ describe("NodeConnection", () => {
 
         it("should have correct data within the wasm object and summary object for a deployment transaction", async () => {
             // Get the deployment transaction for token_registry.aleo
-            if (network === "mainnet") {
-                const transaction = await connection.getTransactionObject(
-                    "at15mwg0jyhvpjjrfxwrlwzn8puusnmy7r3xzvpjht4e5gzgnp68q9qd0qqec",
-                );
+            if (connection.network === "mainnet") {
+                const transaction = await connection.getTransactionObject("at15mwg0jyhvpjjrfxwrlwzn8puusnmy7r3xzvpjht4e5gzgnp68q9qd0qqec");
                 const summary = <TransactionObject>transaction.summary(true);
                 const deployment = <DeploymentObject>summary.deployment;
 
@@ -558,8 +544,8 @@ describe("NodeConnection", () => {
             }
         });
 
-        it("Should give the correct JSON response when requesting multiple transactions", async () => {
-            if (network === "testnet") {
+        it('Should give the correct JSON response when requesting multiple transactions', async () => {
+            if (connection.network === "testnet") {
                 const transactions = await connection.getTransactions(27400);
                 expect(transactions.length).equal(4);
                 expect(transactions[0].status).equal("accepted");

sdk/tests/program-manager.test.ts

@@ -14,7 +14,7 @@ import { expect } from "chai";
 describe('Program Manager', () => {
     const programManager = new ProgramManager("https://api.explorer.provable.com/v1");
     programManager.setAccount(new Account({privateKey: statePathRecordOwnerPrivateKey}));
-    const network = (<AleoNetworkClient>programManager.networkClient).host  === "https://api.explorer.provable.com/v1/testnet" ? "testnet" : "mainnet";
+    const network = programManager.networkClient.network;
 
     describe('Instantiate with AleoNetworkClientOptions', () => {
         it('should have the specified headers when instantiated', async () => {

wasm/src/programs/execution.rs

@@ -16,9 +16,20 @@
 
 pub use super::*;
 
-use crate::{log, native::ProgramIDNative, types::native::{
-    CurrentNetwork, ExecutionNative, IdentifierNative, ProcessNative, ProgramID, ProgramNative, VerifyingKeyNative
-}, Transition};
+use crate::{
+    Transition,
+    log,
+    native::ProgramIDNative,
+    types::native::{
+        CurrentNetwork,
+        ExecutionNative,
+        IdentifierNative,
+        ProcessNative,
+        ProgramID,
+        ProgramNative,
+        VerifyingKeyNative,
+    },
+};
 use snarkvm_algorithms::snark::varuna::VarunaVersion;
 
 use js_sys::{Array, Object, Reflect};
@@ -123,14 +134,14 @@ pub fn verify_function_execution(
     // Secondly, get the verifying keys and insert them into the process object.
     if let Some(imported_verifying_keys) = imported_verifying_keys {
         // Go through the imports and get the program IDs.
-        let program_ids = Object::entries(&imported_verifying_keys)
+        let program_ids = Object::keys(&imported_verifying_keys)
             .iter()
-            .filter_map(|entries| Array::try_from(entries).unwrap().get(0).as_string()) // Safe unwraps because `entries` returns arrays with string keys.
             .map(|entry| {
+                let entry = entry.as_string().unwrap(); // Safe unwraps because `keys` returns array of string keys.
                 ProgramIDNative::from_str(&entry)
                     .map_err(|_| format!("Program ID not found in imports provided: {entry}"))
             })
-            .collect::<Result<Vec<_>,_>>()?;
+            .collect::<Result<Vec<_>, _>>()?;
 
         // Go through the imports and insert the verifying keys for each function.
         for imported_program_id in &program_ids {
@@ -141,8 +152,8 @@ pub fn verify_function_execution(
             )
             .map_err(|_| format!("Verifying key not found for imported program {}", imported_program_id))?;
             // Get the verifying key for each function.
-            for i in 0..vk_list.length() {
-                let vk = Array::try_from(vk_list.get(i)).map_err(|_| format!("Verifying key and function not found for {}, for each function provide an array of the form ['function_name', 'vk']", imported_program_id))?;
+            for vk in vk_list.iter() {
+                let vk = Array::try_from(vk).map_err(|_| format!("Verifying key and function not found for {}, for each function provide an array of the form ['function_name', 'vk']", imported_program_id))?;
                 {
                     // Insert the verifying key into the temporary process.
                     let imported_function = IdentifierNative::from_str(