Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/namadillo/public/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
#masp_indexer_url = ""
#localnet_enabled = false
#fathom_site_id = ""
#is_heliax_namadillo = false
6 changes: 5 additions & 1 deletion apps/namadillo/src/atoms/proposals/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
VoteType,
} from "@namada/types";
import { assertNever, mapUndefined } from "@namada/utils";
import { appendNamadilloBranding } from "atoms/settings";
import BigNumber from "bignumber.js";
import * as E from "fp-ts/Either";
import * as t from "io-ts";
Expand Down Expand Up @@ -389,6 +390,8 @@ export const createVoteProposalTx = async (
): Promise<TransactionPair<VoteProposalProps>> => {
try {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

const voteProposalProps = {
signer: account.address,
proposalId,
Expand All @@ -400,7 +403,8 @@ export const createVoteProposalTx = async (
gasConfig,
chain,
[voteProposalProps],
sdk.tx.buildVoteProposal
sdk.tx.buildVoteProposal,
memo
);
return await signEncodedTx(encodedTx, account.address);
} catch (err) {
Expand Down
21 changes: 21 additions & 0 deletions apps/namadillo/src/atoms/settings/atoms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ export const rpcUrlAtom = atom((get) => {
return "";
});

export const isHeliaxNamadilloAtom = atom((get) => {
return get(defaultServerConfigAtom).data?.is_heliax_namadillo ?? false;
});

export const updateRpcUrlAtom = atomWithMutation(() => {
return {
mutationKey: ["update-rpc-url"],
Expand Down Expand Up @@ -277,3 +281,20 @@ export const lastInvalidateShieldedContextAtom = atomWithStorage<{
}
| undefined;
}>("namadillo:last-invalidate-shielded-context", {});

/**
* Returns a memo with "Powered by Namadillo" appended if this is a Heliax Namadillo instance.
* @param userMemo - Optional user-provided memo text
* @returns The final memo to use in transactions
*/
export const appendNamadilloBranding = (
userMemo?: string
): string | undefined => {
const store = getDefaultStore();
const isHeliaxNamadillo = store.get(isHeliaxNamadilloAtom);
const branding = "Powered by Namadillo";

if (!isHeliaxNamadillo) return userMemo;
else if (userMemo) return `${userMemo} | ${branding}`;
else return branding;
};
31 changes: 25 additions & 6 deletions apps/namadillo/src/atoms/staking/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "@namada/sdk-multicore";
import { Account } from "@namada/types";
import { queryClient } from "App/Common/QueryProvider";
import { appendNamadilloBranding } from "atoms/settings";
import { EncodedTxData, buildTx } from "lib/query";
import { Address, AddressBalance, ChainSettings, GasConfig } from "types";
import { getSdkInstance } from "utils/sdk";
Expand All @@ -29,13 +30,16 @@ export const createBondTx = async (
gasConfig: GasConfig
): Promise<EncodedTxData<BondProps> | undefined> => {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
bondProps,
sdk.tx.buildBond
sdk.tx.buildBond,
memo
);
};

Expand All @@ -46,13 +50,16 @@ export const createUnbondTx = async (
gasConfig: GasConfig
): Promise<EncodedTxData<UnbondProps>> => {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
unbondProps,
sdk.tx.buildUnbond
sdk.tx.buildUnbond,
memo
);
};

Expand All @@ -63,13 +70,16 @@ export const createReDelegateTx = async (
gasConfig: GasConfig
): Promise<EncodedTxData<RedelegateProps>> => {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
redelegateProps,
sdk.tx.buildRedelegate
sdk.tx.buildRedelegate,
memo
);
};

Expand All @@ -80,13 +90,16 @@ export const createWithdrawTx = async (
gasConfig: GasConfig
): Promise<EncodedTxData<WithdrawProps>> => {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
withdrawProps,
sdk.tx.buildWithdraw
sdk.tx.buildWithdraw,
memo
);
};

Expand All @@ -97,13 +110,16 @@ export const createClaimTx = async (
gasConfig: GasConfig
): Promise<EncodedTxData<ClaimRewardsProps>> => {
const sdk = await getSdkInstance();
const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
params,
sdk.tx.buildClaimRewards
sdk.tx.buildClaimRewards,
memo
);
};

