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

Release/pre prod #726

Merged
merged 150 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
1fce7a5
Develop (#648)
niels1286 Dec 27, 2021
70f3156
Bump gson from 2.8.5 to 2.8.9 in /module/nuls-transaction (#665)
dependabot[bot] May 25, 2022
095618b
Bump junit from 4.12 to 4.13.1 in /module/nuls-smart-contract (#666)
dependabot[bot] May 25, 2022
b3fd642
Bump junit from 4.12 to 4.13.1 in /test/nuls-test (#668)
dependabot[bot] May 25, 2022
37b5543
Bump junit from 4.12 to 4.13.1 in /module/nuls-cross-chain/base-lib (…
dependabot[bot] May 25, 2022
fc998ff
Bump commons-io from 2.6 to 2.7 in /module/nuls-smart-contract (#669)
dependabot[bot] May 25, 2022
b3de73e
Pre master (#673)
niels1286 Jul 1, 2022
80fdec5
2.16.1
niels1286 May 15, 2023
f53fb08
add api of contract code (#684)
niels1286 May 16, 2023
e31894f
Master update (#690)
niels1286 Jul 18, 2023
ddfb046
Cross-chain transactions with a high lag of more than one day are no …
lijunzhou Jul 20, 2023
9d68c2b
Cross-chain transactions with a high lag of more than one day are no …
lijunzhou Jul 20, 2023
cab7232
Merge branch 'release/prod' of github.com:nuls-io/nuls-v2 into releas…
lijunzhou Jul 20, 2023
7c29097
Pre master 1011 (#694)
niels1286 Oct 11, 2023
e1138a5
Merge branch 'develop' into release/beta
niels1286 Oct 17, 2023
df0110b
Pre master (#696)
niels1286 Oct 23, 2023
0074800
Pre master (#697)
niels1286 Oct 23, 2023
b88f295
Merge branch 'release/prod'
niels1286 Dec 25, 2023
1aa6ef7
Update README.md (#706)
reagost Jan 3, 2024
83e5b58
Merge remote-tracking branch 'origin/release/prod' into release/prod
lijunzhou Jan 9, 2024
763fc4d
Modify a document
jasonchou82111 Jan 9, 2024
e39826b
en
jasonchou82111 Jan 9, 2024
0b2f717
en
jasonchou82111 Jan 9, 2024
54e383d
Merge remote-tracking branch 'origin/master'
Nicholas-MacLeod Jan 10, 2024
ccb7a71
Merge remote-tracking branch 'origin/release/beta'
Nicholas-MacLeod Jan 10, 2024
3357b7e
Merge pull request #707 from nuls-io/master_pre
Nicholas-MacLeod Jan 10, 2024
9b6d937
Update README.md
reagost Jan 11, 2024
bb37cab
Update README.md
reagost Jan 17, 2024
dc11c6a
p19
cobble586 Feb 18, 2024
15180e8
Merge branch 'develop' into release/beta
Nicholas-MacLeod Feb 18, 2024
cb15f09
2.19.0
Nicholas-MacLeod Feb 18, 2024
4fa8337
2.19.0
Nicholas-MacLeod Feb 18, 2024
ec9a5d6
Merge pull request #708 from nuls-io/reagost-patch-1
Nicholas-MacLeod Feb 18, 2024
6e28351
Merge branch 'master' into reagost-patch-4
Nicholas-MacLeod Feb 18, 2024
a991309
Merge pull request #709 from nuls-io/reagost-patch-4
Nicholas-MacLeod Feb 18, 2024
c4d33fb
add cross asset cmd check
cobble586 Feb 18, 2024
734d368
Merge branch 'develop' into release/beta
Nicholas-MacLeod Feb 18, 2024
a74fb60
2.19.0
Nicholas-MacLeod Feb 18, 2024
336352c
update version
cobble586 Feb 21, 2024
548240d
2.19.0
Nicholas-MacLeod Apr 10, 2024
06ce9cf
update beta config
Apr 10, 2024
7a52599
base fee mod
Nicholas-MacLeod Apr 26, 2024
7cf01af
base fee mod
Nicholas-MacLeod May 24, 2024
b99fbee
Merge branch 'develop-fee' into release/beta
Nicholas-MacLeod May 24, 2024
c7af524
2.20.0
Nicholas-MacLeod May 24, 2024
6d60b51
2.20.0
Nicholas-MacLeod Jun 16, 2024
848ca2b
2.20.0
Nicholas-MacLeod Jun 16, 2024
17d060b
2.20.0pre
Nicholas-MacLeod Jun 16, 2024
bc69a6c
fix cross bug
Jun 17, 2024
c5de280
Merge remote-tracking branch 'origin/release/prod' into release/prod
Jun 17, 2024
0347156
Merge branch 'release/prod' into ccc
Jun 17, 2024
519034c
2.20.0pre
Nicholas-MacLeod Jun 17, 2024
23e46d4
2.20.0-pre
Nicholas-MacLeod Jun 17, 2024
ebd32c7
Cross-chain transactions add backpass signature messages
Jun 19, 2024
49b296a
Merge branch 'develop' into release/pre_prod
Nicholas-MacLeod Jun 19, 2024
bbe250c
Merge remote-tracking branch 'origin/ccc' into release/pre_prod
Nicholas-MacLeod Jun 21, 2024
761e4f6
fix errors
Nicholas-MacLeod Jun 21, 2024
f5bb7fa
Merge branch 'ccc' into develop
Nicholas-MacLeod Jun 21, 2024
dc4b4e1
fix errors
Nicholas-MacLeod Jun 21, 2024
442f9f1
fix errors
Nicholas-MacLeod Jun 24, 2024
a756efc
fix errors
Nicholas-MacLeod Jun 24, 2024
d53e90f
Merge branch 'master' into release/pre_prod
Nicholas-MacLeod Jun 24, 2024
faa6dc5
fix errors
Nicholas-MacLeod Jun 26, 2024
426f76b
fix errors
Nicholas-MacLeod Jun 28, 2024
145e5e4
fix errors
Nicholas-MacLeod Jun 28, 2024
6dcb958
fix errors
Nicholas-MacLeod Jun 28, 2024
5355d26
fix errors
Nicholas-MacLeod Jun 28, 2024
2889916
fix errors
Nicholas-MacLeod Jun 28, 2024
38fbc43
test
Nicholas-MacLeod Jun 28, 2024
74a5349
test
Nicholas-MacLeod Jun 28, 2024
a975b79
test
Nicholas-MacLeod Jun 28, 2024
fa5e4b0
test a
Nicholas-MacLeod Jul 8, 2024
b5c43a2
test a
Nicholas-MacLeod Jul 8, 2024
270a902
test a
Nicholas-MacLeod Jul 8, 2024
7f3a166
test a
Nicholas-MacLeod Jul 8, 2024
a023bb5
test b
Nicholas-MacLeod Jul 10, 2024
dfd9e95
test b
Nicholas-MacLeod Jul 10, 2024
2f1fff8
test b
Nicholas-MacLeod Jul 10, 2024
5edcacb
test b
Nicholas-MacLeod Jul 10, 2024
d957cdb
test b
Nicholas-MacLeod Jul 11, 2024
8d7d5c3
test b
Nicholas-MacLeod Jul 11, 2024
b0fd095
test b
Nicholas-MacLeod Jul 11, 2024
52da03a
test b
Nicholas-MacLeod Jul 11, 2024
a8a0035
test b
Nicholas-MacLeod Jul 11, 2024
410d9cd
test b
Nicholas-MacLeod Jul 11, 2024
cd749d2
test c
Nicholas-MacLeod Jul 11, 2024
e8bcd79
test c
Nicholas-MacLeod Jul 11, 2024
405b674
add logs
Nicholas-MacLeod Jul 18, 2024
c7c8ffd
add logs
Nicholas-MacLeod Jul 18, 2024
37ebc7a
Adding restrictions
Nicholas-MacLeod Jul 18, 2024
45c6593
fix getBalance bug
Nicholas-MacLeod Jul 23, 2024
c3b41cb
Merge branch 'release/beta' into release/pre_prod
Nicholas-MacLeod Jul 25, 2024
0ed949c
fix getBalance bug
Nicholas-MacLeod Jul 25, 2024
f81037b
2.20.0
Nicholas-MacLeod Aug 15, 2024
da532ee
http->https
Nicholas-MacLeod Aug 15, 2024
58a5519
dependency upgrade
Nicholas-MacLeod Aug 15, 2024
806d132
Release/pre prod (#713)
nulsccc Aug 15, 2024
aacb24f
dependency upgrade
Nicholas-MacLeod Aug 15, 2024
33837a3
dependency upgrade
Nicholas-MacLeod Aug 15, 2024
6970b81
Merge branch 'release/beta' into release/pre_prod
Nicholas-MacLeod Aug 15, 2024
7e6e88c
dependency upgrade
Nicholas-MacLeod Aug 20, 2024
285e312
dependency upgrade
Nicholas-MacLeod Aug 20, 2024
0a964b9
Merge branch 'release/prod' into release/pre_prod
Nicholas-MacLeod Aug 20, 2024
aaf68d1
dependency upgrade
Nicholas-MacLeod Aug 20, 2024
f458b74
dependency upgrade
Nicholas-MacLeod Aug 20, 2024
cf2ef4d
dependency upgrade
Nicholas-MacLeod Aug 20, 2024
ff2f407
dependency upgrade 2
Nicholas-MacLeod Aug 20, 2024
0964c4a
Merge branch 'release/pre_prod' into release/prod
Nicholas-MacLeod Aug 21, 2024
c73ec99
Merge branch 'release/prod' into release/beta
Nicholas-MacLeod Aug 21, 2024
9fac94c
beta
Nicholas-MacLeod Aug 21, 2024
1cbdaba
beta
Nicholas-MacLeod Aug 21, 2024
6968071
contract multi asset bug
cobble586 Aug 21, 2024
e919249
beta
Nicholas-MacLeod Aug 22, 2024
c35d39a
beta
Nicholas-MacLeod Aug 22, 2024
3d799ff
beta
Nicholas-MacLeod Aug 22, 2024
f08d956
beta
Nicholas-MacLeod Aug 22, 2024
8b6f3f3
beta
Nicholas-MacLeod Aug 22, 2024
c125143
contract result fee display
cobble586 Aug 23, 2024
791cfee
Merge branch 'develop' into release/beta
Nicholas-MacLeod Aug 23, 2024
af5af32
contract return gas tx
cobble586 Aug 23, 2024
950ce92
Merge branch 'develop' into release/beta
Nicholas-MacLeod Aug 23, 2024
f88d8b5
coinbase modify
Nicholas-MacLeod Aug 26, 2024
e14e054
coinbase modify
Nicholas-MacLeod Aug 27, 2024
592acac
temp commit
Nicholas-MacLeod Aug 27, 2024
4b9b96d
temp commit rollback
Nicholas-MacLeod Aug 27, 2024
bd21558
fix bug of pu-module rollback
Nicholas-MacLeod Aug 27, 2024
3c24128
test pu-module
Nicholas-MacLeod Aug 28, 2024
e602ef1
test pu-module
Nicholas-MacLeod Aug 28, 2024
e792a98
test pu-module rollback
Nicholas-MacLeod Aug 28, 2024
792b34b
Merge branch 'release/beta' into release/pre_prod
Nicholas-MacLeod Aug 29, 2024
f00aeb9
set fee unit
Nicholas-MacLeod Aug 30, 2024
0664263
set fee unit
Nicholas-MacLeod Aug 30, 2024
9a2f286
Merge branch 'release/prod'
Nicholas-MacLeod Sep 2, 2024
5703a2d
Merge branch 'master' into release/beta
Nicholas-MacLeod Sep 2, 2024
445b903
consensus award bug
cobble586 Sep 12, 2024
59b0880
dev settings
cobble586 Sep 12, 2024
d037173
dev
cobble586 Sep 12, 2024
1991a80
dev
cobble586 Sep 13, 2024
bf2a865
dev setting
cobble586 Sep 13, 2024
549d9b1
bug
cobble586 Sep 13, 2024
5eabf92
test case
cobble586 Sep 13, 2024
6a12e37
Merge branch 'develop' into release/beta
Nicholas-MacLeod Sep 13, 2024
8432255
2.20.1
Nicholas-MacLeod Sep 13, 2024
a301943
Merge branch 'release/prod' into release/pre_prod
Nicholas-MacLeod Sep 18, 2024
dfec47a
Merge branch 'release/beta' into release/pre_prod
Nicholas-MacLeod Sep 18, 2024
57bc0f3
2.21.0
Nicholas-MacLeod Oct 9, 2024
b1c6c70
2.21.0
Nicholas-MacLeod Oct 9, 2024
1936bb4
2.21.0
Nicholas-MacLeod Oct 10, 2024
fc34c89
Merge branch 'release/prod' into release/pre_prod
Nicholas-MacLeod Oct 10, 2024
d346d63
add sync script
Nicholas-MacLeod Oct 12, 2024
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
60 changes: 60 additions & 0 deletions build/sync
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/bash

STARTEXISTS=1
STOPEXISTS=1

if [ ! -d "./data" ]
then
echo "The 'data' folder is not present in the current directory, if you want to download the whole blockchain please do it from https:/nuls-io/nuls-v2/releases"
exit 1
fi

if [ ! -f "./start" ]
then
STARTEXISTS=0
fi
if [ ! -f "./stop" ]
then
STOPEXISTS=0
fi

if [ $STARTEXISTS -eq 0 ] || [ $STOPEXISTS -eq 0 ]
then
echo "The script assumes that 'start' and 'stop' scripts are present in your directory, you will need to stop manually before continuing."
fi

read -p "Addresses loaded in the node will be deleted and you will need to import manually after syncing completes. Are you ready to proceed? " -n 1 -r
echo
if [[ $REPLY =~ ^[Yy]$ ]]
then
echo "LFG!"
if [ $STOPEXISTS -eq 1 ]
then
echo "Stopping the blockchain ..."
./stop
sleep 4
echo "Complete!"
fi

echo
echo "Establishing connection and start syncing ..."
rsync -ar --protect-args --delete --info=progress2 -e "ssh -p 23" [email protected]:"/home/data/" "./data/"
echo

if [ $? -eq "0" ]
then
echo "Blockchain Sync finished successfully!"
if [ $STARTEXISTS -eq 1 ]
then
echo "Starting the blockchain ..."
./start
sleep 5
echo "Complete!"
fi
exit 0
else
echo "Error while running rsync"
exit 1
fi
fi

2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.21.1
2.21.0