From 0baef0990c4fdbc9a38cef975efa3424e23485e2 Mon Sep 17 00:00:00 2001 From: dankelleher Date: Tue, 3 Sep 2024 10:42:15 +0200 Subject: [PATCH] Remove console.logs --- scripts/bridge.ts | 35 ------------------- scripts/createHoldingContract.ts | 1 - scripts/swapJupiterApiV6.ts | 5 --- solana-contract/tests/swap-bridge.ts | 9 ----- ui/src/api/polygonRetirement.ts | 6 ---- ui/src/api/solanaRetirement.ts | 14 -------- ui/src/context/solanaRetirementContext.tsx | 4 --- .../holdingContract/useHoldingContract.ts | 2 +- .../useHoldingContractFactory.ts | 1 - ui/src/hooks/holdingContract/useOffset.ts | 4 --- ui/src/hooks/useBridgeRetirementCert.ts | 2 -- ui/src/hooks/useToucan.ts | 6 ---- ui/src/hooks/useVerra.ts | 1 - ui/src/lib/prices.ts | 1 - ui/src/pages/step1.tsx | 1 - ui/src/pages/step2.tsx | 2 -- ui/src/pages/step4.tsx | 9 +---- ui/src/pages/step5.tsx | 1 - 18 files changed, 2 insertions(+), 102 deletions(-) diff --git a/scripts/bridge.ts b/scripts/bridge.ts index 079ac2b..59c82fa 100644 --- a/scripts/bridge.ts +++ b/scripts/bridge.ts @@ -101,35 +101,6 @@ export const createWormholeWrappedTransfer = async ( return { instruction: tokenBridgeTransferIx, message } } -// export const createTransferInstruction = async ( -// connection, -// SOL_BRIDGE_ADDRESS, -// SOL_TOKEN_BRIDGE_ADDRESS, -// payerAddress, -// fromAddress, -// mintAddress, -// amount, -// targetAddress, -// CHAIN_ID_ETH, -// originAddress, -// originChain -// ) => { -// const tx = await transferFromSolana( -// connection, -// SOL_BRIDGE_ADDRESS, -// SOL_TOKEN_BRIDGE_ADDRESS, -// payerAddress, -// fromAddress, -// mintAddress, -// amount, -// targetAddress, -// CHAIN_ID_ETH, -// originAddress, -// originChain -// ); -// return tx.instructions[1]; -// } - /* 0. get test token - i actually found USDC faucet here: https://usdcfaucet.com/, however not available on testnet @@ -164,12 +135,6 @@ async function bridge() { Wormhole.tryNativeToUint8Array(HOLDING_CONTRACT_ADDRESS, CHAIN_ID_POLYGON), ); - instruction.keys.forEach((key) => { - console.log(key.pubkey.toString(), key.isSigner, key.isWritable); - }); - console.log(instruction.keys.length); - console.log(instruction.data.toString("hex")); - const txSig = await solanaProgram.methods.bridge(new BN(amount.toString()), instruction.data).accounts({ state: STATE_ADDRESS, bridgeAuthority, diff --git a/scripts/createHoldingContract.ts b/scripts/createHoldingContract.ts index c216aa2..0414a95 100644 --- a/scripts/createHoldingContract.ts +++ b/scripts/createHoldingContract.ts @@ -41,7 +41,6 @@ async function createHoldingContract() { maxFeePerGas: ethers.utils.parseUnits('30', 'gwei'), maxPriorityFeePerGas: ethers.utils.parseUnits('30', 'gwei'), }); - console.log(tx); const receipt: ContractReceipt = await tx.wait(); return receipt; } diff --git a/scripts/swapJupiterApiV6.ts b/scripts/swapJupiterApiV6.ts index c031165..e57a07e 100644 --- a/scripts/swapJupiterApiV6.ts +++ b/scripts/swapJupiterApiV6.ts @@ -160,13 +160,10 @@ const getSwapIx = async ( console.log({r}); }) - - const programATA = await getAssociatedTokenAddress( new PublicKey(BRIDGE_INPUT_MINT_ADDRESS), USER_KEYPAIR.publicKey ) - console.log(programATA); const programATA2 = PublicKey.findProgramAddressSync( [ USER_KEYPAIR.publicKey.toBuffer(), @@ -175,8 +172,6 @@ const getSwapIx = async ( ], ASSOCIATED_TOKEN_PROGRAM_ID )[0]; - console.log(programATA2); - console.log(USER_KEYPAIR.publicKey); const jupiterIx = await getSwapIx(USER_KEYPAIR.publicKey, quote); // programATA, diff --git a/solana-contract/tests/swap-bridge.ts b/solana-contract/tests/swap-bridge.ts index 08f2084..a6263c8 100644 --- a/solana-contract/tests/swap-bridge.ts +++ b/solana-contract/tests/swap-bridge.ts @@ -69,27 +69,20 @@ export const createWormholeWrappedTransfer = async ( // so we don't want an explicit signer here tokenBridgeTransferIx.keys.find((key) => key.pubkey.equals(tokenAuthority))!.isSigner = false; - console.log("payer: ", payerAddress.toBase58()) - console.log("tokenAuthority: ", tokenAuthority.toBase58()) - console.log("message: ", message.publicKey.toBase58()) - return { instruction: tokenBridgeTransferIx, message } } describe("swap-bridge", () => { // Configure the client to use the local cluster. - console.log("test start"); // const userKeypair = Keypair.generate(); const stateKeypair = Keypair.generate(); const stateAddress = stateKeypair.publicKey; const wallet = new Wallet(USER_KEYPAIR); const connection = new Connection("http://localhost:8890"); const provider = new AnchorProvider(connection, wallet, {}); - console.log("provider set"); const program = new Program(IDL as SwapBridge, provider); const tokenAuthority = PublicKey.findProgramAddressSync([Buffer.from("token_authority"), stateAddress.toBuffer()], PROGRAM_ID)[0]; - console.log("program set"); // const bridgeInputTokenAccount = getAssociatedTokenAddressSync(new PublicKey(BRIDGE_INPUT_MINT_ADDRESS), tokenAuthority, true); const bridgeAuthority = PublicKey.findProgramAddressSync([Buffer.from("authority_signer")], new PublicKey(SOL_TOKEN_BRIDGE_ADDRESS))[0]; @@ -129,8 +122,6 @@ describe("swap-bridge", () => { ); const blockhash2 = await connection.getLatestBlockhash(); await connection.confirmTransaction({ signature: tx2, ...blockhash2 }); - console.log("airdrop done") - console.log(holdingContractAddress); if (!holdingContractAddress) return; const tx = await program.methods.initialize({ diff --git a/ui/src/api/polygonRetirement.ts b/ui/src/api/polygonRetirement.ts index be283bf..ee79c3b 100644 --- a/ui/src/api/polygonRetirement.ts +++ b/ui/src/api/polygonRetirement.ts @@ -10,8 +10,6 @@ import {ContractReceipt} from "ethers"; export const getVAAFromPolygonTransactionSignature = async (receipt: TransactionReceipt): Promise => { // Get the sequence number and emitter address required to fetch the signedVAA of our message - // TODO is this cast a problem? - console.log({receipt}) // Note - to deal with an issue in the wormhole sdk, we need to lowercase the bridge address and the addresses in the receipt logs receipt.logs.forEach((log) => { log.address = log.address.toLowerCase() as `0x${string}`; @@ -19,8 +17,6 @@ export const getVAAFromPolygonTransactionSignature = async (receipt: Transaction const sequence = parseSequenceFromLogEth(receipt as unknown as ContractReceipt, POLYGON_BRIDGE_ADDRESS.toLowerCase()); const emitterAddress = getEmitterAddressEth(POLYGON_NFT_BRIDGE_ADDRESS); - console.log({sequence, emitterAddress}) - // Fetch the signedVAA from the Wormhole Network (this may require retries while you wait for confirmation) const { vaaBytes } = await getSignedVAAWithRetry( WORMHOLE_RPC_HOSTS_MAINNET, @@ -29,8 +25,6 @@ export const getVAAFromPolygonTransactionSignature = async (receipt: Transaction sequence ); - console.log({vaaBytes: Buffer.from(vaaBytes).toString("hex")}); - return { sequence, emitterAddress, diff --git a/ui/src/api/solanaRetirement.ts b/ui/src/api/solanaRetirement.ts index 77a58be..be42fa0 100644 --- a/ui/src/api/solanaRetirement.ts +++ b/ui/src/api/solanaRetirement.ts @@ -85,7 +85,6 @@ export class SolanaRetirement { async getState(): Promise { const state = await this.program.account.state.fetchNullable(new PublicKey(this.stateAddress)); - console.log("State:", state); return state; } @@ -97,7 +96,6 @@ export class SolanaRetirement { const tokenAccount = getAssociatedTokenAddressSync(mint, owner, true); const notify = () => { - console.log("Getting balance for token account", tokenAccount.toBase58(), ", mint ", mint.toBase58(), " and owner ", owner.toBase58()); this.solConnection.getTokenAccountBalance(tokenAccount).then((balance) => { callback(BigInt(balance.value.amount)); }).catch((error) => { @@ -195,8 +193,6 @@ export class SolanaRetirement { const quote = await getQuote(inputMint, BRIDGE_INPUT_MINT_ADDRESS, Number(amount), 20); - console.log("Routes: " + JSON.stringify(quote.route)); - const jupiterIx = await getSwapIx(this.tokenAuthority, quote); const { computeBudgetInstructions, // The necessary instructions to setup the compute budget. @@ -208,8 +204,6 @@ export class SolanaRetirement { // create the swap instruction proxying the jupiter instruction const accountMetas = jupiterSwapIx.keys; - console.log({ accountMetas }); - // mark the token authority as a non-signer, because it is a PDA owned by the Offset Bridge program accountMetas.filter((meta) => meta.pubkey.equals(this.tokenAuthority)).forEach( (meta) => { @@ -238,8 +232,6 @@ export class SolanaRetirement { this.tokenAuthority, true ); - console.log(`ata: ${ata.toBase58()}`); - const ataAccountInfo = await this.solConnection.getAccountInfo(ata) let preIxs: TransactionInstruction[] = []; preIxs.push(...preInstructions ?? []); @@ -285,13 +277,11 @@ export class SolanaRetirement { } async depositAndSwap(inputMint: PublicKey, amount: bigint) : Promise { - console.log("Swapping: ", amount, "of", inputMint.toBase58()); return this.swap(inputMint, amount, [this.makeDepositIx(inputMint, amount)]); } async wrapAndSwap(amountToDeposit: bigint, amountToWrap: bigint = 0n) : Promise { const preInstructions = amountToDeposit > 0n ? await this.makeDepositAndWrapSolIxes(amountToDeposit) : await this.makeWrapSolIx(); - console.log("Swapping: ", amountToDeposit + amountToWrap, " lamports"); return this.swap(WRAPPED_SOL_TOKEN_MINT, amountToDeposit + amountToWrap, preInstructions); } @@ -386,10 +376,6 @@ export class SolanaRetirement { const mintToIx = response.transaction.message.instructions[response.transaction.message.instructions.length - 1]; const mintAccountIndex = mintToIx.accounts[1]; - console.log("Mint account index:", mintAccountIndex); - console.log("Total accounts for ix:", mintToIx.accounts.length); - console.log("Ix program ID:", response.transaction.message.accountKeys[mintToIx.programIdIndex].toBase58()); - return response.transaction.message.accountKeys[mintAccountIndex]; } diff --git a/ui/src/context/solanaRetirementContext.tsx b/ui/src/context/solanaRetirementContext.tsx index 7c0b44d..0d1d0fc 100644 --- a/ui/src/context/solanaRetirementContext.tsx +++ b/ui/src/context/solanaRetirementContext.tsx @@ -22,11 +22,7 @@ export const SolanaRetirementProvider: FC = ({children}) => { const solanaStateAddress = useAppStore(state => state.solanaStateAddress); useEffect(() => { - console.log("SolanaRetirementProvider useEffect"); if (wallet && holdingContractTarget && solanaStateAddress) { - console.log("SolanaRetirementProvider useEffect: creating SolanaRetirement api"); - console.log("SolanaRetirementProvider useEffect: State Address:", solanaStateAddress) - console.log("SolanaRetirementProvider useEffect: Target:", holdingContractTarget); SolanaRetirement.build( wallet, connection, diff --git a/ui/src/hooks/holdingContract/useHoldingContract.ts b/ui/src/hooks/holdingContract/useHoldingContract.ts index 68a6517..7153532 100644 --- a/ui/src/hooks/holdingContract/useHoldingContract.ts +++ b/ui/src/hooks/holdingContract/useHoldingContract.ts @@ -80,7 +80,7 @@ export const useHoldingContract = () => { return writeContract(config.request) }, [holdingContractTarget]); - console.log("data", reads.data); + console.log("Holding Contract:", reads.data); return { reads, diff --git a/ui/src/hooks/holdingContract/useHoldingContractFactory.ts b/ui/src/hooks/holdingContract/useHoldingContractFactory.ts index 42c73b7..a580cab 100644 --- a/ui/src/hooks/holdingContract/useHoldingContractFactory.ts +++ b/ui/src/hooks/holdingContract/useHoldingContractFactory.ts @@ -59,7 +59,6 @@ export const useHoldingContractFactory = (retirementProject = DEFAULT_RETIREMENT , [read.data, deploy.data, read.isRefetching]); const create = async () => { - console.log('create', {deploy, read, config}); if (!deploy.writeAsync) return; return deploy.writeAsync(); } diff --git a/ui/src/hooks/holdingContract/useOffset.ts b/ui/src/hooks/holdingContract/useOffset.ts index b98b7df..b66ac67 100644 --- a/ui/src/hooks/holdingContract/useOffset.ts +++ b/ui/src/hooks/holdingContract/useOffset.ts @@ -4,9 +4,6 @@ import {useAppStore} from "@/app/providers"; export const useOffset = () => { const holdingContractTarget = useAppStore(state => state.holdingContractTarget); - console.log("useOffset", { - holdingContractTarget, - }) const { config, error, isError } = usePrepareContractWrite({ address: holdingContractTarget, abi: HOLDING_CONTRACT_ABI, @@ -15,7 +12,6 @@ export const useOffset = () => { args:[ "Sunrise", "Climate-Positive Staking on Solana" ], }) const offset = useContractWrite(config) - if (isError) console.log("offset error", error); if (!offset.writeAsync) return undefined; diff --git a/ui/src/hooks/useBridgeRetirementCert.ts b/ui/src/hooks/useBridgeRetirementCert.ts index 29c5399..83c6fa7 100644 --- a/ui/src/hooks/useBridgeRetirementCert.ts +++ b/ui/src/hooks/useBridgeRetirementCert.ts @@ -24,7 +24,5 @@ export const useBridgeRetirementCert = () => { args: [BigInt(nftToRetire.tokenId), solanaAddressToHex(new PublicKey(nftToRetire.solanaTokenAddress))] }) - if (bridgePrepare.isError) console.log(bridgePrepare.error) - return useContractWrite(bridgePrepare.config) } \ No newline at end of file diff --git a/ui/src/hooks/useToucan.ts b/ui/src/hooks/useToucan.ts index 8f9abee..173e40e 100644 --- a/ui/src/hooks/useToucan.ts +++ b/ui/src/hooks/useToucan.ts @@ -43,12 +43,8 @@ export const useToucan = () => { } `; - console.log("Querying for all NCT tokens") - const result = await toucan.fetchCustomQuery(query, { poolAddress: NCT_TOKEN_ADDRESS }); - console.log({result}) - if (!result) return []; return result.pooledTCO2Tokens.map((pooledToken) => pooledToken.token); @@ -83,8 +79,6 @@ export const useToucan = () => { })) }); - console.log({tokenIds, data}) - if (!data) return []; return data diff --git a/ui/src/hooks/useVerra.ts b/ui/src/hooks/useVerra.ts index 88bf780..9af8f95 100644 --- a/ui/src/hooks/useVerra.ts +++ b/ui/src/hooks/useVerra.ts @@ -15,7 +15,6 @@ export const useVerra = (project: PooledTCO2Token | undefined): VerraResource | const [link, setLink] = useState() useEffect(() => { - console.log("project", project) if (!project) return; const resourceId = projectToResourceId(project); setLink(VERRA_URL + resourceId); diff --git a/ui/src/lib/prices.ts b/ui/src/lib/prices.ts index 1049b9e..ed1d505 100644 --- a/ui/src/lib/prices.ts +++ b/ui/src/lib/prices.ts @@ -16,7 +16,6 @@ export const PRICES: Prices = { fetch("https://api.sunrisestake.com/prices") .then(async (res) => res.json()) .then(({ solana, "toucan-protocol-nature-carbon-tonne": nct }) => { - console.log("Prices", { solana, nct }); PRICES.solana = Number(solana.usd) * 100; PRICES.nct = Number(nct.usd) * 100; }) diff --git a/ui/src/pages/step1.tsx b/ui/src/pages/step1.tsx index 789ccf2..99869c9 100644 --- a/ui/src/pages/step1.tsx +++ b/ui/src/pages/step1.tsx @@ -11,7 +11,6 @@ export default function Step1() { const [holdingContractUpdateReady, setHoldingContractUpdateReady] = useState(false); const ready = useMemo(() => { - console.log("Step1: ready", api?.ready, holdingContract?.tco2, holdingContractUpdateReady); const solanaState = api?.state; const holdingContractDeployed = !!holdingContract?.tco2; return api?.ready && solanaState && holdingContractDeployed && holdingContractUpdateReady; diff --git a/ui/src/pages/step2.tsx b/ui/src/pages/step2.tsx index 1bd1dba..d13d5dc 100644 --- a/ui/src/pages/step2.tsx +++ b/ui/src/pages/step2.tsx @@ -98,11 +98,9 @@ export default function Step2() { name: token.symbol })); const CarbonAmount:FC<{ tokenAmount: bigint | undefined }> = ({ tokenAmount }) => { - console.log('tokenAmount', tokenAmount) if (tokenAmount === undefined) return ; const carbonAmount = isSolSelected ? lamportsToCarbon(Number(tokenAmount)) : usdcToCarbon(tokenAmount); - console.log('carbonAmount', carbonAmount) return {formatDecimal(tokenAmount, selectedInputToken.decimals)} {selectedInputToken.symbol} ( {toFixedWithPrecision(carbonAmount, 2)} tCO₂E ) diff --git a/ui/src/pages/step4.tsx b/ui/src/pages/step4.tsx index 88fe41f..ff7f511 100644 --- a/ui/src/pages/step4.tsx +++ b/ui/src/pages/step4.tsx @@ -41,14 +41,7 @@ export default function Step4() { } const handleRetire = async () => { - if (offset?.error) console.log("OFFSET ERROR", offset.error); - if (!offset || !offset.writeAsync || !retireEnabled) { - console.log("offset not ready", { - offset, - retireEnabled - }) - return; - } + if (!offset || !offset.writeAsync || !retireEnabled) return; offset.writeAsync().then(result => retireInProgress(result.hash)) .catch(retireFailed); }; diff --git a/ui/src/pages/step5.tsx b/ui/src/pages/step5.tsx index 5e98161..a6fe791 100644 --- a/ui/src/pages/step5.tsx +++ b/ui/src/pages/step5.tsx @@ -96,7 +96,6 @@ export default function Step5() { } const getVAAFailed = (error: Error) => { - console.log(error); toast.error(
Failed to retrieve information from bridge: {error.message}
);