Development fix runtime benchmarks (#1070)

* test: Add MaxTwinAdmins parameter to DAO pallet mock configuration

* ci: Update staticcheck to latest

* Remove add/remove twin admin calls from clients

* add GetNodeV3BillingOptOutTimestamp to also retrieve the opt-out time

Author: sameh-farouk

.github/workflows/070_lint_and_test_go_bridge.yaml

@@ -37,7 +37,7 @@ jobs:
       - name: staticcheck
         uses: dominikh/staticcheck-action@v1.3.0
         with:
-          version: "2022.1.3"
+          version: "latest"
           working-directory: bridge/tfchain_bridge
         env:
           GO111MODULE: on

clients/tfchain-client-go/node.go

@@ -826,48 +826,6 @@ func (s *Substrate) OptOutOfV3Billing(identity Identity, nodeID uint32) (hash ty
 	return callResponse.Hash, nil
 }
 
-// AddTwinAdmin adds an account to the list of twin admins allowed to deploy on opted-out nodes.
-// Requires council (restricted) origin.
-func (s *Substrate) AddTwinAdmin(identity Identity, account AccountID) (hash types.Hash, err error) {
-	cl, meta, err := s.GetClient()
-	if err != nil {
-		return hash, err
-	}
-
-	c, err := types.NewCall(meta, "TfgridModule.add_twin_admin", account)
-	if err != nil {
-		return hash, errors.Wrap(err, "failed to create call")
-	}
-
-	callResponse, err := s.Call(cl, meta, identity, c)
-	if err != nil {
-		return hash, errors.Wrap(err, "failed to add twin admin")
-	}
-
-	return callResponse.Hash, nil
-}
-
-// RemoveTwinAdmin removes an account from the list of twin admins allowed to deploy on opted-out nodes.
-// Requires council (restricted) origin.
-func (s *Substrate) RemoveTwinAdmin(identity Identity, account AccountID) (hash types.Hash, err error) {
-	cl, meta, err := s.GetClient()
-	if err != nil {
-		return hash, err
-	}
-
-	c, err := types.NewCall(meta, "TfgridModule.remove_twin_admin", account)
-	if err != nil {
-		return hash, errors.Wrap(err, "failed to create call")
-	}
-
-	callResponse, err := s.Call(cl, meta, identity, c)
-	if err != nil {
-		return hash, errors.Wrap(err, "failed to remove twin admin")
-	}
-
-	return callResponse.Hash, nil
-}
-
 // GetAllowedTwinAdmins returns the list of accounts allowed to deploy on opted-out nodes.
 // Returns an empty slice if no admins have been configured.
 func (s *Substrate) GetAllowedTwinAdmins() ([]AccountID, error) {
@@ -899,28 +857,48 @@ func (s *Substrate) GetAllowedTwinAdmins() ([]AccountID, error) {
 }
 
 // IsNodeOptedOutOfV3Billing returns true if the node has opted out of v3 billing.
+// Deprecated: use GetNodeV3BillingOptOutTimestamp to also retrieve the opt-out time.
 func (s *Substrate) IsNodeOptedOutOfV3Billing(nodeID uint32) (bool, error) {
-	cl, meta, err := s.GetClient()
+	ts, err := s.GetNodeV3BillingOptOutTimestamp(nodeID)
 	if err != nil {
 		return false, err
 	}
+	return ts != nil, nil
+}
+
+// GetNodeV3BillingOptOutTimestamp returns the Unix timestamp (seconds) at which the node
+// opted out of v3 billing, or nil if the node has not opted out.
+func (s *Substrate) GetNodeV3BillingOptOutTimestamp(nodeID uint32) (*uint64, error) {
+	cl, meta, err := s.GetClient()
+	if err != nil {
+		return nil, err
+	}
 
 	bytes, err := Encode(nodeID)
 	if err != nil {
-		return false, errors.Wrap(err, "substrate: encoding error building query arguments")
+		return nil, errors.Wrap(err, "substrate: encoding error building query arguments")
 	}
 
 	key, err := types.CreateStorageKey(meta, "TfgridModule", "NodeV3BillingOptOut", bytes)
 	if err != nil {
-		return false, errors.Wrap(err, "failed to create substrate query key")
+		return nil, errors.Wrap(err, "failed to create substrate query key")
 	}
 
 	raw, err := cl.RPC.State.GetStorageRawLatest(key)
 	if err != nil {
-		return false, errors.Wrap(err, "failed to lookup node v3 billing opt-out")
+		return nil, errors.Wrap(err, "failed to lookup node v3 billing opt-out")
+	}
+
+	if len(*raw) == 0 {
+		return nil, nil
+	}
+
+	var ts uint64
+	if err := Decode(*raw, &ts); err != nil {
+		return nil, errors.Wrap(err, "failed to decode node v3 billing opt-out timestamp")
 	}
 
-	return len(*raw) > 0, nil
+	return &ts, nil
 }
 
 // SetNodeCertificate sets the node certificate type

clients/tfchain-client-go/node_test.go

@@ -89,32 +89,6 @@ func TestOptOutOfV3Billing(t *testing.T) {
 	require.True(t, optedOut)
 }
 
-func TestGetAllowedTwinAdmins(t *testing.T) {
-	cl := startLocalConnection(t)
-	defer cl.Close()
-
-	rootIdentity, err := NewIdentityFromSr25519Phrase(AliceMnemonics)
-	require.NoError(t, err)
-
-	bobAccount, err := FromAddress(BobAddress)
-	require.NoError(t, err)
-
-	// Ensure Bob is in the list
-	_, err = cl.AddTwinAdmin(rootIdentity, bobAccount)
-	require.NoError(t, err)
-	admins, err := cl.GetAllowedTwinAdmins()
-	require.NoError(t, err)
-	require.Contains(t, admins, bobAccount)
-
-	// Clean up
-	_, err = cl.RemoveTwinAdmin(rootIdentity, bobAccount)
-	require.NoError(t, err)
-
-	admins, err = cl.GetAllowedTwinAdmins()
-	require.NoError(t, err)
-	require.NotContains(t, admins, bobAccount)
-}
-
 func TestUptimeReport(t *testing.T) {
 	cl := startLocalConnection(t)
 	defer cl.Close()

clients/tfchain-client-js/lib/client.js

@@ -18,7 +18,8 @@ const {
 } = require('./farms')
 const {
   createNode, updateNode, getNode,
-  getNodeIDByPubkey, deleteNode, listNodes
+  getNodeIDByPubkey, deleteNode, listNodes,
+  optOutOfV3Billing, getAllowedTwinAdmins, isNodeOptedOutOfV3Billing, getNodeV3BillingOptOutTimestamp
 } = require('./node')
 const { signEntityTwinID, signEntityCreation } = require('./sign')
 const { getBalance, transfer } = require('./balance')
@@ -209,6 +210,22 @@ class Client {
     return deleteNode(this, id, callback)
   }
 
+  async optOutOfV3Billing(nodeID, callback) {
+    return optOutOfV3Billing(this, nodeID, callback)
+  }
+
+  async getAllowedTwinAdmins() {
+    return getAllowedTwinAdmins(this)
+  }
+
+  async isNodeOptedOutOfV3Billing(nodeID) {
+    return isNodeOptedOutOfV3Billing(this, nodeID)
+  }
+
+  async getNodeV3BillingOptOutTimestamp(nodeID) {
+    return getNodeV3BillingOptOutTimestamp(this, nodeID)
+  }
+
   async setNodePower (nodeId, power, callback) {
     return setNodePower(this, nodeId, power, callback)
   }

clients/tfchain-client-js/lib/node.js

@@ -134,32 +134,24 @@ async function optOutOfV3Billing (self, nodeID, callback) {
     .signAndSend(self.key, { nonce }, callback)
 }
 
-// addTwinAdmin adds an account to the list of twin admins (council origin)
-async function addTwinAdmin (self, account, callback) {
-  const nonce = await self.api.rpc.system.accountNextIndex(self.address)
-  return self.api.tx.tfgridModule
-    .addTwinAdmin(account)
-    .signAndSend(self.key, { nonce }, callback)
-}
-
-// removeTwinAdmin removes an account from the list of twin admins (council origin)
-async function removeTwinAdmin (self, account, callback) {
-  const nonce = await self.api.rpc.system.accountNextIndex(self.address)
-  return self.api.tx.tfgridModule
-    .removeTwinAdmin(account)
-    .signAndSend(self.key, { nonce }, callback)
-}
-
 // getAllowedTwinAdmins returns the list of accounts allowed to deploy on opted-out nodes
 async function getAllowedTwinAdmins (self) {
   const result = await self.api.query.tfgridModule.allowedTwinAdmins()
   return result.toJSON() || []
 }
 
-// isNodeOptedOutOfV3Billing returns true if the node has opted out of v3 billing
+// isNodeOptedOutOfV3Billing returns true if the node has opted out of v3 billing.
+// Deprecated: use getNodeV3BillingOptOutTimestamp to also retrieve the opt-out time.
 async function isNodeOptedOutOfV3Billing (self, nodeID) {
+  return (await getNodeV3BillingOptOutTimestamp(self, nodeID)) !== null
+}
+
+// getNodeV3BillingOptOutTimestamp returns the Unix timestamp (seconds) at which the node
+// opted out of v3 billing, or null if the node has not opted out.
+async function getNodeV3BillingOptOutTimestamp (self, nodeID) {
   const result = await self.api.query.tfgridModule.nodeV3BillingOptOut(nodeID)
-  return !result.isNone
+  if (result.isNone) return null
+  return result.unwrap().toNumber()
 }
 
 async function validateNode (self, farmID) {
@@ -177,8 +169,7 @@ module.exports = {
   deleteNode,
   listNodes,
   optOutOfV3Billing,
-  addTwinAdmin,
-  removeTwinAdmin,
   getAllowedTwinAdmins,
-  isNodeOptedOutOfV3Billing
+  isNodeOptedOutOfV3Billing,
+  getNodeV3BillingOptOutTimestamp
 }

substrate-node/pallets/pallet-dao/src/mock.rs

@@ -145,6 +145,7 @@ parameter_types! {
     pub const MaxInterfaceIpsLength: u32 = 5;
     pub const MaxInterfacesLength: u32 = 10;
     pub const MaxFarmPublicIps: u32 = 512;
+    pub const MaxTwinAdmins: u32 = 10;
     pub const TimestampHintDrift: u64 = 60;
 }
 
@@ -172,6 +173,7 @@ impl pallet_tfgrid::Config for TestRuntime {
     type FarmName = TestFarmName;
     type MaxFarmNameLength = MaxFarmNameLength;
     type MaxFarmPublicIps = MaxFarmPublicIps;
+    type MaxTwinAdmins = MaxTwinAdmins;
     type MaxInterfacesLength = MaxInterfacesLength;
     type InterfaceName = TestInterfaceName;
     type InterfaceMac = TestInterfaceMac;