Przeglądaj źródła

Render program address and package names

Loris Leiva 1 rok temu
rodzic
commit
3f4eb39e71

+ 2 - 2
index.ts

@@ -12,6 +12,8 @@ import { renderTemplate } from "./utils/renderTemplates";
   logBanner();
   const ctx = await getRenderContext();
   createOrEmptyTargetDirectory(ctx);
+  logStep(ctx.language.infos.generatingKeypair);
+  await generateKeypair(ctx);
   logStep(
     ctx.language.infos.scaffolding.replace(
       "$targetDirectory",
@@ -19,8 +21,6 @@ import { renderTemplate } from "./utils/renderTemplates";
     )
   );
   renderTemplates(ctx);
-  logStep(ctx.language.infos.generatingKeypair);
-  await generateKeypair(ctx);
   logDone(ctx);
 })().catch((e) => console.error(e));
 

+ 0 - 0
template/programs/counter-shank/program/rustfmt.toml → template/base/rustfmt.toml


+ 1 - 3
template/clients/js/clients/js/package.json → template/clients/js/clients/js/package.json.njk

@@ -1,5 +1,5 @@
 {
-  "name": "@acme/counter",
+  "name": "{{ jsClientPackageName }}",
   "version": "0.1.0",
   "description": "Counters on-chain",
   "sideEffects": false,
@@ -30,8 +30,6 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "repository": "https://github.com/lorisleiva/kinobi-template.git",
-  "author": "Loris Leiva",
   "license": "MIT",
   "dependencies": {
     "@solana/accounts": "2.0.0-experimental.a7a613a",

+ 1 - 1
template/clients/rust/clients/rust/Cargo.toml → template/clients/rust/clients/rust/Cargo.toml.njk

@@ -1,5 +1,5 @@
 [package]
-name = "acme-counter-client"
+name = "{{ rustClientCrateName }}"
 version = "0.1.0"
 edition = "2021"
 readme = "README.md"

+ 3 - 6
template/programs/counter-shank/program/Cargo.toml → template/programs/counter-shank/program/Cargo.toml.njk

@@ -1,5 +1,5 @@
 [package]
-name = "acme-counter"
+name = "{{ programCrateName }}"
 version = "0.1.0"
 edition = "2021"
 readme = "./README.md"
@@ -7,11 +7,8 @@ license-file = "../LICENSE"
 publish = false
 
 [package.metadata.solana]
-program-id = "MyProgram1111111111111111111111111111111111"
-program-dependencies = [
-  "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
-  "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV",
-]
+program-id = "{{ programAddress }}"
+program-dependencies = []
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
template/programs/counter-shank/program/src/lib.rs → template/programs/counter-shank/program/src/lib.rs.njk

@@ -8,4 +8,4 @@ pub mod utils;
 
 pub use solana_program;
 
-solana_program::declare_id!("MyProgram1111111111111111111111111111111111");
+solana_program::declare_id!("{{ programAddress }}");

+ 1 - 1
utils/generateKeypair.ts

@@ -18,7 +18,7 @@ export async function generateKeypair(ctx: RenderContext): Promise<string> {
     "new",
     "--no-bip39-passphrase",
     "--outfile",
-    `${ctx.programDirectory}/keygen.json`,
+    `${ctx.programDirectory}/keypair.json`,
   ]);
 
   // Wait for the command to finish and read the stdout.