Skip to content

Commit

Permalink
chore(tooling): remove old frens and domains mentions (#3225)
Browse files Browse the repository at this point in the history
  • Loading branch information
panteleymonchuk authored Oct 24, 2024
1 parent 74a2d90 commit 68a46ce
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 57 deletions.
2 changes: 1 addition & 1 deletion apps/explorer/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IOTA Explorer

[IOTA Explorer](https://explorer.iota.io/) is a network explorer for the IOTA network, similar in functionality to [Etherscan](https://etherscan.io/) or [Solana Explorer](https://explorer.solana.com/). Use IOTA Explorer to see the latest transactions and objects.
[IOTA Explorer](https://explorer.iota.org/) is a network explorer for the IOTA network, similar in functionality to [Etherscan](https://etherscan.io/) or [Solana Explorer](https://explorer.solana.com/). Use IOTA Explorer to see the latest transactions and objects.

# Set Up

Expand Down
2 changes: 1 addition & 1 deletion apps/explorer/src/lib/utils/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function initSentry() {
/<anonymous>/,
],
allowUrls: [
/.*\.iota\.io/i,
/.*\.iota\.org/i,
/.*-iota-foundation\.vercel\.app/i,
'explorer-topaz.vercel.app',
],
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/manifest/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"host_permissions": [
"http://127.0.0.1:5001/",
"https://fullnode.devnet.iota.io/",
"https://fullnode.staging.iota.io/"
"https://fullnode.devnet.iota.org/",
"https://fullnode.staging.iota.org/"
],
"icons": {
"16": "manifest/icons/iota-icon-16.png",
Expand Down
18 changes: 8 additions & 10 deletions apps/wallet/src/shared/analytics/ampli/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export interface AddedAccountsProperties {
numberOfAccounts: number;
}

export interface ClickedBullsharkQuestsCtaProperties {
export interface ClickedAppsBannerProperties {
/**
* The flow the user came from.
*/
Expand Down Expand Up @@ -392,10 +392,10 @@ export class AddedAccounts implements BaseEvent {
}
}

export class ClickedBullsharkQuestsCta implements BaseEvent {
event_type = 'clicked bullshark quests cta';
export class ClickedAppsBannerCta implements BaseEvent {
event_type = 'clicked apps banner cta';

constructor(public event_properties: ClickedBullsharkQuestsCtaProperties) {
constructor(public event_properties: ClickedAppsBannerProperties) {
this.event_properties = event_properties;
}
}
Expand Down Expand Up @@ -753,20 +753,18 @@ export class Ampli {
}

/**
* clicked bullshark quests cta
*
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Wallet/events/main/latest/clicked%20bullshark%20quests%20cta)
*
* When users click the call-to-action for the Bullshark Quests interstitial/banner.
* When users click the call-to-action for banner.
*
* @param properties The event's properties (e.g. sourceFlow)
* @param options Amplitude event options.
*/
clickedBullsharkQuestsCta(
properties: ClickedBullsharkQuestsCtaProperties,
clickedAppsBannerCta(
properties: ClickedAppsBannerProperties,
options?: EventOptions,
) {
return this.track(new ClickedBullsharkQuestsCta(properties), options);
return this.track(new ClickedAppsBannerCta(properties), options);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet/src/shared/utils/url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import { getUrlWithDeviceId } from '../analytics/amplitude';

const IOTA_DAPPS = ['iotafrens.com'];
const IOTA_DAPPS: string[] = [];

export function isValidUrl(url: string | null) {
if (!url) {
Expand Down
4 changes: 1 addition & 3 deletions apps/wallet/src/ui/app/components/iota-apps/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ export function AppsPageBanner() {
{AppsBannerConfig.value?.bannerUrl && (
<ExternalLink
href={AppsBannerConfig.value?.bannerUrl}
onClick={() =>
ampli.clickedBullsharkQuestsCta({ sourceFlow: 'Banner - Apps tab' })
}
onClick={() => ampli.clickedAppsBannerCta({ sourceFlow: 'Banner - Apps tab' })}
>
<img
className="w-full"
Expand Down
3 changes: 1 addition & 2 deletions apps/wallet/src/ui/app/pages/home/interstitial/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function Interstitial({ enabled, dismissKey, imageUrl, bannerUrl, onClose }: Int
<ExternalLink
href={bannerUrl}
onClick={() => {
ampli.clickedBullsharkQuestsCta({ sourceFlow: 'Interstitial' });
ampli.clickedAppsBannerCta({ sourceFlow: 'Interstitial' });
closeInterstitial();
}}
className="h-full w-full"
Expand All @@ -59,7 +59,6 @@ function Interstitial({ enabled, dismissKey, imageUrl, bannerUrl, onClose }: Int
</ExternalLink>
)}
<button
data-testid="bullshark-dismiss"
className="absolute bottom-0 w-full cursor-pointer appearance-none border-none bg-transparent pb-5"
onClick={() => closeInterstitial(dismissKey)}
>
Expand Down
9 changes: 3 additions & 6 deletions dapps/kiosk-cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ import { Transaction } from '@iota/iota-sdk/transactions';
/**
* List of known types for shorthand search in the `search` command.
*/
const KNOWN_TYPES = {
iotafren:
'0x80d7de9c4a56194087e0ba0bf59492aa8e6a5ee881606226930827085ddf2332::iotafrens::IotaFren<0x80d7de9c4a56194087e0ba0bf59492aa8e6a5ee881606226930827085ddf2332::capy::Capy>',
};
const KNOWN_TYPES = {};

/** JsonRpcProvider for the Testnet */
const client = new IotaClient({ url: getFullnodeUrl('testnet') });
Expand Down Expand Up @@ -140,13 +137,13 @@ program
program
.command('search')
.description('search open listings in Kiosks')
.argument('<type>', 'The type of the item to search for. \nAvailable aliases: "iotafren", "test"')
.argument('<type>', 'The type of the item to search for. \nAvailable aliases: "test"')
.action(searchType);

program
.command('policy')
.description('search for a TransferPolicy for the specified type')
.argument('<type>', 'The type of the item to search for. \nAvailable aliases: "iotafren", "test"')
.argument('<type>', 'The type of the item to search for. \nAvailable aliases: "test"')
.action(searchPolicy);

program
Expand Down
10 changes: 5 additions & 5 deletions sdk/.env.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IOTA_NETWORKS = '
"mainnet": {
"id": "mainnet",
"name": "Mainnet",
"url": "https://fullnode.mainnet.iota.io:443",
"url": "https://fullnode.mainnet.iota.org:443",
"chain": "iota:mainnet",
"explorer": "https://explorer.iota.org",
"kiosk": {
Expand All @@ -19,10 +19,10 @@ IOTA_NETWORKS = '
"testnet": {
"id": "testnet",
"name": "Testnet",
"url": "https://fullnode.testnet.iota.io:443",
"url": "https://fullnode.testnet.iota.org:443",
"explorer": "https://explorer.iota.org",
"chain": "iota:testnet",
"faucet": "https://faucet.testnet.iota.io/gas",
"faucet": "https://faucet.testnet.iota.org/gas",
"kiosk": {
"royaltyRulePackageId": "bd8fc1947cf119350184107a3087e2dc27efefa0dd82e25a1f699069fe81a585",
"kioskLockRulePackageId": "bd8fc1947cf119350184107a3087e2dc27efefa0dd82e25a1f699069fe81a585",
Expand All @@ -33,10 +33,10 @@ IOTA_NETWORKS = '
"devnet": {
"id": "devnet",
"name": "Devnet",
"url": "https://fullnode.devnet.iota.io:443",
"url": "https://fullnode.devnet.iota.org:443",
"explorer": "https://explorer.iota.org",
"chain": "iota:devnet",
"faucet": "https://faucet.devnet.iota.io/gas"
"faucet": "https://faucet.devnet.iota.org/gas"
},
"localnet": {
"id": "localnet",
Expand Down
4 changes: 2 additions & 2 deletions sdk/create-dapp/templates/react-e2e-counter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This template uses `testnet` by default, so we'll need to set up a testnet
environment in the CLI:

```bash
iota client new-env --alias testnet --rpc https://fullnode.testnet.iota.io:443
iota client new-env --alias testnet --rpc https://fullnode.testnet.iota.org:443
iota client switch --env testnet
```

Expand All @@ -51,7 +51,7 @@ We can ensure we have some IOTA in our new wallet by requesting IOTA from the
faucet (make sure to replace the address with your address):

```bash
curl --location --request POST 'https://faucet.testnet.iota.io/gas' \
curl --location --request POST 'https://faucet.testnet.iota.org/gas' \
--header 'Content-Type: application/json' \
--data-raw '{
"FixedAmountRequest": {
Expand Down
1 change: 0 additions & 1 deletion sdk/kiosk/src/client/kiosk-transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ export class KioskTransaction {

/**
* A function to borrow an item from a kiosk & execute any function with it.
* Example: You could borrow a Fren out of a kiosk, attach an accessory (or mix), and return it.
*/
borrowTx({ itemType, itemId }: ItemId, callback: (item: TransactionArgument) => void) {
this.#validateKioskIsSet();
Expand Down
3 changes: 0 additions & 3 deletions sdk/move-bytecode-template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ This package is a perfect fit for the following applications:

## Example of a Template Module

The following code is a close-copy of the `Coin` example from the
[Move by Example](https://examples.iota.io/samples/coin.html) book.

```move
module 0x0::template {
use std::option;
Expand Down
10 changes: 2 additions & 8 deletions sdk/move-bytecode-template/tests/universal.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,12 @@ describe('move-binary-template', () => {

it('should update identifiers', () => {
const patched = template.update_identifiers(pokemonBytes(), {
Stats: 'PokeStats',
pokemon_v1: 'capymon',
new: 'capy_new',
speed: 'capy_speed',
Stats: 'IotaStats',
});

const de = template.deserialize(patched);

expect(de.identifiers.includes('PokeStats')).toBeTruthy();
expect(de.identifiers.includes('capymon')).toBeTruthy();
expect(de.identifiers.includes('capy_new')).toBeTruthy();
expect(de.identifiers.includes('capy_speed')).toBeTruthy();
expect(de.identifiers.includes('IotaStats')).toBeTruthy();
});

it('should update constants', () => {
Expand Down
6 changes: 3 additions & 3 deletions sdk/typescript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ https://stackoverflow.com/questions/52676244/node-version-not-updating-after-nvm
To run E2E tests against Devnet

```
VITE_FAUCET_URL='https://faucet.devnet.iota.io:443/gas' VITE_FULLNODE_URL='https://fullnode.devnet.iota.io' pnpm --filter @iota/iota-sdk exec vitest e2e
VITE_FAUCET_URL='https://faucet.devnet.iota.org:443/gas' VITE_FULLNODE_URL='https://fullnode.devnet.iota.org' pnpm --filter @iota/iota-sdk exec vitest e2e
```

## Connecting to IOTA Network
Expand All @@ -110,7 +110,7 @@ The `IotaClient` class provides a connection to the JSON-RPC Server and should b
read-only operations. The default URLs to connect with the RPC server are:

- local: http://127.0.0.1:9000
- Devnet: https://fullnode.devnet.iota.io
- Devnet: https://fullnode.devnet.iota.org

```typescript
import { getFullnodeUrl, IotaClient } from '@iota/iota-sdk/client';
Expand Down Expand Up @@ -147,7 +147,7 @@ import { getFullnodeUrl, IotaClient } from '@iota/iota-sdk/client';

// create a client connected to devnet
const client = new IotaClient({
url: 'https://fullnode.devnet.iota.io',
url: 'https://fullnode.devnet.iota.org',
});

// get coins owned by an address
Expand Down
14 changes: 7 additions & 7 deletions sdk/typescript/src/transactions/__tests__/bcs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ it('can serialize simplified programmable call struct', () => {
package: '0x2',
module: 'display',
function: 'new',
typeArguments: [normalizeStructTag('0x6::capy::Capy')],
typeArguments: [normalizeStructTag('0x6::iota::IOTA')],
arguments: [
{
$kind: 'GasCoin',
Expand Down Expand Up @@ -104,9 +104,9 @@ it('can serialize transaction data with a programmable transaction', () => {
bytes: bcs
.vector(bcs.String)
.serialize([
'Capy {name}',
'A cute little creature',
'https://api.capy.art/{id}/svg',
'{name}',
'{description}',
'https://api.iota.org/{id}/svg',
])
.toBase64(),
},
Expand All @@ -126,7 +126,7 @@ it('can serialize transaction data with a programmable transaction', () => {
package: iota,
module: 'display',
function: 'new',
typeArguments: [`${iota}::capy::Capy`],
typeArguments: [`${iota}::iota::IOTA`],
arguments: [
// publisher object
{
Expand All @@ -142,7 +142,7 @@ it('can serialize transaction data with a programmable transaction', () => {
package: iota,
module: 'display',
function: 'add_multiple',
typeArguments: [`${iota}::capy::Capy`],
typeArguments: [`${iota}::iota::IOTA`],
arguments: [
// result of the first transaction
{
Expand All @@ -168,7 +168,7 @@ it('can serialize transaction data with a programmable transaction', () => {
package: iota,
module: 'display',
function: 'update_version',
typeArguments: [`${iota}::capy::Capy`],
typeArguments: [`${iota}::iota::IOTA`],
arguments: [
// result of the first transaction again
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/typescript/test/e2e/coin-metadata.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ describe('Test Coin Metadata', () => {
expect(coinMetadata.decimals).to.equal(2);
expect(coinMetadata.name).to.equal('Test Coin');
expect(coinMetadata.description).to.equal('Test coin metadata');
expect(coinMetadata.iconUrl).to.equal('http://iota.io');
expect(coinMetadata.iconUrl).to.equal('http://iota.org');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module coin_metadata::test {
b"TEST",
b"Test Coin",
b"Test coin metadata",
option::some(url::new_unsafe_from_bytes(b"http://iota.io")),
option::some(url::new_unsafe_from_bytes(b"http://iota.org")),
ctx
);

Expand Down

0 comments on commit 68a46ce

Please sign in to comment.