From ac088de6322fc16ebe75c2e5554be73754bf1fe2 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Wed, 12 Jun 2019 17:31:08 +0800 Subject: Rebrand as tangerine-network/go-tangerine --- test/genesis.json | 93 ++++++++++++++++++++++++++-------------------- test/keygen.go | 17 ++++----- test/keystore/bootnode.key | 2 +- test/keystore/monkey.key | 2 +- test/keystore/test0.key | 2 +- test/keystore/test1.key | 2 +- test/keystore/test2.key | 2 +- test/keystore/test3.key | 2 +- test/run_test.sh | 20 +++++----- test/sync_core.sh | 2 +- test/sync_test.sh | 8 ++-- 11 files changed, 82 insertions(+), 70 deletions(-) (limited to 'test') diff --git a/test/genesis.json b/test/genesis.json index 05ffe2aab..922d79a7c 100644 --- a/test/genesis.json +++ b/test/genesis.json @@ -11,16 +11,17 @@ "eip158Block": 0, "byzantiumBlock": 0, "constantinopleBlock": 0, + "petersburgBlock": 0, "dexcon": { "genesisCRSText": "In DEXON, we trust.", - "owner": "0xbf8c48a620bacc46907f9b89732d25e47a2d7cf7", + "owner": "0x0D54AF942d6bF13870F5CA65D470954f21D3cBE5", "minStake": "0xd3c21bcecceda1000000", - "lockupPeriod": 259200000, + "lockupPeriod": 600000, "miningVelocity": 0.1875, "nextHalvingSupply": "0x813f3978f89409844000000", "lastHalvedAmount": "0x4d8c55aefb8c05b5c000000", - "minGasPrice": "0x3b9aca00", - "blockGasLimit": 40000000, + "minGasPrice": "0x59682f000", + "blockGasLimit": 210000000, "lambdaBA": 250, "lambdaDKG": 1000, "notaryParamAlpha": 70.5, @@ -30,79 +31,89 @@ "fineValues": [ "0xad78ebc5ac6200000", "0xde0b6b3a7640000", - "0xd3c21bcecceda0000000", - "0xd3c21bcecceda0000000", - "0xd3c21bcecceda0000000" + "0xd3c21bcecceda1000000", + "0xd3c21bcecceda1000000", + "0xd3c21bcecceda1000000" ] }, "recovery": { - "contract": "0xf675c0e9bf4b949f50dcec5b224a70f0361d4680", + "contract": "0x0546d67343df7c68ea3b387de4b35e676e734e4d", "timeout": 30, "confirmation": 1 } }, "nonce": "0x42", - "timestamp": "0x0", - "extraData": "0x3535353535353535353535353535353535353535353535353535353535353535", + "timestamp": "0x16a51cab400", + "extraData": "0xc0d1cc809ea40f65918b4c15a0f43611d3061d5ea61acd725da1c1c51b5097e1", "gasLimit": "0x2625a00", "difficulty": "0x1", "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0x0000000000000000000000000000000000000000", "alloc": { - "0xBF8C48A620bacc46907f9B89732D25E47A2D7Cf7": { - "balance": "100000000000000000000000", - "staked": "0" - }, - "0x1245A8672FA881Cf858eF01D34c42B55D9b263fF": { - "balance": "100000000000000000000000", - "staked": "0" - }, - "0xe0F859340353854693F537ea337106a33E9FeAB0": { - "balance": "100000000000000000000000000", - "staked": "0" + "0d54af942d6bf13870f5ca65d470954f21d3cbe5": { + "balance": "0x52b7d2dcc80cd2e4000000", + "staked": "0x0", + "publicKey": "0x", + "info": { + "name": "", + "email": "", + "location": "", + "url": "" + } }, - "0x361e4958bd8b4d035C68C473193E77FdAb6aEa9D": { + "14a348cec13f7280d31a4f23e6b897f1e14d16c8": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x040c2f07cf22966ebaa19dd87de11d04f9a606e83e75a5295574760a5a4dd82807e7d9f28f86cd389871dd931a477cac64e233a6f098d5b257871d8163dc1bddcf", + "publicKey": "0x043e9db0a4f53fc6045df46b9bcd20458ffc38910a2b0a3981c1c9ad217ea3db90b8b81f4f21aa6b8e1a9466e4175ddcd614ffebd06af7302ada0d9f43dfd46b60", "info": { - "name": "DEXON Test Node 0", - "email": "node1@dexon.org", + "name": "Tangerine Test Node 2", + "email": "tangerine2tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } }, - "0xbC71C0F2aeCa46fa0001e765965029b16a06049E": { + "33dcbcd20e021a4dc9bc38704984ae2b0386cb78": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x04a12a015f27d98e5305498d23aeacde281e48aad918ae87d7f61784ab43828953db99bf1f44426294cbc21e32cf3a99122f2ce8a35ba718a7c814eec7bae9a3ea", + "publicKey": "0x04c27620945e296715a21a2723c1843a28356c39d14503106199b0356cbdcca66c6785bb8a69e0850d43a00b3dd30e58ac44f9f9dae5075d023627d5a7286685da", "info": { - "name": "DEXON Test Node 1", - "email": "node2@dexon.org", + "name": "Tangerine Test Node 3", + "email": "tangerine3tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } }, - "0xB6a2e270b54F19B4002d6535a71CFDd1CA1f5fC1": { + "8a5018982eb6a14af906c25e08997deee1f0af1c": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x0463f78d398f6b042952062a26f3551a4e294a11084b1006c8d6376437b72488d8f3af6b849931c03624ad2d581900e9ad5f3cfeeed040c799e5308cd8012853fb", + "publicKey": "0x04f3a328c3d694cbe15ec62ad8c1eaf23105927a4f6adfaf6b14539063a1059d9b72b4e48482265ba481e576a45a0573dac8fa18dbc6bf0cd0464015d076ba83a8", "info": { - "name": "DEXON Test Node 2", - "email": "node3@dexon.org", + "name": "Tangerine Test Node 1", + "email": "tangerine1tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" + } + }, + "aa2fe8d6024682af0540f8ba776b549bb50251ab": { + "balance": "0x52b7d2dcc80cd2e4000000", + "staked": "0x0", + "publicKey": "0x", + "info": { + "name": "", + "email": "", + "location": "", + "url": "" } }, - "0xb6bBBE39033131e428d5a3545856a596cacB7810": { + "ea8093b8d2f0077556db45596bd0823b83ce88ec": { "balance": "0x1a784379d99db42000000", "staked": "0xd3c21bcecceda1000000", - "publicKey": "0x04a1118c8f1c2e293de528e5b45ac5e65167af4cb4d10887924a9f839287d060da26414e971cab75013e560dfec7897b1983eaa631ae2f16ea4062525310edd8ea", + "publicKey": "0x04a9f17f7029e22d4762470509c881f7eb6bf6624657dbc3e947c3d134fc5fcedab4de8f36fa995628f1cfe7eb6de14e5724bc22f09f15a367da56b9645a5e8dcb", "info": { - "name": "DEXON Test Node 3", - "email": "node4@dexon.org", + "name": "Tangerine Test Node 0", + "email": "tangerine0tangerine-network.io", "location": "Taipei, Taiwan", - "url": "https://dexon.org" + "url": "https://tangerine-network.io" } } }, diff --git a/test/keygen.go b/test/keygen.go index 26b8385ed..cb93651ed 100644 --- a/test/keygen.go +++ b/test/keygen.go @@ -8,9 +8,9 @@ import ( "os" "strconv" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/crypto" ) const genesisFile = "genesis.json" @@ -18,9 +18,8 @@ const genesisFile = "genesis.json" var preFundAmount *big.Int = new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1e8)) var preFundAddresss = []string{ - "0x2a9D669e4791845EED01D4c0ffF3B927cC94A884", - "0x1245A8672FA881Cf858eF01D34c42B55D9b263fF", - "0xe0F859340353854693F537ea337106a33E9FeAB0", + "0x0D54AF942d6bF13870F5CA65D470954f21D3cBE5", // Owner + "0xAA2fe8D6024682aF0540F8BA776b549bB50251ab", // Monkey } func main() { @@ -54,10 +53,10 @@ func main() { Staked: new(big.Int).Mul(big.NewInt(1e18), big.NewInt(1e6)), PublicKey: crypto.FromECDSAPub(&privKey.PublicKey), NodeInfo: core.NodeInfo{ - Name: fmt.Sprintf("DEXON Test Node %d", i), - Email: fmt.Sprintf("dexon%d@dexon.org", i), + Name: fmt.Sprintf("Tangerine Test Node %d", i), + Email: fmt.Sprintf("tangerine%dtangerine-network.io", i), Location: "Taipei, Taiwan", - Url: "https://dexon.org", + Url: "https://tangerine-network.io", }, } fmt.Printf("Created account %s\n", address.String()) diff --git a/test/keystore/bootnode.key b/test/keystore/bootnode.key index fadd4b3a2..00f5e6f16 100644 --- a/test/keystore/bootnode.key +++ b/test/keystore/bootnode.key @@ -1 +1 @@ -8fde5e98ab761307a68a5ebd8dee1d9def2f2f4c664a676eaa6896fbf13a58ef \ No newline at end of file +86cf9c048a611ea7e17f5107952a88a00aedcd310565f37bef9314acf66265f3 \ No newline at end of file diff --git a/test/keystore/monkey.key b/test/keystore/monkey.key index a9fe18413..5cf8b7399 100644 --- a/test/keystore/monkey.key +++ b/test/keystore/monkey.key @@ -1 +1 @@ -fa30b47a7a3d5ab6935d873ffaeb8ca5b9782d102c4094be6da6b7f2fc04b5bd \ No newline at end of file +a00dd280fd51d288e51234fc852057fca7cd2bacf4e1d58771e03b454df70e5f \ No newline at end of file diff --git a/test/keystore/test0.key b/test/keystore/test0.key index 5ecbc48a6..8491db511 100644 --- a/test/keystore/test0.key +++ b/test/keystore/test0.key @@ -1 +1 @@ -3cf5bdee098cc34536a7b0e80d85e07a380efca76fc12136299b9e5ba24193c8 \ No newline at end of file +d5491d16cd598b977667278bb5d29d39582c10c15c9e1a2637e41da549a81196 \ No newline at end of file diff --git a/test/keystore/test1.key b/test/keystore/test1.key index c16f73286..25d33fc50 100644 --- a/test/keystore/test1.key +++ b/test/keystore/test1.key @@ -1 +1 @@ -96c9f1435d53577db18d45411326311529a0e8affb19218e27f65769a482c0fb \ No newline at end of file +7c8fec7b78a87fbfb2f5c990082a6f679e5c063142fefdf973108ade195c5f2f \ No newline at end of file diff --git a/test/keystore/test2.key b/test/keystore/test2.key index 402577df2..5a5fb63d3 100644 --- a/test/keystore/test2.key +++ b/test/keystore/test2.key @@ -1 +1 @@ -b25e955e30dd87cbaec83287beea6ec9c4c72498bc66905590756bf48da5d1fc \ No newline at end of file +a29a00b5e63f3d6eaac8b4c6b9be00a0b8aceafe438b5522666a4acfc1645108 \ No newline at end of file diff --git a/test/keystore/test3.key b/test/keystore/test3.key index b706958d6..5f881461e 100644 --- a/test/keystore/test3.key +++ b/test/keystore/test3.key @@ -1 +1 @@ -35577f65312f4a5e0b5391f5385043a6bc7b51fa4851a579e845b5fea33efded \ No newline at end of file +b7b185c3d3122b298aaa085d7a14dd37b658bf864b847ad06935d4f9c315f431 \ No newline at end of file diff --git a/test/run_test.sh b/test/run_test.sh index 0aecf3b6e..20c3357e0 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,9 +1,9 @@ #!/bin/bash -BOOTNODE_FLAGS="--bootnodes enode://0478aa13c91aa0db8e93b668313b7eb0532fbdb24f64772375373b14dbe326c238ad09ab4469f6442c9a9753f1275aeec2e531912c14a958ed1feb4ae7e227ef@127.0.0.1:30301" +BOOTNODE_FLAGS="--bootnodes enode://b0dacdaceb9ce26f89406e8048d279d3aa81c770e967db7e2556e416ca446de0e9327dbdf85eb56c421eeabbc843ceb8f373e7a26dc31d48178620e48cb095c4@127.0.0.1:30301" GENESIS="genesis.json" -GDEX="../build/bin/gdex" +GDEX="../build/bin/gtan" BOOTNODE="../build/bin/bootnode" @@ -31,7 +31,7 @@ fi $BOOTNODE -nodekey keystore/bootnode.key --verbosity=9 > bootnode.log 2>&1 & # Kill all previous instances. -pkill -9 -f gdex +pkill -9 -f gtan logsdir=$PWD/log-$(date '+%Y-%m-%d-%H:%M:%S') mkdir $logsdir @@ -68,7 +68,7 @@ with open('$GENESIS', 'w') as f: __FILE__ # A standalone RPC server for accepting RPC requests. -datadir=$PWD/Dexon.rpc +datadir=$PWD/Tangerine.rpc if ! $CONTINUE; then rm -rf $datadir $GDEX --datadir=$datadir init ${GENESIS} @@ -76,6 +76,7 @@ fi $GDEX \ ${BOOTNODE_FLAGS} \ --verbosity=3 \ + --nat=none \ --gcmode=archive \ --datadir=$datadir --nodekey=keystore/rpc.key \ --rpc --rpcapi=eth,net,web3,debug \ @@ -83,9 +84,9 @@ $GDEX \ --ws --wsapi=eth,net,web3,debug \ --wsaddr=0.0.0.0 --wsport=8546 \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ - > $logsdir/gdex.rpc.log 2>&1 & + > $logsdir/gtan.rpc.log 2>&1 & -NUM_NODES=$(cat ${GENESIS} | grep 'DEXON Test Node' | wc -l) +NUM_NODES=$(cat ${GENESIS} | grep 'Tangerine Test Node' | wc -l) RECOVERY_FLAGS="--recovery.network-rpc=https://rinkeby.infura.io" @@ -96,7 +97,7 @@ fi # Nodes for i in $(seq 0 $(($NUM_NODES - 1))); do - datadir=$PWD/Dexon.$i + datadir=$PWD/Tangerine.$i if ! $CONTINUE; then rm -rf $datadir @@ -106,6 +107,7 @@ for i in $(seq 0 $(($NUM_NODES - 1))); do ${BOOTNODE_FLAGS} \ --bp \ --verbosity=4 \ + --nat=none \ --gcmode=archive \ --datadir=$datadir --nodekey=keystore/test$i.key \ --port=$((30305 + $i)) \ @@ -116,9 +118,9 @@ for i in $(seq 0 $(($NUM_NODES - 1))); do --wsaddr=0.0.0.0 --wsport=$((8548 + $i * 2)) \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ --pprof --pprofaddr=localhost --pprofport=$((6060 + $i)) \ - > $logsdir/gdex.$i.log 2>&1 & + > $logsdir/gtan.$i.log 2>&1 & done if ! $SMOKETEST; then - tail -f $logsdir/gdex.*.log + tail -f $logsdir/gtan.*.log fi diff --git a/test/sync_core.sh b/test/sync_core.sh index d18c7b8f7..544ca854a 100755 --- a/test/sync_core.sh +++ b/test/sync_core.sh @@ -1,3 +1,3 @@ #!/bin/bash -govendor fetch github.com/dexon-foundation/dexon-consensus/...@master +govendor fetch github.com/byzantine-lab/dexon-consensus/...@master diff --git a/test/sync_test.sh b/test/sync_test.sh index 702cc1e32..c12b0e3ae 100755 --- a/test/sync_test.sh +++ b/test/sync_test.sh @@ -1,6 +1,6 @@ #!/bin/bash -GDEX=../build/bin/gdex +GDEX=../build/bin/gtan logsdir=$PWD/sync-log rm -rf $logsdir @@ -8,7 +8,7 @@ mkdir $logsdir # A standalone RPC server for accepting RPC requests. for i in $(seq 0 3); do - datadir=$PWD/Dexon.sync.$i + datadir=$PWD/Tangerine.sync.$i rm -rf $datadir $GDEX --datadir=$datadir init genesis.json $GDEX --testnet --verbosity=4 --gcmode=archive --datadir=$datadir \ @@ -18,7 +18,7 @@ for i in $(seq 0 3); do --wsport=$((8664 + $i * 2)) \ --ws --wsapi=eth,net,web3,debug --wsaddr=0.0.0.0 \ --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ - > $logsdir/gdex.sync.$i.log 2>&1 & + > $logsdir/gtan.sync.$i.log 2>&1 & done -tail -f $logsdir/gdex.*.log +tail -f $logsdir/gtan.*.log -- cgit