Skip to content
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.

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

Sync develop to mainnet #317

Merged
merged 6 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# [Changelog](https://keepachangelog.com/en/1.0.0/)

# 0.4.5 (2023-08-22)
- Update block_interval_seconds of Godwoken mainnet_v1 ([#320](https://github.com/godwokenrises/light-godwoken/pull/320))

# 0.4.4 (2023-06-21)
### Bug Fixes
- update readme file and godwoken bridge script for development([#308](https://github.com/godwokenrises/light-godwoken/commit/1d347d2e3c7af53efa5597606d84ea4f3523d35f))(@lee920217)
Expand Down
2 changes: 1 addition & 1 deletion apps/godwoken-bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "godwoken-bridge",
"version": "0.4.4",
"version": "0.4.5",
"private": true,
"scripts": {
"start": "REACT_APP_COMMIT_HASH=$(git rev-parse --short HEAD) vite --open",
Expand Down
19 changes: 12 additions & 7 deletions apps/godwoken-bridge/src/components/Withdrawal/ListV1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,18 @@ export const WithdrawalList: React.FC<Props> = ({ txHistory: localTxHistory, rem
return withdrawalList?.filter((cw) => ["succeed", "failed"].includes(cw.status)) || [];
}, [withdrawalList]);

const loadPendingHistory = useCallback((localTxHistory: L1TxHistoryInterface[]) => {
if (localTxHistory.length === 0) {
setPendingHistory([]);
return;
}
getPendingHistoriesByRPC(lightGodwoken as LightGodwokenV1, localTxHistory).then((list) => setPendingHistory(list));
}, [localTxHistory, lightGodwoken]);
const loadPendingHistory = useCallback(
(localTxHistory: L1TxHistoryInterface[]) => {
if (localTxHistory.length === 0) {
setPendingHistory([]);
return;
}
getPendingHistoriesByRPC(lightGodwoken as LightGodwokenV1, localTxHistory).then((list) =>
setPendingHistory(list),
);
},
[localTxHistory, lightGodwoken],
);

useDebounceEffect(() => loadPendingHistory(localTxHistory), [localTxHistory]);

Expand Down
2 changes: 1 addition & 1 deletion packages/light-godwoken/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "light-godwoken",
"version": "0.3.3",
"version": "0.3.4",
"license": "MIT",
"scripts": {
"test": "jest",
Expand Down
4 changes: 3 additions & 1 deletion packages/light-godwoken/src/config/predefined/mainnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ export const MainnetLayer2ConfigV1: LightGodwokenConfig = {
SCANNER_API: "https://api.v1.gwscan.com/api/",
CHAIN_NAME: "Godwoken Mainnet v1",
FINALITY_BLOCKS: 16800,
BLOCK_PRODUCE_TIME: 45, // L2 average block produce time from GwScan
// delay seconds between Godwoken blocks, defined by Godwoken mainnet_v1's fullnode
// see https://github.com/godwokenrises/godwoken/blob/v1.14.0/crates/config/src/config.rs#L184-L185
BLOCK_PRODUCE_TIME: 36,
MIN_CANCEL_DEPOSIT_TIME: 604800,

// https://github.com/mds1/multicall/commit/a6ed03f4bb232a573e9f6d4bdeca21a4edd3c1f7
Expand Down
46 changes: 16 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12528,18 +12528,18 @@ secp256k1@^4.0.1:
node-gyp-build "^4.2.0"

"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
version "5.7.1"
resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
version "5.7.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==

[email protected]:
version "7.0.0"
resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==

[email protected], semver@^7.3.2:
[email protected]:
version "7.3.4"
resolved "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
dependencies:
lru-cache "^6.0.0"
Expand All @@ -12551,31 +12551,17 @@ [email protected]:
dependencies:
lru-cache "^6.0.0"

[email protected], semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.7:
version "7.3.7"
resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"
integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
[email protected], semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.3.5:
version "7.3.5"
resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
dependencies:
lru-cache "^6.0.0"

semver@^7.3.8:
version "7.4.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.4.0.tgz#8481c92feffc531ab1e012a8ffc15bdd3a0f4318"
integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==
dependencies:
lru-cache "^6.0.0"
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

[email protected]:
version "0.18.0"
Expand Down Expand Up @@ -14371,9 +14357,9 @@ wide-align@^1.1.0, wide-align@^1.1.5:
string-width "^1.0.2 || 2 || 3 || 4"

word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
version "1.2.4"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==

wordwrap@^1.0.0:
version "1.0.0"
Expand Down