Merge pull request #165 from arda-org/dev

dev into main
arda-org · Jul 7, 2024 · 2016987 · 2016987
2 parents fcd2502 + 8975be0
commit 2016987
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 170 deletions.
diff --git a/contracts/blank/interact/index.ts b/contracts/blank/interact/index.ts
@@ -17,7 +17,7 @@ program.command("deploy").action(async () => {
     codeMetadata: ["upgradeable"],
     gasLimit: 20_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
   console.log("Contract:", result.contract.explorerUrl);
 });
 
@@ -29,7 +29,7 @@ program.command("upgrade").action(async () => {
     codeMetadata: ["upgradeable"],
     gasLimit: 20_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
 });
 
 program.command("ClaimDeveloperRewards").action(async () => {
@@ -39,7 +39,7 @@ program.command("ClaimDeveloperRewards").action(async () => {
     funcName: "ClaimDeveloperRewards",
     gasLimit: 10_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
 });
 
 program.parse(process.argv);
diff --git a/contracts/vested-transfers/interact/index.ts b/contracts/vested-transfers/interact/index.ts
@@ -17,7 +17,7 @@ program.command("deploy").action(async () => {
     codeMetadata: ["upgradeable"],
     gasLimit: 100_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
   console.log("Contract:", result.contract.explorerUrl);
 });
 
@@ -29,7 +29,7 @@ program.command("upgrade").action(async () => {
     codeMetadata: ["upgradeable"],
     gasLimit: 100_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
 });
 
 program.command("ClaimDeveloperRewards").action(async () => {
@@ -39,7 +39,7 @@ program.command("ClaimDeveloperRewards").action(async () => {
     funcName: "ClaimDeveloperRewards",
     gasLimit: 10_000_000,
   });
-  console.log("Transaction:", result.tx.explorerUrl);
+  console.log("Transaction:", result.explorerUrl);
 });
 
 program.parse(process.argv);
diff --git a/xsuite/package.json b/xsuite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xsuite",
-  "version": "0.0.66",
+  "version": "0.0.67",
   "license": "MIT",
   "bin": {
     "xsuite": "cli.js"

diff --git a/xsuite/src/cli/cli.test.ts b/xsuite/src/cli/cli.test.ts
@@ -347,24 +347,12 @@ test.concurrent(
   async () => {
     using c = newContext();
 
-    // TO BE REMOVED!
-    // Switch to a rust version compatible with sample contracts on main branch.
-    await c.cmd('install-rust --toolchain "nightly-2023-12-11"');
-
     const dir = "contract";
     await c.cmd(`new --dir ${dir}`);
     expect(fs.readdirSync(c.cwd()).length).toEqual(1);
     const starterChalk = chalk.magenta("blank");
     const absDirPath = path.resolve(c.cwd(), dir);
     expect(c.flushStdout().split("\n")).toEqual([
-      //// Must be removed when removing rust version switch (line 350) ////
-      chalk.blue(
-        'Installing Rust: toolchain "nightly-2023-12-11" & target wasm32-unknown-unknown...',
-      ),
-      chalk.cyan(
-        '$ curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain "nightly-2023-12-11" -t wasm32-unknown-unknown -y',
-      ),
-      //////////////////////////////////////////////////////////////////////
       chalk.blue(`Downloading contract ${starterChalk} in "${absDirPath}"...`),
       "",
       chalk.blue("Installing packages..."),
@@ -438,10 +426,6 @@ test.concurrent(
       chalk.cyan(`$ ${binaryPath} .`),
       "",
     ]);
-
-    // Must be removed when removing rust version switch (line 350).
-    // Switch back to the default rust version.
-    await c.cmd("install-rust");
   },
   100_000,
 );