diff --git a/Anchor.toml b/Anchor.toml index 2ceaca281..f2069dd9a 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -77,7 +77,7 @@ address = "propFYxqmVcufMhk5esNMrexq2ogHbbC2kP9PU1qxKs" # Proposal address = "66t3XARU6Ja3zj91gDZ2KoNLJHEMTYPSKqJWYb6PJJBA" # Proposal IDL [[test.validator.clone]] -address = "moraMdsjyPFz8Lp1RJGoW4bQriSF5mHE7Evxt7hytSF" # Mobile price oracle +address = "JBaTytFv1CmGNkyNiLu16jFMXNZ49BGfy4bYAYZdkxg5" # Mobile price oracle # Pyth price oracle [[test.validator.clone]] diff --git a/Cargo.lock b/Cargo.lock index 6af373c8a..39c4dc98e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1951,7 +1951,7 @@ dependencies = [ "helium-sub-daos", "mpl-token-metadata", "no-emit", - "price-oracle", + "pyth-sdk-solana", "shared-utils", "solana-security-txt", ] diff --git a/packages/helium-admin-cli/src/create-dao.ts b/packages/helium-admin-cli/src/create-dao.ts index c8fd820e3..71ef16c83 100644 --- a/packages/helium-admin-cli/src/create-dao.ts +++ b/packages/helium-admin-cli/src/create-dao.ts @@ -500,7 +500,6 @@ export async function run(args: any = process.argv) { await sendInstructionsOrSquads({ provider, instructions: [ - ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 }), await hemProgram.methods .initializeDataOnlyV0({ authority, diff --git a/packages/helium-admin-cli/src/create-subdao.ts b/packages/helium-admin-cli/src/create-subdao.ts index 6188df9a4..4b3db615e 100644 --- a/packages/helium-admin-cli/src/create-subdao.ts +++ b/packages/helium-admin-cli/src/create-subdao.ts @@ -33,7 +33,6 @@ import { } from '@solana/spl-governance'; import { getAssociatedTokenAddress } from '@solana/spl-token'; import { - ComputeBudgetProgram, LAMPORTS_PER_SOL, PublicKey, SystemProgram, @@ -331,9 +330,6 @@ export async function run(args: any = process.argv) { .initializeRegistrarV0({ positionUpdateAuthority: null, }) - .preInstructions([ - ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }), - ]) .accounts({ realm, realmGoverningTokenMint: subdaoKeypair.publicKey, @@ -459,7 +455,6 @@ export async function run(args: any = process.argv) { await sendInstructionsOrSquads({ provider, instructions: [ - ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }), await initSubdaoMethod.instruction(), ], executeTransaction: true, diff --git a/packages/helium-entity-manager-sdk/src/resolvers.ts b/packages/helium-entity-manager-sdk/src/resolvers.ts index 196273b35..cbdfc9b77 100644 --- a/packages/helium-entity-manager-sdk/src/resolvers.ts +++ b/packages/helium-entity-manager-sdk/src/resolvers.ts @@ -33,9 +33,12 @@ export const heliumEntityManagerResolvers = combineResolvers( mint: "dntMint", owner: "maker", }), - resolveIndividual(async ({ path }) => { + resolveIndividual(async ({ path, provider }) => { if (path[path.length - 1] == "dntPrice") { - return new PublicKey("moraMdsjyPFz8Lp1RJGoW4bQriSF5mHE7Evxt7hytSF"); + if (provider.connection.rpcEndpoint.includes("devnet") || provider.connection.rpcEndpoint.includes("test")) { + return new PublicKey("BmUdxoioVgoRTontomX8nBjWbnLevtxeuBYaLipP8GTQ"); + } + return new PublicKey("JBaTytFv1CmGNkyNiLu16jFMXNZ49BGfy4bYAYZdkxg5"); } }), resolveIndividual(async ({ path, args, accounts, provider }) => { diff --git a/packages/monitor-service/package.json b/packages/monitor-service/package.json index 848c136f4..7c3be510f 100644 --- a/packages/monitor-service/package.json +++ b/packages/monitor-service/package.json @@ -6,7 +6,7 @@ "registry": "https://registry.npmjs.org/" }, "license": "Apache-2.0", - "version": "0.6.27", + "version": "0.6.26", "description": "Prometheus monitoring of important accounts on Solana", "repository": { "type": "git", @@ -33,17 +33,17 @@ }, "dependencies": { "@coral-xyz/anchor": "^0.28.0", - "@helium/account-fetch-cache": "^0.6.27", - "@helium/circuit-breaker-sdk": "^0.6.27", - "@helium/data-credits-sdk": "^0.6.27", - "@helium/helium-entity-manager-sdk": "^0.6.27", - "@helium/helium-sub-daos-sdk": "^0.6.27", - "@helium/idls": "^0.6.27", - "@helium/lazy-distributor-sdk": "^0.6.27", - "@helium/lazy-transactions-sdk": "^0.6.27", - "@helium/price-oracle-sdk": "^0.6.27", - "@helium/spl-utils": "^0.6.27", - "@metaplex-foundation/mpl-bubblegum": "^3.0.0", + "@helium/account-fetch-cache": "^0.6.26", + "@helium/circuit-breaker-sdk": "^0.6.26", + "@helium/data-credits-sdk": "^0.6.26", + "@helium/helium-entity-manager-sdk": "^0.6.26", + "@helium/helium-sub-daos-sdk": "^0.6.26", + "@helium/idls": "^0.6.26", + "@helium/lazy-distributor-sdk": "^0.6.26", + "@helium/lazy-transactions-sdk": "^0.6.26", + "@helium/price-oracle-sdk": "^0.6.26", + "@helium/spl-utils": "^0.6.26", + "@metaplex-foundation/mpl-bubblegum": "^0.7.0", "@metaplex-foundation/mpl-token-metadata": "^2.10.0", "@solana/spl-account-compression": "^0.1.7", "@solana/spl-token": "^0.3.8", diff --git a/packages/monitor-service/yarn.deploy.lock b/packages/monitor-service/yarn.deploy.lock index 961175b96..b4713d671 100644 --- a/packages/monitor-service/yarn.deploy.lock +++ b/packages/monitor-service/yarn.deploy.lock @@ -5,7 +5,7 @@ __metadata: version: 6 cacheKey: 8 -"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.22.6": +"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.22.6": version: 7.22.11 resolution: "@babel/runtime@npm:7.22.11" dependencies: @@ -58,26 +58,6 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/rlp@npm:^4.0.1": - version: 4.0.1 - resolution: "@ethereumjs/rlp@npm:4.0.1" - bin: - rlp: bin/rlp - checksum: 30db19c78faa2b6ff27275ab767646929207bb207f903f09eb3e4c273ce2738b45f3c82169ddacd67468b4f063d8d96035f2bf36f02b6b7e4d928eefe2e3ecbc - languageName: node - linkType: hard - -"@ethereumjs/util@npm:^8.1.0": - version: 8.1.0 - resolution: "@ethereumjs/util@npm:8.1.0" - dependencies: - "@ethereumjs/rlp": "npm:^4.0.1" - ethereum-cryptography: "npm:^2.0.0" - micro-ftch: "npm:^0.3.1" - checksum: 9ae5dee8f12b0faf81cd83f06a41560e79b0ba96a48262771d897a510ecae605eb6d84f687da001ab8ccffd50f612ae50f988ef76e6312c752897f462f3ac08d - languageName: node - linkType: hard - "@fastify/ajv-compiler@npm:^3.5.0": version: 3.5.0 resolution: "@fastify/ajv-compiler@npm:3.5.0" @@ -112,7 +92,7 @@ __metadata: languageName: node linkType: hard -"@helium/account-fetch-cache@^0.6.27": +"@helium/account-fetch-cache@^0.6.26, @helium/account-fetch-cache@^0.6.27": version: 0.0.0-use.local resolution: "@helium/account-fetch-cache@workspace:packages/account-fetch-cache" dependencies: @@ -160,7 +140,7 @@ __metadata: languageName: node linkType: hard -"@helium/circuit-breaker-sdk@^0.6.27": +"@helium/circuit-breaker-sdk@^0.6.26, @helium/circuit-breaker-sdk@^0.6.27": version: 0.0.0-use.local resolution: "@helium/circuit-breaker-sdk@workspace:packages/circuit-breaker-sdk" dependencies: @@ -176,7 +156,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/data-credits-sdk@^0.6.27": +"@helium/data-credits-sdk@^0.6.26": version: 0.0.0-use.local resolution: "@helium/data-credits-sdk@workspace:packages/data-credits-sdk" dependencies: @@ -196,7 +176,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/helium-entity-manager-sdk@^0.6.27": +"@helium/helium-entity-manager-sdk@^0.6.26": version: 0.0.0-use.local resolution: "@helium/helium-entity-manager-sdk@workspace:packages/helium-entity-manager-sdk" dependencies: @@ -219,7 +199,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/helium-sub-daos-sdk@^0.6.27": +"@helium/helium-sub-daos-sdk@^0.6.26, @helium/helium-sub-daos-sdk@^0.6.27": version: 0.0.0-use.local resolution: "@helium/helium-sub-daos-sdk@workspace:packages/helium-sub-daos-sdk" dependencies: @@ -237,7 +217,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/idls@^0.6.27": +"@helium/idls@^0.6.26, @helium/idls@^0.6.27": version: 0.0.0-use.local resolution: "@helium/idls@workspace:packages/idls" dependencies: @@ -264,7 +244,7 @@ __metadata: languageName: node linkType: hard -"@helium/lazy-distributor-sdk@^0.6.27": +"@helium/lazy-distributor-sdk@^0.6.26": version: 0.0.0-use.local resolution: "@helium/lazy-distributor-sdk@workspace:packages/lazy-distributor-sdk" dependencies: @@ -280,7 +260,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/lazy-transactions-sdk@^0.6.27": +"@helium/lazy-transactions-sdk@^0.6.26": version: 0.0.0-use.local resolution: "@helium/lazy-transactions-sdk@workspace:packages/lazy-transactions-sdk" dependencies: @@ -303,17 +283,17 @@ __metadata: resolution: "@helium/monitor-service@workspace:." dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/account-fetch-cache": ^0.6.27 - "@helium/circuit-breaker-sdk": ^0.6.27 - "@helium/data-credits-sdk": ^0.6.27 - "@helium/helium-entity-manager-sdk": ^0.6.27 - "@helium/helium-sub-daos-sdk": ^0.6.27 - "@helium/idls": ^0.6.27 - "@helium/lazy-distributor-sdk": ^0.6.27 - "@helium/lazy-transactions-sdk": ^0.6.27 - "@helium/price-oracle-sdk": ^0.6.27 - "@helium/spl-utils": ^0.6.27 - "@metaplex-foundation/mpl-bubblegum": ^3.0.0 + "@helium/account-fetch-cache": ^0.6.26 + "@helium/circuit-breaker-sdk": ^0.6.26 + "@helium/data-credits-sdk": ^0.6.26 + "@helium/helium-entity-manager-sdk": ^0.6.26 + "@helium/helium-sub-daos-sdk": ^0.6.26 + "@helium/idls": ^0.6.26 + "@helium/lazy-distributor-sdk": ^0.6.26 + "@helium/lazy-transactions-sdk": ^0.6.26 + "@helium/price-oracle-sdk": ^0.6.26 + "@helium/spl-utils": ^0.6.26 + "@metaplex-foundation/mpl-bubblegum": ^0.7.0 "@metaplex-foundation/mpl-token-metadata": ^2.10.0 "@solana/spl-account-compression": ^0.1.7 "@solana/spl-token": ^0.3.8 @@ -355,7 +335,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/price-oracle-sdk@^0.6.27": +"@helium/price-oracle-sdk@^0.6.26": version: 0.0.0-use.local resolution: "@helium/price-oracle-sdk@workspace:packages/price-oracle-sdk" dependencies: @@ -370,7 +350,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/spl-utils@^0.6.27": +"@helium/spl-utils@^0.6.26, @helium/spl-utils@^0.6.27": version: 0.0.0-use.local resolution: "@helium/spl-utils@workspace:packages/spl-utils" dependencies: @@ -465,7 +445,7 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/beet-solana@npm:^0.4.0": +"@metaplex-foundation/beet-solana@npm:0.4.0, @metaplex-foundation/beet-solana@npm:^0.4.0": version: 0.4.0 resolution: "@metaplex-foundation/beet-solana@npm:0.4.0" dependencies: @@ -477,7 +457,7 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/beet@npm:>=0.1.0, @metaplex-foundation/beet@npm:^0.7.1": +"@metaplex-foundation/beet@npm:0.7.1, @metaplex-foundation/beet@npm:>=0.1.0, @metaplex-foundation/beet@npm:^0.7.1": version: 0.7.1 resolution: "@metaplex-foundation/beet@npm:0.7.1" dependencies: @@ -495,42 +475,23 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/digital-asset-standard-api@npm:^1.0.0-alpha.0": - version: 1.0.0 - resolution: "@metaplex-foundation/digital-asset-standard-api@npm:1.0.0" - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: f881c38145aad093efffea011b06b1fc68495dfe8bf10299811a6d3a15bac74e24af396a248f3307ff93d644cc1a64d4ee05bc933a30cc402b37dccbbacde43f - languageName: node - linkType: hard - -"@metaplex-foundation/mpl-bubblegum@npm:^3.0.0": - version: 3.0.0 - resolution: "@metaplex-foundation/mpl-bubblegum@npm:3.0.0" - dependencies: - "@metaplex-foundation/digital-asset-standard-api": ^1.0.0-alpha.0 - "@metaplex-foundation/mpl-token-metadata": 3.0.0-alpha.27 - "@metaplex-foundation/mpl-toolbox": ^0.9.0 - "@noble/hashes": ^1.3.1 - merkletreejs: ^0.3.9 - peerDependencies: - "@metaplex-foundation/umi": ^0.8.9 - checksum: 61ed8366608b11939bf6f4c701d1c3de0025ba71328700ad5187bea558c9ca5ba818b58a76728f9b473ea93552b2480f14ac7b7d68b934e36c56d88ce888f659 - languageName: node - linkType: hard - -"@metaplex-foundation/mpl-token-metadata@npm:3.0.0-alpha.27": - version: 3.0.0-alpha.27 - resolution: "@metaplex-foundation/mpl-token-metadata@npm:3.0.0-alpha.27" +"@metaplex-foundation/mpl-bubblegum@npm:^0.7.0": + version: 0.7.0 + resolution: "@metaplex-foundation/mpl-bubblegum@npm:0.7.0" dependencies: - "@metaplex-foundation/mpl-toolbox": ^0.9.0 - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: ec79071615b418a4efcfac50616dc6a873f6a827589a5c83990e68e8aa3617813893f8574268cdd53d0cb0330997a979913494ee2e1a722b7716f5536dd579a4 + "@metaplex-foundation/beet": "npm:0.7.1" + "@metaplex-foundation/beet-solana": "npm:0.4.0" + "@metaplex-foundation/cusper": "npm:^0.0.2" + "@metaplex-foundation/mpl-token-metadata": "npm:^2.5.2" + "@solana/spl-account-compression": "npm:^0.1.4" + "@solana/spl-token": "npm:^0.1.8" + "@solana/web3.js": "npm:^1.50.1" + js-sha3: "npm:^0.8.0" + checksum: 9bf5a0fa05c8a2fcf6ba9ce101854aa82a505e823f6acf6d57adf6e2093213ebe6d24818e2bab880e4759360f2640a8b71fa1b7deebb42db5a3a40cbbbcadd9d languageName: node linkType: hard -"@metaplex-foundation/mpl-token-metadata@npm:^2.10.0": +"@metaplex-foundation/mpl-token-metadata@npm:^2.10.0, @metaplex-foundation/mpl-token-metadata@npm:^2.5.2": version: 2.13.0 resolution: "@metaplex-foundation/mpl-token-metadata@npm:2.13.0" dependencies: @@ -545,24 +506,6 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/mpl-toolbox@npm:^0.9.0": - version: 0.9.1 - resolution: "@metaplex-foundation/mpl-toolbox@npm:0.9.1" - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: d2bb9bed47fdba70f9a16b18113f3e4dbe7d7a52a36926bd55511c9c3f4c10d5847620dfd48c20c64e7904f187073e381e78d03bf1001ae13c1204693236129d - languageName: node - linkType: hard - -"@noble/curves@npm:1.1.0, @noble/curves@npm:~1.1.0": - version: 1.1.0 - resolution: "@noble/curves@npm:1.1.0" - dependencies: - "@noble/hashes": "npm:1.3.1" - checksum: 2658cdd3f84f71079b4e3516c47559d22cf4b55c23ac8ee9d2b1f8e5b72916d9689e59820e0f9d9cb4a46a8423af5b56dc6bb7782405c88be06a015180508db5 - languageName: node - linkType: hard - "@noble/curves@npm:^1.0.0": version: 1.2.0 resolution: "@noble/curves@npm:1.2.0" @@ -572,14 +515,7 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.3.1": - version: 1.3.1 - resolution: "@noble/hashes@npm:1.3.1" - checksum: 7fdefc0f7a0c1ec27acc6ff88841793e3f93ec4ce6b8a6a12bfc0dd70ae6b7c4c82fe305fdfeda1735d5ad4a9eebe761e6693b3d355689c559e91242f4bc95b1 - languageName: node - linkType: hard - -"@noble/hashes@npm:1.3.2, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1": +"@noble/hashes@npm:1.3.2, @noble/hashes@npm:^1.3.1": version: 1.3.2 resolution: "@noble/hashes@npm:1.3.2" checksum: fe23536b436539d13f90e4b9be843cc63b1b17666a07634a2b1259dded6f490be3d050249e6af98076ea8f2ea0d56f578773c2197f2aa0eeaa5fba5bc18ba474 @@ -602,34 +538,6 @@ __metadata: languageName: node linkType: hard -"@scure/base@npm:~1.1.0": - version: 1.1.2 - resolution: "@scure/base@npm:1.1.2" - checksum: f666b09dbd62ecb5fe6d0e7a629c8a86a972a47dc4f4555ebbbd7b09782b10a5f894fed9c3b8c74fd683b1588c064df079a44e9f695c075ccd98c30a8d3e91f7 - languageName: node - linkType: hard - -"@scure/bip32@npm:1.3.1": - version: 1.3.1 - resolution: "@scure/bip32@npm:1.3.1" - dependencies: - "@noble/curves": "npm:~1.1.0" - "@noble/hashes": "npm:~1.3.1" - "@scure/base": "npm:~1.1.0" - checksum: 394d65f77a40651eba21a5096da0f4233c3b50d422864751d373fcf142eeedb94a1149f9ab1dbb078086dab2d0bc27e2b1afec8321bf22d4403c7df2fea5bfe2 - languageName: node - linkType: hard - -"@scure/bip39@npm:1.2.1": - version: 1.2.1 - resolution: "@scure/bip39@npm:1.2.1" - dependencies: - "@noble/hashes": "npm:~1.3.0" - "@scure/base": "npm:~1.1.0" - checksum: c5bd6f1328fdbeae2dcdd891825b1610225310e5e62a4942714db51066866e4f7bef242c7b06a1b9dcc8043a4a13412cf5c5df76d3b10aa9e36b82e9b6e3eeaa - languageName: node - linkType: hard - "@solana/buffer-layout-utils@npm:^0.2.0": version: 0.2.0 resolution: "@solana/buffer-layout-utils@npm:0.2.0" @@ -651,7 +559,7 @@ __metadata: languageName: node linkType: hard -"@solana/spl-account-compression@npm:^0.1.7": +"@solana/spl-account-compression@npm:^0.1.4, @solana/spl-account-compression@npm:^0.1.7": version: 0.1.10 resolution: "@solana/spl-account-compression@npm:0.1.10" dependencies: @@ -667,6 +575,20 @@ __metadata: languageName: node linkType: hard +"@solana/spl-token@npm:^0.1.8": + version: 0.1.8 + resolution: "@solana/spl-token@npm:0.1.8" + dependencies: + "@babel/runtime": "npm:^7.10.5" + "@solana/web3.js": "npm:^1.21.0" + bn.js: "npm:^5.1.0" + buffer: "npm:6.0.3" + buffer-layout: "npm:^1.2.0" + dotenv: "npm:10.0.0" + checksum: be4971c4af9c56fd30353356d8ca404b4460eb37806499ab1257e7d77afa56f89149cfe03c41a0f8908f50e9c421c5b805502857455281e8d3088a2eae1c3297 + languageName: node + linkType: hard + "@solana/spl-token@npm:^0.3.6, @solana/spl-token@npm:^0.3.8": version: 0.3.8 resolution: "@solana/spl-token@npm:0.3.8" @@ -680,7 +602,7 @@ __metadata: languageName: node linkType: hard -"@solana/web3.js@npm:^1.32.0, @solana/web3.js@npm:^1.56.2, @solana/web3.js@npm:^1.66.2, @solana/web3.js@npm:^1.68.0, @solana/web3.js@npm:^1.78.4": +"@solana/web3.js@npm:^1.21.0, @solana/web3.js@npm:^1.32.0, @solana/web3.js@npm:^1.50.1, @solana/web3.js@npm:^1.56.2, @solana/web3.js@npm:^1.66.2, @solana/web3.js@npm:^1.68.0, @solana/web3.js@npm:^1.78.4": version: 1.78.4 resolution: "@solana/web3.js@npm:1.78.4" dependencies: @@ -1148,14 +1070,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:4.11.6": - version: 4.11.6 - resolution: "bn.js@npm:4.11.6" - checksum: db23047bf06fdf9cf74401c8e76bca9f55313c81df382247d2c753868b368562e69171716b81b7038ada8860af18346fd4bcd1cf9d4963f923fe8e54e61cb58a - languageName: node - linkType: hard - -"bn.js@npm:^5.1.2, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": +"bn.js@npm:^5.1.0, bn.js@npm:^5.1.2, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": version: 5.2.1 resolution: "bn.js@npm:5.2.1" checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3 @@ -1233,13 +1148,6 @@ __metadata: languageName: node linkType: hard -"buffer-reverse@npm:^1.0.1": - version: 1.0.1 - resolution: "buffer-reverse@npm:1.0.1" - checksum: e350872a89b17af0a7e1bd7a73239a535164f3f010b0800add44f2e52bd0511548dc5b96c20309effba969868c385023d2d02a0add6155f6a76da7b3073b77bd - languageName: node - linkType: hard - "buffer-writer@npm:2.0.0": version: 2.0.0 resolution: "buffer-writer@npm:2.0.0" @@ -1470,13 +1378,6 @@ __metadata: languageName: node linkType: hard -"crypto-js@npm:^4.2.0": - version: 4.2.0 - resolution: "crypto-js@npm:4.2.0" - checksum: f051666dbc077c8324777f44fbd3aaea2986f198fe85092535130d17026c7c2ccf2d23ee5b29b36f7a4a07312db2fae23c9094b644cc35f7858b1b4fcaf27774 - languageName: node - linkType: hard - "debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" @@ -1527,6 +1428,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:10.0.0": + version: 10.0.0 + resolution: "dotenv@npm:10.0.0" + checksum: f412c5fe8c24fbe313d302d2500e247ba8a1946492db405a4de4d30dd0eb186a88a43f13c958c5a7de303938949c4231c56994f97d05c4bc1f22478d631b4005 + languageName: node + linkType: hard + "dotenv@npm:^16.3.1": version: 16.3.1 resolution: "dotenv@npm:16.3.1" @@ -1620,37 +1528,6 @@ __metadata: languageName: node linkType: hard -"ethereum-bloom-filters@npm:^1.0.6": - version: 1.0.10 - resolution: "ethereum-bloom-filters@npm:1.0.10" - dependencies: - js-sha3: "npm:^0.8.0" - checksum: 4019cc6f9274ae271a52959194a72f6e9b013366f168f922dc3b349319faf7426bf1010125ee0676b4f75714fe4a440edd4e7e62342c121a046409f4cd4c0af9 - languageName: node - linkType: hard - -"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2": - version: 2.1.2 - resolution: "ethereum-cryptography@npm:2.1.2" - dependencies: - "@noble/curves": "npm:1.1.0" - "@noble/hashes": "npm:1.3.1" - "@scure/bip32": "npm:1.3.1" - "@scure/bip39": "npm:1.2.1" - checksum: 2e8f7b8cc90232ae838ab6a8167708e8362621404d26e79b5d9e762c7b53d699f7520aff358d9254de658fcd54d2d0af168ff909943259ed27dc4cef2736410c - languageName: node - linkType: hard - -"ethjs-unit@npm:0.1.6": - version: 0.1.6 - resolution: "ethjs-unit@npm:0.1.6" - dependencies: - bn.js: "npm:4.11.6" - number-to-bn: "npm:1.7.0" - checksum: df6b4752ff7461a59a20219f4b1684c631ea601241c39660e3f6c6bd63c950189723841c22b3c6c0ebeb3c9fc99e0e803e3c613101206132603705fcbcf4def5 - languageName: node - linkType: hard - "event-target-shim@npm:^5.0.0": version: 5.0.1 resolution: "event-target-shim@npm:5.0.1" @@ -2239,13 +2116,6 @@ __metadata: languageName: node linkType: hard -"is-hex-prefixed@npm:1.0.0": - version: 1.0.0 - resolution: "is-hex-prefixed@npm:1.0.0" - checksum: 5ac58e6e528fb029cc43140f6eeb380fad23d0041cc23154b87f7c9a1b728bcf05909974e47248fd0b7fcc11ba33cf7e58d64804883056fabd23e2b898be41de - languageName: node - linkType: hard - "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -2449,26 +2319,6 @@ __metadata: languageName: node linkType: hard -"merkletreejs@npm:^0.3.9": - version: 0.3.11 - resolution: "merkletreejs@npm:0.3.11" - dependencies: - bignumber.js: ^9.0.1 - buffer-reverse: ^1.0.1 - crypto-js: ^4.2.0 - treeify: ^1.1.0 - web3-utils: ^1.3.4 - checksum: 93edb8ec66aa6c9f59aa0902e675590e3791692893bb3e8c1018f758367ded1bf7d6b1057ccde3729b283ca946a316838a631a922960b76889b3be528c43ef4e - languageName: node - linkType: hard - -"micro-ftch@npm:^0.3.1": - version: 0.3.1 - resolution: "micro-ftch@npm:0.3.1" - checksum: 0e496547253a36e98a83fb00c628c53c3fb540fa5aaeaf718438873785afd193244988c09d219bb1802984ff227d04938d9571ef90fe82b48bd282262586aaff - languageName: node - linkType: hard - "micromatch@npm:^4.0.0": version: 4.0.5 resolution: "micromatch@npm:4.0.5" @@ -2743,16 +2593,6 @@ __metadata: languageName: node linkType: hard -"number-to-bn@npm:1.7.0": - version: 1.7.0 - resolution: "number-to-bn@npm:1.7.0" - dependencies: - bn.js: "npm:4.11.6" - strip-hex-prefix: "npm:1.0.0" - checksum: 5b8c9dbe7b49dc7a069e5f0ba4e197257c89db11463478cb002fee7a34dc8868636952bd9f6310e5fdf22b266e0e6dffb5f9537c741734718107e90ae59b3de4 - languageName: node - linkType: hard - "obuf@npm:~1.1.2": version: 1.1.2 resolution: "obuf@npm:1.1.2" @@ -3125,15 +2965,6 @@ __metadata: languageName: node linkType: hard -"randombytes@npm:^2.1.0": - version: 2.1.0 - resolution: "randombytes@npm:2.1.0" - dependencies: - safe-buffer: "npm:^5.1.0" - checksum: d779499376bd4cbb435ef3ab9a957006c8682f343f14089ed5f27764e4645114196e75b7f6abf1cbd84fd247c0cb0651698444df8c9bf30e62120fbbc52269d6 - languageName: node - linkType: hard - "readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -3290,7 +3121,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:^5.0.1, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -3582,15 +3413,6 @@ __metadata: languageName: node linkType: hard -"strip-hex-prefix@npm:1.0.0": - version: 1.0.0 - resolution: "strip-hex-prefix@npm:1.0.0" - dependencies: - is-hex-prefixed: "npm:1.0.0" - checksum: 4cafe7caee1d281d3694d14920fd5d3c11adf09371cef7e2ccedd5b83efd9e9bd2219b5d6ce6e809df6e0f437dc9d30db1192116580875698aad164a6d6b285b - languageName: node - linkType: hard - "strip-json-comments@npm:^2.0.0": version: 2.0.1 resolution: "strip-json-comments@npm:2.0.1" @@ -3727,13 +3549,6 @@ __metadata: languageName: node linkType: hard -"treeify@npm:^1.1.0": - version: 1.1.0 - resolution: "treeify@npm:1.1.0" - checksum: aa00dded220c1dd052573bd6fc2c52862f09870851a284f0d3650d72bf913ba9b4f6b824f4f1ab81899bae29375f4266b07fe47cbf82343a1efa13cc09ce87af - languageName: node - linkType: hard - "ts-loader@npm:^9.2.3": version: 9.4.4 resolution: "ts-loader@npm:9.4.4" @@ -3907,13 +3722,6 @@ __metadata: languageName: node linkType: hard -"utf8@npm:3.0.0": - version: 3.0.0 - resolution: "utf8@npm:3.0.0" - checksum: cb89a69ad9ab393e3eae9b25305b3ff08bebca9adc839191a34f90777eb2942f86a96369d2839925fea58f8f722f7e27031d697f10f5f39690f8c5047303e62d - languageName: node - linkType: hard - "util-deprecate@npm:^1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -3966,22 +3774,6 @@ __metadata: languageName: node linkType: hard -"web3-utils@npm:^1.3.4": - version: 1.10.2 - resolution: "web3-utils@npm:1.10.2" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - bn.js: "npm:^5.2.1" - ethereum-bloom-filters: "npm:^1.0.6" - ethereum-cryptography: "npm:^2.1.2" - ethjs-unit: "npm:0.1.6" - number-to-bn: "npm:1.7.0" - randombytes: "npm:^2.1.0" - utf8: "npm:3.0.0" - checksum: a5f8db69603fdd5e984aa6407f47f7a4e0dab83af42e10de25a6d9eeaf2e7d4d18fe665b569e364b2e916233fb73b26cc70ff0d730e7909720118c4790dfb043 - languageName: node - linkType: hard - "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1" diff --git a/programs/helium-entity-manager/Cargo.toml b/programs/helium-entity-manager/Cargo.toml index 944e7a5b6..e368ba902 100644 --- a/programs/helium-entity-manager/Cargo.toml +++ b/programs/helium-entity-manager/Cargo.toml @@ -34,5 +34,5 @@ data-credits = { path = "../data-credits", features = ["cpi"] } helium-sub-daos = { workspace = true } solana-security-txt = { workspace = true } default-env = { workspace = true } -price-oracle = { workspace = true } no-emit = { workspace = true } +pyth-sdk-solana = { version = "0.8.0" } diff --git a/programs/helium-entity-manager/src/error.rs b/programs/helium-entity-manager/src/error.rs index 9c57723f4..cd4de7636 100644 --- a/programs/helium-entity-manager/src/error.rs +++ b/programs/helium-entity-manager/src/error.rs @@ -45,6 +45,15 @@ pub enum ErrorCode { InvalidSymbol, #[msg("Mobile device type not found")] InvalidDeviceType, - #[msg("No mobile oracle price")] - NoOraclePrice, + #[msg("Error loading Pyth data")] + PythError, + + #[msg("Pyth price is not available")] + PythPriceNotFound, + + #[msg("Pyth price is stale")] + PythPriceFeedStale, + + #[msg("Arithmetic error")] + ArithmeticError, } diff --git a/programs/helium-entity-manager/src/instructions/onboard_mobile_hotspot_v0.rs b/programs/helium-entity-manager/src/instructions/onboard_mobile_hotspot_v0.rs index 4d554589e..67b238fdd 100644 --- a/programs/helium-entity-manager/src/instructions/onboard_mobile_hotspot_v0.rs +++ b/programs/helium-entity-manager/src/instructions/onboard_mobile_hotspot_v0.rs @@ -1,6 +1,7 @@ -use crate::error::ErrorCode; use crate::state::*; +use crate::{error::ErrorCode, TESTING}; use anchor_lang::{prelude::*, solana_program::hash::hash}; +use pyth_sdk_solana::load_price_feed_from_account_info; use std::str::FromStr; use anchor_spl::{ @@ -23,9 +24,13 @@ use helium_sub_daos::{ use account_compression_cpi::program::SplAccountCompression; use bubblegum_cpi::get_asset_id; -use price_oracle::{calculate_current_price, PriceOracleV0}; use shared_utils::*; +#[cfg(feature = "devnet")] +const PRICE_ORACLE: &str = "BmUdxoioVgoRTontomX8nBjWbnLevtxeuBYaLipP8GTQ"; +#[cfg(not(feature = "devnet"))] +const PRICE_ORACLE: &str = "JBaTytFv1CmGNkyNiLu16jFMXNZ49BGfy4bYAYZdkxg5"; + #[derive(AnchorSerialize, AnchorDeserialize, Clone)] pub struct OnboardMobileHotspotArgsV0 { pub data_hash: [u8; 32], @@ -104,10 +109,11 @@ pub struct OnboardMobileHotspotV0<'info> { pub dc_mint: Box>, #[account(mut)] pub dnt_mint: Box>, + /// CHECK: Checked by loading with pyth. Also double checked by the has_one on data credits instance. #[account( - address = Pubkey::from_str("moraMdsjyPFz8Lp1RJGoW4bQriSF5mHE7Evxt7hytSF").unwrap() + address = Pubkey::from_str(PRICE_ORACLE).unwrap() )] - pub dnt_price: Box>, + pub dnt_price: AccountInfo<'info>, #[account( seeds=[ @@ -235,15 +241,34 @@ pub fn handler<'info>( // Burn the mobile tokens let dnt_fee = fees.mobile_onboarding_fee_usd; - let mobile_price = calculate_current_price( - &ctx.accounts.dnt_price.oracles, - Clock::get()?.unix_timestamp, - ) - .ok_or_else(|| error!(ErrorCode::NoOraclePrice))?; + let mobile_price_oracle = + load_price_feed_from_account_info(&ctx.accounts.dnt_price).map_err(|e| { + msg!("Pyth error {}", e); + error!(ErrorCode::PythError) + })?; + + let current_time = Clock::get()?.unix_timestamp; + let mobile_price = mobile_price_oracle + .get_ema_price_no_older_than(current_time, if TESTING { 6000000 } else { 10 * 60 }) + .ok_or_else(|| error!(ErrorCode::PythPriceNotFound))?; + // Remove the confidence from the price to use the most conservative price + // https://docs.pyth.network/pythnet-price-feeds/best-practices + let mobile_price_with_conf = mobile_price + .price + .checked_sub(i64::try_from(mobile_price.conf.checked_mul(2).unwrap()).unwrap()) + .unwrap(); + // Exponent is a negative number, likely -8 + // Since the price is multiplied by an extra 10^8, and we're dividing by that price, need to also multiply + // by the exponent + let exponent_dec = 10_u64 + .checked_pow(u32::try_from(-mobile_price.expo).unwrap()) + .ok_or_else(|| error!(ErrorCode::ArithmeticError))?; + + require_gt!(mobile_price_with_conf, 0); let mobile_fee = dnt_fee - .checked_mul(1000000) + .checked_mul(exponent_dec) .unwrap() - .checked_div(mobile_price) + .checked_div(mobile_price_with_conf.try_into().unwrap()) .unwrap(); if mobile_fee > 0 { burn(ctx.accounts.mobile_burn_ctx(), mobile_fee)?; diff --git a/yarn.lock b/yarn.lock index f4979c137..302e78718 100644 --- a/yarn.lock +++ b/yarn.lock @@ -347,26 +347,6 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/rlp@npm:^4.0.1": - version: 4.0.1 - resolution: "@ethereumjs/rlp@npm:4.0.1" - bin: - rlp: bin/rlp - checksum: 30db19c78faa2b6ff27275ab767646929207bb207f903f09eb3e4c273ce2738b45f3c82169ddacd67468b4f063d8d96035f2bf36f02b6b7e4d928eefe2e3ecbc - languageName: node - linkType: hard - -"@ethereumjs/util@npm:^8.1.0": - version: 8.1.0 - resolution: "@ethereumjs/util@npm:8.1.0" - dependencies: - "@ethereumjs/rlp": "npm:^4.0.1" - ethereum-cryptography: "npm:^2.0.0" - micro-ftch: "npm:^0.3.1" - checksum: 9ae5dee8f12b0faf81cd83f06a41560e79b0ba96a48262771d897a510ecae605eb6d84f687da001ab8ccffd50f612ae50f988ef76e6312c752897f462f3ac08d - languageName: node - linkType: hard - "@fastify/ajv-compiler@npm:^3.5.0": version: 3.5.0 resolution: "@fastify/ajv-compiler@npm:3.5.0" @@ -486,7 +466,7 @@ __metadata: languageName: node linkType: hard -"@helium/account-fetch-cache@^0.6.27, @helium/account-fetch-cache@workspace:packages/account-fetch-cache": +"@helium/account-fetch-cache@^0.6.26, @helium/account-fetch-cache@^0.6.27, @helium/account-fetch-cache@workspace:packages/account-fetch-cache": version: 0.0.0-use.local resolution: "@helium/account-fetch-cache@workspace:packages/account-fetch-cache" dependencies: @@ -614,7 +594,7 @@ __metadata: languageName: node linkType: hard -"@helium/circuit-breaker-sdk@^0.6.27, @helium/circuit-breaker-sdk@workspace:packages/circuit-breaker-sdk": +"@helium/circuit-breaker-sdk@^0.6.26, @helium/circuit-breaker-sdk@^0.6.27, @helium/circuit-breaker-sdk@workspace:packages/circuit-breaker-sdk": version: 0.0.0-use.local resolution: "@helium/circuit-breaker-sdk@workspace:packages/circuit-breaker-sdk" dependencies: @@ -701,7 +681,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/data-credits-sdk@^0.6.27, @helium/data-credits-sdk@workspace:packages/data-credits-sdk": +"@helium/data-credits-sdk@^0.6.26, @helium/data-credits-sdk@^0.6.27, @helium/data-credits-sdk@workspace:packages/data-credits-sdk": version: 0.0.0-use.local resolution: "@helium/data-credits-sdk@workspace:packages/data-credits-sdk" dependencies: @@ -900,7 +880,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/helium-entity-manager-sdk@^0.6.27, @helium/helium-entity-manager-sdk@workspace:packages/helium-entity-manager-sdk": +"@helium/helium-entity-manager-sdk@^0.6.26, @helium/helium-entity-manager-sdk@^0.6.27, @helium/helium-entity-manager-sdk@workspace:packages/helium-entity-manager-sdk": version: 0.0.0-use.local resolution: "@helium/helium-entity-manager-sdk@workspace:packages/helium-entity-manager-sdk" dependencies: @@ -966,7 +946,7 @@ __metadata: languageName: node linkType: hard -"@helium/helium-sub-daos-sdk@^0.6.27, @helium/helium-sub-daos-sdk@workspace:packages/helium-sub-daos-sdk": +"@helium/helium-sub-daos-sdk@^0.6.26, @helium/helium-sub-daos-sdk@^0.6.27, @helium/helium-sub-daos-sdk@workspace:packages/helium-sub-daos-sdk": version: 0.0.0-use.local resolution: "@helium/helium-sub-daos-sdk@workspace:packages/helium-sub-daos-sdk" dependencies: @@ -1015,7 +995,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/idls@^0.6.27, @helium/idls@workspace:packages/idls": +"@helium/idls@^0.6.26, @helium/idls@^0.6.27, @helium/idls@workspace:packages/idls": version: 0.0.0-use.local resolution: "@helium/idls@workspace:packages/idls" dependencies: @@ -1042,7 +1022,7 @@ __metadata: languageName: node linkType: hard -"@helium/lazy-distributor-sdk@^0.6.27, @helium/lazy-distributor-sdk@workspace:packages/lazy-distributor-sdk": +"@helium/lazy-distributor-sdk@^0.6.26, @helium/lazy-distributor-sdk@^0.6.27, @helium/lazy-distributor-sdk@workspace:packages/lazy-distributor-sdk": version: 0.0.0-use.local resolution: "@helium/lazy-distributor-sdk@workspace:packages/lazy-distributor-sdk" dependencies: @@ -1058,7 +1038,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/lazy-transactions-sdk@^0.6.27, @helium/lazy-transactions-sdk@workspace:packages/lazy-transactions-sdk": +"@helium/lazy-transactions-sdk@^0.6.26, @helium/lazy-transactions-sdk@^0.6.27, @helium/lazy-transactions-sdk@workspace:packages/lazy-transactions-sdk": version: 0.0.0-use.local resolution: "@helium/lazy-transactions-sdk@workspace:packages/lazy-transactions-sdk" dependencies: @@ -1220,17 +1200,17 @@ __metadata: resolution: "@helium/monitor-service@workspace:packages/monitor-service" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/account-fetch-cache": ^0.6.27 - "@helium/circuit-breaker-sdk": ^0.6.27 - "@helium/data-credits-sdk": ^0.6.27 - "@helium/helium-entity-manager-sdk": ^0.6.27 - "@helium/helium-sub-daos-sdk": ^0.6.27 - "@helium/idls": ^0.6.27 - "@helium/lazy-distributor-sdk": ^0.6.27 - "@helium/lazy-transactions-sdk": ^0.6.27 - "@helium/price-oracle-sdk": ^0.6.27 - "@helium/spl-utils": ^0.6.27 - "@metaplex-foundation/mpl-bubblegum": ^3.0.0 + "@helium/account-fetch-cache": ^0.6.26 + "@helium/circuit-breaker-sdk": ^0.6.26 + "@helium/data-credits-sdk": ^0.6.26 + "@helium/helium-entity-manager-sdk": ^0.6.26 + "@helium/helium-sub-daos-sdk": ^0.6.26 + "@helium/idls": ^0.6.26 + "@helium/lazy-distributor-sdk": ^0.6.26 + "@helium/lazy-transactions-sdk": ^0.6.26 + "@helium/price-oracle-sdk": ^0.6.26 + "@helium/spl-utils": ^0.6.26 + "@metaplex-foundation/mpl-bubblegum": ^0.7.0 "@metaplex-foundation/mpl-token-metadata": ^2.10.0 "@solana/spl-account-compression": ^0.1.7 "@solana/spl-token": ^0.3.8 @@ -1284,7 +1264,7 @@ __metadata: languageName: node linkType: hard -"@helium/price-oracle-sdk@^0.6.27, @helium/price-oracle-sdk@workspace:packages/price-oracle-sdk": +"@helium/price-oracle-sdk@^0.6.26, @helium/price-oracle-sdk@^0.6.27, @helium/price-oracle-sdk@workspace:packages/price-oracle-sdk": version: 0.0.0-use.local resolution: "@helium/price-oracle-sdk@workspace:packages/price-oracle-sdk" dependencies: @@ -1366,7 +1346,7 @@ __metadata: languageName: unknown linkType: soft -"@helium/spl-utils@^0.6.27, @helium/spl-utils@workspace:packages/spl-utils": +"@helium/spl-utils@^0.6.26, @helium/spl-utils@^0.6.27, @helium/spl-utils@workspace:packages/spl-utils": version: 0.0.0-use.local resolution: "@helium/spl-utils@workspace:packages/spl-utils" dependencies: @@ -2500,15 +2480,6 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/digital-asset-standard-api@npm:^1.0.0-alpha.0": - version: 1.0.0 - resolution: "@metaplex-foundation/digital-asset-standard-api@npm:1.0.0" - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: f881c38145aad093efffea011b06b1fc68495dfe8bf10299811a6d3a15bac74e24af396a248f3307ff93d644cc1a64d4ee05bc933a30cc402b37dccbbacde43f - languageName: node - linkType: hard - "@metaplex-foundation/mpl-bubblegum@npm:^0.7.0": version: 0.7.0 resolution: "@metaplex-foundation/mpl-bubblegum@npm:0.7.0" @@ -2525,32 +2496,6 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/mpl-bubblegum@npm:^3.0.0": - version: 3.0.0 - resolution: "@metaplex-foundation/mpl-bubblegum@npm:3.0.0" - dependencies: - "@metaplex-foundation/digital-asset-standard-api": ^1.0.0-alpha.0 - "@metaplex-foundation/mpl-token-metadata": 3.0.0-alpha.27 - "@metaplex-foundation/mpl-toolbox": ^0.9.0 - "@noble/hashes": ^1.3.1 - merkletreejs: ^0.3.9 - peerDependencies: - "@metaplex-foundation/umi": ^0.8.9 - checksum: 61ed8366608b11939bf6f4c701d1c3de0025ba71328700ad5187bea558c9ca5ba818b58a76728f9b473ea93552b2480f14ac7b7d68b934e36c56d88ce888f659 - languageName: node - linkType: hard - -"@metaplex-foundation/mpl-token-metadata@npm:3.0.0-alpha.27": - version: 3.0.0-alpha.27 - resolution: "@metaplex-foundation/mpl-token-metadata@npm:3.0.0-alpha.27" - dependencies: - "@metaplex-foundation/mpl-toolbox": ^0.9.0 - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: ec79071615b418a4efcfac50616dc6a873f6a827589a5c83990e68e8aa3617813893f8574268cdd53d0cb0330997a979913494ee2e1a722b7716f5536dd579a4 - languageName: node - linkType: hard - "@metaplex-foundation/mpl-token-metadata@npm:^2.10.0, @metaplex-foundation/mpl-token-metadata@npm:^2.5.2": version: 2.13.0 resolution: "@metaplex-foundation/mpl-token-metadata@npm:2.13.0" @@ -2566,15 +2511,6 @@ __metadata: languageName: node linkType: hard -"@metaplex-foundation/mpl-toolbox@npm:^0.9.0": - version: 0.9.1 - resolution: "@metaplex-foundation/mpl-toolbox@npm:0.9.1" - peerDependencies: - "@metaplex-foundation/umi": ^0.8.2 - checksum: d2bb9bed47fdba70f9a16b18113f3e4dbe7d7a52a36926bd55511c9c3f4c10d5847620dfd48c20c64e7904f187073e381e78d03bf1001ae13c1204693236129d - languageName: node - linkType: hard - "@mischnic/json-sourcemap@npm:^0.1.0": version: 0.1.0 resolution: "@mischnic/json-sourcemap@npm:0.1.0" @@ -2816,15 +2752,6 @@ __metadata: languageName: node linkType: hard -"@noble/curves@npm:1.1.0, @noble/curves@npm:~1.1.0": - version: 1.1.0 - resolution: "@noble/curves@npm:1.1.0" - dependencies: - "@noble/hashes": "npm:1.3.1" - checksum: 2658cdd3f84f71079b4e3516c47559d22cf4b55c23ac8ee9d2b1f8e5b72916d9689e59820e0f9d9cb4a46a8423af5b56dc6bb7782405c88be06a015180508db5 - languageName: node - linkType: hard - "@noble/curves@npm:^1.0.0, @noble/curves@npm:^1.1.0": version: 1.2.0 resolution: "@noble/curves@npm:1.2.0" @@ -2834,14 +2761,7 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.3.1": - version: 1.3.1 - resolution: "@noble/hashes@npm:1.3.1" - checksum: 7fdefc0f7a0c1ec27acc6ff88841793e3f93ec4ce6b8a6a12bfc0dd70ae6b7c4c82fe305fdfeda1735d5ad4a9eebe761e6693b3d355689c559e91242f4bc95b1 - languageName: node - linkType: hard - -"@noble/hashes@npm:1.3.2, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.1": +"@noble/hashes@npm:1.3.2, @noble/hashes@npm:^1.3.1": version: 1.3.2 resolution: "@noble/hashes@npm:1.3.2" checksum: fe23536b436539d13f90e4b9be843cc63b1b17666a07634a2b1259dded6f490be3d050249e6af98076ea8f2ea0d56f578773c2197f2aa0eeaa5fba5bc18ba474 @@ -4299,34 +4219,6 @@ __metadata: languageName: node linkType: hard -"@scure/base@npm:~1.1.0": - version: 1.1.2 - resolution: "@scure/base@npm:1.1.2" - checksum: f666b09dbd62ecb5fe6d0e7a629c8a86a972a47dc4f4555ebbbd7b09782b10a5f894fed9c3b8c74fd683b1588c064df079a44e9f695c075ccd98c30a8d3e91f7 - languageName: node - linkType: hard - -"@scure/bip32@npm:1.3.1": - version: 1.3.1 - resolution: "@scure/bip32@npm:1.3.1" - dependencies: - "@noble/curves": "npm:~1.1.0" - "@noble/hashes": "npm:~1.3.1" - "@scure/base": "npm:~1.1.0" - checksum: 394d65f77a40651eba21a5096da0f4233c3b50d422864751d373fcf142eeedb94a1149f9ab1dbb078086dab2d0bc27e2b1afec8321bf22d4403c7df2fea5bfe2 - languageName: node - linkType: hard - -"@scure/bip39@npm:1.2.1": - version: 1.2.1 - resolution: "@scure/bip39@npm:1.2.1" - dependencies: - "@noble/hashes": "npm:~1.3.0" - "@scure/base": "npm:~1.1.0" - checksum: c5bd6f1328fdbeae2dcdd891825b1610225310e5e62a4942714db51066866e4f7bef242c7b06a1b9dcc8043a4a13412cf5c5df76d3b10aa9e36b82e9b6e3eeaa - languageName: node - linkType: hard - "@sindresorhus/is@npm:^0.7.0": version: 0.7.0 resolution: "@sindresorhus/is@npm:0.7.0" @@ -5938,13 +5830,6 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:4.11.6": - version: 4.11.6 - resolution: "bn.js@npm:4.11.6" - checksum: db23047bf06fdf9cf74401c8e76bca9f55313c81df382247d2c753868b368562e69171716b81b7038ada8860af18346fd4bcd1cf9d4963f923fe8e54e61cb58a - languageName: node - linkType: hard - "bn.js@npm:^5.0.0, bn.js@npm:^5.1.0, bn.js@npm:^5.1.2, bn.js@npm:^5.1.3, bn.js@npm:^5.2.0, bn.js@npm:^5.2.1": version: 5.2.1 resolution: "bn.js@npm:5.2.1" @@ -6114,13 +5999,6 @@ __metadata: languageName: node linkType: hard -"buffer-reverse@npm:^1.0.1": - version: 1.0.1 - resolution: "buffer-reverse@npm:1.0.1" - checksum: e350872a89b17af0a7e1bd7a73239a535164f3f010b0800add44f2e52bd0511548dc5b96c20309effba969868c385023d2d02a0add6155f6a76da7b3073b77bd - languageName: node - linkType: hard - "buffer-writer@npm:2.0.0": version: 2.0.0 resolution: "buffer-writer@npm:2.0.0" @@ -7012,13 +6890,6 @@ __metadata: languageName: node linkType: hard -"crypto-js@npm:^4.2.0": - version: 4.2.0 - resolution: "crypto-js@npm:4.2.0" - checksum: f051666dbc077c8324777f44fbd3aaea2986f198fe85092535130d17026c7c2ccf2d23ee5b29b36f7a4a07312db2fae23c9094b644cc35f7858b1b4fcaf27774 - languageName: node - linkType: hard - "css-select@npm:^4.1.3": version: 4.3.0 resolution: "css-select@npm:4.3.0" @@ -8024,37 +7895,6 @@ __metadata: languageName: node linkType: hard -"ethereum-bloom-filters@npm:^1.0.6": - version: 1.0.10 - resolution: "ethereum-bloom-filters@npm:1.0.10" - dependencies: - js-sha3: "npm:^0.8.0" - checksum: 4019cc6f9274ae271a52959194a72f6e9b013366f168f922dc3b349319faf7426bf1010125ee0676b4f75714fe4a440edd4e7e62342c121a046409f4cd4c0af9 - languageName: node - linkType: hard - -"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2": - version: 2.1.2 - resolution: "ethereum-cryptography@npm:2.1.2" - dependencies: - "@noble/curves": "npm:1.1.0" - "@noble/hashes": "npm:1.3.1" - "@scure/bip32": "npm:1.3.1" - "@scure/bip39": "npm:1.2.1" - checksum: 2e8f7b8cc90232ae838ab6a8167708e8362621404d26e79b5d9e762c7b53d699f7520aff358d9254de658fcd54d2d0af168ff909943259ed27dc4cef2736410c - languageName: node - linkType: hard - -"ethjs-unit@npm:0.1.6": - version: 0.1.6 - resolution: "ethjs-unit@npm:0.1.6" - dependencies: - bn.js: "npm:4.11.6" - number-to-bn: "npm:1.7.0" - checksum: df6b4752ff7461a59a20219f4b1684c631ea601241c39660e3f6c6bd63c950189723841c22b3c6c0ebeb3c9fc99e0e803e3c613101206132603705fcbcf4def5 - languageName: node - linkType: hard - "event-target-shim@npm:^5.0.0": version: 5.0.1 resolution: "event-target-shim@npm:5.0.1" @@ -9713,13 +9553,6 @@ __metadata: languageName: node linkType: hard -"is-hex-prefixed@npm:1.0.0": - version: 1.0.0 - resolution: "is-hex-prefixed@npm:1.0.0" - checksum: 5ac58e6e528fb029cc43140f6eeb380fad23d0041cc23154b87f7c9a1b728bcf05909974e47248fd0b7fcc11ba33cf7e58d64804883056fabd23e2b898be41de - languageName: node - linkType: hard - "is-in-browser@npm:^1.0.2, is-in-browser@npm:^1.1.3": version: 1.1.3 resolution: "is-in-browser@npm:1.1.3" @@ -10948,19 +10781,6 @@ __metadata: languageName: node linkType: hard -"merkletreejs@npm:^0.3.9": - version: 0.3.11 - resolution: "merkletreejs@npm:0.3.11" - dependencies: - bignumber.js: ^9.0.1 - buffer-reverse: ^1.0.1 - crypto-js: ^4.2.0 - treeify: ^1.1.0 - web3-utils: ^1.3.4 - checksum: 93edb8ec66aa6c9f59aa0902e675590e3791692893bb3e8c1018f758367ded1bf7d6b1057ccde3729b283ca946a316838a631a922960b76889b3be528c43ef4e - languageName: node - linkType: hard - "methods@npm:^1.1.2, methods@npm:~1.1.2": version: 1.1.2 resolution: "methods@npm:1.1.2" @@ -10968,13 +10788,6 @@ __metadata: languageName: node linkType: hard -"micro-ftch@npm:^0.3.1": - version: 0.3.1 - resolution: "micro-ftch@npm:0.3.1" - checksum: 0e496547253a36e98a83fb00c628c53c3fb540fa5aaeaf718438873785afd193244988c09d219bb1802984ff227d04938d9571ef90fe82b48bd282262586aaff - languageName: node - linkType: hard - "micromatch@npm:^4.0.0, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": version: 4.0.5 resolution: "micromatch@npm:4.0.5" @@ -11814,16 +11627,6 @@ __metadata: languageName: node linkType: hard -"number-to-bn@npm:1.7.0": - version: 1.7.0 - resolution: "number-to-bn@npm:1.7.0" - dependencies: - bn.js: "npm:4.11.6" - strip-hex-prefix: "npm:1.0.0" - checksum: 5b8c9dbe7b49dc7a069e5f0ba4e197257c89db11463478cb002fee7a34dc8868636952bd9f6310e5fdf22b266e0e6dffb5f9537c741734718107e90ae59b3de4 - languageName: node - linkType: hard - "nx@npm:15.9.6, nx@npm:>=14.8.1 < 16": version: 15.9.6 resolution: "nx@npm:15.9.6" @@ -14331,15 +14134,6 @@ __metadata: languageName: node linkType: hard -"strip-hex-prefix@npm:1.0.0": - version: 1.0.0 - resolution: "strip-hex-prefix@npm:1.0.0" - dependencies: - is-hex-prefixed: "npm:1.0.0" - checksum: 4cafe7caee1d281d3694d14920fd5d3c11adf09371cef7e2ccedd5b83efd9e9bd2219b5d6ce6e809df6e0f437dc9d30db1192116580875698aad164a6d6b285b - languageName: node - linkType: hard - "strip-indent@npm:^3.0.0": version: 3.0.0 resolution: "strip-indent@npm:3.0.0" @@ -14713,13 +14507,6 @@ __metadata: languageName: node linkType: hard -"treeify@npm:^1.1.0": - version: 1.1.0 - resolution: "treeify@npm:1.1.0" - checksum: aa00dded220c1dd052573bd6fc2c52862f09870851a284f0d3650d72bf913ba9b4f6b824f4f1ab81899bae29375f4266b07fe47cbf82343a1efa13cc09ce87af - languageName: node - linkType: hard - "treeverse@npm:^2.0.0": version: 2.0.0 resolution: "treeverse@npm:2.0.0" @@ -15196,13 +14983,6 @@ __metadata: languageName: node linkType: hard -"utf8@npm:3.0.0": - version: 3.0.0 - resolution: "utf8@npm:3.0.0" - checksum: cb89a69ad9ab393e3eae9b25305b3ff08bebca9adc839191a34f90777eb2942f86a96369d2839925fea58f8f722f7e27031d697f10f5f39690f8c5047303e62d - languageName: node - linkType: hard - "util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -15352,22 +15132,6 @@ __metadata: languageName: node linkType: hard -"web3-utils@npm:^1.3.4": - version: 1.10.2 - resolution: "web3-utils@npm:1.10.2" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - bn.js: "npm:^5.2.1" - ethereum-bloom-filters: "npm:^1.0.6" - ethereum-cryptography: "npm:^2.1.2" - ethjs-unit: "npm:0.1.6" - number-to-bn: "npm:1.7.0" - randombytes: "npm:^2.1.0" - utf8: "npm:3.0.0" - checksum: a5f8db69603fdd5e984aa6407f47f7a4e0dab83af42e10de25a6d9eeaf2e7d4d18fe665b569e364b2e916233fb73b26cc70ff0d730e7909720118c4790dfb043 - languageName: node - linkType: hard - "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1"