From d68e288ca6abf6df5f90e653861ad4b41db3cbe2 Mon Sep 17 00:00:00 2001 From: An Date: Fri, 6 Sep 2024 14:57:12 -0400 Subject: [PATCH 1/2] rename app operator and clean up --- readme.md | 8 +++---- src/example/app/register.ts | 6 ++--- src/example/bps/advance-session.ts | 31 ------------------------ src/example/bps/cancel-transfer.ts | 6 ++--- src/example/bps/grant-points.ts | 38 ------------------------------ src/example/bps/transfer-points.ts | 6 ++--- src/example/e2e/index.ts | 26 ++++++-------------- 7 files changed, 19 insertions(+), 102 deletions(-) delete mode 100644 src/example/bps/advance-session.ts delete mode 100644 src/example/bps/grant-points.ts diff --git a/readme.md b/readme.md index 560b0be..fb17b06 100644 --- a/readme.md +++ b/readme.md @@ -2,12 +2,10 @@ ```mermaid sequenceDiagram - actor AppOperator - actor B3Admin - AppOperator->>AppRegistry: Register application + actor AppAdmin + AppAdmin->>AppRegistry: Register application loop Every 2 weeks - B3Admin-->>PointsService: Grant points - AppOperator->>PointsService: Transfer points to users + AppAdmin->>PointsService: Transfer points to users end ``` diff --git a/src/example/app/register.ts b/src/example/app/register.ts index 00cf878..e03dd9c 100644 --- a/src/example/app/register.ts +++ b/src/example/app/register.ts @@ -13,8 +13,8 @@ import { dotenv.config(); // Load environment variables from .env file -const appModeratorPrivateKey = - `0x${process.env.MODERATOR_PRIVATE_KEY}` || `{0x}`; +const appOperatorPrivateKey = + `0x${process.env.OPERATOR_PRIVATE_KEY}` || `{0x}`; export async function registerApp(): Promise { const registry = new AppRegistry( @@ -26,7 +26,7 @@ export async function registerApp(): Promise { const resp = await registry.register( "b3.b3.fun", "0xB90d8162a3A1a2d760699F1f08c5F0cdAe1808F9", - privateKeyToAccount(appModeratorPrivateKey), + privateKeyToAccount(appOperatorPrivateKey), ); return resp.toString(); } diff --git a/src/example/bps/advance-session.ts b/src/example/bps/advance-session.ts deleted file mode 100644 index b80108d..0000000 --- a/src/example/bps/advance-session.ts +++ /dev/null @@ -1,31 +0,0 @@ -import process from "node:process"; - -import * as dotenv from "dotenv"; -import type { Hex } from "viem"; -import { privateKeyToAccount } from "viem/accounts"; -import { b3Sepolia } from "viem/chains"; - -import { BPS } from "../../bps"; -import { - B3SepoliaPointIndexerURL, - B3SepoliaPointServiceContractAddress, -} from "../../constants"; - -dotenv.config(); // Load environment variables from .env file - -const b3AdminPrivateKey = `0x${process.env.B3_ADMIN_PRIVATE_KEY}` || `{0x}`; - -export async function advanceSession(): Promise { - const bps = new BPS( - B3SepoliaPointIndexerURL, - B3SepoliaPointServiceContractAddress, - b3Sepolia, - ); - bps.connect(); - const response = await bps.advanceSession( - privateKeyToAccount(b3AdminPrivateKey), - ); - return response.toString(); -} - -void advanceSession().then((r) => console.log("advanceSession:", r)); diff --git a/src/example/bps/cancel-transfer.ts b/src/example/bps/cancel-transfer.ts index 4035c33..cd36fca 100644 --- a/src/example/bps/cancel-transfer.ts +++ b/src/example/bps/cancel-transfer.ts @@ -13,8 +13,8 @@ import { dotenv.config(); // Load environment variables from .env file -const appModeratorPrivateKey = - `0x${process.env.MODERATOR_PRIVATE_KEY}` || `{0x}`; +const appOperatorPrivateKey = + `0x${process.env.OPERATOR_PRIVATE_KEY}` || `{0x}`; export async function cancelTransfer(): Promise { const bps = new BPS( @@ -25,7 +25,7 @@ export async function cancelTransfer(): Promise { bps.connect(); const response = await bps.cancelTransfer( "0x123456", // replace with existing transfer uid - privateKeyToAccount(appModeratorPrivateKey), + privateKeyToAccount(appOperatorPrivateKey), ); return response.toString(); } diff --git a/src/example/bps/grant-points.ts b/src/example/bps/grant-points.ts deleted file mode 100644 index a8b8dbe..0000000 --- a/src/example/bps/grant-points.ts +++ /dev/null @@ -1,38 +0,0 @@ -import process from "node:process"; - -import * as dotenv from "dotenv"; -import type { Hex } from "viem"; -import { privateKeyToAccount } from "viem/accounts"; -import { b3Sepolia } from "viem/chains"; - -import { BPS } from "../../bps"; -import { - B3SepoliaPointIndexerURL, - B3SepoliaPointServiceContractAddress, -} from "../../constants"; - -dotenv.config(); // Load environment variables from .env file - -const b3AdminPrivateKey: Hex = - `0x${process.env.B3_ADMIN_PRIVATE_KEY}` || `{0x}`; - -export async function grantPoints(): Promise { - const bps = new BPS( - B3SepoliaPointIndexerURL, - B3SepoliaPointServiceContractAddress, - b3Sepolia, - ); - bps.connect(); - const response = await bps.grantPoints( - [ - { - appId: 3n, - point: 20n, - }, - ], - privateKeyToAccount(b3AdminPrivateKey), - ); - return response.toString(); -} - -void grantPoints().then((r) => console.log("grantPoints:", r)); diff --git a/src/example/bps/transfer-points.ts b/src/example/bps/transfer-points.ts index badfbc2..78b1c49 100644 --- a/src/example/bps/transfer-points.ts +++ b/src/example/bps/transfer-points.ts @@ -13,8 +13,8 @@ import { dotenv.config(); // Load environment variables from .env file -const appModeratorPrivateKey = - `0x${process.env.MODERATOR_PRIVATE_KEY}` || `{0x}`; +const appOperatorPrivateKey = + `0x${process.env.OPERATOR_PRIVATE_KEY}` || `{0x}`; export async function transferPoints(): Promise { const bps = new BPS( @@ -31,7 +31,7 @@ export async function transferPoints(): Promise { point: 10n, }, ], - privateKeyToAccount(appModeratorPrivateKey), + privateKeyToAccount(appOperatorPrivateKey), ); return response.toString(); } diff --git a/src/example/e2e/index.ts b/src/example/e2e/index.ts index 086fce7..0f88f8b 100644 --- a/src/example/e2e/index.ts +++ b/src/example/e2e/index.ts @@ -15,9 +15,8 @@ import { dotenv.config(); // Load environment variables from .env file -const appModeratorPrivateKey = - `0x${process.env.MODERATOR_PRIVATE_KEY}` || `{0x}`; -const b3AdminPrivateKey = `0x${process.env.B3_ADMIN_PRIVATE_KEY}` || `{0x}`; +const appOperatorPrivateKey = + `0x${process.env.OPERATOR_PRIVATE_KEY}` || `{0x}`; const registry = new AppRegistry( B3SepoliaPointIndexerURL, @@ -37,8 +36,8 @@ async function main(): Promise { // register an app let resp = await registry.register( "test.b3.fun", - privateKeyToAccount(appModeratorPrivateKey).address, - privateKeyToAccount(appModeratorPrivateKey), + privateKeyToAccount(appOperatorPrivateKey).address, + privateKeyToAccount(appOperatorPrivateKey), ); console.log("register-app:", resp); @@ -52,28 +51,17 @@ async function main(): Promise { }); console.log("list-apps:", apps); - // grant points - resp = await bps.grantPoints( - [ - { - appId: BigInt(apps.results.length > 0 ? apps.results[0].appId : 3n), - point: 20n, - }, - ], - privateKeyToAccount(b3AdminPrivateKey), - ); - console.log("grant-points:", resp); // grant points resp = await bps.transferPoints( BigInt(apps.results.length > 0 ? apps.results[0].appId : 3n), [ { - recipient: privateKeyToAccount(appModeratorPrivateKey).address, // replace + recipient: privateKeyToAccount(appOperatorPrivateKey).address, // replace point: 20n, }, ], - privateKeyToAccount(appModeratorPrivateKey), + privateKeyToAccount(appOperatorPrivateKey), ); console.log("transfer-points:", resp); @@ -85,7 +73,7 @@ async function main(): Promise { console.log("appPoints:", appPoints); const userPoints = await bps.getUserTotalPoints({ - account: privateKeyToAccount(appModeratorPrivateKey).address, + account: privateKeyToAccount(appOperatorPrivateKey).address, }); console.log("userPoints:", userPoints); } From 493a8ef3df0db47b997094826dab5dd47eaaa65f Mon Sep 17 00:00:00 2001 From: An Date: Fri, 6 Sep 2024 15:01:07 -0400 Subject: [PATCH 2/2] rename --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index fb17b06..8dbd3d8 100644 --- a/readme.md +++ b/readme.md @@ -2,10 +2,10 @@ ```mermaid sequenceDiagram - actor AppAdmin - AppAdmin->>AppRegistry: Register application + actor AppOperator + AppOperator->>AppRegistry: Register application loop Every 2 weeks - AppAdmin->>PointsService: Transfer points to users + AppOperator->>PointsService: Transfer points to users end ```