Merge pull request #215 from alephium/customize-network

Update Network Management
alephium · Sep 25, 2024 · 3234610 · 3234610
2 parents bccb570 + 7513f21
commit 3234610
Show file tree

Hide file tree

Showing 21 changed files with 139 additions and 137 deletions.
diff --git a/packages/dapp/.project.json b/packages/dapp/.project.json
@@ -1,5 +1,5 @@
 {
-  "fullNodeVersion": "v3.5.0",
+  "fullNodeVersion": "v3.6.2",
   "compilerOptionsUsed": {
     "ignoreUnusedConstantsWarnings": false,
     "ignoreUnusedVariablesWarnings": false,
@@ -17,7 +17,7 @@
       "codeHashDebug": ""
     },
     "IFungibleToken": {
-      "sourceFile": "../../../node_modules/@alephium/web3/std/fungible_token_interface.ral",
+      "sourceFile": "../../../../../../.npm/_npx/f1b120e1b513c04c/node_modules/@alephium/web3/std/fungible_token_interface.ral",
       "sourceCodeHash": "62910bf11e1eeb6cb2fd468626ff606a9b06306b2b81590c3b10f6deb5966bde",
       "bytecodeDebugPatch": "",
       "codeHashDebug": ""

diff --git a/packages/dapp/artifacts/Destroy.ral.json b/packages/dapp/artifacts/Destroy.ral.json
@@ -1,5 +1,5 @@
 {
-  "version": "v3.5.0",
+  "version": "v3.6.2",
   "name": "Destroy",
   "bytecodeTemplate": "01010300000005{1}0d0c{0}0105",
   "fieldsSig": {

diff --git a/packages/dapp/artifacts/ShinyToken.ral.json b/packages/dapp/artifacts/ShinyToken.ral.json
@@ -1,5 +1,5 @@
 {
-  "version": "v3.5.0",
+  "version": "v3.6.2",
   "name": "ShinyToken",
   "bytecode": "050609121b40244041404f010000000102ce0002010000000102ce0102010000000102ce0202010000000102ce0302010202020008d36ee15a7b1600b11601ab160013c3038d7ea4c68000a8010201010003d320f98f621600b0",
   "codeHash": "9bdc139154d4e611dd391a5b262cc081d2519b9a3ccc95df943a98a9e3c67661",

diff --git a/packages/dapp/artifacts/Transfer.ral.json b/packages/dapp/artifacts/Transfer.ral.json
@@ -1,5 +1,5 @@
 {
-  "version": "v3.5.0",
+  "version": "v3.6.2",
   "name": "Transfer",
   "bytecodeTemplate": "01010300000006{1}{2}0e0c{0}0104",
   "fieldsSig": {

diff --git a/packages/dapp/artifacts/ts/ShinyToken.ts b/packages/dapp/artifacts/ts/ShinyToken.ts
@@ -4,34 +4,34 @@
 
 import {
   Address,
-  CallContractParams,
-  CallContractResult,
   Contract,
-  ContractEvent,
-  ContractFactory,
-  ContractInstance,
   ContractState,
+  TestContractResult,
+  HexString,
+  ContractFactory,
   EventSubscribeOptions,
   EventSubscription,
-  HexString,
-  SignExecuteContractMethodParams,
-  SignExecuteScriptTxResult,
+  CallContractParams,
+  CallContractResult,
   TestContractParams,
-  TestContractParamsWithoutMaps,
-  TestContractResult,
-  TestContractResultWithoutMaps,
-  addStdIdToFields,
+  ContractEvent,
+  subscribeContractEvent,
+  subscribeContractEvents,
+  testMethod,
   callMethod,
-  encodeContractFields,
+  multicallMethods,
   fetchContractState,
+  Asset,
+  ContractInstance,
   getContractEventsCurrentCount,
-  multicallMethods,
+  TestContractParamsWithoutMaps,
+  TestContractResultWithoutMaps,
+  SignExecuteContractMethodParams,
+  SignExecuteScriptTxResult,
   signExecuteMethod,
-  subscribeContractEvent,
-  subscribeContractEvents,
-  testMethod,
+  addStdIdToFields,
+  encodeContractFields,
 } from "@alephium/web3";
-
 import { default as ShinyTokenContractJson } from "../ShinyToken.ral.json";
 import { getContractByCodeHash } from "./contracts";
 
@@ -84,10 +84,9 @@ export namespace ShinyTokenTypes {
       ? CallMethodTable[MaybeName]["result"]
       : undefined;
   };
-  export type MulticallReturnType<Callss extends MultiCallParams[]> =
-    Callss["length"] extends 1
-      ? MultiCallResults<Callss[0]>
-      : { [index in keyof Callss]: MultiCallResults<Callss[index]> };
+  export type MulticallReturnType<Callss extends MultiCallParams[]> = {
+    [index in keyof Callss]: MultiCallResults<Callss[index]>;
+  };
 
   export interface SignExecuteMethodTable {
     getSymbol: {
@@ -187,6 +186,14 @@ class Factory extends ContractFactory<
       return testMethod(this, "destroy", params, getContractByCodeHash);
     },
   };
+
+  stateForTest(
+    initFields: ShinyTokenTypes.Fields,
+    asset?: Asset,
+    address?: string
+  ) {
+    return this.stateForTest_(initFields, asset, address, undefined);
+  }
 }
 
 // Use this object to test and deploy the contract

diff --git a/packages/dapp/artifacts/ts/contracts.ts b/packages/dapp/artifacts/ts/contracts.ts
@@ -3,18 +3,14 @@
 /* eslint-disable */
 
 import { Contract, ContractFactory } from "@alephium/web3";
-
 import { ShinyToken } from ".";
 
 let contracts: ContractFactory<any>[] | undefined = undefined;
 export function getContractByCodeHash(codeHash: string): Contract {
   if (contracts === undefined) {
     contracts = [ShinyToken];
   }
-  const c = contracts.find(
-    (c) =>
-      c.contract.codeHash === codeHash || c.contract.codeHashDebug === codeHash
-  );
+  const c = contracts.find((c) => c.contract.hasCodeHash(codeHash));
   if (c === undefined) {
     throw new Error("Unknown code with code hash: " + codeHash);
   }

diff --git a/packages/dapp/artifacts/ts/scripts.ts b/packages/dapp/artifacts/ts/scripts.ts
@@ -7,14 +7,13 @@ import {
   ExecutableScript,
   ExecuteScriptParams,
   ExecuteScriptResult,
-  HexString,
   Script,
   SignerProvider,
+  HexString,
 } from "@alephium/web3";
-
+import { getContractByCodeHash } from "./contracts";
 import { default as DestroyScriptJson } from "../Destroy.ral.json";
 import { default as TransferScriptJson } from "../Transfer.ral.json";
-import { getContractByCodeHash } from "./contracts";
 
 export const Destroy = new ExecutableScript<{
   shinyToken: HexString;

diff --git a/packages/dapp/package.json b/packages/dapp/package.json
@@ -10,15 +10,15 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@alephium/get-extension-wallet": "^1.5.0",
-    "@alephium/web3": "^1.5.0",
+    "@alephium/get-extension-wallet": "^1.7.3",
+    "@alephium/web3": "^1.7.3",
     "ethers": "^5.5.1",
     "next": "^13.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@alephium/cli": "^1.5.0",
+    "@alephium/cli": "^1.7.3",
     "@types/node": "18.11.18",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",

diff --git a/packages/extension/locales/en-US/translation.json b/packages/extension/locales/en-US/translation.json
@@ -189,6 +189,7 @@
   "Network ID": "Network ID",
   "Name": "Name",
   "Node URL": "Node URL",
+  "Node API Key (Optional)": "Node API Key (Optional)",
   "Explorer URL": "Explorer URL",
   "Explorer API URL": "Explorer API URL",
   "Reject": "Reject",

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -4,12 +4,12 @@
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
-    "@alephium/get-extension-wallet": "^1.5.0",
+    "@alephium/get-extension-wallet": "^1.7.3",
     "@alephium/ledger-app": "0.6.0",
     "@alephium/token-list": "0.0.19",
-    "@alephium/web3": "^1.5.0",
-    "@alephium/web3-test": "^1.5.0",
-    "@alephium/web3-wallet": "^1.5.0",
+    "@alephium/web3": "^1.7.3",
+    "@alephium/web3-test": "^1.7.3",
+    "@alephium/web3-wallet": "^1.7.3",
     "@ledgerhq/hw-transport-webusb": "6.29.0",
     "@ledgerhq/hw-transport-webhid": "6.29.0",
     "@playwright/test": "^1.23.0",

diff --git a/packages/extension/src/background/networkStatus.ts b/packages/extension/src/background/networkStatus.ts
@@ -39,7 +39,7 @@ export const getNetworkStatuses = async (
 }
 
 export const isNetworkHealthy = async (network: Network): Promise<boolean> => {
-  const nodeProvider = new NodeProvider(network.nodeUrl)
+  const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
   const explorerProvider = new ExplorerProvider(network.explorerApiUrl)
 
   return swr(`${network.id}-network-status`, async () => {

diff --git a/packages/extension/src/background/wallet.ts b/packages/extension/src/background/wallet.ts
@@ -99,7 +99,7 @@ export class Wallet {
 
   async submitSignedTx(account: WalletAccount, unsignedTx: string, signature: string): Promise<void> {
     const network = await this.getNetwork(account.networkId)
-    const nodeProvider = new NodeProvider(network.nodeUrl)
+    const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
     await nodeProvider.transactions.postTransactionsSubmit({ unsignedTx, signature })
     return
   }
@@ -127,7 +127,7 @@ export class Wallet {
     }
 
     const network = await this.getNetwork(account.networkId)
-    const nodeProvider = new NodeProvider(network.nodeUrl)
+    const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
     const privateKey = deriveHDWalletPrivateKey(session.secret, account.signer.keyType, account.signer.derivationIndex)
     return new PrivateKeyWallet({ privateKey, keyType: account.signer.keyType, nodeProvider })
   }

diff --git a/packages/extension/src/inpage/alephiumWindowObject.ts b/packages/extension/src/inpage/alephiumWindowObject.ts
@@ -130,7 +130,7 @@ export const alephiumWindowObject: AlephiumWindowObject =
       }
       this.#connectedAccount = account
       this.#connectedNetworkId = walletAccount.network.id
-      this.#nodeProvider = new NodeProvider(walletAccount.network.nodeUrl)
+      this.#nodeProvider = new NodeProvider(walletAccount.network.nodeUrl, walletAccount.network.nodeApiKey)
       if (walletAccount.network.explorerApiUrl) {
         this.#explorerProvider = new ExplorerProvider(
           walletAccount.network.explorerApiUrl,

diff --git a/packages/extension/src/shared/network/defaults.ts b/packages/extension/src/shared/network/defaults.ts
@@ -14,15 +14,14 @@ export const defaultNetworks: Network[] = [
     nodeUrl: 'https://node.mainnet.alephium.org',
     explorerApiUrl: 'https://backend.mainnet.alephium.org',
     explorerUrl: 'https://explorer.alephium.org',
-    name: 'Mainnet',
-    readonly: true
+    name: 'Mainnet'
   },
   {
     id: 'testnet',
     nodeUrl: 'https://node.testnet.alephium.org',
     explorerApiUrl: 'https://backend.testnet.alephium.org',
     explorerUrl: 'https://testnet.alephium.org',
-    name: 'Testnet',
+    name: 'Testnet'
   },
   DEVNET
 ]

diff --git a/packages/extension/src/shared/network/schema.ts b/packages/extension/src/shared/network/schema.ts
@@ -10,10 +10,11 @@ export const networkSchema: Schema<Network> = object()
   .required()
   .shape({
     id: string().required().min(2).max(31),
-    name: string().required().min(2).max(128),
+    name: string().label("Network name").required().min(2).max(128),
     nodeUrl: string()
       .required()
       .matches(REGEX_URL_WITH_LOCAL, "${path} must be a valid URL"),
+    nodeApiKey: string().label("Node API Key").optional().min(32),
     explorerApiUrl: string()
       .required()
       .matches(REGEX_URL_WITH_LOCAL, "${path} must be a valid URL"),

diff --git a/packages/extension/src/shared/network/type.ts b/packages/extension/src/shared/network/type.ts
@@ -4,6 +4,7 @@ export interface Network {
   nodeUrl: string
   explorerApiUrl: string
   explorerUrl?: string
+  nodeApiKey?: string
   readonly?: boolean
 }
 

diff --git a/packages/extension/src/ui/features/accountNfts/alephium-nft.service.ts b/packages/extension/src/ui/features/accountNfts/alephium-nft.service.ts
@@ -24,21 +24,6 @@ export const fetchCollectionAndNfts = async (
     }
   }
 
-  // TODO: Fix explorer backend for 000301 NFTs
-  if (nftMetadataz.length != nftIds.length) {
-    const nodeProvider = new NodeProvider(network.nodeUrl)
-    const otherNonFungibleTokenIds = nftIds.filter(id => nftMetadataz.findIndex((m) => m.id == id) == -1)
-    for (const tokenId of otherNonFungibleTokenIds) {
-      const nftMetadata = await fetchImmutable(`nft-metadata-${tokenId}`, () => nodeProvider.fetchNFTMetaData(tokenId))
-      const collectionId = nftMetadata.collectionId
-      if (parentAndTokenIds[collectionId]) {
-        parentAndTokenIds[collectionId].push(tokenId)
-      } else {
-        parentAndTokenIds[collectionId] = [tokenId]
-      }
-    }
-  }
-
   return parentAndTokenIds
 }
 
@@ -48,7 +33,7 @@ export const fetchNFTCollection = async (
   network: Network
 ): Promise<NFTCollection | undefined> => {
   try {
-    const nodeProvider = new NodeProvider(network.nodeUrl)
+    const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
     const collectionMetadata = await getCollectionMetadata(collectionId, nodeProvider)
     return {
       id: collectionId,
@@ -63,7 +48,7 @@ export const fetchNFTCollection = async (
 
 export async function getNFT(collectionId: string, nftId: string, network: Network): Promise<NFT | undefined> {
   try {
-    const nodeProvider = new NodeProvider(network.nodeUrl)
+    const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
     const nftMetadata = await fetchImmutable(`nft-metadata-${nftId}`, () => nodeProvider.fetchNFTMetaData(nftId))
     const metadataResponse = await fetch(nftMetadata.tokenUri)
     const metadata = await metadataResponse.json()

diff --git a/packages/extension/src/ui/features/accountTokens/tokens.state.ts b/packages/extension/src/ui/features/accountTokens/tokens.state.ts
@@ -132,7 +132,7 @@ export const useNonFungibleTokensWithBalance = (
     [getAccountIdentifier(selectedAccount), "accountNonFungibleTokens"],
     async () => {
       const network = await getNetwork(networkId)
-      const nodeProvider = new NodeProvider(network.nodeUrl)
+      const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
 
       const nonFungibleTokens: BaseTokenWithBalance[] = []
       for (const token of potentialNonFungibleTokens) {
@@ -248,7 +248,7 @@ export const useAllTokensWithBalance = (
 
       const allTokens: BaseTokenWithBalance[] = []
       const network = await getNetwork(networkId)
-      const nodeProvider = new NodeProvider(network.nodeUrl)
+      const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
       const tokenBalances = await getBalances(nodeProvider, account.address)
 
       for (const tokenId of tokenBalances.keys()) {
@@ -323,7 +323,7 @@ async function getBalances(nodeProvider: NodeProvider, address: string): Promise
 }
 
 async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string): Promise<Token | undefined> {
-  const nodeProvider = new NodeProvider(network.nodeUrl)
+  const nodeProvider = new NodeProvider(network.nodeUrl, network.nodeApiKey)
   try {
     const tokenType = await fetchImmutable(`token-type-${tokenId}`, () => nodeProvider.guessStdTokenType(tokenId))
     if (tokenType !== 'fungible') {