Skip to content

Commit

Permalink
Merge branch 'main' into xiaodino/upgrade-walletconnect-v3-1
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaodino committed Oct 25, 2023
2 parents 076ccae + 02664a7 commit 72a6470
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/bridge-ui-v2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ These are are the additional configuration files that have to be filled in:
| **/config/configuredBridges.json** | Defines the chains that are connected via taiko bridges and lists the contract addresses |
| **/config/configuredChains.json** | Defines some metadata for the chains, such as name, icons, explorer URL, etc. |
| **/config/configuredRelayer.json** | If chains have a relayer, the URL and the chain IDs it covers are entered here |
| **/config/configuredCustomTokens.json** | Defines a list of tokens that should be availabe in the token dropdowns |
| **/config/configuredCustomTokens.json** | Defines a list of tokens that should be available in the token dropdowns |

---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
--toastWidth: 339px;
/*
We need to makes the surroundings dissapear in order
We need to makes the surroundings disappear in order
to fully customize the toast with our own component
*/
--toastBackground: transparent;
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui-v2/src/libs/proof/Prover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class Prover {
const key = await this._getKey(contractAddress, msgHash);

// Unfortunately, since this method is stagnant, it hasn't been included into Viem lib
// as supported methods. Still stupported by Alchmey, Infura and others.
// as supported methods. Still stupported by Alchemy, Infura and others.
// See https://eips.ethereum.org/EIPS/eip-1186
// Following is a workaround to support this method.
const clientWithEthProofRequest = client as ClientWithEthGetProofRequest;
Expand Down
4 changes: 2 additions & 2 deletions packages/bridge-ui-v2/src/libs/token/checkOwnership.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ describe('checkOwnership', () => {
});

describe('General tests', () => {
it('should return an emtpy array if tokenType is null', async () => {
it('should return an empty array if tokenType is null', async () => {
// When
const result = await checkOwnership(TOKEN_ADDRESS, null, TOKEN_IDS, OWNER, CHAIN_ID);

// Then
expect(result).toEqual([]);
});

it('should return an emtpy array if tokenIds array is empty', async () => {
it('should return an empty array if tokenIds array is empty', async () => {
// When
const result = await checkOwnership(TOKEN_ADDRESS, TokenType.ERC721, [], OWNER, CHAIN_ID);

Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/signer/subscriber.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('subscribeToSigner', () => {
// Next we test functions are called with the right arguments:
expect(tokenService.getTokens).toHaveBeenCalledWith(address);

// We pass what's returned from the previos tokenService.getTokens
// We pass what's returned from the previous tokenService.getTokens
// and that is the tokens array
expect(userTokens.set).toHaveBeenCalledWith(tokens);

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L1/TaikoL1.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ contract TaikoL1Test is TaikoL1TestBase {
// uint96 minAmount = conf.ethDepositMinAmount;
uint96 maxAmount = conf.ethDepositMaxAmount;

// We need 8 depostis otherwise we are not processing them !
// We need 8 deposits otherwise we are not processing them !
giveEthAndTko(Alice, 1e6 ether, maxAmount + 1 ether);
giveEthAndTko(Bob, 0, maxAmount + 1 ether);
giveEthAndTko(Carol, 0, maxAmount + 1 ether);
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/L1/TaikoL1Oracle.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ contract TaikoL1OracleTest is TaikoL1TestBase {
/// @dev So in case we have regular proving mechanism we shall check if
/// still a cooldown happens
/// @dev when proving a block (in a normal way).
/// @notice In case oracle_prover is disbaled, there
/// @notice In case oracle_prover is disabled, there
/// is no reason why
/// @notice cooldowns be above 0 min tho (!).
function test_L1_if_oracle_is_disabled_cooldown_is_still_as_proofRegularCooldown(
Expand Down Expand Up @@ -391,7 +391,7 @@ contract TaikoL1OracleTest is TaikoL1TestBase {
proveBlock(Carol, Carol, meta, parentHash, blockHash, signalRoot);

/// @notice: Based on the current codebase we still need to wait
/// even if the system and oracle proofs are disbaled, which
/// even if the system and oracle proofs are disabled, which
/// @notice: in such case best to set 0 mins (cause noone could
/// overwrite a valid fk).
vm.warp(block.timestamp + conf.proofRegularCooldown);
Expand Down
10 changes: 5 additions & 5 deletions packages/website/components/Ecosystem/EcosystemSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -439,12 +439,12 @@ const ecosystemData: EcosystemData[] = [
isLive: true,
},
{
icon: "/images/ecosystem/taiko-dashboard.png",
name: "Taiko Node Dashboard",
link: "https://github.com/wolfderechter/taiko-node-dashboard-docker",
icon: "/images/ecosystem/dojonode.png",
name: "dojo node",
link: "https://dojonode.xyz",
description:
"A user friendly, easy to read, and visually pleasing dashboard for those running a Node/Proposer/Prover.",
filters: [],
"A user friendly, easy to read, and visually pleasing dashboard for monitoring your Node/Proposer/Prover.",
filters: ["dashboard"],
isLive: true,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,11 @@ If you do not want to delete the node folder, please follow one of these steps b
6. Do the same for `start-zkevm-chain-rpcd.sh`
7. Do the same for `start-proposer.sh`
8. Do the same for `start-driver.sh`
9. The same goes for files in the l3 folder
10. Then go back to command line and do:
9. Then go back to command line and do:

```sh
docker compose -f ./docker-compose.l3.yml --env-file .env.l3 down -v
docker compose down -v
docker compose up -d
docker compose -f ./docker-compose.l3.yml --env-file .env.l3 up -d
```

</Tab>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ You can edit the page by clicking [here](https://github.com/taikoxyz/taiko-mono/
| Vitek73 | http://65.21.14.11:9876 | 10 wei |
| FTP Crypto | http://161.97.133.1:9876 | 10 wei |
| snowleopard | http://161.97.146.121:9876 | 10 wei |
| Elsass Node | http://90.11.209.115:9876 | 10 wei |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

0 comments on commit 72a6470

Please sign in to comment.