Skip to content

Samples to accompany the Test Net 2.0 code in Disgo #4

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.

Sign up for GitHub

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

Merged
merged 19 commits into from
Jun 13, 2018
Merged

Samples to accompany the Test Net 2.0 code in Disgo #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a853688
Simple contract and tests to debug storage
Jun 1, 2018
676c7e6
Add multiple params support
Jun 1, 2018
84186a3
update tests
Jun 4, 2018
bbf50b8
Update the ABI
Jun 4, 2018
3ff32f2
Remove ETHEREUM Aaccount, use from Common
Jun 4, 2018
0838c39
Remove ETHEREUM Aaccount, use from Common
Jun 4, 2018
5159aed
Add state restore support
Jun 4, 2018
dd3424e
some fixes
Jun 4, 2018
1afa275
Test Net 2.0 is Ready !
Jun 6, 2018
25bd2e8
Update DVM Result with execution context
Jun 6, 2018
debe71d
Fix the Nonce
Jun 7, 2018
74b7edf
update to script and updated to new configuration
Jun 11, 2018
3db1732
Merge remote-tracking branch 'origin/DG-484' into DG-484
Jun 11, 2018
7cbef12
Helpers to generate new TXes
Jun 11, 2018
e68b200
small updates to launch file
Jun 13, 2018
ec90c28
update for delegateNode
Jun 13, 2018
d7073a1
update spawn scripts
Jun 13, 2018
e2ae40b
Fix the path for go get
Jun 13, 2018
7f72788
Fix the genesis for seed
Jun 13, 2018
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
16 changes: 9 additions & 7 deletions blockchain-grpc/client/grpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package client

import (
"fmt"
"log"
"time"

"github.com/dispatchlabs/disgo/commons/utils"
"github.com/dispatchlabs/samples/blockchain-grpc/proto"
"golang.org/x/net/context"
"google.golang.org/grpc"
Expand All @@ -21,7 +21,7 @@ func Start(flag string) {

conn, err := grpc.Dial("localhost:8080", grpc.WithInsecure())
if err != nil {
log.Fatalf("cannot dial server: %v", err)
utils.Fatal(fmt.Sprintf("cannot dial server: %v", err))
}
defer conn.Close()

Expand All @@ -46,19 +46,21 @@ func AddBlock() {
Data: time.Now().String(),
})
if addErr != nil {
log.Fatalf("unable to add block: %v", addErr)
utils.Fatal(fmt.Sprintf("unable to add block: %v", addErr))
}
log.Printf("new block hash: %s\n", block.Hash)

utils.Info(fmt.Sprintf("new block hash: %s\n", block.Hash))
}

func GetBlockchain() {
blockchain, getErr := client.GetBlockchain(context.Background(), &proto.GetBlockchainRequest{})
if getErr != nil {
log.Fatalf("unable to get blockchain: %v", getErr)
utils.Fatal(fmt.Sprintf("unable to get blockchain: %v", getErr))
}

log.Println("blocks:")
utils.Info("blocks:")

for _, b := range blockchain.Blocks {
log.Printf("hash %s, prev hash: %s, data: %s, timestamp: %d\n", b.Hash, b.PrevBlockHash, b.Data, b.Timestamp)
utils.Info(fmt.Sprintf("hash %s, prev hash: %s, data: %s, timestamp: %d\n", b.Hash, b.PrevBlockHash, b.Data, b.Timestamp))
}
}
28 changes: 16 additions & 12 deletions blockchain-grpc/server/grpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
package server

import (
"fmt"
"log"
"net"

"github.com/dispatchlabs/disgo/commons/utils"
"github.com/dispatchlabs/samples/blockchain-grpc/proto"
"github.com/dispatchlabs/samples/blockchain-grpc/server/blockchain"
"golang.org/x/net/context"
"google.golang.org/grpc"
)

