From 9738b0c62421470fb8fc5807bf38802142fab15e Mon Sep 17 00:00:00 2001 From: aman035 Date: Tue, 27 Jun 2023 16:50:28 +0530 Subject: [PATCH 1/4] fix: shift to sepolia --- packages/demoreact/src/app/helpers.ts | 6 +-- .../examples/sdk-backend-node/src/main.ts | 31 ++++++------- .../video/helpers/getCAIPAddress.ts | 2 +- packages/socket/src/lib/constants.ts | 12 ++++- packages/socket/src/lib/helpers.ts | 23 +++++++--- .../uiembed/src/lib/embedsdk/constants.ts | 44 ++++++++++--------- packages/uiembed/src/lib/embedsdk/embedsdk.ts | 4 +- 7 files changed, 74 insertions(+), 48 deletions(-) diff --git a/packages/demoreact/src/app/helpers.ts b/packages/demoreact/src/app/helpers.ts index 309927910..011d9a25a 100644 --- a/packages/demoreact/src/app/helpers.ts +++ b/packages/demoreact/src/app/helpers.ts @@ -16,10 +16,10 @@ const Constants = { LIMIT_MIN: 1, LIMIT_MAX: 50 }, - DEFAULT_CHAIN_ID: 5, + DEFAULT_CHAIN_ID: 11155111, DEV_CHAIN_ID: 99999, NON_ETH_CHAINS: [137, 80001, 56, 97, 10, 420, 1442, 1101], - ETH_CHAINS: [1, 5] + ETH_CHAINS: [1, 11155111] }; export interface AddressValidatorsType { @@ -58,7 +58,7 @@ export function getFallbackETHCAIPAddress(env: ENV, address: string) { let chainId = 1; // by default PROD if (env === Constants.ENV.DEV || env === Constants.ENV.STAGING) { - chainId = 5; + chainId = 11155111; } return `eip155:${chainId}:${address}`; diff --git a/packages/examples/sdk-backend-node/src/main.ts b/packages/examples/sdk-backend-node/src/main.ts index 97150161f..5801416fa 100644 --- a/packages/examples/sdk-backend-node/src/main.ts +++ b/packages/examples/sdk-backend-node/src/main.ts @@ -19,6 +19,7 @@ enum ENV { */ LOCAL = 'local', } +const chainId = 11155111; // Sepolia Testnet // CONFIGS const env = process.env.PUSH_NODE_NETWORK; // choose ENV.STAGING or ENV.PROD @@ -145,7 +146,7 @@ async function runNotificaitonsUseCases() { // Push Notification - PushAPI.user.getFeeds async function PushAPI_user_getFeeds(silent = !showAPIResponse) { const notifications = await PushAPI.user.getFeeds({ - user: `eip155:5:${signer.address}`, // user address in CAIP + user: `eip155:${chainId}:${signer.address}`, // user address in CAIP env: env as ENV, }); @@ -158,7 +159,7 @@ async function PushAPI_user_getFeeds(silent = !showAPIResponse) { // Push Notification - PushAPI.user.getFeeds - Spam async function PushAPI_user_getFeeds__spam(silent = !showAPIResponse) { const notifications = await PushAPI.user.getFeeds({ - user: `eip155:5:${signer.address}`, // user address in CAIP + user: `eip155:${chainId}:${signer.address}`, // user address in CAIP spam: true, env: env as ENV, }); @@ -172,7 +173,7 @@ async function PushAPI_user_getFeeds__spam(silent = !showAPIResponse) { // Push Notification - PushAPI.user.getSubscriptions async function PushAPI_user_getSubscriptions(silent = !showAPIResponse) { const subscriptions = await PushAPI.user.getSubscriptions({ - user: `eip155:5:${signer.address}`, // user address in CAIP + user: `eip155:${chainId}:${signer.address}`, // user address in CAIP env: env as ENV, }); @@ -214,8 +215,8 @@ async function PushAPI_channels_search(silent = !showAPIResponse) { async function PushAPI_channels_subscribe(silent = !showAPIResponse) { const response = await PushAPI.channels.subscribe({ signer: signer, - channelAddress: `eip155:5:${channelAddress}`, // channel address in CAIP - userAddress: `eip155:5:${signer.address}`, // user address in CAIP + channelAddress: `eip155:${chainId}:${channelAddress}`, // channel address in CAIP + userAddress: `eip155:${chainId}:${signer.address}`, // user address in CAIP onSuccess: () => { console.log('opt in success'); }, @@ -235,8 +236,8 @@ async function PushAPI_channels_subscribe(silent = !showAPIResponse) { async function PushAPI_channels_unsubscribe(silent = !showAPIResponse) { const response = await PushAPI.channels.unsubscribe({ signer: signer, - channelAddress: `eip155:5:${channelAddress}`, // channel address in CAIP - userAddress: `eip155:5:${signer.address}`, // user address in CAIP + channelAddress: `eip155:${chainId}:${channelAddress}`, // channel address in CAIP + userAddress: `eip155:${chainId}:${signer.address}`, // user address in CAIP onSuccess: () => { console.log('opt out success'); }, @@ -272,8 +273,8 @@ async function PushAPI_payloads_sendNotification__direct_payload_single_recipien cta: '', img: '', }, - recipients: `eip155:5:${signer.address}`, // recipient address - channel: `eip155:5:${signerChannel.address}`, // your channel address + recipients: `eip155:${chainId}:${signer.address}`, // recipient address + channel: `eip155:${chainId}:${signerChannel.address}`, // your channel address env: env as ENV, }); @@ -303,10 +304,10 @@ async function PushAPI_payloads_sendNotification__direct_payload_group_of_recipi img: '', }, recipients: [ - `eip155:5:${signer.address}`, - `eip155:5:${signerSecondAccount.address}`, + `eip155:${chainId}:${signer.address}`, + `eip155:${chainId}:${signerSecondAccount.address}`, ], // recipient addresses - channel: `eip155:5:${signerChannel.address}`, // your channel address + channel: `eip155:${chainId}:${signerChannel.address}`, // your channel address env: env as ENV, }); @@ -335,7 +336,7 @@ async function PushAPI_payloads_sendNotification__direct_payload_all_recipients_ cta: '', img: '', }, - channel: `eip155:5:${signerChannel.address}`, // your channel address + channel: `eip155:${chainId}:${signerChannel.address}`, // your channel address env: env as ENV, }); @@ -348,7 +349,7 @@ async function PushAPI_payloads_sendNotification__direct_payload_all_recipients_ // Push Notification - Get Subscribers list from channels (DEPRECATED) async function PushAPI_channels_getSubscribers(silent = !showAPIResponse) { const subscribers = await PushAPI.channels._getSubscribers({ - channel: `eip155:5:${channelAddress}`, // channel address in CAIP + channel: `eip155:${chainId}:${channelAddress}`, // channel address in CAIP env: env as ENV, }); @@ -361,7 +362,7 @@ async function PushAPI_channels_getSubscribers(silent = !showAPIResponse) { // Push Notification - Socket Connection async function PushSDKSocket(silent = !showAPIResponse) { const pushSDKSocket = createSocketConnection({ - user: `eip155:5:${signer.address}`, // CAIP, see below + user: `eip155:${chainId}:${signer.address}`, // CAIP, see below socketOptions: { autoConnect: false }, env: env as ENV, }); diff --git a/packages/examples/sdk-frontend/video/helpers/getCAIPAddress.ts b/packages/examples/sdk-frontend/video/helpers/getCAIPAddress.ts index 9b0cecdee..09fcea3dc 100644 --- a/packages/examples/sdk-frontend/video/helpers/getCAIPAddress.ts +++ b/packages/examples/sdk-frontend/video/helpers/getCAIPAddress.ts @@ -31,7 +31,7 @@ function getFallbackETHCAIPAddress(env: ENV, address: string) { let chainId = 1; // by default PROD if (env === ENV.DEV || env === ENV.STAGING) { - chainId = 5; + chainId = 11155111; } return `eip155:${chainId}:${address}`; diff --git a/packages/socket/src/lib/constants.ts b/packages/socket/src/lib/constants.ts index 6e14243e7..b4639acc5 100644 --- a/packages/socket/src/lib/constants.ts +++ b/packages/socket/src/lib/constants.ts @@ -8,6 +8,16 @@ export enum ENV { LOCAL = 'local', } +export enum DEFAULT_CHAINS { + PROD = 1, //ETH Mainnet + STAGING = 11155111, //Sepolia Testnet + DEV = 11155111, + /** + * **This is for local development only** + */ + LOCAL = 11155111, +} + export const EVENTS = { // Websocket CONNECT: 'connect', @@ -20,5 +30,5 @@ export const EVENTS = { // Chat CHAT_RECEIVED_MESSAGE: 'CHATS', CHAT_GROUPS: 'CHAT_GROUPS' - + }; \ No newline at end of file diff --git a/packages/socket/src/lib/helpers.ts b/packages/socket/src/lib/helpers.ts index 918ca4aed..faf6ae10d 100644 --- a/packages/socket/src/lib/helpers.ts +++ b/packages/socket/src/lib/helpers.ts @@ -1,7 +1,6 @@ // import * as ethers from 'ethers'; import { ethers } from 'ethers'; -import * as Constants from './constants'; -import { ENV } from './constants'; +import { ENV, DEFAULT_CHAINS } from './constants'; export interface AddressValidatorsType { [key: string]: ({ address }: { address: string }) => boolean; @@ -52,12 +51,24 @@ export function validateCAIP(addressInCAIP: string) { } export function getFallbackETHCAIPAddress(env: ENV, address: string) { - let chainId = 1; // by default PROD + let chainId; // by default PROD - if (env === Constants.ENV.DEV || env === Constants.ENV.STAGING) { - chainId = 5; + switch (env) { + case ENV.PROD: + chainId = DEFAULT_CHAINS.PROD; + break; + case ENV.STAGING: + chainId = DEFAULT_CHAINS.STAGING; + break; + case ENV.DEV: + chainId = DEFAULT_CHAINS.DEV; + break; + case ENV.LOCAL: + chainId = DEFAULT_CHAINS.LOCAL; + break; + default: + chainId = DEFAULT_CHAINS.PROD; } - return `eip155:${chainId}:${address}`; } diff --git a/packages/uiembed/src/lib/embedsdk/constants.ts b/packages/uiembed/src/lib/embedsdk/constants.ts index 723eb0cc9..f5b28e7ea 100644 --- a/packages/uiembed/src/lib/embedsdk/constants.ts +++ b/packages/uiembed/src/lib/embedsdk/constants.ts @@ -1,36 +1,40 @@ export interface URLConfigType { - [key: number]: string + [key: number]: string; } const API_URL = { - PROD: "https://backend.epns.io/apis", - STAGING: "https://backend-staging.epns.io/apis" -} + PROD: 'https://backend.epns.io/apis', + STAGING: 'https://backend-staging.epns.io/apis', +}; -const URLConfig : URLConfigType = { +const URLConfig: URLConfigType = { 1: API_URL.PROD, 137: API_URL.PROD, - 5: API_URL.STAGING, + 11155111: API_URL.STAGING, 80001: API_URL.STAGING, 56: API_URL.PROD, 97: API_URL.STAGING, 10: API_URL.PROD, 420: API_URL.STAGING, 1442: API_URL.STAGING, - 1101: API_URL.PROD + 1101: API_URL.PROD, }; export default { - EPNS_SDK_EMBED_NAMESPACE: '[EPNS_SDK_EMBED]', - EPNS_SDK_EMBED_APP_URL: 'https://ethereum-push-notification-service.github.io/embed-dapp', - EPNS_SDK_EMBED_API_URL: URLConfig, - EPNS_SDK_EMBED_VIEW_ROOT: 'EPNS_SDK_EMBED_VIEW_ROOT', - EPNS_SDK_EMBED_STYLE_TAG_ID_PREFIX: 'EPNS_SDK_EMBED_STYLE_TAG_ID_', - EPNS_SDK_EMBED_IFRAME_ID: 'EPNS_SDK_EMBED_IFRAME_ID', - EPNS_SDK_EMBED_CSS_ZINDEX_MAX: 2147483638, // MAX value - EPNS_SDK_EMBED_CHANNEL: 'EPNS_SDK_EMBED_CHANNEL', - EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_LOADED: 'EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_LOADED', - EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_CLOSED: 'EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_CLOSED', - EPNS_SDK_EMBED_CHANNEL_TOPIC_SDK_CONFIG_INIT: 'EPNS_SDK_EMBED_CHANNEL_TOPIC_SDK_CONFIG_INIT', - EPNS_SDK_EMBED_LOCAL_STORAGE_PREFIX: 'EPNS_SDK_EMBED_LOCAL_STORAGE_' -} + EPNS_SDK_EMBED_NAMESPACE: '[EPNS_SDK_EMBED]', + EPNS_SDK_EMBED_APP_URL: + 'https://ethereum-push-notification-service.github.io/embed-dapp', + EPNS_SDK_EMBED_API_URL: URLConfig, + EPNS_SDK_EMBED_VIEW_ROOT: 'EPNS_SDK_EMBED_VIEW_ROOT', + EPNS_SDK_EMBED_STYLE_TAG_ID_PREFIX: 'EPNS_SDK_EMBED_STYLE_TAG_ID_', + EPNS_SDK_EMBED_IFRAME_ID: 'EPNS_SDK_EMBED_IFRAME_ID', + EPNS_SDK_EMBED_CSS_ZINDEX_MAX: 2147483638, // MAX value + EPNS_SDK_EMBED_CHANNEL: 'EPNS_SDK_EMBED_CHANNEL', + EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_LOADED: + 'EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_LOADED', + EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_CLOSED: + 'EPNS_SDK_EMBED_CHANNEL_TOPIC_IFRAME_APP_CLOSED', + EPNS_SDK_EMBED_CHANNEL_TOPIC_SDK_CONFIG_INIT: + 'EPNS_SDK_EMBED_CHANNEL_TOPIC_SDK_CONFIG_INIT', + EPNS_SDK_EMBED_LOCAL_STORAGE_PREFIX: 'EPNS_SDK_EMBED_LOCAL_STORAGE_', +}; diff --git a/packages/uiembed/src/lib/embedsdk/embedsdk.ts b/packages/uiembed/src/lib/embedsdk/embedsdk.ts index d78bd0831..637a007e1 100644 --- a/packages/uiembed/src/lib/embedsdk/embedsdk.ts +++ b/packages/uiembed/src/lib/embedsdk/embedsdk.ts @@ -37,8 +37,8 @@ function validateConfig(passedConfig : ConfigType) : boolean { return false } - if (![1, 5, 137, 80001, 56, 97, 10, 420, 1442, 1101].includes(passedConfig.chainId)) { - console.error(`${Constants.EPNS_SDK_EMBED_NAMESPACE} - config.chainId passed is not in EPNS supported networks [1, 5, 137, 80001, 56, 97, 10, 420, 1442, 1101]!`) + if (![1, 11155111, 137, 80001, 56, 97, 10, 420, 1442, 1101].includes(passedConfig.chainId)) { + console.error(`${Constants.EPNS_SDK_EMBED_NAMESPACE} - config.chainId passed is not in PUSH supported networks [1, 11155111, 137, 80001, 56, 97, 10, 420, 1442, 1101]!`) return false } if (!passedConfig.targetID) { From 202d43096c4be18d92da7706ee7989520e39c01d Mon Sep 17 00:00:00 2001 From: aman035 Date: Wed, 28 Jun 2023 15:10:40 +0530 Subject: [PATCH 2/4] fix: restapi shifted to sepolia --- packages/restapi/src/lib/config.ts | 36 +++++++++---------- packages/restapi/src/lib/constants.ts | 4 +-- packages/restapi/src/lib/helpers/address.ts | 2 +- .../restapi/src/lib/payloads/constants.ts | 4 +-- packages/restapi/src/lib/payloads/helpers.ts | 4 ++- packages/restapi/tests/lib/chat/chat.test.ts | 2 +- packages/restapi/tests/lib/chat/send.test.ts | 2 +- .../lib/progressHook/progressHook.test.ts | 4 +-- .../restapi/tests/lib/user/createUser.test.ts | 4 +-- .../restapi/tests/lib/user/getUser.test.ts | 4 +-- .../tests/lib/user/upgradeUser.test.ts | 4 +-- 11 files changed, 36 insertions(+), 34 deletions(-) diff --git a/packages/restapi/src/lib/config.ts b/packages/restapi/src/lib/config.ts index 2042dd33c..4ef4114e7 100644 --- a/packages/restapi/src/lib/config.ts +++ b/packages/restapi/src/lib/config.ts @@ -15,7 +15,7 @@ export const API_BASE_URL = { const BLOCKCHAIN_NETWORK = { ETH_MAINNET: 'eip155:1', - ETH_GOERLI: 'eip155:5', + ETH_SEPOLIA: 'eip155:11155111', POLYGON_MAINNET: 'eip155:137', POLYGON_MUMBAI: 'eip155:80001', BSC_MAINNET: 'eip155:56', @@ -23,7 +23,7 @@ const BLOCKCHAIN_NETWORK = { OPTIMISM_TESTNET: 'eip155:420', OPTIMISM_MAINNET: 'eip155:10', POLYGON_ZK_EVM_TESTNET: 'eip155:1442', - POLYGON_ZK_EVM_MAINNET: 'eip155:1101' + POLYGON_ZK_EVM_MAINNET: 'eip155:1101', }; export type ALIAS_CHAIN = 'POLYGON' | 'BSC' | 'OPTIMISM' | 'POLYGONZKEVM'; @@ -52,8 +52,8 @@ export const ALIAS_CHAIN_ID = { [ENV.STAGING]: 1442, [ENV.DEV]: 1442, [ENV.LOCAL]: 420, - } -} + }, +}; export interface ConfigType { API_BASE_URL: string; @@ -76,15 +76,15 @@ const CONFIG = { }, [BLOCKCHAIN_NETWORK.OPTIMISM_MAINNET]: { API_BASE_URL: API_BASE_URL[ENV.PROD], - EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa' + EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa', }, [BLOCKCHAIN_NETWORK.POLYGON_ZK_EVM_MAINNET]: { API_BASE_URL: API_BASE_URL[ENV.PROD], - EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa' - } + EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa', + }, }, [ENV.STAGING]: { - [BLOCKCHAIN_NETWORK.ETH_GOERLI]: { + [BLOCKCHAIN_NETWORK.ETH_SEPOLIA]: { API_BASE_URL: API_BASE_URL[ENV.STAGING], EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa', }, @@ -98,15 +98,15 @@ const CONFIG = { }, [BLOCKCHAIN_NETWORK.OPTIMISM_TESTNET]: { API_BASE_URL: API_BASE_URL[ENV.STAGING], - EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa' + EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa', }, [BLOCKCHAIN_NETWORK.POLYGON_ZK_EVM_TESTNET]: { API_BASE_URL: API_BASE_URL[ENV.STAGING], - EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa' - } + EPNS_COMMUNICATOR_CONTRACT: '0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa', + }, }, [ENV.DEV]: { - [BLOCKCHAIN_NETWORK.ETH_GOERLI]: { + [BLOCKCHAIN_NETWORK.ETH_SEPOLIA]: { API_BASE_URL: API_BASE_URL[ENV.DEV], EPNS_COMMUNICATOR_CONTRACT: '0xc064F30bac07e84500c97A04D21a9d1bfFC72Ec0', }, @@ -120,15 +120,15 @@ const CONFIG = { }, [BLOCKCHAIN_NETWORK.OPTIMISM_TESTNET]: { API_BASE_URL: API_BASE_URL[ENV.DEV], - EPNS_COMMUNICATOR_CONTRACT: '0x4305D572F2bf38Fc2AE8D0172055b1EFd18F57a6' + EPNS_COMMUNICATOR_CONTRACT: '0x4305D572F2bf38Fc2AE8D0172055b1EFd18F57a6', }, [BLOCKCHAIN_NETWORK.POLYGON_ZK_EVM_TESTNET]: { API_BASE_URL: API_BASE_URL[ENV.DEV], - EPNS_COMMUNICATOR_CONTRACT: '0x630b152e4185c63D7177c656b56b26f878C61572' - } + EPNS_COMMUNICATOR_CONTRACT: '0x630b152e4185c63D7177c656b56b26f878C61572', + }, }, [ENV.LOCAL]: { - [BLOCKCHAIN_NETWORK.ETH_GOERLI]: { + [BLOCKCHAIN_NETWORK.ETH_SEPOLIA]: { API_BASE_URL: API_BASE_URL[ENV.LOCAL], EPNS_COMMUNICATOR_CONTRACT: '0xc064F30bac07e84500c97A04D21a9d1bfFC72Ec0', }, @@ -146,8 +146,8 @@ const CONFIG = { }, [BLOCKCHAIN_NETWORK.POLYGON_ZK_EVM_TESTNET]: { API_BASE_URL: API_BASE_URL[ENV.DEV], - EPNS_COMMUNICATOR_CONTRACT: '0x630b152e4185c63D7177c656b56b26f878C61572' - } + EPNS_COMMUNICATOR_CONTRACT: '0x630b152e4185c63D7177c656b56b26f878C61572', + }, }, }; diff --git a/packages/restapi/src/lib/constants.ts b/packages/restapi/src/lib/constants.ts index 9f9abd72f..c186bc462 100644 --- a/packages/restapi/src/lib/constants.ts +++ b/packages/restapi/src/lib/constants.ts @@ -24,10 +24,10 @@ const Constants = { LIMIT_MIN: 1, LIMIT_MAX: 50, }, - DEFAULT_CHAIN_ID: 5, + DEFAULT_CHAIN_ID: 11155111, DEV_CHAIN_ID: 99999, NON_ETH_CHAINS: [137, 80001, 56, 97, 10, 420, 1442, 1101], - ETH_CHAINS: [1, 5], + ETH_CHAINS: [1, 11155111], ENC_TYPE_V1: 'x25519-xsalsa20-poly1305', ENC_TYPE_V2: 'aes256GcmHkdfSha256', ENC_TYPE_V3: 'eip191-aes256-gcm-hkdf-sha256', diff --git a/packages/restapi/src/lib/helpers/address.ts b/packages/restapi/src/lib/helpers/address.ts index 2457953e2..917ba1b90 100644 --- a/packages/restapi/src/lib/helpers/address.ts +++ b/packages/restapi/src/lib/helpers/address.ts @@ -102,7 +102,7 @@ export function getFallbackETHCAIPAddress(env: ENV, address: string) { let chainId = 1; // by default PROD if (env === Constants.ENV.DEV || env === Constants.ENV.STAGING || env === Constants.ENV.LOCAL) { - chainId = 5; + chainId = 11155111; } return `eip155:${chainId}:${address}`; diff --git a/packages/restapi/src/lib/payloads/constants.ts b/packages/restapi/src/lib/payloads/constants.ts index fc0eca252..2ad905476 100644 --- a/packages/restapi/src/lib/payloads/constants.ts +++ b/packages/restapi/src/lib/payloads/constants.ts @@ -4,7 +4,7 @@ export interface ChainIdToSourceType { export const CHAIN_ID_TO_SOURCE: ChainIdToSourceType = { 1: 'ETH_MAINNET', - 5: 'ETH_TEST_GOERLI', + 11155111: 'ETH_TEST_SEPOLIA', 137: 'POLYGON_MAINNET', 80001: 'POLYGON_TEST_MUMBAI', 56: 'BSC_MAINNET', @@ -17,7 +17,7 @@ export const CHAIN_ID_TO_SOURCE: ChainIdToSourceType = { export const SOURCE_TYPES = { ETH_MAINNET: 'ETH_MAINNET', - ETH_TEST_GOERLI: 'ETH_TEST_GOERLI', + ETH_TEST_SEPOLIA: 'ETH_TEST_SEPOLIA', POLYGON_MAINNET: 'POLYGON_MAINNET', POLYGON_TEST_MUMBAI: 'POLYGON_TEST_MUMBAI', BSC_MAINNET: 'BSC_MAINNET', diff --git a/packages/restapi/src/lib/payloads/helpers.ts b/packages/restapi/src/lib/payloads/helpers.ts index f51b4241c..e0bc4e4c8 100644 --- a/packages/restapi/src/lib/payloads/helpers.ts +++ b/packages/restapi/src/lib/payloads/helpers.ts @@ -303,7 +303,9 @@ export function getSource( export function getCAIPFormat(chainId: number, address: string) { // EVM based chains - if ([1, 5, 42, 137, 80001, 56, 97, 10, 420, 1442, 1101].includes(chainId)) { + if ( + [1, 11155111, 42, 137, 80001, 56, 97, 10, 420, 1442, 1101].includes(chainId) + ) { return `eip155:${chainId}:${address}`; } diff --git a/packages/restapi/tests/lib/chat/chat.test.ts b/packages/restapi/tests/lib/chat/chat.test.ts index 05b56d0ef..be922c917 100644 --- a/packages/restapi/tests/lib/chat/chat.test.ts +++ b/packages/restapi/tests/lib/chat/chat.test.ts @@ -12,7 +12,7 @@ const _env = Constants.ENV.DEV; describe('Get chat', () => { it('Should return {} when not chat between users', async () => { try { - const provider = ethers.getDefaultProvider(5); + const provider = ethers.getDefaultProvider(11155111); const Pkey = `0x${WALLET_PRIVATE_KEY}`; const _signer = new ethers.Wallet(Pkey, provider); const walletAddress = _signer.address; diff --git a/packages/restapi/tests/lib/chat/send.test.ts b/packages/restapi/tests/lib/chat/send.test.ts index 6c5278adf..a81487c92 100644 --- a/packages/restapi/tests/lib/chat/send.test.ts +++ b/packages/restapi/tests/lib/chat/send.test.ts @@ -11,7 +11,7 @@ chai.use(chaiAsPromised); describe('PushAPI.chat.send', () => { const _env = Constants.ENV.DEV; - const provider = ethers.getDefaultProvider(5); + const provider = ethers.getDefaultProvider(11155111); let _signer1: any; let walletAddress1: string; let account1: string; diff --git a/packages/restapi/tests/lib/progressHook/progressHook.test.ts b/packages/restapi/tests/lib/progressHook/progressHook.test.ts index 3d177985b..5092ac560 100644 --- a/packages/restapi/tests/lib/progressHook/progressHook.test.ts +++ b/packages/restapi/tests/lib/progressHook/progressHook.test.ts @@ -16,7 +16,7 @@ import { authUpdate } from '../../../src/lib/user/auth.updateUser'; describe('ProgressHook Tests', () => { const _env = Constants.ENV.DEV; - let provider = ethers.getDefaultProvider(5); + let provider = ethers.getDefaultProvider(11155111); let _signer: any; let walletAddress: string; let account: string; @@ -29,7 +29,7 @@ describe('ProgressHook Tests', () => { const _nftAccount1 = `nft:eip155:${process.env['NFT_CHAIN_ID_1']}:${process.env['NFT_CONTRACT_ADDRESS_1']}:${process.env['NFT_TOKEN_ID_1']}`; beforeEach(() => { - provider = ethers.getDefaultProvider(5); + provider = ethers.getDefaultProvider(11155111); const WALLET = ethers.Wallet.createRandom(); _signer = new ethers.Wallet(WALLET.privateKey, provider); walletAddress = _signer.address; diff --git a/packages/restapi/tests/lib/user/createUser.test.ts b/packages/restapi/tests/lib/user/createUser.test.ts index ade9220be..5eb590c51 100644 --- a/packages/restapi/tests/lib/user/createUser.test.ts +++ b/packages/restapi/tests/lib/user/createUser.test.ts @@ -11,7 +11,7 @@ chai.use(chaiAsPromised); describe('Create Push Profile', () => { const _env = Constants.ENV.DEV; - let provider = ethers.getDefaultProvider(5); + let provider = ethers.getDefaultProvider(11155111); let _signer: any; let walletAddress: string; let account: string; @@ -24,7 +24,7 @@ describe('Create Push Profile', () => { const _nftAccount1 = `nft:eip155:${process.env['NFT_CHAIN_ID_1']}:${process.env['NFT_CONTRACT_ADDRESS_1']}:${process.env['NFT_TOKEN_ID_1']}`; beforeEach(() => { - provider = ethers.getDefaultProvider(5); + provider = ethers.getDefaultProvider(11155111); const WALLET = ethers.Wallet.createRandom(); _signer = new ethers.Wallet(WALLET.privateKey, provider); walletAddress = _signer.address; diff --git a/packages/restapi/tests/lib/user/getUser.test.ts b/packages/restapi/tests/lib/user/getUser.test.ts index ca8fcbd9a..3d93a8cb5 100644 --- a/packages/restapi/tests/lib/user/getUser.test.ts +++ b/packages/restapi/tests/lib/user/getUser.test.ts @@ -5,13 +5,13 @@ import Constants from '../../../src/lib/constants'; describe('Get user', () => { const _env = Constants.ENV.DEV; - let provider = ethers.getDefaultProvider(5); + let provider = ethers.getDefaultProvider(11155111); let Pkey: string; let _signer: any; let walletAddress: string; let account: string; beforeEach(() => { - provider = ethers.getDefaultProvider(5); + provider = ethers.getDefaultProvider(11155111); const WALLET = ethers.Wallet.createRandom(); Pkey = WALLET.privateKey; _signer = new ethers.Wallet(Pkey, provider); diff --git a/packages/restapi/tests/lib/user/upgradeUser.test.ts b/packages/restapi/tests/lib/user/upgradeUser.test.ts index 1648f369d..4f81d2dde 100644 --- a/packages/restapi/tests/lib/user/upgradeUser.test.ts +++ b/packages/restapi/tests/lib/user/upgradeUser.test.ts @@ -11,12 +11,12 @@ chai.use(chaiAsPromised); describe('Upgrade user keys', () => { const upgradationVersion = Constants.ENC_TYPE_V3; const _env = Constants.ENV.DEV; - let provider = ethers.getDefaultProvider(5); + let provider = ethers.getDefaultProvider(11155111); let _signer: any; let walletAddress: string; let account: string; beforeEach(() => { - provider = ethers.getDefaultProvider(5); + provider = ethers.getDefaultProvider(11155111); const WALLET = ethers.Wallet.createRandom(); _signer = new ethers.Wallet(WALLET.privateKey, provider); walletAddress = _signer.address; From 8d4b67385bc1860947af058041a3a7797acb69fa Mon Sep 17 00:00:00 2001 From: aman035 Date: Wed, 28 Jun 2023 16:04:03 +0530 Subject: [PATCH 3/4] fix: doc changes and demoreact fix --- apps/demonative/src/app/App.tsx | 2 +- .../demoreact/src/app/components/Connect.tsx | 4 +- packages/restapi/README.md | 67 +++++++++---------- packages/socket/README.md | 4 +- packages/uiweb/README.md | 4 +- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/apps/demonative/src/app/App.tsx b/apps/demonative/src/app/App.tsx index 6cb988728..704af5482 100644 --- a/apps/demonative/src/app/App.tsx +++ b/apps/demonative/src/app/App.tsx @@ -24,7 +24,7 @@ export default function App() { const getData = async () => { try { const notifications = await PushAPI.user.getFeeds({ - user: `eip155:5:${user}`, + user: `eip155:11155111:${user}`, env: 'dev', limit: parseInt(pageSize, 10) }); diff --git a/packages/demoreact/src/app/components/Connect.tsx b/packages/demoreact/src/app/components/Connect.tsx index 08ae29d7a..aef9a9556 100644 --- a/packages/demoreact/src/app/components/Connect.tsx +++ b/packages/demoreact/src/app/components/Connect.tsx @@ -9,7 +9,7 @@ interface NwMappingType { const NETWORK_MAPPING : NwMappingType = { 1: 'ETH_MAIN_NET', - 5: 'ETH_GOERLI', + 11155111: 'ETH_SEPOLIA', 3: 'ETH_ROPSTEN', 137: 'POLYGON_MAINNET', 80001: 'POLYGON_MUMBAI', @@ -22,7 +22,7 @@ const NETWORK_MAPPING : NwMappingType = { }; const injected = new InjectedConnector({ - supportedChainIds: [1, 3, 4, 5, 42, 137, 80001, 56, 97, 10, 420, 1442, 1101], + supportedChainIds: [1, 3, 4, 11155111, 42, 137, 80001, 56, 97, 10, 420, 1442, 1101], }) const ConnectWrapper = styled.div` diff --git a/packages/restapi/README.md b/packages/restapi/README.md index 03ec9b1b0..2da9d63d5 100644 --- a/packages/restapi/README.md +++ b/packages/restapi/README.md @@ -171,7 +171,7 @@ Optimism Testnet - 0xb3971BCef2D791bc4027BbfedFb47319A4AAaaAa ```typescript const notifications = await PushAPI.user.getFeeds({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP env: 'staging', }); ``` @@ -335,7 +335,7 @@ const notifications = await PushAPI.user.getFeeds({ ```typescript const spams = await PushAPI.user.getFeeds({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP spam: true, env: 'staging', }); @@ -528,7 +528,7 @@ PushAPI.user.getFeeds [Spam] | Response - 200 OK ```typescript const subscriptions = await PushAPI.user.getSubscriptions({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP env: 'staging', }); ``` @@ -1079,8 +1079,8 @@ Allowed Options (params with _ are mandatory) ```typescript await PushAPI.channels.subscribe({ signer: _signer, - channelAddress: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP - userAddress: 'eip155:5:0x52f856A160733A860ae7DC98DC71061bE33A28b3', // user address in CAIP + channelAddress: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP + userAddress: 'eip155:11155111:0x52f856A160733A860ae7DC98DC71061bE33A28b3', // user address in CAIP onSuccess: () => { console.log('opt in success'); }, @@ -1120,8 +1120,8 @@ Allowed Options (params with _ are mandatory) ```typescript await PushAPI.channels.unsubscribe({ signer: _signer, - channelAddress: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP - userAddress: 'eip155:5:0x52f856A160733A860ae7DC98DC71061bE33A28b3', // user address in CAIP + channelAddress: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP + userAddress: 'eip155:11155111:0x52f856A160733A860ae7DC98DC71061bE33A28b3', // user address in CAIP onSuccess: () => { console.log('opt out success'); }, @@ -1233,8 +1233,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - recipients: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // recipient address - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // recipient address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1257,8 +1257,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - recipients: ['eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', 'eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1'], // recipients addresses - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: ['eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', 'eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1'], // recipients addresses + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1281,7 +1281,7 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1295,8 +1295,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ type: PushAPI.payloads.NOTIFICATION_TYPE.TARGETTED, // target identityType: PushAPI.payloads.IDENTITY_TYPE.IPFS, // ipfs payload ipfsHash: 'bafkreicuttr5gpbyzyn6cyapxctlr7dk2g6fnydqxy6lps424mcjcn73we', // IPFS hash of the payload - recipients: 'eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: 'eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1310,8 +1310,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ type: PushAPI.payloads.NOTIFICATION_TYPE.SUBSET, // subset identityType: PushAPI.payloads.IDENTITY_TYPE.IPFS, // ipfs payload ipfsHash: 'bafkreicuttr5gpbyzyn6cyapxctlr7dk2g6fnydqxy6lps424mcjcn73we', // IPFS hash of the payload - recipients: ['eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:5:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients addresses - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: ['eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:11155111:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients addresses + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1325,7 +1325,7 @@ const apiResponse = await PushAPI.payloads.sendNotification({ type: PushAPI.payloads.NOTIFICATION_TYPE.BROADCAST, // broadcast identityType: PushAPI.payloads.IDENTITY_TYPE.DIRECT_PAYLOAD, // direct payload ipfsHash: 'bafkreicuttr5gpbyzyn6cyapxctlr7dk2g6fnydqxy6lps424mcjcn73we', // IPFS hash of the payload - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1348,8 +1348,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - recipients: 'eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: 'eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1372,8 +1372,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - recipients: ['eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:5:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients address - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: ['eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:11155111:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1396,7 +1396,7 @@ const apiResponse = await PushAPI.payloads.sendNotification({ cta: '', img: '', }, - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1415,8 +1415,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ id: '_your_graph_id', counter: 3, }, - recipients: 'eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: 'eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', // recipient address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1435,8 +1435,8 @@ const apiResponse = await PushAPI.payloads.sendNotification({ id: '_your_graph_id', counter: 3, }, - recipients: ['eip155:5:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:5:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients addresses - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + recipients: ['eip155:11155111:0xCdBE6D076e05c5875D90fa35cc85694E1EAFBBd1', 'eip155:11155111:0x52f856A160733A860ae7DC98DC71061bE33A28b3'], // recipients addresses + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1455,7 +1455,7 @@ const apiResponse = await PushAPI.payloads.sendNotification({ id: '_your_graph_id', counter: 3, }, - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // your channel address env: 'staging', }); ``` @@ -1480,7 +1480,7 @@ Utils method to parse raw Push Feeds API response into a pre-defined shape as be ```typescript // fetch some raw feeds data const apiResponse = await PushAPI.user.getFeeds({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address raw: true, env: 'staging', }); @@ -1506,7 +1506,7 @@ _We get the above `keys` after the parsing of the API repsonse._ ```typescript const subscribers = await PushAPI.channels.getSubscribers({ - channel: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP + channel: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // channel address in CAIP page: 1, // Optional, defaults to 1 limit : 10 // Optional, defaults to 10 env: 'staging' @@ -1786,7 +1786,7 @@ Example response NFT user: about: null, name: null, allowedNumMsg: 1000, - did: 'nft:eip155:5:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', + did: 'nft:eip155:11155111:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', encryptedPrivateKey: '{"ciphertext":"833ddc6dfe07e8af7f78991f679ecb5b64d60b1cffc2fed4ecb6287dd04fb27e712c1fd8988b1f15c7b6f30914941f52b316a67b4cc1a8172c7918f00ee333b8a8610cca0320b9593145087a27d4dbd0582043d47538735d087455afacfa3b48b5aa40d82040778f5de3b8bed2c281fa9a381024dc233a92132afd745853a1abb2f305a4eafe7072dc3df405af93ceec52f1b8ce9bb796b5567993ef29e735c7ddcfd8b5b5e7ac6c261b67a76e0c392505777591a98e85f7829796d35efaed030b348b14349539bcd6bd34d4599c7af95db1fb605672d3318737184f92c0d54580abf4be00138f047d8ad69952f368192ab62906dd7f9ef66d1573f9ffdb129bf40c11816057541aefaf8fbee93e80d27e6b09854aef29b8d853bd8b9d994c955400b90e8d4e2b40dd1885ebad81f6c6bf2c41e16039e6a94b8213a501d100ae0b5351198ababe328a8f17480daa70cc0cb65c0f4791903ddb8508f1d304daf64b91f43bbcb489163fb01a6c43815d18e6befbeb78c30be4699366b64b5687335a1f910eb7bb542df5b3fee6f01807656e7b498a55914453dc08c17d89aed5b68d65959959e1a6381944491c7f709cbdec6192f2431f8f47bf94939c866539e5869b1b2ada24159b217fb30f117064120c8eab40eea54b7cf5b2ecb862bb9cdbe45c2d6f5a83476ae3c04019a7920120fc98ae704017f0b93a7ea84ef2a0b503ddbceef31fb31b5e57e6b3e782a4622dfd3fc9df59e4d8100fbf9901ec5a18768c2368182a4a6db10d2bbdaf5972ba8c7a57d4d45d6bbfaecdc529522e4dbe852b6cedcb82d7e105e8f8c169537e15bbb87c64270856328af88262b89ac2abe038d9d185d0cf8e03b760a4f08ce02c06ea205bce7c837259f06bce42795e5bfd8aa769175cba15fd29bbced2f39748e5ed992760aa6da6379560b2247976fec08614226d5090ece1daff0013fec33dd9bee160d9eee9d357c9efc859af81944996d7f4f12c56910b96dfc4b1ae7530c259027229a0e6cd8da0f352bc296611d7ae3d83aee6007aa72ff0a6de0e49a4f73eaea9b688162845f28875da97b0968caa39cdb9d64c4440799fde517b63e2836840173054952ecb7a70dcb139cf78261056cc9120bc78adb815380038b1c4c1c7502ab0ec065349a3f44ebc838663f1618c9ba1c22920baee2f8ab97fd4526c7a6ba7f6d69a8a2bd5b0142e63e2fd29c7618c2c902d50de3b0c16cc849acc003c6865460ce81280ab4fc1eeb93aaa21ec2093e3337e05b3755bc2bff3157ab5c292dcdac3b514560b14ac60e08b770f008e4e77217a84a153f2fa246f728317f06470ca31abcc060f00b6eee751a99e38f56b3759e395c2ec58a77e7cca5312077a0f23d3e456ae329f8e1ec54e9f59d21537756b1b1f07b776edd8ea5dea34c84ada1331cb0d6f2b84df6785a36615786985082f7f8a6b8ef52f1111245f5cdda223d6e5e3794e5fd7afdafaa104280337e0bb2db832c004e9ea74f10b95c272ea4361d4bc6f5ed79ee361fbafedc629da0ecfb91f14da9b687b0c569982fe8682b383476a445c67d3929b4b80fa2478ea3b49d9fc73aa58c3567f2271679978ccfc0c511bf596bd5e4bd1ff79fc939bcb9f4f21781098411043a20aa0b48b91bcf55bcf0bea1af34acef1c27c2d3e1b6afef2dc0265e40ac812872faed5ef0f948181fceb303eb8a43ba5f25523f06031bc6ad151dddabd7df2296f91d1f6a9840b3d3651c02c93a467249d01b364302b7a2def68ba64114861ec61eebf353823d043ad72ec40068e2b60b19a1582a817e1048f02578a2933f4cdbfd87029b5329b1c05babf3650d1f7895333100a695fcba41ceb092fc0c539c62960b232ddd83fbefe8b757b1f69f853657493ea5ed23009ace2faa47a6bd0f253c8990f934e7c26a4924bd5628b59a969e56ffea4fdb3fba9aeb0213149cbb4f9cb33ee62bde1ab4330f3a7674264e89d97d131ceade5e11c9de12305602c6c148d7e19fa77457396ca9bd0d7d5816dd46a9e14690f4d3c40843d17489b70b89a655566fd01d3fd3d2dfb559599e2f450b137ef5fad512b98bff6f783ee6b348edcd4163b7ff554e3bd093c5c7bf1a4823a82bb2ae641f24963ad54409f65db3ab094d0605397ca2774204af5bcac834ce0c987c1b5d2afb43f07c461dd64a523030f9329cbc48f6cfbe6a28a41bc8c6ead39fab275f6d6c6e07be9313702f314dd12c1fb3f1d6666d5d05623d9633ae892b9545b96a77f48de349ed3105b714c7cafa8990e1a7e7a135624374dd1b9338fbe2dabc583f8faa4f5e3978b10c2b6ff0218c51fe604267e93757fa3a65d2ce9698e6ac50d1bf3bb7721b54a8395084d20d9a85d774389f867e91650e4699cfb0f2850e0512d2b53efbf5df6ef3a816fdb1829ab32ce3ae96b564d36f415a55721d0b9f5b6277d23f47c1a58669083d77a11c9d543332ca73e261f8046639b07f35bf727ce2ccbf86a15f853350b58cde58992bba4ba79b6d52654bb956093c6d876b1cc18566677da4d281273305e20eeab54dfbc8f9d00f7a36d3addb9f622986936f80a2c74798a9dadd3fc0fa489f9211e32bc7e3b33752249a1911b44d873128b22ecbe95451c8b693ad40f7898f7e5b76e5f09b51a1dd9dd9ca838e4f8c19eeca153f99b57387ae8d7fc71939d7f48ae75296cfc4db6ddab08b4d2cb15b7d69acdf13e2a0e9a6839db390ba9744b421c029a9811c9fea18948eaebaeeb75b9476e3be90fdd162419152cdd6b7f4a099c1a807f55882415f936add29210dbd8f6462be8c7f1949011f62529f98dcfb9766c60d40292f01c6fcab1f5a899bfe4ebe8b60515f6afbe4803ee99e37b976a92891251d28a43d56fca6ce736f1eb6ef94d20b84c53c822edc94a3ccc55de033a852f3da27508b1c81de1cca9f19b46a5909b0ba8bf7c38ddef2179d119ea205a00573c435befe16cbfdc0c315922a24cdcfc789c965297c64017ac0a0ab23e8ed5b47f76f42ab3552e470a4080564fc7b77149b997761f1a4b3b9f15ba22fa1a6da3f7366a7f90df62124ae637573b92a50b3c29870edd96250d310e8e8413e958880d73619840ecc1b8a8c5f6ce7133dae4740d2deba69ad89d4a7b637db48df5f36491793042ecd88605863024db842768acb43d12cd61aedcf8ab7a34957918d4688f2728b02431dee06a28ed6d6b149f714b7f89986ad684991f291459bbd97bbeb1ab73da5475dc75b48b6417a25a9c2836cb4f3d30e433382b6cb78d5b8642c37b8e9a8c02bbc0fac47e84f80cbf555f8e886a1f4e4ed9064884d7ffa8833933d30d13a31f1deb875f86f4a25b7456a96eeaceb44f4dc39620ac3fe1f8a4830a6bc30c584adadada3dd4a612c8941f6b97417411cc1ed2aa41c6bc442b8971bf5efb1998d5110861fb650004d0a33a5ca4522bb6ac7cd904909f206ae15f66314be98d7772ee4bf7185455c867719c3b61bbc753ca3e6b5b4052fb2a71c80dce5ee31fff0380ce786c934f94896c2c344561f8da151eefec62c84784dd38b2c19d32e3d27571ddb4c30b673e6aac7ea59e56455c7bd1084fbe0eaacd23e3c72a4d16e7cf3296bdde8037ba085a5d8e5e12e506be8696b97f0a4cdbdc3ba63ab5a3567f558d287e67ed897d084a66fc9e74ea5f8c3f4c66b5b132d123d81a6bd313fa735a3472776f917ae6c9b2e1ede2dea152277338d60c4c27446f1dd55f338cdd22dc30002c2a4c9bf7d8c82a0dca395062a3cbe6d3d1e67aed0bfd877334f134228221b530aee740a9fd96cdbf2dab8ac178d53a690edb592e5264f05faacc83721d35bb878724a90369b6b339884f53d51583ae7110caaf5790964c7adcc50d6310226b1fee785616ed47ae54b9e89233be47b7c53c7c51d7cf99bf2785d742b1927ae1b46b389c00c9be90def2475d5ef01fb30477b864389172686bf27af83c68ee0811fa03c12d3356b44cb8aed2cbc0e562ac0d7b2da58293b568bda2d73a2cc716f6796583b6f1213654153997e4f9e0fd68b47df65d933d14be7876d66d7a80b45ef1e53a172473b6b70e9d5eee0e4e77fa15c63c8dc21d452dcf9346973d6b539eebf88d1163314aeb180b44fc19e37a155537075e905155001935b2a09d041c4afbf9ebb688e70c0d90867af9f18b005ff0f6765b5e1483e5b9af9faefd12208ed285ab46a19f4f147e0a30aa66b683a84db4942953ca4b65cef720819d1c6b67983c16d78da3b6e649b55a26b69fa307a339139fc51c56fc8eccf3297fddd1fbfcdda60d3906225160091380725673dfa0e508e7407b1a1d6668ab63c6e2f171dbf647abe0e9c0edc231b99c0ccf7ef64206a51aa566e00e6c549104a5139e844d1876b85123aa6f4bb42a643279da16190c272ddd11ab854a6f8420ceff18108646bb2a7fc914cfcb93dc496ced49c72afc97dea4d285ecd09f55797178e7d366931117ce55532a1ded360635f64d3ea1553ee7dbad5945391810927f22c378970c0d26fd0d9662e381bed5d066cf99b4e52660a10c86ca116fdd2fa763c2d4be36871c24b577a12b6e405a49776f691b5e72567c38d0ea5b302fe5c190eb3e3e97f7145dc67bfbed9bc4371747e7d015b528b21c7fcdfd189d0801849950aeb23dd9d727ce524138ce382c02f17f4b5b62923150abfdabd254e96a62ae3acbfd136febed24b693c124ae8b38e18e69bf1dc0835dcaa38891a6b78bef84317d817964d92b97e48ed4dc4a79b1939bc020bde8b58eed6bd72c380fb1872101d08e340f593daa5ad1aed1dfb13734aa0e8f6c6fe6aae8b3c7cbbb17b2a152424c29e3b7c47a7803c4b1ab0536c3f74e3b1b9c103d64c8f1895b48f71fe881bf1d82e9e6c0f9a7da703a7b774dfd72f0293ca25f338cd7a63354bf912b1668","salt":"cfdf1532770a3b27e0329a8fb1053f9d8a226e836192be779e17d41433bf460d","nonce":"f5d61962ead20df2cd138c89","version":"pgpv1:nft","preKey":"","encryptedPassword":{"ciphertext":"7cae72fd38d784c7e200a7e503042876cd9fae923c0614a1d1f66a3008","salt":"7af2cf5b44bbeb31f19559fccbab9890fae5ecc67e0e3a1e0654cb2caadb51e3","nonce":"194fca4778be7d05348d9c04","version":"eip191-aes256-gcm-hkdf-sha256","preKey":"78217c6716dc1f346f7335d5bc7e3c39cd71cfc866fec1ac0daae98af0787909"}}', encryptionType: 'pgpv1:nft', encryptedPassword: null, @@ -1826,7 +1826,7 @@ Example response NFT user: '-----END PGP PUBLIC KEY BLOCK-----\n', sigType: '0x2422c8b422b5437cd3718823b4bd952c418108f77e0f5d67994d268445ff076d0ca9b73555e642d4ae656af1bff1a7ac87b856181067175541168b7ae492b0c61c', signature: 'eip191v2', - wallets: 'nft:eip155:5:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', + wallets: 'nft:eip155:11155111:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', linkedListHash: null, nfts: [] } @@ -2095,7 +2095,7 @@ Example response NFT user: '-----END PGP PUBLIC KEY BLOCK-----\n', sigType: '0x2422c8b422b5437cd3718823b4bd952c418108f77e0f5d67994d268445ff076d0ca9b73555e642d4ae656af1bff1a7ac87b856181067175541168b7ae492b0c61c', signature: 'eip191v2', - wallets: 'nft:eip155:5:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', + wallets: 'nft:eip155:11155111:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', linkedListHash: null, nfts: [] } @@ -2417,7 +2417,7 @@ const updateUser = await PushAPI.user.profile.update({ '-----END PGP PUBLIC KEY BLOCK-----\n', sigType: '0x2422c8b422b5437cd3718823b4bd952c418108f77e0f5d67994d268445ff076d0ca9b73555e642d4ae656af1bff1a7ac87b856181067175541168b7ae492b0c61c', signature: 'eip191v2', - wallets: 'nft:eip155:5:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', + wallets: 'nft:eip155:11155111:0x42af3147f17239341477113484752D5D3dda997B:2:1684313853', linkedListHash: null, nfts: [] } @@ -3209,7 +3209,6 @@ const response = await PushAPI.chat.updateGroup({ }); ``` - ### **To update token gated group details** Note - updateGroup is an idompotent call diff --git a/packages/socket/README.md b/packages/socket/README.md index dae5625af..53b6a9eb0 100644 --- a/packages/socket/README.md +++ b/packages/socket/README.md @@ -53,7 +53,7 @@ In any of the below methods (unless explicitly stated otherwise) we accept eithe ### **For notification** ```typescript const pushSDKSocket = createSocketConnection({ - user: 'eip155:5:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb', // CAIP, see below + user: 'eip155:11155111:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb', // CAIP, see below env: 'staging', socketOptions: { autoConnect: false } }); @@ -131,7 +131,7 @@ import { useState, useEffect } from "react"; import { createSocketConnection, EVENTS } from '@pushprotocol/socket'; const user = '0xD8634C39BBFd4033c0d3289C4515275102423681'; -const chainId = 5; +const chainId = 11155111; const userCAIP = `eip155:${chainId}:${user}`; diff --git a/packages/uiweb/README.md b/packages/uiweb/README.md index bc7646dea..f47a170e6 100644 --- a/packages/uiweb/README.md +++ b/packages/uiweb/README.md @@ -36,7 +36,7 @@ After you get the Notification data from the [API](../restapi/README.md#fetching ```typescript const notifications = await PushAPI.user.getFeeds({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP env: 'staging' }); ``` @@ -79,7 +79,7 @@ For Spam data [API](../restapi/README.md#fetching-user-spam-notifications) ```typescript const spams = await PushAPI.user.getFeeds({ - user: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP + user: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681', // user address in CAIP spam: true, env: 'staging' }); From 03b168563a7c60761d8d1ff59268e47ab410833d Mon Sep 17 00:00:00 2001 From: akp111 Date: Fri, 10 Nov 2023 02:37:21 +0530 Subject: [PATCH 4/4] fix: merged main --- packages/examples/notification-setting/index.js | 2 +- .../examples/sdk-backend-node/notification/notification.ts | 2 +- packages/examples/sdk-backend-node/pushAPI/channel.ts | 2 +- packages/restapi/src/lib/config.ts | 3 +++ packages/restapi/tests/lib/pushNotification/alias.test.ts | 2 +- packages/restapi/tests/lib/pushNotification/channel.test.ts | 4 ++-- .../restapi/tests/lib/pushNotification/delegate.test.ts | 2 +- .../restapi/tests/lib/pushNotification/notification.test.ts | 6 +++--- .../restapi/tests/lib/user/createUserWithProfile.test.ts | 4 ++-- packages/uiembed/src/lib/embedsdk/embedsdk.ts | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/examples/notification-setting/index.js b/packages/examples/notification-setting/index.js index 324af8524..1a4493c0d 100644 --- a/packages/examples/notification-setting/index.js +++ b/packages/examples/notification-setting/index.js @@ -6,7 +6,7 @@ dotenv.config(); // initialise the provider const provider = new ethers.providers.JsonRpcProvider( // PUBLIC RPC - process.env?.RPC?? 'https://goerli.blockpi.network/v1/rpc/public' + process.env?.RPC?? 'https://rpc.sepolia.org' ); let signer; diff --git a/packages/examples/sdk-backend-node/notification/notification.ts b/packages/examples/sdk-backend-node/notification/notification.ts index 685c9d2da..4c55d4569 100644 --- a/packages/examples/sdk-backend-node/notification/notification.ts +++ b/packages/examples/sdk-backend-node/notification/notification.ts @@ -32,7 +32,7 @@ export const runNotificationClassUseCases = async (): Promise => { // ------------------------------------------------------------------- // Signer Generation const provider = new ethers.providers.JsonRpcProvider( - 'https://goerli.blockpi.network/v1/rpc/public' // Goerli Provider + 'https://rpc.sepolia.org' // Goerli Provider ); const signer = new ethers.Wallet( `0x${process.env.WALLET_PRIVATE_KEY}`, diff --git a/packages/examples/sdk-backend-node/pushAPI/channel.ts b/packages/examples/sdk-backend-node/pushAPI/channel.ts index 593f91bd8..0076d2bf8 100644 --- a/packages/examples/sdk-backend-node/pushAPI/channel.ts +++ b/packages/examples/sdk-backend-node/pushAPI/channel.ts @@ -16,7 +16,7 @@ export const runPushAPIChannelCases = async (): Promise => { // ------------------------------------------------------------------- // Signer Generation const provider = new ethers.providers.JsonRpcProvider( - 'https://goerli.blockpi.network/v1/rpc/public' // Goerli Provider + 'https://rpc.sepolia.org' // Goerli Provider ); const signer = new ethers.Wallet( `0x${process.env.WALLET_PRIVATE_KEY}`, diff --git a/packages/restapi/src/lib/config.ts b/packages/restapi/src/lib/config.ts index 04878fbae..4f8777afe 100644 --- a/packages/restapi/src/lib/config.ts +++ b/packages/restapi/src/lib/config.ts @@ -105,6 +105,9 @@ export const CHAIN_NAME: { [key: number]: string } = { // plygonzkevm 1101: 'POLYGONZKEVM', 1442: 'POLYGONZKEVM', + // arbitrun + 421613:'ARBITRUN', + 42161:'ARBITRUM' }; export interface ConfigType { API_BASE_URL: string; diff --git a/packages/restapi/tests/lib/pushNotification/alias.test.ts b/packages/restapi/tests/lib/pushNotification/alias.test.ts index ae62cf864..bada09f36 100644 --- a/packages/restapi/tests/lib/pushNotification/alias.test.ts +++ b/packages/restapi/tests/lib/pushNotification/alias.test.ts @@ -21,7 +21,7 @@ describe('PushAPI.alias functionality', () => { const provider = new ethers.providers.JsonRpcProvider( // PUBLIC RPC - 'https://goerli.blockpi.network/v1/rpc/public' + 'https://rpc.sepolia.org' ); signer2 = new ethers.Wallet( diff --git a/packages/restapi/tests/lib/pushNotification/channel.test.ts b/packages/restapi/tests/lib/pushNotification/channel.test.ts index 4fbc3bac8..a980b0cd0 100644 --- a/packages/restapi/tests/lib/pushNotification/channel.test.ts +++ b/packages/restapi/tests/lib/pushNotification/channel.test.ts @@ -24,7 +24,7 @@ describe('PushAPI.channel functionality', () => { const provider = new ethers.providers.JsonRpcProvider( // PUBLIC RPC - 'https://goerli.blockpi.network/v1/rpc/public' + 'https://rpc.sepolia.org' ); signer2 = new ethers.Wallet( @@ -318,7 +318,7 @@ describe('PushAPI.channel functionality', () => { }, 10000000000); }); - describe.skip('channel :: create', () => { + describe('channel :: create', () => { it('Should create channel', async () => { const res = await userKate.channel.create({ name: 'SDK Test', diff --git a/packages/restapi/tests/lib/pushNotification/delegate.test.ts b/packages/restapi/tests/lib/pushNotification/delegate.test.ts index cb124d9df..74f6a98e7 100644 --- a/packages/restapi/tests/lib/pushNotification/delegate.test.ts +++ b/packages/restapi/tests/lib/pushNotification/delegate.test.ts @@ -20,7 +20,7 @@ describe('PushAPI.delegate functionality', () => { account1 = await signer1.getAddress(); const provider = new ethers.providers.JsonRpcProvider( - 'https://goerli.blockpi.network/v1/rpc/public' + 'https://rpc.sepolia.org' ); signer2 = new ethers.Wallet( diff --git a/packages/restapi/tests/lib/pushNotification/notification.test.ts b/packages/restapi/tests/lib/pushNotification/notification.test.ts index 9517ffc64..7c3976882 100644 --- a/packages/restapi/tests/lib/pushNotification/notification.test.ts +++ b/packages/restapi/tests/lib/pushNotification/notification.test.ts @@ -7,7 +7,7 @@ import { expect } from 'chai'; import { ethers } from 'ethers'; import { createWalletClient, http } from 'viem'; import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'; -import { goerli } from 'viem/chains'; +import { sepolia } from 'viem/chains'; // import tokenABI from './tokenABI'; describe('PushAPI.notification functionality', () => { let userAlice: PushAPI; @@ -26,7 +26,7 @@ describe('PushAPI.notification functionality', () => { account1 = await signer1.getAddress(); const provider = new ethers.providers.JsonRpcProvider( - 'https://goerli.blockpi.network/v1/rpc/public' + 'https://rpc.sepolia.org' ); signer2 = new ethers.Wallet( @@ -38,7 +38,7 @@ describe('PushAPI.notification functionality', () => { account: privateKeyToAccount( `0x${process.env['NFT_HOLDER_WALLET_PRIVATE_KEY_1']}` ), - chain: goerli, + chain: sepolia, transport: http(), }); // initialisation with signer and provider diff --git a/packages/restapi/tests/lib/user/createUserWithProfile.test.ts b/packages/restapi/tests/lib/user/createUserWithProfile.test.ts index c160cf25f..60a5e7b44 100644 --- a/packages/restapi/tests/lib/user/createUserWithProfile.test.ts +++ b/packages/restapi/tests/lib/user/createUserWithProfile.test.ts @@ -11,14 +11,14 @@ chai.use(chaiAsPromised); describe('Create Push Profile with Profile update', () => { const _env = Constants.ENV.DEV; - let provider = ethers.getDefaultProvider(5); + let provider = ethers.getDefaultProvider(11155111); let _signer: any; let walletAddress: string; let account: string; beforeEach(() => { - provider = ethers.getDefaultProvider(5); + provider = ethers.getDefaultProvider(11155111); const WALLET = ethers.Wallet.createRandom(); _signer = new ethers.Wallet(WALLET.privateKey, provider); walletAddress = _signer.address; diff --git a/packages/uiembed/src/lib/embedsdk/embedsdk.ts b/packages/uiembed/src/lib/embedsdk/embedsdk.ts index 637a007e1..1411a18f4 100644 --- a/packages/uiembed/src/lib/embedsdk/embedsdk.ts +++ b/packages/uiembed/src/lib/embedsdk/embedsdk.ts @@ -37,7 +37,7 @@ function validateConfig(passedConfig : ConfigType) : boolean { return false } - if (![1, 11155111, 137, 80001, 56, 97, 10, 420, 1442, 1101].includes(passedConfig.chainId)) { + if (![1, 11155111, 137, 80001, 56, 97, 10, 420, 1442, 1101, 421613, 42161].includes(passedConfig.chainId)) { console.error(`${Constants.EPNS_SDK_EMBED_NAMESPACE} - config.chainId passed is not in PUSH supported networks [1, 11155111, 137, 80001, 56, 97, 10, 420, 1442, 1101]!`) return false }