Add support for v13 + General improvments (#161)

centrifuge · Jun 15, 2021 · 35e1b61 · 35e1b61
1 parent 3db578f
commit 35e1b61
Show file tree

Hide file tree

Showing 21 changed files with 863 additions and 154 deletions.
diff --git a/main_test.go b/main_test.go
@@ -102,7 +102,7 @@ func Example_listenToBalanceChange() {
 	}
 
 	alice := signature.TestKeyringPairAlice.PublicKey
-	key, err := types.CreateStorageKey(meta, "System", "Account", alice, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Account", alice)
 	if err != nil {
 		panic(err)
 	}
@@ -227,7 +227,7 @@ func Example_makeASimpleTransfer() {
 		panic(err)
 	}
 
-	key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey)
 	if err != nil {
 		panic(err)
 	}
@@ -280,7 +280,7 @@ func Example_displaySystemEvents() {
 	}
 
 	// Subscribe to system events via storage
-	key, err := types.CreateStorageKey(meta, "System", "Events", nil, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Events", nil)
 	if err != nil {
 		panic(err)
 	}
@@ -441,7 +441,7 @@ func Example_transactionWithEvents() {
 	}
 
 	// Get the nonce for Alice
-	key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey)
 	if err != nil {
 		panic(err)
 	}

diff --git a/rpc/author/submit_and_watch_extrinsic_test.go b/rpc/author/submit_and_watch_extrinsic_test.go
@@ -39,7 +39,7 @@ func TestAuthor_SubmitAndWatchExtrinsic(t *testing.T) {
 		assert.NoError(t, err)
 
 		// Get the nonce for Alice
-		key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey, nil)
+		key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey)
 		assert.NoError(t, err)
 
 		var accountInfo types.AccountInfo

diff --git a/rpc/author/submit_extrinsic_test.go b/rpc/author/submit_extrinsic_test.go
@@ -53,7 +53,7 @@ func TestAuthor_SubmitExtrinsic(t *testing.T) {
 		assert.NoError(t, err)
 
 		// Get the nonce for Alice
-		key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey, nil)
+		key, err := types.CreateStorageKey(meta, "System", "Account", signature.TestKeyringPairAlice.PublicKey)
 		assert.NoError(t, err)
 
 		var accountInfo types.AccountInfo