func Start() {
log.Println("Starting Server")
utils.Info("Starting Server")

listener, err := net.Listen("tcp", ":8080")
if err != nil {
log.Fatalf("unable to listen port 8080: %v", err)
utils.Fatal(fmt.Sprintf("unable to listen port 8080: %v", err))
}

srv := grpc.NewServer()
proto.RegisterBlockchainServer(srv, &Server {
proto.RegisterBlockchainServer(srv, &Server{
Blockchain: blockchain.NewBlockchain(),
})
srv.Serve(listener)
Expand All @@ -39,15 +43,15 @@ func (s *Server) AddBlock(ctx context.Context, in *proto.AddBlockRequest) (*prot

// GetBlockchain : returns blockchain
func (s *Server) GetBlockchain(ctx context.Context, in *proto.GetBlockchainRequest) (*proto.GetBlockchainResponse, error) {
log.Print("Get full block chain")
resp := new(proto.GetBlockchainResponse)
for _, b := range s.Blockchain.Blocks {
resp.Blocks = append(resp.Blocks, &proto.Block{
PrevBlockHash: b.PrevBlockHash,
Data: b.Data,
Hash: b.Hash,
Timestamp: b.Timestamp,
})
log.Print("Get full block chain")
resp := new(proto.GetBlockchainResponse)
for _, b := range s.Blockchain.Blocks {
resp.Blocks = append(resp.Blocks, &proto.Block{
PrevBlockHash: b.PrevBlockHash,
Data: b.Data,
Hash: b.Hash,
Timestamp: b.Timestamp,
})
}
return resp, nil
}
275 changes: 275 additions & 0 deletions dvm/generate_new_tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
package main

import (
"encoding/hex"
"fmt"
"time"

"github.com/dispatchlabs/disgo/commons/types"
"github.com/dispatchlabs/disgo/commons/utils"
)

func main() {
dumpNewDeployTx()
// dumpNewSetTx()
// dumpNewGetTx()
}

func dumpNewDeployTx() {
var privateKey = "0f86ea981203b26b5b8244c8f661e30e5104555068a4bd168d3e3015db9bb25a"
var from = "3ed25f42484d517cdfc72cafb7ebc9e8baa52c2c"
var code = "608060405234801561001057600080fd5b506040805190810160405280600d81526020017f61616161616161616161616161000000000000000000000000000000000000008152506000908051906020019061005c9291906100f7565b50600060016000018190555060006001800160006101000a81548160ff02191690831515021790555060018060010160016101000a81548160ff021916908360ff1602179055506040805190810160405280600b81526020017f6262626262626262626262000000000000000000000000000000000000000000815250600160020190805190602001906100f19291906100f7565b5061019c565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061013857805160ff1916838001178555610166565b82800160010185558215610166579182015b8281111561016557825182559160200191906001019061014a565b5b5090506101739190610177565b5090565b61019991905b8082111561019557600081600090555060010161017d565b5090565b90565b610664806101ab6000396000f300608060405260043610610078576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806333e538e91461007d57806334e45f531461010d5780633a458b1f1461017657806378d8866e1461022557806379af6473146102b5578063cb69e300146102cc575b600080fd5b34801561008957600080fd5b50610092610335565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100d25780820151818401526020810190506100b7565b50505050905090810190601f1680156100ff5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561011957600080fd5b50610174600480360381019080803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091929192905050506103d7565b005b34801561018257600080fd5b5061018b6103f4565b60405180858152602001841515151581526020018360ff1660ff16815260200180602001828103825283818151815260200191508051906020019080838360005b838110156101e75780820151818401526020810190506101cc565b50505050905090810190601f1680156102145780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561023157600080fd5b5061023a6104c4565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561027a57808201518184015260208101905061025f565b50505050905090810190601f1680156102a75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156102c157600080fd5b506102ca610562565b005b3480156102d857600080fd5b50610333600480360381019080803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284378201915050505050509192919290505050610579565b005b606060008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103cd5780601f106103a2576101008083540402835291602001916103cd565b820191906000526020600020905b8154815290600101906020018083116103b057829003601f168201915b5050505050905090565b80600160020190805190602001906103f0929190610593565b5050565b60018060000154908060010160009054906101000a900460ff16908060010160019054906101000a900460ff1690806002018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156104ba5780601f1061048f576101008083540402835291602001916104ba565b820191906000526020600020905b81548152906001019060200180831161049d57829003601f168201915b5050505050905084565b60008054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561055a5780601f1061052f5761010080835404028352916020019161055a565b820191906000526020600020905b81548152906001019060200180831161053d57829003601f168201915b505050505081565b600160000160008154809291906001019190505550565b806000908051906020019061058f929190610593565b5050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106105d457805160ff1916838001178555610602565b82800160010185558215610602579182015b828111156106015782518255916020019190600101906105e6565b5b50905061060f9190610613565b5090565b61063591905b80821115610631576000816000905550600101610619565b5090565b905600a165627a7a72305820f782ba3879cbbd0ec37bd4bbfbe885796488e7504e9b2f1f6817a4d3b8fdae460029"
var theTime = utils.ToMilliSeconds(time.Now())

var tx, _ = types.NewDeployContractTransaction(
privateKey,
from,
code,
theTime,
)

fmt.Printf("DEPLOY: %s", tx.String())
}

func dumpNewSetTx() {
var privateKey = "0f86ea981203b26b5b8244c8f661e30e5104555068a4bd168d3e3015db9bb25a"
var from = "3ed25f42484d517cdfc72cafb7ebc9e8baa52c2c"
var to = "02955e1b3f89d71096b70d910e0a7e5b11f781f8"
var abi = `[
{
"constant": true,
"inputs": [],
"name": "getVar5",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "value",
"type": "string"
}
],
"name": "setVar6Var4",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "var6",
"outputs": [
{
"name": "var1",
"type": "uint256"
},
{
"name": "var2",
"type": "bool"
},
{
"name": "var3",
"type": "uint8"
},
{
"name": "var4",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "var5",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "incVar6Var1",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "value",
"type": "string"
}
],
"name": "setVar5",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "constructor"
}
]`

var theTime = utils.ToMilliSeconds(time.Now())
var method = "setVar5"
var params = make([]interface{}, 1)
params[0] = "5555"

var tx, _ = types.NewExecuteContractTransaction(
privateKey,
from,
to,
hex.EncodeToString([]byte(abi)),
method,
params,
theTime,
)

fmt.Printf("EXECUTE_Get: %s", tx.String())
}

func dumpNewGetTx() {
var privateKey = "0f86ea981203b26b5b8244c8f661e30e5104555068a4bd168d3e3015db9bb25a"
var from = "3ed25f42484d517cdfc72cafb7ebc9e8baa52c2c"
var to = "fe8fc34a2b981fbd86ed11bf27e7d54dfd0fc54a"
var abi = `[
{
"constant": true,
"inputs": [],
"name": "getVar5",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "value",
"type": "string"
}
],
"name": "setVar6Var4",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "var6",
"outputs": [
{
"name": "var1",
"type": "uint256"
},
{
"name": "var2",
"type": "bool"
},
{
"name": "var3",
"type": "uint8"
},
{
"name": "var4",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "var5",
"outputs": [
{
"name": "",
"type": "string"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [],
"name": "incVar6Var1",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "value",
"type": "string"
}
],
"name": "setVar5",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "constructor"
}
]`

var theTime = utils.ToMilliSeconds(time.Now())
var method = "getVar5"
var params = make([]interface{}, 0)

var tx, _ = types.NewExecuteContractTransaction(
privateKey,
from,
to,
hex.EncodeToString([]byte(abi)),
method,
params,
theTime,
)

fmt.Printf("EXECUTE_Get: %s", tx.String())
}
6 changes: 3 additions & 3 deletions dvm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"flag"
"fmt"
"os"
"github.com/dispatchlabs/dvm/test"
"C"

test "github.com/dispatchlabs/samples/dvm/test-project"
)

var (
Expand All @@ -16,7 +16,7 @@ var (
printLLVMIR = flag.Bool("llvm", false, "print LLVM generated code")
)

func main() {
func main2() {
flag.Parse()
if *optimized {
test.Optimize()
Expand Down
0 dvm/test/LICENSE → dvm/test-project/LICENSE
View file
Open in desktop
File renamed without changes.
0 dvm/test/README.md → dvm/test-project/README.md
View file
Open in desktop
File renamed without changes.
0 dvm/test/codegen.go → dvm/test-project/codegen.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/exec.go → dvm/test-project/exec.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/lex.go → dvm/test-project/lex.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/lib.c → dvm/test-project/lib.c
View file
Open in desktop
File renamed without changes.
0 dvm/test/lib.go → dvm/test-project/lib.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/libExt.c → dvm/test-project/libExt.c
View file
Open in desktop
File renamed without changes.
0 dvm/test/mandel.k → dvm/test-project/mandel.k
View file
Open in desktop
File renamed without changes.
0 dvm/test/nodes.go → dvm/test-project/nodes.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/parse.go → dvm/test-project/parse.go
View file
Open in desktop
File renamed without changes.
0 dvm/test/test.k → dvm/test-project/test.k
View file
Open in desktop
File renamed without changes.
0 dvm/test/update_llvm.sh → dvm/test-project/update_llvm.sh
View file
Open in desktop
File renamed without changes.
Loading