Merge pull request #76 from moreal/minter-conf

PDX-244: Make upstream NCG minter configurable
planetarium · Dec 18, 2023 · 1dc31e8 · 1dc31e8
2 parents dcd7cb8 + f1060f7
commit 1dc31e8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.env.sample b/.env.sample
@@ -5,6 +5,7 @@ NC_VAULT_ADDRESS=
 NC_VAULT_AVATAR_ADDRESS=
 NC_UPSTREAM_PRIVATE_KEY=
 NC_DOWNSTREAM_PRIVATE_KEY=
+NC_UPSTREAM_NCG_MINTER=
 
 NC_UPSTREAM_ACCOUNT_TYPE=
 NC_UPSTREAM__KMS__KEY_ID=

diff --git a/src/index.ts b/src/index.ts
@@ -52,6 +52,11 @@ const slackBot: SlackBot | null =
     const avatarAddress = Address.fromHex(
         getRequiredEnv("NC_VAULT_AVATAR_ADDRESS"),
     );
+    const upstreamNcgMinter = Address.fromHex(
+        getEnv("NC_UPSTREAM_NCG_MINTER") ||
+            "47d082a115c63e7b58b1532d20e631538eafadde",
+        false,
+    );
 
     const useRDB = getEnv("USE_RDB");
     if (useRDB?.toLowerCase() === "true") {
@@ -62,6 +67,7 @@ const slackBot: SlackBot | null =
             downstreamAccount,
             agentAddress,
             avatarAddress,
+            upstreamNcgMinter,
             slackBot,
         );
     } else {
@@ -80,6 +86,7 @@ async function withRDB(
     downstreamAccount: Account,
     agentAddress: Address,
     avatarAddress: Address,
+    upstreamNcgMinter: Address,
     slackBot: SlackBot | null,
 ) {
     const upstreamStartBlockIndex = BigInt(
@@ -110,6 +117,7 @@ async function withRDB(
                     upstreamGQLClient,
                     downstreamGQLClient,
                     agentAddress,
+                    upstreamNcgMinter,
                     downstreamStartBlockIndex,
                     slackBot,
                 ),

diff --git a/src/sync/downstream/events/transfer.ts b/src/sync/downstream/events/transfer.ts
@@ -17,11 +17,13 @@ export async function responseTransactionsFromTransferEvents(
         networkId: upstreamNetworkId,
         genesisHash: upstreamGenesisHash,
         startNonce: upstreamStartNonce,
+        ncgMinter: upstreamNcgMinter,
     }: {
         account: Account;
         networkId: string;
         genesisHash: Uint8Array;
         startNonce: bigint;
+        ncgMinter: Address;
     },
     {
         account: downstreamAccount,
@@ -53,12 +55,7 @@ export async function responseTransactionsFromTransferEvents(
                 ? {
                       currency: {
                           ...amount.currency,
-                          minters: new Set([
-                              Buffer.from(
-                                  "47d082a115c63e7b58b1532d20e631538eafadde",
-                                  "hex",
-                              ),
-                          ]),
+                          minters: new Set([upstreamNcgMinter.toBytes()]),
                       },
                       rawValue: amount.rawValue,
                   }

diff --git a/src/sync/downstream/index.ts b/src/sync/downstream/index.ts
@@ -26,6 +26,7 @@ export async function processDownstreamEvents(
     upstreamGQLClient: IHeadlessGraphQLClient,
     downstreamGQLClient: IHeadlessGraphQLClient,
     agentAddress: Address,
+    upstreamNcgMinter: Address,
     defaultStartBlockIndex: bigint,
     slackBot: SlackBot | null,
 ) {
@@ -136,6 +137,7 @@ export async function processDownstreamEvents(
                         networkId: upstreamNetworkId,
                         genesisHash: upstreamGenesisHash,
                         startNonce: upstreamNextTxNonce,
+                        ncgMinter: upstreamNcgMinter,
                     },
                     {
                         account: downstreamAccount,