Update to Substrate 2.0.0-RC6 (#97)

* update types

* add new weight

* wip new events + types

* All Events

* tests fix

* enable substription tests

* fix subkey version

* add tests

* add extrinsicv4 test

Co-authored-by: vedhavyas <[email protected]>

.travis.yml

@@ -4,7 +4,7 @@ dist: xenial
 language: go
 
 go:
-  - 1.11.x
+  - 1.14.x
 
 # Only clone the most recent commit.
 git:

Dockerfile

@@ -2,11 +2,11 @@
 # preventing them from being used to build Substrate/Polkadot.
 
 # First Phase - Load Subkey
-FROM parity/subkey:2.0.0-alpha.3 as subkey
+FROM parity/subkey:2.0.0 as subkey
 RUN subkey --version
 
 ## Second Phase - Build context for tests
-FROM parity/substrate:v2.0.0-alpha.3
+FROM parity/substrate:v2.0.0-rc6
 
 USER root
 
@@ -22,20 +22,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		git-core \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.12.9
+ENV GOLANG_VERSION 1.14.9
 
 RUN set -eux; \
 	\
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
-		amd64) goRelArch='linux-amd64'; goRelSha256='ac2a6efcc1f5ec8bdc0db0a988bb1d301d64b6d61b7e8d9e42f662fbb75a2b9b' ;; \
-		armhf) goRelArch='linux-armv6l'; goRelSha256='0d9be0efa9cd296d6f8ab47de45356ba45cb82102bc5df2614f7af52e3fb5842' ;; \
-		arm64) goRelArch='linux-arm64'; goRelSha256='3606dc6ce8b4a5faad81d7365714a86b3162df041a32f44568418c9efbd7f646' ;; \
-		i386) goRelArch='linux-386'; goRelSha256='c40824a3e6c948b8ecad8fe9095b620c488b3d8d6694bdd48084a4798db4799a' ;; \
-		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='2e74c071c6a68446c9b00c1717ceeb59a826025b9202b3b0efed4f128e868b30' ;; \
-		s390x) goRelArch='linux-s390x'; goRelSha256='2aac6de8e83b253b8413781a2f9a0733384d859cff1b89a2ad0d13814541c336' ;; \
-		*) goRelArch='src'; goRelSha256='ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc'; \
+		amd64) goRelArch='linux-amd64'; goRelSha256='f0d26ff572c72c9823ae752d3c81819a81a60c753201f51f89637482531c110a' ;; \
+		armhf) goRelArch='linux-armv6l'; goRelSha256='e85dc09608dc9fc245ebc5daea0826898ac0eb0d48ed24e2300427850876c442' ;; \
+		arm64) goRelArch='linux-arm64'; goRelSha256='65e6cef5c474a3514e754f6a7987c49388bb85a7b370370c1318087ac35427fa' ;; \
+		i386) goRelArch='linux-386'; goRelSha256='14982ef997ec323023a11cffe1a4afc3aacd1b5edebf70a00e17b67f888d8cdb' ;; \
+		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='5880a37faf93b2396edc3ff231e0f8df14d0520505cc13d01116e24d7d1d0147' ;; \
+		s390x) goRelArch='linux-s390x'; goRelSha256='381fc24aff153c4affcb00f4547683212157af29b8f9e3de5952d78ac35f5a0f' ;; \
+		*) goRelArch='src'; goRelSha256='c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554'; \
 			echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
 	esac; \
 	\

Makefile

@@ -50,7 +50,7 @@ run-substrate-docker: 		## runs the Substrate 1.0 Default Docker image, this can
 	docker run -p 9933:9933 -p 9944:9944 -p 30333:30333 parity/substrate:latest-v1.0 --dev --rpc-external --ws-external
 
 run-substrate-docker-v2: 	## runs the Substrate 2.0 Default Docker image, this can be used to run the tests
-	docker run -p 9933:9933 -p 9944:9944 -p 30333:30333 parity/substrate:v2.0.0-alpha.3 --dev --rpc-external --ws-external
+	docker run -p 9933:9933 -p 9944:9944 -p 30333:30333 parity/substrate:v2.0.0-rc6 --dev --rpc-external --ws-external
 
 help: 				## shows this help
 	@sed -ne '/@sed/!s/## //p' $(MAKEFILE_LIST)

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   substrate:
-    image: parity/substrate:v2.0.0-alpha.3
+    image: parity/substrate:v2.0.0-rc6
     ports:
       - 9933:9933
       - 9944:9944

gethrpc/handler.go

@@ -282,9 +282,9 @@ func (h *handler) handleResponse(msg *jsonrpcMessage) {
 		op.err = msg.Error
 		return
 	}
