Skip to content

Commit

Permalink
Merge branch 'main' into fix_network_error
Browse files Browse the repository at this point in the history
  • Loading branch information
jscriptcoder committed Apr 6, 2023
2 parents 8b7b157 + f54242a commit 813e499
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/components/Toast.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
pausable: false,
};
// TODO: props to control its possition:
// TODO: props to control its position:
// top, bottom, left, right...
</script>

Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-ui/src/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function setupI18n({ withLocale: _locale } = { withLocale: 'en' }) {
toast: {
transactionSent: 'Transaction sent',
errorSendingTransaction: 'Error sending transaction',
errorDisconneting: 'Could not disconnect',
errorDisconnecting: 'Could not disconnect',
},
switchChainModal: {
title: 'Not on the right network',
Expand Down
2 changes: 1 addition & 1 deletion packages/eventindexer/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ var (
})
ErrorsEncounteredDuringSubscription = promauto.NewCounter(prometheus.CounterOpts{
Name: "errors_encountered_during_subscription_opts_total",
Help: "The total number of errors that occured during active subscription",
Help: "The total number of errors that occurred during active subscription",
})
)
2 changes: 1 addition & 1 deletion packages/eventindexer/repo/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (r *BlockRepository) startQuery() *gorm.DB {
func (r *BlockRepository) Save(opts eventindexer.SaveBlockOpts) error {
exists := &eventindexer.Block{}
_ = r.startQuery().Where("block_height = ?", opts.Height).Where("chain_id = ?", opts.ChainID.Int64()).First(exists)
// block procesed already
// block processed already
if exists.Height == opts.Height {
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/contracts/libs/LibInvalidTxList.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ library LibInvalidTxList {
error ERR_PARAMS_NOT_DEFAULTS();
error ERR_INVALID_TX_IDX();
error ERR_INVALID_HINT();
error ERR_VERIFICAITON_FAILURE();
error ERR_VERIFICATION_FAILURE();

enum Hint {
NONE,
Expand Down Expand Up @@ -93,7 +93,7 @@ library LibInvalidTxList {
return;
}

revert ERR_VERIFICAITON_FAILURE();
revert ERR_VERIFICATION_FAILURE();
} catch (bytes memory) {
_checkParams(hint, txIdx);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/contracts/libs/LibTxUtils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ library LibTxUtils {
internal
pure
returns (
// transaction hash (without singature values)
// transaction hash (without signature values)
bytes32 hash
)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ library LibBlockHeaderDecoder {
}

// decodes all RLP encoded data and stores their DATA items
// [length, calldata offset] in a continous memory region.
// [length, calldata offset] in a continuous memory region.
// Expects that the RLP starts with a list that defines the length
// of the whole RLP region.
function decodeFlat(_ptr) -> ptr, memStart, nItems, hash {
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/L1/TaikoL1.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe("integration:TaikoL1", function () {
);
});

it("should return valid block if it's been commmited and proposed", async function () {
it("should return valid block if it's been committed and proposed", async function () {
const commitSlot = 0;
const { proposedEvent } = await commitAndProposeLatestBlock(
taikoL1,
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/bridge/Bridge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ describe("Bridge", function () {
});

describe("context()", function () {
it("returns unitialized context", async () => {
it("returns uninitialized context", async () => {
const ctx = await l1Bridge.context();
expect(ctx[0]).to.be.eq(ethers.constants.HashZero);
expect(ctx[1]).to.be.eq(ethers.constants.AddressZero);
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/libs/LibTrieProof.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { EthGetProofResponse } from "../utils/rpc";
import { deploySignalService } from "../utils/signal";

// TODO(roger): this test shall not use any file in contracts/bridge/*.sol
// Instead, it should use the `writeStorageAt` function to manipulate stroage
// Instead, it should use the `writeStorageAt` function to manipulate storage
// values then verify the proof.
describe("integration:LibTrieProof", function () {
async function deployLibTrieProofFixture() {
Expand Down Expand Up @@ -112,7 +112,7 @@ describe("integration:LibTrieProof", function () {
msgHash
);

// use this instead of ethers.provider.getBlock() beccause it doesnt have stateRoot
// use this instead of ethers.provider.getBlock() because it doesnt have stateRoot
// in the response
const block: { stateRoot: string; number: string; hash: string } =
await ethers.provider.send("eth_getBlockByNumber", [
Expand Down
2 changes: 1 addition & 1 deletion packages/relayer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Optional:
`event`: filter events by event name. Default: all event names. Options: `MessageSent`, `MessageStatusChanged`

Pagination:
`page`: page number to retrive. Default: 0.
`page`: page number to retrieve. Default: 0.
`size`: size to retrieve per page. Default: 100

Example:
Expand Down
2 changes: 1 addition & 1 deletion packages/relayer/contracts/taikol2/TaikoL2.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/relayer/message/wait_header_synced.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func (p *Processor) waitHeaderSynced(ctx context.Context, event *bridge.BridgeMe
return ctx.Err()
case <-ticker.C:
log.Infof(
"msgHash: %v, txHash: %v is waiting to be processable. occured in block %v",
"msgHash: %v, txHash: %v is waiting to be processable. occurred in block %v",
common.Hash(event.MsgHash).Hex(),
event.Raw.TxHash.Hex(),
event.Raw.BlockNumber,
Expand All @@ -41,7 +41,7 @@ func (p *Processor) waitHeaderSynced(ctx context.Context, event *bridge.BridgeMe
// header is caught up and processible
if header.Number.Uint64() >= event.Raw.BlockNumber {
log.Infof(
"msgHash: %v, txHash: %v is processable. occured in block %v, latestSynced is block %v",
"msgHash: %v, txHash: %v is processable. occurred in block %v, latestSynced is block %v",
common.Hash(event.MsgHash).Hex(),
event.Raw.TxHash.Hex(),
event.Raw.BlockNumber,
Expand All @@ -52,7 +52,7 @@ func (p *Processor) waitHeaderSynced(ctx context.Context, event *bridge.BridgeMe
}

log.Infof(
"msgHash: %v, txHash: %v is waiting to be processable. occured in block %v, latestSynced is block %v",
"msgHash: %v, txHash: %v is waiting to be processable. occurred in block %v, latestSynced is block %v",
common.Hash(event.MsgHash).Hex(),
event.Raw.TxHash.Hex(),
event.Raw.BlockNumber,
Expand Down
2 changes: 1 addition & 1 deletion packages/relayer/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ var (
})
ErrorsEncounteredDuringSubscription = promauto.NewCounter(prometheus.CounterOpts{
Name: "errors_encountered_during_subscription_opts_total",
Help: "The total number of errors that occured during active subscription",
Help: "The total number of errors that occurred during active subscription",
})
)
2 changes: 1 addition & 1 deletion packages/relayer/repo/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (r *BlockRepository) startQuery() *gorm.DB {
func (r *BlockRepository) Save(opts relayer.SaveBlockOpts) error {
exists := &relayer.Block{}
_ = r.startQuery().Where("block_height = ?", opts.Height).Where("chain_id = ?", opts.ChainID.Int64()).First(exists)
// block procesed already
// block processed already
if exists.Height == opts.Height {
return nil
}
Expand Down
14 changes: 7 additions & 7 deletions packages/starter-dapp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ You can use the following values in the `.env` file to spin up the Starter dapp

```
VITE_NODE_ENV=dev
VITE_L1_RPC_URL="https://l1rpc.internal.taiko.xyz/"
VITE_L2_RPC_URL="https://l2rpc.internal.taiko.xyz/"
VITE_L1_EXPLORER_URL="https://l1explorer.internal.taiko.xyz/"
VITE_L2_EXPLORER_URL="https://l2explorer.internal.taiko.xyz/"
VITE_MAINNET_CHAIN_ID=31336
VITE_TAIKO_CHAIN_ID=167001
VITE_MAINNET_CHAIN_NAME="Ethereum A2"
VITE_L1_RPC_URL="https://rpc.sepolia.org/"
VITE_L2_RPC_URL="https://rpc.a2.taiko.xyz/"
VITE_L1_EXPLORER_URL="https://sepolia.etherscan.io/"
VITE_L2_EXPLORER_URL="https://explorer.a2.taiko.xyz/"
VITE_MAINNET_CHAIN_ID=11155111
VITE_TAIKO_CHAIN_ID=167004
VITE_MAINNET_CHAIN_NAME="Sepolia"
VITE_TAIKO_CHAIN_NAME="Taiko A2"
VITE_APP_NAME="Starter"
```
2 changes: 1 addition & 1 deletion packages/starter-dapp/src/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function setupI18n({ withLocale: _locale } = { withLocale: "en" }) {
toast: {
transactionSent: "Transaction sent",
errorSendingTransaction: "Error sending transaction",
errorDisconneting: "Could not disconnect",
errorDisconnecting: "Could not disconnect",
},
switchChainModal: {
title: "Not on the right network",
Expand Down
2 changes: 1 addition & 1 deletion packages/status-page/src/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function setupI18n({ withLocale: _locale } = { withLocale: "en" }) {
toast: {
transactionSent: "Transaction sent",
errorSendingTransaction: "Error sending transaction",
errorDisconneting: "Could not disconnect",
errorDisconnecting: "Could not disconnect",
},
switchChainModal: {
title: "Not on the right network",
Expand Down
Loading

0 comments on commit 813e499

Please sign in to comment.