diff --git a/.github/workflows/ts-run-tests.yaml b/.github/workflows/ts-run-tests.yaml index 9b2b20903..d5dd6c5d4 100644 --- a/.github/workflows/ts-run-tests.yaml +++ b/.github/workflows/ts-run-tests.yaml @@ -2,7 +2,7 @@ env: NEXT_PUBLIC_MODULE_ADDRESS: |- 4bab58978ec1b1bef032eeb285ad47a6a9b997d646c19b598c35f46b26ff9ece - PUBLISHER_PK: |- + PUBLISHER_PRIVATE_KEY: |- 29479e9e5fe47ba9a8af509dd6da1f907510bcf8917bfb19b7079d8c63c0b720 START_LOCAL_NODE_FOR_TEST: 'true' TS_DIR: 'src/typescript' diff --git a/src/docker/aptos-node/initialize-contract.sh b/src/docker/aptos-node/initialize-contract.sh index 9ac518eb1..61e0c77b2 100644 --- a/src/docker/aptos-node/initialize-contract.sh +++ b/src/docker/aptos-node/initialize-contract.sh @@ -12,7 +12,7 @@ export BIG_MONEY_GUY="big_money_guy" aptos init --profile $PUBLISHER \ --rest-url http://host.docker.internal:8080/v1 \ --faucet-url http://host.docker.internal:8081 \ - --private-key $PUBLISHER_PK \ + --private-key $PUBLISHER_PRIVATE_KEY \ --encoding hex \ --assume-yes \ --network custom @@ -20,7 +20,7 @@ aptos init --profile $PUBLISHER \ aptos init --profile $BIG_MONEY_GUY \ --rest-url http://host.docker.internal:8080/v1 \ --faucet-url http://host.docker.internal:8081 \ - --private-key $BIG_MONEY_GUY_PK \ + --private-key $BIG_MONEY_GUY_PRIVATE_KEY \ --encoding hex \ --assume-yes \ --network custom diff --git a/src/docker/compose.local.yaml b/src/docker/compose.local.yaml index 2bfdf0e22..1c0120e9d 100644 --- a/src/docker/compose.local.yaml +++ b/src/docker/compose.local.yaml @@ -36,8 +36,8 @@ services: context: '../../' dockerfile: 'src/docker/aptos-node/Dockerfile' environment: - PUBLISHER_PK: '${PUBLISHER_PK}' - BIG_MONEY_GUY_PK: '${BIG_MONEY_GUY_PK}' + PUBLISHER_PRIVATE_KEY: '${PUBLISHER_PRIVATE_KEY}' + BIG_MONEY_GUY_PRIVATE_KEY: '${BIG_MONEY_GUY_PRIVATE_KEY}' EMOJICOIN_MODULE_ADDRESS: '${EMOJICOIN_MODULE_ADDRESS}' depends_on: aptos-node: diff --git a/src/docker/example.local.env b/src/docker/example.local.env index 2fb2cc30b..9bb297fb7 100644 --- a/src/docker/example.local.env +++ b/src/docker/example.local.env @@ -67,7 +67,7 @@ BROKER_PORT="3009" # production or for any real value transactions. # If you change this, local tests will fail unless you also change the # corresponding `*_ADDRESS` values that are derived from this key. -PUBLISHER_PK="0xeaa964d1353b075ac63b0c5a0c1e92aa93355be1402f6077581e37e2a846105e" +PUBLISHER_PRIVATE_KEY="0xeaa964d1353b075ac63b0c5a0c1e92aa93355be1402f6077581e37e2a846105e" # The caching time for server-side requests for the NextJS web application. REVALIDATION_TIME="1" @@ -81,4 +81,4 @@ HASH_SEED="some random string that is not public" # The private key for the "big money guy", who sends transactions in tests. # Corresponds to the address: # 0xb168d5a1137a3254a9443459ae5b4959e8f5c835858f04e5a01fe133d237d00d -BIG_MONEY_GUY_PK="0xa5e11183d0c23b8c49b40dd71bba7fa0992aed9b89c42934a1bb8f6e4ccc4ec4" +BIG_MONEY_GUY_PRIVATE_KEY="0xa5e11183d0c23b8c49b40dd71bba7fa0992aed9b89c42934a1bb8f6e4ccc4ec4" diff --git a/src/typescript/.env.test b/src/typescript/.env.test index cb38c3483..1d93880f3 100644 --- a/src/typescript/.env.test +++ b/src/typescript/.env.test @@ -7,6 +7,6 @@ NEXT_PUBLIC_MODULE_ADDRESS="0x4bab58978ec1b1bef032eeb285ad47a6a9b997d646c19b598c NEXT_PUBLIC_REWARDS_MODULE_ADDRESS="0x76044a237dcc3f71af75fb314f016e8032633587f7d70df4e70777f2b0221e75" # Randomly generated private key for tests. This is only used in e2e tests and for script data generation. -PUBLISHER_PK="29479e9e5fe47ba9a8af509dd6da1f907510bcf8917bfb19b7079d8c63c0b720" +PUBLISHER_PRIVATE_KEY="29479e9e5fe47ba9a8af509dd6da1f907510bcf8917bfb19b7079d8c63c0b720" INBOX_URL="http://localhost:3000" diff --git a/src/typescript/sdk/src/utils/mock-data.ts b/src/typescript/sdk/src/utils/mock-data.ts index 6bc3840f4..c9828a6a0 100644 --- a/src/typescript/sdk/src/utils/mock-data.ts +++ b/src/typescript/sdk/src/utils/mock-data.ts @@ -60,7 +60,7 @@ const { aptos, publisher } = getTestHelpers(); // const PUBLISHER = publisher; const PUBLISHER = Account.fromPrivateKey({ - privateKey: new Ed25519PrivateKey(process.env.PUBLISHER_PK!), + privateKey: new Ed25519PrivateKey(process.env.PUBLISHER_PRIVATE_KEY!), }); if (!(NUM_TRADERS % CHUNK_SIZE === 0)) { diff --git a/src/typescript/sdk/tests/pre-test.js b/src/typescript/sdk/tests/pre-test.js index d5b4e0555..0eb1c5755 100644 --- a/src/typescript/sdk/tests/pre-test.js +++ b/src/typescript/sdk/tests/pre-test.js @@ -5,7 +5,7 @@ const { Inbox, LocalNode, publishForTest, - getPublisherPKForTest, + getTestPublisherPrivateKey, PK_PATH, PUBLISH_RES_PATH, } = require("./utils"); @@ -23,7 +23,7 @@ module.exports = async function setup() { fs.mkdirSync(path.dirname(PK_PATH), { recursive: true }); fs.mkdirSync(path.dirname(PUBLISH_RES_PATH), { recursive: true }); - const pk = await getPublisherPKForTest(); + const pk = await getTestPublisherPrivateKey(); if (!pk) { throw new Error("Please provide a private key for testing"); }; diff --git a/src/typescript/sdk/tests/utils/load-priv-key.ts b/src/typescript/sdk/tests/utils/load-priv-key.ts index 7c10034ce..e6b544418 100644 --- a/src/typescript/sdk/tests/utils/load-priv-key.ts +++ b/src/typescript/sdk/tests/utils/load-priv-key.ts @@ -2,26 +2,28 @@ import { Account, AccountAddress, Ed25519PrivateKey } from "@aptos-labs/ts-sdk"; import { VERCEL } from "../../src/const"; -export const getPublisherPKForTest = async () => { +export const getTestPublisherPrivateKey = async () => { if (VERCEL) { throw new Error("This function should not be called in a Vercel deployment."); } // If the publisher private key is not set by now, throw an error. - if (!process.env.PUBLISHER_PK) { - console.warn("Missing PUBLISHER_PK environment variable for test, using the default value."); - process.env.PUBLISHER_PK = "29479e9e5fe47ba9a8af509dd6da1f907510bcf8917bfb19b7079d8c63c0b720"; + if (!process.env.PUBLISHER_PRIVATE_KEY) { + console.warn( + "Missing PUBLISHER_PRIVATE_KEY environment variable for test, using the default value."); + process.env.PUBLISHER_PRIVATE_KEY = + "29479e9e5fe47ba9a8af509dd6da1f907510bcf8917bfb19b7079d8c63c0b720"; } const derivedAccount = Account.fromPrivateKey({ - privateKey: new Ed25519PrivateKey(process.env.PUBLISHER_PK), + privateKey: new Ed25519PrivateKey(process.env.PUBLISHER_PRIVATE_KEY), }); const derivedAddress = derivedAccount.accountAddress.toString(); const normalizedEnvAddress = AccountAddress.from(process.env.NEXT_PUBLIC_MODULE_ADDRESS!); if (derivedAddress !== normalizedEnvAddress.toString()) { const msg = `${derivedAddress} !== ${process.env.NEXT_PUBLIC_MODULE_ADDRESS}`; - throw new Error(`PUBLISHER_PK does not match NEXT_PUBLIC_MODULE_ADDRESS: ${msg}`); + throw new Error(`PUBLISHER_PRIVATE_KEY does not match NEXT_PUBLIC_MODULE_ADDRESS: ${msg}`); } - return process.env.PUBLISHER_PK; + return process.env.PUBLISHER_PRIVATE_KEY; };