Expand Down Expand Up @@ -150,13 +166,16 @@ export const createClaimAndStakeTx = async (
}
});

const memo = appendNamadilloBranding();

return await buildTx(
sdk,
account,
gasConfig,
chain,
claimAndStakingParams,
buildClaimRewardsAndStake
buildClaimRewardsAndStake,
memo
);
};

Expand Down
24 changes: 18 additions & 6 deletions apps/namadillo/src/atoms/transfer/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
AccountType,
GenDisposableSignerResponse,
} from "@namada/types";
import { appendNamadilloBranding } from "atoms/settings";
import BigNumber from "bignumber.js";
import * as Comlink from "comlink";
import { NamadaKeychain } from "hooks/useNamadaKeychain";
Expand Down Expand Up @@ -93,14 +94,16 @@ export const createTransparentTransferTx = async (
memo?: string
): Promise<EncodedTxData<TransparentTransferProps> | undefined> => {
const sdk = await getSdkInstance();
const finalMemo = appendNamadilloBranding(memo);

return await buildTx(
sdk,
account,
gasConfig,
chain,
props,
sdk.tx.buildTransparentTransfer,
memo
finalMemo
);
};

Expand Down Expand Up @@ -132,6 +135,8 @@ export const createShieldedTransferTx = async (
ledger.closeTransport();
}

const finalMemo = appendNamadilloBranding(memo);

return await workerBuildTxPair({
rpcUrl,
nativeToken: chain.nativeTokenAddress,
Expand All @@ -151,7 +156,7 @@ export const createShieldedTransferTx = async (
gasConfig,
props: [msgValue],
chain,
memo,
memo: finalMemo,
},
};
return (await workerLink.shieldedTransfer(msg)).payload;
Expand Down Expand Up @@ -184,6 +189,8 @@ export const createShieldingTransferTx = async (
ledger.closeTransport();
}

const finalMemo = appendNamadilloBranding(memo);

return await workerBuildTxPair({
rpcUrl,
nativeToken: chain.nativeTokenAddress,
Expand All @@ -202,7 +209,7 @@ export const createShieldingTransferTx = async (
props: [msgValue],
chain,
publicKeyRevealed,
memo,
memo: finalMemo,
},
};
return (await workerLink.shield(msg)).payload;
Expand Down Expand Up @@ -239,6 +246,8 @@ export const createUnshieldingTransferTx = async (
ledger.closeTransport();
}

const finalMemo = appendNamadilloBranding(memo);

return await workerBuildTxPair({
rpcUrl,
nativeToken: chain.nativeTokenAddress,
Expand All @@ -259,7 +268,7 @@ export const createUnshieldingTransferTx = async (
gasConfig,
props: [msgValue],
chain,
memo,
memo: finalMemo,
},
};
return (await workerLink.unshield(msg)).payload;
Expand All @@ -284,6 +293,8 @@ export const createIbcTx = async (
ledger.closeTransport();
}

const finalMemo = appendNamadilloBranding(memo);

return await workerBuildTxPair({
rpcUrl,
nativeToken: chain.nativeTokenAddress,
Expand All @@ -309,7 +320,7 @@ export const createIbcTx = async (
gasConfig,
props: [msgValue],
chain,
memo,
memo: finalMemo,
publicKeyRevealed,
},
};
Expand Down Expand Up @@ -338,6 +349,7 @@ export const createOsmosisSwapTx = async (
ledger.closeTransport();
}
const { transfer } = props[0];
const finalMemo = appendNamadilloBranding(memo);

return await workerBuildTxPair({
rpcUrl,
Expand All @@ -361,7 +373,7 @@ export const createOsmosisSwapTx = async (
gasConfig,
props: [msgValue],
chain,
memo,
memo: finalMemo,
},
};

Expand Down
1 change: 1 addition & 0 deletions apps/namadillo/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export type SettingsTomlOptions = {
rpc_url?: string;
localnet_enabled?: boolean;
fathom_site_id?: string;
is_heliax_namadillo?: boolean;
};

export type ChainParameters = {
Expand Down