diff --git a/teste2e/author_submit_and_watch_extrinsic_test.go b/teste2e/author_submit_and_watch_extrinsic_test.go
@@ -61,7 +61,7 @@ func TestAuthor_SubmitAndWatchExtrinsic(t *testing.T) {
 	rv, err := api.RPC.State.GetRuntimeVersionLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "System", "Account", from.PublicKey, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Account", from.PublicKey)
 	assert.NoError(t, err)
 
 	var sub *author.ExtrinsicStatusSubscription

diff --git a/teste2e/author_submit_extrinsic_test.go b/teste2e/author_submit_extrinsic_test.go
@@ -34,7 +34,7 @@ func TestChain_Events(t *testing.T) {
 	meta, err := api.RPC.State.GetMetadataLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "System", "Events", nil, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Events", nil)
 	assert.NoError(t, err)
 
 	blockNUmber := uint64(0) // Replace with desired block to parse events
@@ -80,7 +80,7 @@ func TestChain_SubmitExtrinsic(t *testing.T) {
 	rv, err := api.RPC.State.GetRuntimeVersionLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "System", "Account", from.PublicKey, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Account", from.PublicKey)
 	assert.NoError(t, err)
 
 	var accountInfo types.AccountInfo

diff --git a/teste2e/main_test.go b/teste2e/main_test.go
@@ -74,7 +74,7 @@ func TestEnd2end(t *testing.T) {
 	meta, err := api.RPC.State.GetMetadataLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "Session", "Validators", nil, nil)
+	key, err := types.CreateStorageKey(meta, "Session", "Validators", nil)
 	assert.NoError(t, err)
 
 	var validators []types.AccountID

diff --git a/teste2e/state_subscribe_storage_test.go b/teste2e/state_subscribe_storage_test.go
@@ -38,7 +38,7 @@ func TestState_SubscribeStorage_EventsRaw(t *testing.T) {
 	meta, err := api.RPC.State.GetMetadataLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "System", "Events", nil, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Events", nil)
 	assert.NoError(t, err)
 
 	sub, err := api.RPC.State.SubscribeStorageRaw([]types.StorageKey{key})
@@ -75,7 +75,7 @@ func TestState_SubscribeStorage_Events(t *testing.T) {
 	meta, err := api.RPC.State.GetMetadataLatest()
 	assert.NoError(t, err)
 
-	key, err := types.CreateStorageKey(meta, "System", "Events", nil, nil)
+	key, err := types.CreateStorageKey(meta, "System", "Events", nil)
 	assert.NoError(t, err)
 
 	sub, err := api.RPC.State.SubscribeStorageRaw([]types.StorageKey{key})

diff --git a/types/metadata.go b/types/metadata.go
@@ -43,6 +43,8 @@ type Metadata struct {
 	AsMetadataV11 MetadataV11
 	IsMetadataV12 bool
 	AsMetadataV12 MetadataV12
+	IsMetadataV13 bool
+	AsMetadataV13 MetadataV13
 }
 
 func NewMetadataV4() *Metadata {
@@ -81,6 +83,14 @@ func NewMetadataV12() *Metadata {
 	}
 }
 
+func NewMetadataV13() *Metadata {
+	return &Metadata{
+		Version:       13,
+		IsMetadataV13: true,
+		AsMetadataV13: MetadataV13{Modules: make([]ModuleMetadataV13, 0)},
+	}
+}
+
 func (m *Metadata) Decode(decoder scale.Decoder) error {
 	err := decoder.Decode(&m.MagicNumber)
 	if err != nil {
@@ -117,6 +127,9 @@ func (m *Metadata) Decode(decoder scale.Decoder) error {
 	case 12:
 		m.IsMetadataV12 = true
 		err = decoder.Decode(&m.AsMetadataV12)
+	case 13:
+		m.IsMetadataV13 = true
+		err = decoder.Decode(&m.AsMetadataV13)
 	default:
 		return fmt.Errorf("unsupported metadata version %v", m.Version)
 	}
@@ -150,13 +163,40 @@ func (m Metadata) Encode(encoder scale.Encoder) error {
 		err = encoder.Encode(m.AsMetadataV11)
 	case 12:
 		err = encoder.Encode(m.AsMetadataV12)
+	case 13:
+		err = encoder.Encode(m.AsMetadataV13)
 	default:
 		return fmt.Errorf("unsupported metadata version %v", m.Version)
 	}
 
 	return err
 }
 
+func (m *Metadata) FindConstantValue(module string, constantName string) ([]byte, error) {
+	txtModule := Text(module)
+	txtConstantName := Text(constantName)
+	switch {
+	case m.IsMetadataV4:
+		return m.AsMetadataV4.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV7:
+		return m.AsMetadataV7.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV8:
+		return m.AsMetadataV8.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV9:
+		return m.AsMetadataV9.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV10:
+		return m.AsMetadataV10.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV11:
+		return m.AsMetadataV11.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV12:
+		return m.AsMetadataV12.FindConstantValue(txtModule, txtConstantName)
+	case m.IsMetadataV13:
+		return m.AsMetadataV13.FindConstantValue(txtModule, txtConstantName)
+	default:
+		return nil, fmt.Errorf("unsupported metadata version")
+	}
+}
+
 func (m *Metadata) FindCallIndex(call string) (CallIndex, error) {
 	switch {
 	case m.IsMetadataV4:
@@ -173,6 +213,8 @@ func (m *Metadata) FindCallIndex(call string) (CallIndex, error) {
 		return m.AsMetadataV11.FindCallIndex(call)
 	case m.IsMetadataV12:
 		return m.AsMetadataV12.FindCallIndex(call)
+	case m.IsMetadataV13:
+		return m.AsMetadataV13.FindCallIndex(call)
 	default:
 		return CallIndex{}, fmt.Errorf("unsupported metadata version")
 	}
@@ -194,6 +236,8 @@ func (m *Metadata) FindEventNamesForEventID(eventID EventID) (Text, Text, error)
 		return m.AsMetadataV11.FindEventNamesForEventID(eventID)
 	case m.IsMetadataV12:
 		return m.AsMetadataV12.FindEventNamesForEventID(eventID)
+	case m.IsMetadataV13:
+		return m.AsMetadataV13.FindEventNamesForEventID(eventID)
 	default:
 		return "", "", fmt.Errorf("unsupported metadata version")
 	}
@@ -215,6 +259,8 @@ func (m *Metadata) FindStorageEntryMetadata(module string, fn string) (StorageEn
 		return m.AsMetadataV11.FindStorageEntryMetadata(module, fn)
 	case m.IsMetadataV12:
 		return m.AsMetadataV12.FindStorageEntryMetadata(module, fn)
+	case m.IsMetadataV13:
+		return m.AsMetadataV13.FindStorageEntryMetadata(module, fn)
 	default:
 		return nil, fmt.Errorf("unsupported metadata version")
 	}
@@ -236,6 +282,8 @@ func (m *Metadata) ExistsModuleMetadata(module string) bool {
 		return m.AsMetadataV11.ExistsModuleMetadata(module)
 	case m.IsMetadataV12:
 		return m.AsMetadataV12.ExistsModuleMetadata(module)
+	case m.IsMetadataV13:
+		return m.AsMetadataV13.ExistsModuleMetadata(module)
 	default:
 		return false
 	}

diff --git a/types/metadataV10.go b/types/metadataV10.go
@@ -87,6 +87,18 @@ func (m *MetadataV10) FindEventNamesForEventID(eventID EventID) (Text, Text, err
 	return "", "", fmt.Errorf("module index %v out of range", eventID[0])
 }
 
+func (m *MetadataV10) FindConstantValue(module Text, constant Text) ([]byte, error) {
+	for _, mod := range m.Modules {
+		if mod.Name == module {
+			value, err := mod.FindConstantValue(constant)
+			if err == nil {
+				return value, nil
+			}
+		}
+	}
+	return nil, fmt.Errorf("could not find constant %s.%s", module, constant)
+}
+
 func (m *MetadataV10) FindStorageEntryMetadata(module string, fn string) (StorageEntryMetadata, error) {
 	for _, mod := range m.Modules {
 		if !mod.HasStorage {
@@ -227,6 +239,15 @@ func (m ModuleMetadataV10) Encode(encoder scale.Encoder) error {
 	return encoder.Encode(m.Errors)
 }
 
+func (m *ModuleMetadataV10) FindConstantValue(constant Text) ([]byte, error) {
+	for _, cons := range m.Constants {
+		if cons.Name == constant {
+			return cons.Value, nil
+		}
+	}
+	return nil, fmt.Errorf("could not find constant %s", constant)
+}
+
 type StorageMetadataV10 struct {
 	Prefix Text
 	Items  []StorageFunctionMetadataV10
@@ -252,6 +273,14 @@ func (s StorageFunctionMetadataV10) IsDoubleMap() bool {
 	return s.Type.IsDoubleMap
 }
 
+func (s StorageFunctionMetadataV10) IsNMap() bool {
+	return false
+}
+
+func (s StorageFunctionMetadataV10) Hashers() ([]hash.Hash, error) {
+	return nil, fmt.Errorf("Hashers is not supported for metadata v10, please upgrade to use metadata v13 or newer")
+}
+
 func (s StorageFunctionMetadataV10) Hasher() (hash.Hash, error) {
 	if s.Type.IsMap {
 		return s.Type.AsMap.Hasher.HashFunc()