fix: get it working

stellar · Oct 29, 2024 · 9f4bad3 · 9f4bad3
1 parent a16fadf
commit 9f4bad3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/src/contract/client.ts b/src/contract/client.ts
@@ -9,6 +9,7 @@ import { Server } from '../rpc';
 import { AssembledTransaction } from "./assembled_transaction";
 import type { ClientOptions, MethodOptions } from "./types";
 import { processSpecEntryStream } from './utils';
+import randomBytes from "randombytes";
 
 const CONSTRUCTOR_FUNC = "__constructor";
 
@@ -62,7 +63,7 @@ export class Client {
     options: MethodOptions &
       Omit<ClientOptions, "contractId"> & {
         wasmHash: Buffer | string;
-        salt: Buffer;
+        salt?: Buffer;
         format?: "hex" | "base64";
       }
   ): Promise<AssembledTransaction<T>> {
@@ -82,7 +83,7 @@ export class Client {
     let contractIdPreimage =
       xdr.ContractIdPreimage.contractIdPreimageFromAddress(
         new xdr.ContractIdPreimageFromAddress({
-          salt: options.salt,
+          salt: options.salt ?? hash(randomBytes(48)),
           address: address.toScAddress(),
         })
       );
@@ -106,8 +107,9 @@ export class Client {
       ...options,
       contractId,
       method: CONSTRUCTOR_FUNC,
-      parseResultXdr: () =>
-        new Client(spec, { ...options, contractId }),
+      parseResultXdr: (result) =>
+        new Client(spec, { ...options, contractId: Address.fromScVal(result).toString() })
+
     }) as unknown as AssembledTransaction<T>;
   }
 

diff --git a/test/e2e/src/test-constructor-args.js b/test/e2e/src/test-constructor-args.js
@@ -3,28 +3,40 @@ const { Address, contract, hash } = require("../../../lib");
 const { installContract, rpcUrl, networkPassphrase } = require("./util");
 const { basicNodeSigner } = require("../../../lib/contract");
 
-describe("Constructor Args", function () {
+const INIT_VALUE = 42;
+
+describe("contract with constructor args", function () {
   before(async function () {
     const { wasmHash, keypair } = await installContract("constructorArgs");
     this.context = { wasmHash, keypair };
   });
 
-  it("does things", async function () {
-    expect(this.context.wasmHash).not.to.be.empty;
+  it("can be instantiated when deployed", async function () {
     const tx = await contract.Client.deploy(
-      { counter: 42 },
+      { counter: INIT_VALUE },
       {
         networkPassphrase,
         rpcUrl,
         allowHttp: true,
         wasmHash: this.context.wasmHash,
-        salt: hash(Buffer.from("salt")),
         publicKey: this.context.keypair.publicKey(),
-        ...basicNodeSigner(this.context.keypair),
+        ...basicNodeSigner(this.context.keypair, networkPassphrase),
       },
     );
-    console.log(tx);
-    const { result } = await tx.signAndSend();
-    console.log(result);
+    const { result: client } = await tx.signAndSend();
+    const t = await client.counter();
+    expect(t.result, INIT_VALUE);
+  });
+
+  it("fails deploy if not given arguments", async function () {
+    const tx = await contract.Client.deploy(null, {
+      networkPassphrase,
+      rpcUrl,
+      allowHttp: true,
+      wasmHash: this.context.wasmHash,
+      publicKey: this.context.keypair.publicKey(),
+      ...basicNodeSigner(this.context.keypair, networkPassphrase),
+    });
+    expect(tx.signAndSend().then((t) => t.result)).to.eventually.throw();
   });
 });