Skip to content

backmerge 14-04-26 #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
technophile-04 merged 4 commits into from
Apr 14, 2026
Merged

backmerge 14-04-26 #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
559132e
better default for border radius (#1266)
carletex Apr 13, 2026
f2d85d5
Merge branch 'upstream-main' into backmerge-14-04-26
technophile-04 Apr 14, 2026
bdbbf8a
chore: add changeset for backmerge
technophile-04 Apr 14, 2026
39d176a
chore: update default foundry Alchemy key
technophile-04 Apr 14, 2026
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
6 changes: 6 additions & 0 deletions .changeset/backmerge-14-04-26.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"create-eth": patch
---

- better default for border radius (https://github.com/scaffold-eth/scaffold-eth-2/pull/1266)
- update default foundry Alchemy key (https://github.com/scaffold-eth/scaffold-eth-2/pull/1267)
5 changes: 3 additions & 2 deletions templates/base/packages/nextjs/styles/globals.css.template.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const contents = ({ postContent }) =>
--color-warning: #ffcf72;
--color-error: #ff8863;

--radius-field: 9999rem;
--radius-field: 1rem;
--radius-box: 1rem;
--tt-tailw: 6px;
}
Expand All @@ -63,7 +63,7 @@ const contents = ({ postContent }) =>
--color-warning: #ffcf72;
--color-error: #ff8863;

--radius-field: 9999rem;
--radius-field: 1rem;
--radius-box: 1rem;

--tt-tailw: 6px;
Expand Down Expand Up @@ -111,6 +111,7 @@ const contents = ({ postContent }) =>

.btn {
@apply shadow-md;
border-radius: 9999rem;
}

.btn.btn-ghost {
Expand Down
2 changes: 1 addition & 1 deletion templates/solidity-frameworks/foundry/packages/foundry/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# be auto filled when run `yarn generate`.

# Alchemy rpc URL is used while deploying the contracts to some testnets/mainnets, checkout `foundry.toml` for it's use.
ALCHEMY_API_KEY=oKxs-03sij-U_N0iOlrSsZFr29-IqbuF
ALCHEMY_API_KEY=cR4WnXePioePZ5fFrnSiR
# Etherscan API key is used to verify the contract on etherscan.
ETHERSCAN_API_KEY=DNXJA8RX2Q3VZ4URQIWP7Z68CJXQZSC6AW
# Default account for localhost / use "scaffold-eth-custom" if you wish to use a generated account or imported account
Expand Down
2 changes: 1 addition & 1 deletion templates/solidity-frameworks/foundry/packages/foundry/.env.template.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const contents = () =>
# but we recommend getting your own API Keys for Production Apps.

# Alchemy rpc URL is used while deploying the contracts to some testnets/mainnets, checkout \`foundry.toml\` for it's use.
ALCHEMY_API_KEY=oKxs-03sij-U_N0iOlrSsZFr29-IqbuF
ALCHEMY_API_KEY=cR4WnXePioePZ5fFrnSiR

# Etherscan API key is used to verify the contract on etherscan.
ETHERSCAN_API_KEY=DNXJA8RX2Q3VZ4URQIWP7Z68CJXQZSC6AW
Expand Down
2 changes: 1 addition & 1 deletion templates/solidity-frameworks/foundry/packages/foundry/scripts-js/checkAccountBalance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { parse } from "toml";
import { ethers } from "ethers";

const ALCHEMY_API_KEY =
process.env.ALCHEMY_API_KEY || "oKxs-03sij-U_N0iOlrSsZFr29-IqbuF";
process.env.ALCHEMY_API_KEY || "cR4WnXePioePZ5fFrnSiR";

// Load environment variables
const __filename = fileURLToPath(import.meta.url);
Expand Down
Loading