Skip to content

Commit 528a323

Browse files
izyaksdpisreddevil
andauthored
Merge pull request from GHSA-pmf5-wx49-g3fg
* fix(bts): Add check for nativecoin in transfer method #56 * fix(bts): Add checks for fees during registration #57 * fix(bts): Add negative check in tokenFallback #58 * fix(bts): Add fees to feeBalance after refund #59 * fix(bts): Reentrancy in refund #60 * fix(bmc): Avoid use of loop for fee gathering calculation #68 * fix(bmc): Relayer bond should be greater than zero #69 * fix(bmc): Relayer properties changed before distributing rewards #70 * fix(bts): Revert when registering coin of different name for preregistered address #52 * fix(bts): Use TokenLimitResponse in handleChangeTokenLimit #73 * fix(bts): balanceOf optimization #74 * fix(bts): Add checks earlier in transferBatch #75 * fix(bts): Make non-external function private #76 * fix(bts): Do not set refundable amount to zero on reclaim #77 * fix(bmc): feeGatheringNext for feeGatheringTerm * fix(bts):fix incorrect operator for feeNumerator * fix(bts):fix incorrect operator for fixedFee * fix(bts):fix solidity version * Revert "fix(bts):fix solidity version" This reverts commit ed45276411ec8ee86b95511198390acad51d833a. * fix(bts):fix revert message * fix(bts):fix `this.<>` on local calls * fix(bts):update `links` from internal to private * fix(bts):fix duplicate address check * fix(bts): Set limit on batch transfers #88 * fix(bts): Add checks for null value #88 * fix(bts):set max transfer batch number to 15 * fix(bts):set max transfer batch number to 15 * fix(bts): implement variable for maxBatchSize * fix(bts): use batchSize limit on `balanceOfBatch()` * fix(bts): use batchSize limit on `balanceOfBatch()` * fix(bts): Add check for array size for consistency with solidity #88 * chore: Remove duplicate lines * fix(bmr): Only forward events to the intended destination * feat(bts): Remove this.<> for local calls to minimize gas #84 * fix(bts):fix range same as JAVA version * fix(bts):Update deployment migration scripts for BTS * fix(bts):Split BTS contracts to solve contract size limit for BTS * fix(bts):New BTS Contract for OwnerManagement, solves contract max size * fix(bts):add SPDX License * fix(bts): Update BTSCore equivalent to V3 * fix(bts): Add BatchLimit on BTSPeriphery and handle versions of BTSPeriphery contract * fix(bmc): Handle versions of BMCManagement contract * feat: Solidity Contract migration scripts * feat: Scripts for solidity contract upgrades * refactor: Use internal keyword for variable * feat: Update script for bmc management * fix: Update nid of arctic testnet * fix: Check status on transactions * feat: Add BTSOwnerManager address to addresses.json file * fix: snow mainnet endpoint fix * fix: typo, address -> addresses * fix: Add meaningful messages * config: Split files into mainnet and testnet * feat: Separate config for testnet and mainnet * fix: Update deploy commands in docs * fix: Coinnames * fix: Script upgrades * docs: Update docs to deploy on mainnet * fix: Path for migrations file * chore: Add build folder within devnet/docker/icon-bsc/ * chore: Fix typo Co-authored-by: sdpbhandari <bhandari.sudeep68@gmail.com>
1 parent 1335f07 commit 528a323

34 files changed

+3834
-1007
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ __pycache__
55
**/.DS_Store
66
**/*.iml
77
build/
8-
buildarctic/
8+
devnet/docker/icon-bsc/build*/
99
bin/
1010
**/*/node_modules/
1111
abigenBindings/

devnet/docker/icon-bsc/Makefile

+19-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,27 @@ runnodes:
1010
deploysclocalnet:
1111
./build.sh deploysclocalnet
1212

13-
deploysctestnet:
14-
./build.sh deploysctestnet
13+
# Usage: make deploysc net=mainnet/testnet
14+
deploysc:
15+
./build.sh deploysc ${net}
1516

17+
# Usage: make deployscarctic net=mainnet/testnet
1618
deployscarctic:
17-
./build.sh deployscarctic
19+
./build.sh deployscarctic ${net}
20+
21+
############## AUDIT FIXES ##############
22+
23+
# Usage: make auditfixbsc net=mainnet
24+
auditfixbsc:
25+
./build.sh bscaudit ${net}
26+
27+
auditfixarctic:
28+
./build.sh arcticaudit ${net}
29+
30+
auditfixicon:
31+
./build.sh iconaudit ${net}
32+
33+
#########################################
1834

1935
runrelaysrc:
2036
./build.sh runrelaysrc

devnet/docker/icon-bsc/README.md

+14-8
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@ Description to the Alternative Deployment Processes:
9999

100100
make buildsc #Builds smart contracts
101101

102-
make deploysctestnet #Deploy smart contracts on Testnet. Using scripts/config.sh
102+
make deploysc net=testnet #Deploy smart contracts on Testnet. Using scripts/config/*
103+
104+
Optional:
105+
106+
make deploysc net=mainnet #Deploy smart contracts on mainnet
107+
103108

104109
make runrelaysrc #Run relay from source
105110

@@ -110,8 +115,7 @@ Description to the Alternative Deployment Processes:
110115
make buildrelayimg #Build relay docker image
111116

112117
make runrelayimg #Run relay docker container
113-
114-
Optional:
118+
115119

116120
make cleanartifacts #Clean artifacts generated by smart contract deployment
117121

@@ -307,13 +311,15 @@ The following must be installed on your PC to run Section 1.2 and Section 2
307311
308312
------------------------------------------------------------------------------------------------
309313
ICON-SNOW Deployment
310-
1. If you are looking to run a fresh ICON-SNOW deployment. linkfromarg should not be supplied. End result will be ICON-SNOW pair connected to each other only.
311-
314+
1. If you are looking to run a fresh ICON-SNOW deployment. linkfromarg should not be supplied. End result will be ICON-SNOW pair connected to each other only. net can be mainnet or testnet.
315+
```sh
312316
make buildsc buildsuffix=arctic
313-
make deployscarctic
317+
make deployscarctic net=testnet
318+
```
314319
315320
2. If you are looking to merge SNOW deployment with existing deployment (e.g. ICON-BSC). The linkfrom arg will use an absolute path to reference needed values (e.g. contract addresses of existing icon-bsc deployment). End result will be linked smart contracts from ICON-BSC-SNOW; thus BSC<=>SNOW transfer will also be possible.
316-
321+
```sh
317322
make buildsc buildsuffix=arctic
318-
make deployscarctic linkfrom=<absolute_path_to_ixh_folder_of_icon_bsc_deployment>
323+
make deployscarctic net=testnet linkfrom=<absolute_path_to_ixh_folder_of_icon_bsc_deployment>
324+
```
319325

0 commit comments

Comments
 (0)