-	var subid int
-	if op.err = json.Unmarshal(msg.Result, &subid); op.err == nil {
-		op.sub.subid = fmt.Sprintf("%v", subid)
+	var subID string
+	if op.err = json.Unmarshal(msg.Result, &subID); op.err == nil {
+		op.sub.subid = subID
 		go op.sub.start()
 		h.clientSubs[op.sub.subid] = op.sub
 	}

gethrpc/json.go

@@ -39,7 +39,7 @@ const (
 var null = json.RawMessage("null")
 
 type subscriptionResult struct {
-	ID     int             `json:"subscription"`
+	ID     string          `json:"subscription"`
 	Result json.RawMessage `json:"result,omitempty"`
 }
 

gethrpc/subscription.go

@@ -168,7 +168,7 @@ func (n *Notifier) activate() error {
 }
 
 func (n *Notifier) send(sub *Subscription, data json.RawMessage) error {
-	params, _ := json.Marshal(&subscriptionResult{ID: int(sub.ID), Result: data})
+	params, _ := json.Marshal(&subscriptionResult{ID: string(sub.ID), Result: data})
 	ctx := context.Background()
 	return n.h.conn.Write(ctx, &jsonrpcMessage{
 		Version: vsn,

main_test.go

@@ -50,7 +50,7 @@ func Example_simpleConnect() {
 
 	fmt.Printf("You are connected to chain %v using %v v%v\n", chain, nodeName, nodeVersion)
 
-	// Output: You are connected to chain Development using Substrate Node v2.0.0-alpha.3
+	// Output: You are connected to chain Development using Substrate Node v2.0.0-rc6-be8bb186-x86_64-linux-gnu
 }
 
 func Example_listenToNewBlocks() {
@@ -361,7 +361,7 @@ func Example_displaySystemEvents() {
 			}
 			for _, e := range events.Staking_Reward {
 				fmt.Printf("\tStaking:Reward:: (phase=%#v)\n", e.Phase)
-				fmt.Printf("\t\t%v\n", e.Balance)
+				fmt.Printf("\t\t%v\n", e.Amount)
 			}
 			for _, e := range events.Staking_Slash {
 				fmt.Printf("\tStaking:Slash:: (phase=%#v)\n", e.Phase)

signature/signature.go

@@ -47,9 +47,9 @@ var reAddressNew = regexp.MustCompile(`SS58 Address:\s+([a-zA-Z0-9]*)\n`)
 func KeyringPairFromSecret(seedOrPhrase, network string) (KeyringPair, error) {
 	var args []string
 	if network != "" {
-		args = []string{"-n", network}
+		args = []string{"--network", network}
 	}
-	args = append(args, []string{"inspect", seedOrPhrase}...)
+	args = append([]string{"inspect", seedOrPhrase}, args...)
 
 	// use "subkey" command for creation of public key and address
 	cmd := exec.Command(subkeyCmd, args...)
@@ -107,7 +107,7 @@ func Sign(data []byte, privateKeyURI string) ([]byte, error) {
 	}
 
 	// use "subkey" command for signature
-	cmd := exec.Command(subkeyCmd, "sign", privateKeyURI, "--hex")
+	cmd := exec.Command(subkeyCmd, "sign", "--suri", privateKeyURI, "--hex")
 
 	// data to stdin
 	dataHex := hex.EncodeToString(data)
@@ -146,13 +146,13 @@ func Verify(data []byte, sig []byte, privateKeyURI string) (bool, error) {
 	sigHex := hex.EncodeToString(sig)
 
 	// use "subkey" command for signature
-	cmd := exec.Command(subkeyCmd, "verify", sigHex, privateKeyURI, "--hex")
+	cmd := exec.Command(subkeyCmd, "verify", "--hex", sigHex, privateKeyURI)
 
 	// data to stdin
 	dataHex := hex.EncodeToString(data)
 	cmd.Stdin = strings.NewReader(dataHex)
 
-	// log.Printf("echo -n \"%v\" | %v verify %v %v --hex", dataHex, subkeyCmd, sigHex, privateKeyURI)
+	//log.Printf("echo -n \"%v\" | %v verify --hex %v %v", dataHex, subkeyCmd, sigHex, privateKeyURI)
 
 	// execute the command, get the output
 	out, err := cmd.Output()

teste2e/author_submit_and_watch_extrinsic_test.go

@@ -96,10 +96,9 @@ func TestAuthor_SubmitAndWatchExtrinsic(t *testing.T) {
 		Nonce:       types.NewUCompactFromUInt(uint64(nonce)),
 		SpecVersion: rv.SpecVersion,
 		Tip:         types.NewUCompactFromUInt(0),
+		TransactionVersion: 1,
 	}
 
-
-
 	err = ext.Sign(from, o)
 	if err != nil {
 		panic(err)

teste2e/author_submit_extrinsic_test.go

@@ -139,6 +139,7 @@ func TestChain_SubmitExtrinsic(t *testing.T) {
 			Nonce:       types.NewUCompactFromUInt(uint64(nonce + i)),
 			SpecVersion: rv.SpecVersion,
 			Tip:         types.NewUCompactFromUInt(0),
+			TransactionVersion: 1,
 		}
 
 		extI := ext

teste2e/state_subscribe_storage_test.go

@@ -111,6 +111,7 @@ func TestState_SubscribeStorage_Events(t *testing.T) {
 					continue
 				}
 
+				fmt.Printf("%s\n", chng.StorageKey.Hex())
 				fmt.Printf("%#x\n", chng.StorageData)
 
 				events := types.EventRecords{}

types/balance_status.go

@@ -0,0 +1,32 @@
+package types
+
+import (
+	"fmt"
+
+	"github.com/centrifuge/go-substrate-rpc-client/scale"
+)
+
+type BalanceStatus byte
+
+const (
+	// Funds are free, as corresponding to `free` item in Balances.
+	Free BalanceStatus = 0
+	// Funds are reserved, as corresponding to `reserved` item in Balances.
+	Reserved BalanceStatus = 1
+)
+
+func (bs *BalanceStatus) Decode(decoder scale.Decoder) error {
+	b, err := decoder.ReadOneByte()
+	vb := BalanceStatus(b)
+	switch vb {
+	case Free, Reserved:
+		*bs = vb
+	default:
+		return fmt.Errorf("unknown BalanceStatus enum: %v", vb)
+	}
+	return err
+}
+
+func (bs BalanceStatus) Encode(encoder scale.Encoder) error {
+	return encoder.PushByte(byte(bs))
+}

types/balance_status_test.go

@@ -0,0 +1,32 @@
+package types
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/centrifuge/go-substrate-rpc-client/scale"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBalanceStatusEncodeDecode(t *testing.T) {
+	// encode
+	bs := Reserved
+	var buf bytes.Buffer
+	encoder := scale.NewEncoder(&buf)
+	assert.NoError(t, encoder.Encode(bs))
+	assert.Equal(t, buf.Len(), 1)
+	assert.Equal(t, buf.Bytes(), []byte{1})
+
+	//decode
+	decoder := scale.NewDecoder(bytes.NewReader(buf.Bytes()))
+	bs0 := BalanceStatus(0)
+	err := decoder.Decode(&bs0)
+	assert.NoError(t, err)
+	assert.Equal(t, bs0, Reserved)
+
+	//decode error
+	decoder = scale.NewDecoder(bytes.NewReader([]byte{5}))
+	bs0 = BalanceStatus(0)
+	err = decoder.Decode(&bs0)
+	assert.Error(t, err)
+}

types/election_compute.go

@@ -0,0 +1,34 @@
+package types
+
+import (
+	"fmt"
+
+	"github.com/centrifuge/go-substrate-rpc-client/scale"
+)
+
+type ElectionCompute byte
+
+const (
+	// Result was forcefully computed on chain at the end of the session.
+	OnChain ElectionCompute = 0
+	// Result was submitted and accepted to the chain via a signed transaction.
+	Signed ElectionCompute = 1
+	// Result was submitted and accepted to the chain via an unsigned transaction (by an authority).
+	Unsigned ElectionCompute = 2
+)
+
+func (ec *ElectionCompute) Decode(decoder scale.Decoder) error {
+	b, err := decoder.ReadOneByte()
+	vb := ElectionCompute(b)
+	switch vb {
+	case OnChain, Signed, Unsigned:
+		*ec = vb
+	default:
+		return fmt.Errorf("unknown ElectionCompute enum: %v", vb)
+	}
+	return err
+}
+
+func (ec ElectionCompute) Encode(encoder scale.Encoder) error {
+	return encoder.PushByte(byte(ec))
+}

types/election_compute_test.go

@@ -0,0 +1,32 @@
+package types
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/centrifuge/go-substrate-rpc-client/scale"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestElectionComputeEncodeDecode(t *testing.T) {
+	// encode
+	ec := OnChain
+	var buf bytes.Buffer
+	encoder := scale.NewEncoder(&buf)
+	assert.NoError(t, encoder.Encode(ec))
+	assert.Equal(t, buf.Len(), 1)
+	assert.Equal(t, buf.Bytes(), []byte{0})
+
+	//decode
+	decoder := scale.NewDecoder(bytes.NewReader(buf.Bytes()))
+	ec0 := ElectionCompute(0)
+	err := decoder.Decode(&ec0)
+	assert.NoError(t, err)
+	assert.Equal(t, ec0, OnChain)
+
+	//decode error
+	decoder = scale.NewDecoder(bytes.NewReader([]byte{5}))
+	ec0 = ElectionCompute(0)
+	err = decoder.Decode(&ec0)
+	assert.Error(t, err)
+}