Merge pull request #2 from Platdot-network/meta-v14

Support metadata v14
Platdot-network · Nov 23, 2021 · 977cc23 · 977cc23
2 parents 8be0a2b + e45de8b
commit 977cc23
Show file tree

Hide file tree

Showing 33 changed files with 371 additions and 333 deletions.
diff --git a/client/client.go b/client/client.go
@@ -6,26 +6,28 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
+	"strconv"
+	"strings"
+
+	gsrpc "github.com/Platdot-Network/go-substrate-rpc-client/v3"
+	gsClient "github.com/Platdot-Network/go-substrate-rpc-client/v3/client"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/rpc"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/scale"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
+	log2 "github.com/ethereum/go-ethereum/log"
 	"github.com/rjman-ljm/go-substrate-crypto/ss58"
+	"golang.org/x/crypto/blake2b"
+
 	"github.com/Platdot-Network/substrate-go/expand"
 	"github.com/Platdot-Network/substrate-go/expand/base"
 	"github.com/Platdot-Network/substrate-go/expand/chainx/xevents"
 	"github.com/Platdot-Network/substrate-go/models"
 	"github.com/Platdot-Network/substrate-go/utils"
-	gsrc "github.com/centrifuge/go-substrate-rpc-client/v3"
-	gsClient "github.com/centrifuge/go-substrate-rpc-client/v3/client"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/rpc"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
-	log2 "github.com/ethereum/go-ethereum/log"
-	"golang.org/x/crypto/blake2b"
-	"log"
-	"strconv"
-	"strings"
 )
 
 type Client struct {
-	Api                *gsrc.SubstrateAPI
+	Api                *gsrpc.SubstrateAPI
 	Meta               *types.Metadata
 	Prefix             []byte //币种的前缀
 	Name               string //链名字
@@ -41,7 +43,7 @@ func New(url string) (*Client, error) {
 	var err error
 
 	// 初始化rpc客户端
-	c.Api, err = gsrc.NewSubstrateAPI(url)
+	c.Api, err = gsrpc.NewSubstrateAPI(url)
 	//Api, err := gsrpc.NewSubstrateAPI(config.Default().RPCURL)
 	if err != nil {
 		return nil, err
@@ -55,7 +57,7 @@ func New(url string) (*Client, error) {
 	return c, nil
 }
 
-func (c *Client) reConnectWs() (*gsrc.SubstrateAPI, error) {
+func (c *Client) reConnectWs() (*gsrpc.SubstrateAPI, error) {
 	cl, err := gsClient.Connect(c.Url)
 	if err != nil {
 		return nil, err
@@ -64,7 +66,7 @@ func (c *Client) reConnectWs() (*gsrc.SubstrateAPI, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &gsrc.SubstrateAPI{
+	return &gsrpc.SubstrateAPI{
 		RPC:    newRPC,
 		Client: cl,
 	}, nil
@@ -943,7 +945,7 @@ func (c *Client) GetAccountInfo(address string) (*types.AccountInfo, error) {
 	if err != nil {
 		return nil, fmt.Errorf("ss58 decode address error: %v\n", err)
 	}
-	storage, err = types.CreateStorageKey(c.Meta, "System", "Account", pub, nil)
+	storage, err = types.CreateStorageKey(c.Meta, "System", "Account", pub)
 	if err != nil {
 		return nil, fmt.Errorf("create System.Account storage error: %v\n", err)
 	}

diff --git a/expand/base/types.go b/expand/base/types.go
@@ -4,9 +4,9 @@ import (
 	"encoding/hex"
 	"fmt"
 
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/scale"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/extra"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 /// Polkadot MultiSignExtrinsic Type

diff --git a/expand/bifrost/types.go b/expand/bifrost/types.go
@@ -2,10 +2,10 @@ package bifrost
 
 import (
 	"fmt"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/scale"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/base"
 	"github.com/Platdot-Network/substrate-go/expand/bridge"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 type BifrostEventRecords struct {

diff --git a/expand/bridge/bridge_event.go b/expand/bridge/bridge_event.go
@@ -1,7 +1,7 @@
 package bridge
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	events "github.com/hacpy/chainbridge-substrate-events"
 )
 
@@ -39,4 +39,3 @@ type AssetEvents struct {
 	Registry_RegistryCreated         []EventRegistryRegistryCreated        //nolint:stylecheck,golint
 	Registry_RegistryTmp             []EventRegistryTmp                    //nolint:stylecheck,golint
 }
-
diff --git a/expand/bridge/bridge_types.go b/expand/bridge/bridge_types.go
@@ -1,7 +1,7 @@
 package bridge
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 type Erc721Token struct {

diff --git a/expand/call.go b/expand/call.go
@@ -3,25 +3,26 @@ package expand
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /*
 扩展： 创建一个新的Call方法
 */
-func NewCall(callIdx string,args ...interface{})(types.Call,error){
-	if len(callIdx)!=4 {
-		return types.Call{},fmt.Errorf("callIdx length is not equal 4,len=%d",len(callIdx))
+func NewCall(callIdx string, args ...interface{}) (types.Call, error) {
+	if len(callIdx) != 4 {
+		return types.Call{}, fmt.Errorf("callIdx length is not equal 4,len=%d", len(callIdx))
 	}
-	m,err:=hex.DecodeString(callIdx[:2])
+	m, err := hex.DecodeString(callIdx[:2])
 	if err != nil {
 		return types.Call{}, err
 	}
-	n,err:=hex.DecodeString(callIdx[2:])
+	n, err := hex.DecodeString(callIdx[2:])
 	if err != nil {
-		return types.Call{},err
+		return types.Call{}, err
 	}
-	c:=types.CallIndex{SectionIndex: m[0],MethodIndex: n[0]}
+	c := types.CallIndex{SectionIndex: m[0], MethodIndex: n[0]}
 	var a []byte
 	for _, arg := range args {
 		e, err := types.EncodeToBytes(arg)

diff --git a/expand/chainx/pallets/swap.go b/expand/chainx/pallets/swap.go
@@ -1,52 +1,52 @@
 package pallets
 
-import "github.com/centrifuge/go-substrate-rpc-client/v3/types"
+import "github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 
 type AssetId types.U32
 type Balance types.U128
 
 /// XAssets Type
 type Swap struct {
-	Swap_PairCreated		[]EventPairCreated
-	Swap_LiquidityAdded		[]EventLiquidityAdded
-	Swap_LiquidityRemoved	[]EventLiquidityRemoved
-	Swap_TokenSwap			[]EventTokenSwap
+	Swap_PairCreated      []EventPairCreated
+	Swap_LiquidityAdded   []EventLiquidityAdded
+	Swap_LiquidityRemoved []EventLiquidityRemoved
+	Swap_TokenSwap        []EventTokenSwap
 }
 
 /// Create a trading pair. \[creator, asset_id, asset_id\]
 type EventPairCreated struct {
-	Phase    	types.Phase
-	Creator     types.AccountID
-	AssetA  	AssetId
-	AssetB  	AssetId
-	Topics   	[]types.Hash
+	Phase   types.Phase
+	Creator types.AccountID
+	AssetA  AssetId
+	AssetB  AssetId
+	Topics  []types.Hash
 }
 
 /// Add liquidity. \[owner, asset_id, asset_id\]
 type EventLiquidityAdded struct {
-	Phase    	types.Phase
-	Owner     	types.AccountID
-	AssetA  	AssetId
-	AssetB  	AssetId
-	Topics   	[]types.Hash
+	Phase  types.Phase
+	Owner  types.AccountID
+	AssetA AssetId
+	AssetB AssetId
+	Topics []types.Hash
 }
 
 /// Remove liquidity. \[owner, recipient, asset_id, asset_id, amount\]
 type EventLiquidityRemoved struct {
-	Phase    	types.Phase
-	Owner     	types.AccountID
-	Recipient   types.AccountID
-	AssetA  	AssetId
-	AssetB  	AssetId
-	Amount 		Balance
-	Topics   	[]types.Hash
+	Phase     types.Phase
+	Owner     types.AccountID
+	Recipient types.AccountID
+	AssetA    AssetId
+	AssetB    AssetId
+	Amount    Balance
+	Topics    []types.Hash
 }
 
 /// Transact in trading \[owner, recipient, swap_path\]
 type EventTokenSwap struct {
-	Phase    	types.Phase
-	Owner     	types.AccountID
-	Recipient   types.AccountID
-	SwapPath  	[]AssetId
-	Topics   	[]types.Hash
-}
+	Phase     types.Phase
+	Owner     types.AccountID
+	Recipient types.AccountID
+	SwapPath  []AssetId
+	Topics    []types.Hash
+}
diff --git a/expand/chainx/types.go b/expand/chainx/types.go
@@ -1,11 +1,11 @@
 package chainx
 
 import (
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/base"
 	"github.com/Platdot-Network/substrate-go/expand/bridge"
 	"github.com/Platdot-Network/substrate-go/expand/chainx/pallets"
 	"github.com/Platdot-Network/substrate-go/expand/extra"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 type ChainXEventRecords struct {

diff --git a/expand/chainx/xbtc_events.go b/expand/chainx/xbtc_events.go
@@ -1,9 +1,9 @@
 package chainx
 
 import (
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/chainx/xevents"
 	"github.com/Platdot-Network/substrate-go/expand/chainx/xevents/xgateway"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 type XPallets struct {

diff --git a/expand/chainx/xevents/xassets.go b/expand/chainx/xevents/xassets.go
@@ -1,7 +1,7 @@
 package xevents
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// XAssets Type

diff --git a/expand/chainx/xevents/xgateway/xbitcoin.go b/expand/chainx/xevents/xgateway/xbitcoin.go
@@ -1,7 +1,7 @@
 package xgateway
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// XGatewayBitcoin Type

diff --git a/expand/chainx/xevents/xgateway/xcommon.go b/expand/chainx/xevents/xgateway/xcommon.go
@@ -1,7 +1,7 @@
 package xgateway
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// XGatewayCommon Type

diff --git a/expand/chainx/xevents/xgateway/xrecords.go b/expand/chainx/xevents/xgateway/xrecords.go
@@ -1,7 +1,7 @@
 package xgateway
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// XGatewayRecords Type

diff --git a/expand/chainx/xevents/xmining.go b/expand/chainx/xevents/xmining.go
@@ -1,7 +1,7 @@
 package xevents
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 ///XMining Type

diff --git a/expand/chainx/xevents/xsystem.go b/expand/chainx/xevents/xsystem.go
@@ -1,7 +1,7 @@
 package xevents
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// XSystem Type

diff --git a/expand/chainx_types.go b/expand/chainx_types.go
@@ -3,10 +3,10 @@ package expand
 import (
 	"fmt"
 
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/scale"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/chainx/xevents"
 	"github.com/Platdot-Network/substrate-go/utils"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 	"github.com/huandu/xstrings"
 )
 

diff --git a/expand/event_records.go b/expand/event_records.go
@@ -3,11 +3,11 @@ package expand
 import (
 	"strings"
 
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 	"github.com/Platdot-Network/substrate-go/expand/bifrost"
 	"github.com/Platdot-Network/substrate-go/expand/chainx"
 	"github.com/Platdot-Network/substrate-go/expand/extra"
 	"github.com/Platdot-Network/substrate-go/expand/polkadot"
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 type IEventRecords interface {
@@ -80,4 +80,3 @@ func DecodeEventRecords(meta *types.Metadata, rawData string, chainName string)
 
 	return ier, nil
 }
-
diff --git a/expand/extra/crowdloan.go b/expand/extra/crowdloan.go
@@ -1,8 +1,8 @@
 package extra
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	gsrpcTypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/scale"
+	gsrpcTypes "github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 /// Crowdloan

diff --git a/expand/extra/election.go b/expand/extra/election.go
@@ -1,18 +1,18 @@
 package extra
 
 import (
-	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	"github.com/Platdot-Network/go-substrate-rpc-client/v3/types"
 )
 
 type ElectionsPhragmen struct {
-	Claims_Claimed                    	[]EventClaimsClaimed
-	ElectionsPhragmen_VoterReported   	[]EventElectionsPhragmenVoterReported
-	ElectionsPhragmen_MemberRenounced 	[]EventElectionsPhragmenMemberRenounced
-	ElectionsPhragmen_MemberKicked    	[]EventElectionsPhragmenMemberKicked
-	ElectionsPhragmen_ElectionError   	[]EventElectionsPhragmenElectionError
-	ElectionsPhragmen_EmptyTerm       	[]EventElectionsPhragmenEmptyTerm
+	Claims_Claimed                    []EventClaimsClaimed
+	ElectionsPhragmen_VoterReported   []EventElectionsPhragmenVoterReported
+	ElectionsPhragmen_MemberRenounced []EventElectionsPhragmenMemberRenounced
+	ElectionsPhragmen_MemberKicked    []EventElectionsPhragmenMemberKicked
+	ElectionsPhragmen_ElectionError   []EventElectionsPhragmenElectionError
+	ElectionsPhragmen_EmptyTerm       []EventElectionsPhragmenEmptyTerm
 	//ElectionsPhragmen_NewTerm			[]EventElectionsPhragmenNewTerm		暂不支持解析
-	Democracy_Blacklisted 				[]EventDemocracyBlacklisted
+	Democracy_Blacklisted []EventDemocracyBlacklisted
 }
 
 type EventDemocracyBlacklisted struct {