Merge pull request #16 from maticnetwork/jhilliard-avail-header-fixes

Avail Header Fixes
0xPolygon · Nov 21, 2022 · 75fd909 · 75fd909
2 parents 402caf3 + e817755
commit 75fd909
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cmd/loadtest.go b/cmd/loadtest.go
@@ -1078,13 +1078,13 @@ func loadtestAvailTransfer(ctx context.Context, c *gsrpc.SubstrateAPI, nonce uin
 
 	o := gstypes.SignatureOptions{
 		BlockHash:          genesisHash,
-		Era:                gstypes.ExtrinsicEra{IsMortalEra: false},
+		Era:                gstypes.ExtrinsicEra{IsMortalEra: false, IsImmortalEra: true},
 		GenesisHash:        genesisHash,
 		Nonce:              gstypes.NewUCompactFromUInt(uint64(nonce)),
 		SpecVersion:        rv.SpecVersion,
-		Tip:                gstypes.NewUCompactFromUInt(100),
+		Tip:                gstypes.NewUCompactFromUInt(0),
 		TransactionVersion: rv.TransactionVersion,
-		AppID:              gstypes.U32(*ltp.AvailAppID),
+		AppID:              gstypes.NewUCompactFromUInt(uint64(*ltp.AvailAppID)),
 	}
 
 	err = ext.Sign(kp, o)
@@ -1121,13 +1121,13 @@ func loadtestAvailStore(ctx context.Context, c *gsrpc.SubstrateAPI, nonce uint64
 
 	o := gstypes.SignatureOptions{
 		BlockHash:          genesisHash,
-		Era:                gstypes.ExtrinsicEra{IsMortalEra: false},
+		Era:                gstypes.ExtrinsicEra{IsMortalEra: false, IsImmortalEra: true},
 		GenesisHash:        genesisHash,
 		Nonce:              gstypes.NewUCompactFromUInt(uint64(nonce)),
 		SpecVersion:        rv.SpecVersion,
 		Tip:                gstypes.NewUCompactFromUInt(100),
 		TransactionVersion: rv.TransactionVersion,
-		AppID:              gstypes.U32(*ltp.AvailAppID),
+		AppID:              gstypes.NewUCompactFromUInt(uint64(*ltp.AvailAppID)),
 	}
 	// Sign the transaction using Alice's default account
 	err = ext.Sign(kp, o)

diff --git a/go.mod b/go.mod
@@ -111,4 +111,6 @@ require (
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
 
-replace github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.0-avail-alpha
+// replace github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.0-avail-alpha
+// replace github.com/centrifuge/go-substrate-rpc-client/v4 => /Users/john/code/prabal-go-substrate
+replace github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.1-0.20221121161007-6f2ae8fdd74e
diff --git a/go.sum b/go.sum
@@ -376,8 +376,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.0-avail-alpha h1:TEtcXKtAHM3VrDE5WbsRbsftZDQ3GJltEJj2ZTRBD0A=
-github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.0-avail-alpha/go.mod h1:MDzvG8lkzMGRaO4qzvxdfJtlDtukRPqNVWG9HJybVt0=
+github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.1-0.20221121161007-6f2ae8fdd74e h1:vHdXzdPJQXx5GClOincLOhggKyrzNWZbUcnZOwETUsY=
+github.com/prabal-banerjee/go-substrate-rpc-client/v4 v4.0.1-0.20221121161007-6f2ae8fdd74e/go.mod h1:MDzvG8lkzMGRaO4qzvxdfJtlDtukRPqNVWG9HJybVt0=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=