From 2f1d450d4e86519d728be695eb358b18d43179a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ram=C3=B3n=20Rivera?= Date: Wed, 24 Apr 2024 17:19:01 -0600 Subject: [PATCH] - Moved Codigo project into a new folder - Reverted Readme in root folder. --- Codigo/README.md | 22 +++++++++++++++++++ {program => Codigo/program}/Cargo.lock | 0 {program => Codigo/program}/Cargo.toml | 2 +- .../program}/generated/entrypoint.rs | 0 .../program}/generated/errors.rs | 0 .../program}/generated/instructions.rs | 0 {program => Codigo/program}/generated/mod.rs | 0 .../program}/generated/processor.rs | 0 .../program}/generated/state.rs | 0 {program => Codigo/program}/lib.rs | 0 {program => Codigo/program}/src/add_tweet.rs | 5 ----- {program => Codigo/program}/src/mod.rs | 0 .../program_client}/app.ts | 5 +++-- Codigo/program_client/greeter.html | 9 ++++++++ Codigo/program_client/greeter.ts | 7 ++++++ .../program_client}/index.ts | 0 .../program_client}/lib/pda.ts | 0 .../program_client}/lib/rpc.ts | 0 .../program_client}/lib/types.ts | 0 .../program_client}/lib/utils.ts | 0 .../program_client}/package-lock.json | 0 .../program_client}/package.json | 0 .../program_client}/tsconfig.json | 0 xsol.cidl => Codigo/xsol.cidl | 0 README.md | 2 +- 25 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 Codigo/README.md rename {program => Codigo/program}/Cargo.lock (100%) rename {program => Codigo/program}/Cargo.toml (94%) rename {program => Codigo/program}/generated/entrypoint.rs (100%) rename {program => Codigo/program}/generated/errors.rs (100%) rename {program => Codigo/program}/generated/instructions.rs (100%) rename {program => Codigo/program}/generated/mod.rs (100%) rename {program => Codigo/program}/generated/processor.rs (100%) rename {program => Codigo/program}/generated/state.rs (100%) rename {program => Codigo/program}/lib.rs (100%) rename {program => Codigo/program}/src/add_tweet.rs (99%) rename {program => Codigo/program}/src/mod.rs (100%) rename {program_client => Codigo/program_client}/app.ts (82%) create mode 100644 Codigo/program_client/greeter.html create mode 100644 Codigo/program_client/greeter.ts rename {program_client => Codigo/program_client}/index.ts (100%) rename {program_client => Codigo/program_client}/lib/pda.ts (100%) rename {program_client => Codigo/program_client}/lib/rpc.ts (100%) rename {program_client => Codigo/program_client}/lib/types.ts (100%) rename {program_client => Codigo/program_client}/lib/utils.ts (100%) rename {program_client => Codigo/program_client}/package-lock.json (100%) rename {program_client => Codigo/program_client}/package.json (100%) rename {program_client => Codigo/program_client}/tsconfig.json (100%) rename xsol.cidl => Codigo/xsol.cidl (100%) diff --git a/Codigo/README.md b/Codigo/README.md new file mode 100644 index 0000000..c12b24f --- /dev/null +++ b/Codigo/README.md @@ -0,0 +1,22 @@ +# Encode-Solana-Decentralized-Twitter + + + + Encode Main Repo for Solana-Decentralized-Twitter + +## Local Deployment + +1. Start a local validator by running `solana-test-validator`. +2. Go to the `program` folder and run `cargo build-sbf` +2. Run `solana program deploy target/deploy/x_sol.so`. This will deploy the program on-chain. +3. Save the program Id returned by the deploy command. + +## Testing Locally + +1. Start a local validator by running `solana-test-validator`. +2. Run `solana logs` on a separate terminal to keep track of interactions with the local validator. +2. Go to the `program_client` folder and run `npm install` +2. Now run `npm install --save-dev ts-node`. This will install the TypeScript execution engine. +3. Use the program Id returned by the `deploy` command to set the `progId` constant in the `app.ts` file. +4. Run `npx ts-node app.ts`. This will trigger the transaction that creates a new tweet. +5. Check the logs terminal to see all interactions with the validator. diff --git a/program/Cargo.lock b/Codigo/program/Cargo.lock similarity index 100% rename from program/Cargo.lock rename to Codigo/program/Cargo.lock diff --git a/program/Cargo.toml b/Codigo/program/Cargo.toml similarity index 94% rename from program/Cargo.toml rename to Codigo/program/Cargo.toml index 235f514..d308bd9 100644 --- a/program/Cargo.toml +++ b/Codigo/program/Cargo.toml @@ -25,4 +25,4 @@ toml_edit = "=0.21.0" [lib] crate-type = ["cdylib", "lib"] -path = "./lib.rs" \ No newline at end of file +path = "lib.rs" \ No newline at end of file diff --git a/program/generated/entrypoint.rs b/Codigo/program/generated/entrypoint.rs similarity index 100% rename from program/generated/entrypoint.rs rename to Codigo/program/generated/entrypoint.rs diff --git a/program/generated/errors.rs b/Codigo/program/generated/errors.rs similarity index 100% rename from program/generated/errors.rs rename to Codigo/program/generated/errors.rs diff --git a/program/generated/instructions.rs b/Codigo/program/generated/instructions.rs similarity index 100% rename from program/generated/instructions.rs rename to Codigo/program/generated/instructions.rs diff --git a/program/generated/mod.rs b/Codigo/program/generated/mod.rs similarity index 100% rename from program/generated/mod.rs rename to Codigo/program/generated/mod.rs diff --git a/program/generated/processor.rs b/Codigo/program/generated/processor.rs similarity index 100% rename from program/generated/processor.rs rename to Codigo/program/generated/processor.rs diff --git a/program/generated/state.rs b/Codigo/program/generated/state.rs similarity index 100% rename from program/generated/state.rs rename to Codigo/program/generated/state.rs diff --git a/program/lib.rs b/Codigo/program/lib.rs similarity index 100% rename from program/lib.rs rename to Codigo/program/lib.rs diff --git a/program/src/add_tweet.rs b/Codigo/program/src/add_tweet.rs similarity index 99% rename from program/src/add_tweet.rs rename to Codigo/program/src/add_tweet.rs index a3ba535..6e81002 100644 --- a/program/src/add_tweet.rs +++ b/Codigo/program/src/add_tweet.rs @@ -18,10 +18,5 @@ pub fn add_tweet( ) -> ProgramResult { // Implement your business logic here... tweet_account.data.text = "test txt".to_string(); - - - - - Ok(()) } \ No newline at end of file diff --git a/program/src/mod.rs b/Codigo/program/src/mod.rs similarity index 100% rename from program/src/mod.rs rename to Codigo/program/src/mod.rs diff --git a/program_client/app.ts b/Codigo/program_client/app.ts similarity index 82% rename from program_client/app.ts rename to Codigo/program_client/app.ts index c1e217d..3ca5e74 100644 --- a/program_client/app.ts +++ b/Codigo/program_client/app.ts @@ -6,10 +6,10 @@ import * as os from "os"; async function main(feePayer: Keypair) { // TODO: Specify the program Id we saved from when we deploy it - const progId = new PublicKey("DeAgefytsTT6cucaWBAgah3LkYpN7gngWfxk5JHddWEL"); + const progId = new PublicKey("9U8FpTpoP6j5uqBURoRUkGY7JLpUmAmALd6KWhMSKaXh"); // Create a new Solana connection - const connection = new Connection("http://127.0.0.1:8899", { + const connection = new Connection("https://api.devnet.solana.com ", { commitment: "confirmed" }); @@ -29,6 +29,7 @@ async function main(feePayer: Keypair) { console.info(account); console.log(await connection.getAccountInfo(tweetAccount.publicKey)); console.log(await connection.getAccountInfo(feePayer.publicKey)); + console.log(await connection.getAccountInfo(feePayer.publicKey)); } diff --git a/Codigo/program_client/greeter.html b/Codigo/program_client/greeter.html new file mode 100644 index 0000000..6458ebb --- /dev/null +++ b/Codigo/program_client/greeter.html @@ -0,0 +1,9 @@ + + + + TypeScript Greeter + + + + + \ No newline at end of file diff --git a/Codigo/program_client/greeter.ts b/Codigo/program_client/greeter.ts new file mode 100644 index 0000000..8343755 --- /dev/null +++ b/Codigo/program_client/greeter.ts @@ -0,0 +1,7 @@ +function greeter(person: string) { + return "Hello, " + person; +} + +let user = "Jane User"; + +document.body.textContent = greeter(user); \ No newline at end of file diff --git a/program_client/index.ts b/Codigo/program_client/index.ts similarity index 100% rename from program_client/index.ts rename to Codigo/program_client/index.ts diff --git a/program_client/lib/pda.ts b/Codigo/program_client/lib/pda.ts similarity index 100% rename from program_client/lib/pda.ts rename to Codigo/program_client/lib/pda.ts diff --git a/program_client/lib/rpc.ts b/Codigo/program_client/lib/rpc.ts similarity index 100% rename from program_client/lib/rpc.ts rename to Codigo/program_client/lib/rpc.ts diff --git a/program_client/lib/types.ts b/Codigo/program_client/lib/types.ts similarity index 100% rename from program_client/lib/types.ts rename to Codigo/program_client/lib/types.ts diff --git a/program_client/lib/utils.ts b/Codigo/program_client/lib/utils.ts similarity index 100% rename from program_client/lib/utils.ts rename to Codigo/program_client/lib/utils.ts diff --git a/program_client/package-lock.json b/Codigo/program_client/package-lock.json similarity index 100% rename from program_client/package-lock.json rename to Codigo/program_client/package-lock.json diff --git a/program_client/package.json b/Codigo/program_client/package.json similarity index 100% rename from program_client/package.json rename to Codigo/program_client/package.json diff --git a/program_client/tsconfig.json b/Codigo/program_client/tsconfig.json similarity index 100% rename from program_client/tsconfig.json rename to Codigo/program_client/tsconfig.json diff --git a/xsol.cidl b/Codigo/xsol.cidl similarity index 100% rename from xsol.cidl rename to Codigo/xsol.cidl diff --git a/README.md b/README.md index 4da47e3..767d451 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ - Encode Main Repo for Solana-Decentralized-Twitter + Encode Main Repo for Solana-Decentralized-Twitter \ No newline at end of file