Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Rufusfavour authored Dec 27, 2024
2 parents cdd968c + 4aa50ed commit a185d47
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = {
// We utilize class properties
'react/state-in-constructor': 'off',

// Dont use prop types since were using TypeScript
// Dont use prop types since we are using TypeScript
'react/default-props-match-prop-types': 'off',
'react/forbid-foreign-prop-types': 'off',
'react/forbid-prop-types': 'off',
Expand Down Expand Up @@ -135,7 +135,7 @@ module.exports = {
'@typescript-eslint/prefer-string-starts-ends-with': 'error',

// Hard to migrate
// Errors for all try/catch blocks and any types from third-parties
// Errors for all try/catch blocks and any types from third parties
'@typescript-eslint/no-unsafe-member-access': 'off',
},
};
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ out/
!.yarn/sdks
!.yarn/versions
.pnp.*
# prevent people from accidentally commiting a package-lock
# prevent people from accidentally committing a package-lock
package-lock.json

# Env files
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The following is a set of guidelines for contributing to Base Web. These are jus

## Code of Conduct

This project and everyone participating in it are governed by our [Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
This project and everyone participating in it is governed by our [Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.

## How Can I Contribute?

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ We recommend switching to Reth going forward. We will continue to maintain the R

If you need continued Geth support, we would advise that you maintain your own snapshot that is specific to your infrastructure e.g. EBS on AWS.

If you have any questions or would like assistance, please reach out to us on [Discord](https://base.org/discord) or [GitHub](https://github.com/base-org/base-node).
If you have any questions or would like assistance, please reach out to us on [Discord](https://base.org/discord) or [GitHub](https://github.com/base-org/node).
4 changes: 2 additions & 2 deletions apps/base-docs/docs/tokens/token-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ hide_table_of_contents: true

This page is intended for token issuers who already have an ERC-20 contract deployed on Ethereum and would like to submit their token for bridging between Ethereum and Base. Base uses the [Superchain token list](https://github.com/ethereum-optimism/ethereum-optimism.github.io) as a reference for tokens that have been deployed on Base.

**_Disclaimer: Base does not endorse any of the tokens that are listed in the Github repository and has conducted only preliminary checks, which include automated checks listed_** [**_here_**](https://github.com/ethereum-optimism/ethereum-optimism.github.io)**_._**
**_Disclaimer: Base does not endorse any of the tokens that are listed in the GitHub repository and has conducted only preliminary checks, which include automated checks listed_** [**_here_**](https://github.com/ethereum-optimism/ethereum-optimism.github.io)**_._**

---

Expand All @@ -41,4 +41,4 @@ Follow the instructions in the [GitHub repository](https://github.com/ethereum-o

### Step 3: Await final approval

Reviews are regularly conducted by the Base team and you should receive a reply within 24-72 hours (depending on if the PR is opened on a week day, weekend or holiday).
Reviews are regularly conducted by the Base team and you should receive a reply within 24-72 hours (depending on if the PR is opened on a weekday, weekend or holiday).
2 changes: 1 addition & 1 deletion apps/base-docs/docs/tools/oracles.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ See [this guide](https://docs.redstone.finance/) to learn how to use the RedSton

[Supra](https://supraoracles.com) provides VRF and decentralized oracle price feeds that can be used for onchain and offchain use-cases such as spot and perpetual DEXes, lending protocols, and payments protocols. Supra’s oracle chain and consensus algorithm makes it one of the fastest-to-finality oracle providers, with layer-1 security guarantees. The pull oracle has a sub-second response time. Aside from speed and security, Supra’s rotating node architecture gathers data from 40+ data sources and applies a robust calculation methodology to get the most accurate value. The node provenance on the data dashboard also provides a fully transparent historical audit trail. Supra’s Distributed Oracle Agreement (DORA) paper was accepted into ICDCS 2023, the oldest distributed systems conference.

Visit the Supra [documentation](https://supraoracles.com/docs/) to learn more about integrating Supra's oracle and VRF into your Base project.
Visit the Supra [documentation](https://docs.supra.com) to learn more about integrating Supra's oracle and VRF into your Base project.

#### Supported Networks

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Start by opening the `.env` file in the Healing Honey project and adding your pr
SPENDER_PRIVATE_KEY=0xcd57753bb4e308ba0c6f574e8af04a7bae0ca0aff5750ddd6275460f49635527
```

Next, navigate to the `src/app/lib/spender.ts` file. Here, you'll see the `privateKeyToAccount` function from Viem in use. This function creates an wallet from the private key, enabling it to sign transactions and messages. The generated `account` is then used to create a [Wallet Client], which allows signing and executing onchain transactions to interact with the Spend Permission contract.
Next, navigate to the `src/app/lib/spender.ts` file. Here, you'll see the `privateKeyToAccount` function from Viem in use. This function creates a wallet from the private key, enabling it to sign transactions and messages. The generated `account` is then used to create a [Wallet Client], which allows signing and executing onchain transactions to interact with the Spend Permission contract.

With your Spender Client set up, ensure all other required environment variables are configured for the app to work when running the dev server.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ Once you have the private key to the wallet of your choice, open your terminal a
export PRIVATE_KEY="<YOUR_PRIVATE_KEY>"
```

To deploy our contract you will need a RPC URL to a Base node in order to broadcast our transactions to the network. [CDP] provides us with a free node for interacting with Base mainnet and testnet.
To deploy our contract you will need an RPC URL to a Base node in order to broadcast our transactions to the network. [CDP] provides us with a free node for interacting with Base mainnet and testnet.

Obtain a rpc url from the [Node product] and store the url as an environment variable similar to the private key in the previous step.
Obtain an rpc url from the [Node product] and store the url as an environment variable similar to the private key in the previous step.

![cdp-node](../../assets/images/verify-with-basescan-api/cdp-node-full.png)

Expand Down
6 changes: 3 additions & 3 deletions apps/base-docs/tutorials/docs/4_hardhat-test-coverage.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ describe("Lock Tests", function () {
await expect(newInstanceUsingAnotherSigner.withdraw()).to.be.revertedWith("You aren't the owner")
})
it('should allow to withdraw a owner', async()=> {
it('should allow to withdraw an owner', async()=> {
const balanceBefore = await ethers.provider.getBalance(await lockInstance.getAddress());
expect(balanceBefore).to.equal(VALUE_LOCKED)
Expand All @@ -180,7 +180,7 @@ If you run `npx hardhat coverage`, you should get:
✔ should have the right owner
✔ shouldn't allow to withdraw before unlock time
✔ shouldn't allow to withdraw a non owner
✔ should allow to withdraw a owner
✔ should allow to withdraw an owner
6 passing (195ms)
Expand Down Expand Up @@ -232,7 +232,7 @@ Then, run `npx hardhat coverage` and you should get:
✔ should have the right owner
✔ shouldn't allow to withdraw before unlock time
✔ shouldn't allow to withdraw a non owner
✔ should allow to withdraw a owner
✔ should allow to withdraw an owner
7 passing (198ms)
Expand Down
2 changes: 1 addition & 1 deletion apps/bridge/src/data/useWithdrawals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ async function fetchOPWithdrawals(address: string) {

async function fetchExplorerWithdrawals(address: string, isMainnet: boolean) {
const response = await getJSON<BlockExplorerApiResponse<BlockExplorerTransaction[]>>(
// TODO: filter to transactions to the withdraw contract
// TODO: filter transactions to the withdraw contract
publicRuntimeConfig.l2ExplorerApiURL,
{
address,
Expand Down
2 changes: 1 addition & 1 deletion apps/bridge/src/utils/transactions/isETHOrERC20Deposit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function isETHOrERC20OrCCTPDeposit(tx: BlockExplorerTransaction) {
return true;
}

// ERC-20 desposit
// ERC-20 deposit
if (tx.to === ERC20_DEPOSIT_ADDRESS) {
const { functionName, args } = decodeFunctionData({
abi: l1StandardBridgeABI,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/AppProviders.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type AppProvidersProps = {
children: React.ReactNode;
};

// TODO: Not all pages needs all these components, ideally should be split and put
// TODO: Not all pages need all these components, ideally should be split and put
// on the sub-layouts
export default function AppProviders({ children }: AppProvidersProps) {
const trackingPreference = useRef<TrackingPreference | undefined>();
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/api/cloudinaryUrl/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async function getCloudinaryMediaUrl({
media,
width,
}: CloudinaryMediaUrlRequest): Promise<string | false> {
// Asset idea based on URL
// Asset ID based on URL
const assetId = generateAssetId(media);

// Return the asset if already uploaded
Expand Down
2 changes: 1 addition & 1 deletion apps/web/contexts/Analytics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const AnalyticsContext = createContext<AnalyticsContextProps>({
export function useAnalytics() {
const context = useContext(AnalyticsContext);
if (context === undefined) {
throw new Error('useAnalytics must be used within a AnalyticsProvider');
throw new Error('useAnalytics must be used within an AnalyticsProvider');
}
return context;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/pages/api/proofs/coinbase/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export type CoinbaseProofResponse = {
};

/**
* This endpoint reports whether or not the provided access has access to the verified account attestation
* This endpoint reports whether or not the provided address has access to the verified account attestation
*
* Error responses:
* 400: if address is invalid or missing verifications
Expand Down
Binary file added apps/web/public/images/partners/tribally.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 13 additions & 5 deletions apps/web/src/data/ecosystem.json
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@
{
"name": "Obvious",
"url": "https://www.obvious.technology",
"description": "Obvious is a ERC-4337 compatible smart contract wallet focussed on simplifying transaction experience.",
"description": "Obvious is a ERC-4337 compatible smart contract wallet focused on simplifying transaction experience.",
"category": "wallet",
"subcategory": "account abstraction",
"imageUrl": "/images/partners/obvious.webp"
Expand Down Expand Up @@ -3154,7 +3154,7 @@
{
"name": "Franklin Payroll",
"description": "All-in-one onchain financial operations suite. Pay US W2 employees, vendors, global contractors, and invoice customers. Franklin supports USD and crypto payouts plus stablecoin to USD off-ramping.",
"url": "www.hellofranklin.co",
"url": "https://www.hellofranklin.co",
"imageUrl": "/images/partners/franklin.png",
"category": "consumer",
"subcategory": "payments"
Expand Down Expand Up @@ -3426,15 +3426,15 @@
{
"name": "AuditOne & Insura",
"description": "AuditOne is an all-in-one audit platform, that offers security services, tools & risk coverage to ensure the safety and reliability of smart contracts and AI-systems. We redefine blockchain auditing by perfectly balancing quality, speed, affordability, and reliability.\nOur unique approach is tailored to the dynamic nature of the blockchain industry, ensuring we deliver excellence without compromise.\n",
"url": "https://www.auditone.io/, \n\n\n",
"url": "https://www.auditone.io",
"imageUrl": "/images/partners/audit.png",
"category": "infra",
"subcategory": "security"
},
{
"name": "Stack",
"description": "Stack offers scalable infrastructure for loyalty and rewards programs. Our mission is to revolutionizing loyalty by reducing time spent away from core business.",
"url": "stack.so",
"url": "https://stack.so",
"imageUrl": "/images/partners/stack.png",
"category": "consumer",
"subcategory": "social"
Expand Down Expand Up @@ -3514,7 +3514,7 @@
{
"name": "Hypersub",
"description": "Discover creators. Subscribe for access, perks and benefits. Earn rewards.",
"url": "hypersub.xyz",
"url": "https://hypersub.xyz",
"imageUrl": "/images/partners/hypersub.png",
"category": "consumer",
"subcategory": "creator"
Expand Down Expand Up @@ -3598,5 +3598,13 @@
"imageUrl": "/images/partners/gbm-domains.png",
"category": "consumer",
"subcategory": "nft"
},
{
"name": "Tribally",
"description": "Tribally is a growth and activation platform for gaming, and the world’s first provider of onchain growth mechanics for offchain games. Battle against other gamers, complete quests and earn rewards!",
"url": "https://tribally.games",
"imageUrl": "/images/partners/tribally.png",
"category": "consumer",
"subcategory": "gaming"
}
]

0 comments on commit a185d47

Please sign in to comment.