Skip to content

Commit

Permalink
Merge pull request #435 from maticnetwork/audit-fix
Browse files Browse the repository at this point in the history
fix: audit fix and remove webpack
  • Loading branch information
nitinmittal23 authored Aug 5, 2024
2 parents 414bc74 + f9819c5 commit 7077e83
Show file tree
Hide file tree
Showing 39 changed files with 16,649 additions and 42,372 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [16.x, 18.x, 20.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/npm-release.yml

This file was deleted.

50 changes: 0 additions & 50 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/.env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
USER1_FROM=0x
USER1_PRIVATE_KEY=0x
USER2_FROM=0x
GOERLI_ROOT_RPC=
ROOT_RPC=
MATIC_RPC=
ZKEVM_RPC=
PROOF_API=
35 changes: 13 additions & 22 deletions examples/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,35 @@ if (env.error) {
module.exports = {
rpc: {
pos: {
parent: process.env.GOERLI_ROOT_RPC,
child: process.env.MATIC_RPC || 'https://rpc-mumbai.matic.today',
parent: process.env.ROOT_RPC || 'https://rpc.sepolia.org',
child: process.env.MATIC_RPC || 'https://rpc-amoy.polygon.technology',
},
zkEvm: {
parent: process.env.GOERLI_ROOT_RPC,
child: process.env.ZKEVM_RPC || 'https://rpc.public.zkevm-test.net',
parent: process.env.ROOT_RPC || 'https://rpc.sepolia.org',
child: process.env.ZKEVM_RPC || 'https://rpc.cardona.zkevm-rpc.com',
},
},
pos: {
parent: {
erc20: '0x655f2166b0709cd575202630952d71e2bb0d61af',
erc721: '0x16F7EF3774c59264C46E5063b1111bCFd6e7A72f',
erc1155: '0x2e3Ef7931F2d0e4a7da3dea950FF3F19269d9063',
chainManagerAddress: '0xBbD7cBFA79faee899Eaf900F13C9065bF03B1A74', // Address of RootChainManager for POS Portal
erc20: '0xb480378044d92C96D16589Eb95986df6a97F2cFB',
erc721: '0x421DbB7B5dFCb112D7a13944DeFB80b28eC5D22C',
erc1155: '0x095DD31b6473c4a32548d2A5B09e0f2F3F30d8F1',
chainManagerAddress: '0xb991E39a401136348Dee93C75143B159FabF483f',
},
child: {
erc721: '0xbD88C3A7c0e242156a46Fbdf87141Aa6D0c0c649',
erc20: '0xfe4F5145f6e09952a5ba9e956ED0C25e3Fa4c7F1',
weth: '0x714550C2C1Ea08688607D86ed8EeF4f5E4F22323',
erc1155: '0xA07e45A987F19E25176c877d98388878622623FA',
erc20: '0xf3202E7270a10E599394d8A7dA2F4Fbd475e96bA',
erc721: '0x02f83d4110D3595872481f677Ae323D50Aa09209',
erc1155: '0x488AfDFef019f511E343becb98B7c24ee02fA639',
},
},
zkEvm: {
parent: {
bridgeAdapter: "0x5eB6485573C2Ea289554A044e1D34b41958c0842",
ether: '0x0000000000000000000000000000000000000000',
// erc20: '0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6', // WETH
// erc20: '0x5C221E77624690fff6dd741493D735a17716c26B' // DAI
// erc20: '0x27b4861cf36453b9478cd5416426ca6fbd06f67a', // DAI TEMP
// erc20: '0xe7e7ad60b75614829be79a3014c5c6aeb006e079', // UNI TEMP
erc20: '0x4701Aa9471d7bfAc765D87dcb1Ea6BB23AD32733' // Polygon
erc20: '0x3fd0A53F4Bf853985a95F4Eb3F9C9FDE1F8e2b53', // MATIC
},
child: {
bridgeAdapter: "0x6b0393fD45B1a95EfB1bcd93536DaB44417119C3",
ether: '0x0000000000000000000000000000000000000000',
// erc20: '0x270969e59d170fB576cBB5E254493e9bfB13684f', // WETH
// erc20: '0x08bd5b6d0237FaAED3C5E04fB131de2f843aC756', // DAI
erc20: '0x73DeceDCa3d3aD2fFdB7FD5afd819a11dbc297f5' // Polygon
erc20: '0x244f21e2cDB60e9B6C9aEbB96FFe04489831F881' // MATIC
},
},
SYNCER_URL: 'https://testnetv3-syncer.api.matic.network/api/v1', // Backend service which syncs the Matic sidechain state to a MySQL database which we use for faster querying. This comes in handy especially for constructing withdrawal proofs while exiting assets from Plasma.
Expand Down
Loading

0 comments on commit 7077e83

Please sign in to comment.