From c29085f2f64bb56b9a5ef9b47048da12d90132ee Mon Sep 17 00:00:00 2001 From: Juanma Hidalgo Date: Wed, 12 Jun 2024 14:57:23 +0200 Subject: [PATCH 1/2] feat: add main The Graph subgraphs to use dcl provider (#6213) --- browser-interface/packages/config/index.ts | 2 +- .../DCL/ServiceProviders/TheGraph/TheGraph.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser-interface/packages/config/index.ts b/browser-interface/packages/config/index.ts index 6c24b16446..527984da30 100644 --- a/browser-interface/packages/config/index.ts +++ b/browser-interface/packages/config/index.ts @@ -197,7 +197,7 @@ export namespace ethereumConfigurations { wss: 'wss://rpc.decentraland.org/mainnet', http: 'https://rpc.decentraland.org/mainnet', etherscan: 'https://etherscan.io', - names: 'https://api.thegraph.com/subgraphs/name/decentraland/marketplace', + names: 'https://subgraph.decentraland.org/marketplace', // contracts LANDProxy: assertValue(contractInfo.mainnet.LANDProxy), diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs index 73a6ff2bcd..bc3c8c6300 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs @@ -11,12 +11,12 @@ public class TheGraph : ITheGraph { private const float DEFAULT_CACHE_TIME = 5 * 60; - private const string LAND_SUBGRAPH_URL_ORG = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager"; - private const string LAND_SUBGRAPH_URL_ZONE = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager-sepolia"; - private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/mana-ethereum-mainnet"; - private const string MANA_SUBGRAPH_URL_POLYGON = "https://api.thegraph.com/subgraphs/name/decentraland/mana-matic-mainnet"; - private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/collections-ethereum-mainnet"; - private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://api.thegraph.com/subgraphs/name/decentraland/collections-matic-mainnet"; + private const string LAND_SUBGRAPH_URL_ORG = "https://subgraph.decentraland.org/land-manager"; + private const string LAND_SUBGRAPH_URL_ZONE = "https://api.studio.thegraph.com/query/49472/land-manager-sepolia/version/latest"; + private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/mana-ethereum-mainnet"; + private const string MANA_SUBGRAPH_URL_POLYGON = "https://subgraph.decentraland.org/mana-matic-mainnet"; + private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/collections-ethereum-mainnet"; + private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://subgraph.decentraland.org/collections-matic-mainnet"; private readonly IDataCache> landQueryCache = new DataCache>(); From ced50323afec03a85f62c46d0818916eaec95310 Mon Sep 17 00:00:00 2001 From: Alejo Thomas Ortega Date: Fri, 4 Oct 2024 18:21:56 -0300 Subject: [PATCH 2/2] fix: comms handshake (#6252) --- .../packages/shared/comms/adapters/WebSocketAdapter.ts | 4 ++++ .../shared/realm/connections/ArchipelagoConnection.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/browser-interface/packages/shared/comms/adapters/WebSocketAdapter.ts b/browser-interface/packages/shared/comms/adapters/WebSocketAdapter.ts index 68c8cada01..33fe5410b3 100644 --- a/browser-interface/packages/shared/comms/adapters/WebSocketAdapter.ts +++ b/browser-interface/packages/shared/comms/adapters/WebSocketAdapter.ts @@ -87,6 +87,10 @@ export class WebSocketAdapter implements MinimumCommunicationsAdapter { return this.handleWelcomeMessage(message.welcomeMessage, ws) } case 'challengeMessage': { + if (!message.challengeMessage.challengeToSign.match(/^dcl-[^:]*$/)) { + throw new Error('Protocol error: invalid challenge') + } + const authChainJson = JSON.stringify( Authenticator.signPayload(this.identity, message.challengeMessage.challengeToSign) ) diff --git a/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts b/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts index ad6ca443af..1adb5b0de5 100644 --- a/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts +++ b/browser-interface/packages/shared/realm/connections/ArchipelagoConnection.ts @@ -74,6 +74,10 @@ export async function createArchipelagoConnection( switch (message.$case) { case 'challengeResponse': { + if (!message.challengeResponse.challengeToSign.match(/^dcl-[^:]*$/)) { + throw new Error('Protocol error: invalid challenge') + } + const authChainJson = JSON.stringify( Authenticator.signPayload(identity, message.challengeResponse.challengeToSign) )