feat: support stake transactions (#29)

RSS3-Network · Jan 19, 2024 · 91debe9 · 91debe9
1 parent 01a52ba
commit 91debe9
Show file tree

Hide file tree

Showing 20 changed files with 6,212 additions and 1,001 deletions.
diff --git a/contract/l2/abi/Chips.abi b/contract/l2/abi/Chips.abi
diff --git a/contract/l2/abi/Staking.abi b/contract/l2/abi/Staking.abi
@@ -1,11 +1,6 @@
 [
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
       {
         "internalType": "address",
         "name": "treasury",
@@ -66,28 +61,6 @@
     "name": "AccessControlUnauthorizedAccount",
     "type": "error"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "target",
-        "type": "address"
-      }
-    ],
-    "name": "AddressEmptyCode",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "AddressInsufficientBalance",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "AlreadyClaimed",
@@ -210,7 +183,7 @@
   },
   {
     "inputs": [],
-    "name": "FailedInnerCall",
+    "name": "InsufficientValue",
     "type": "error"
   },
   {
@@ -308,19 +281,13 @@
     "type": "error"
   },
   {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "SafeERC20FailedOperation",
+    "inputs": [],
+    "name": "TaxRateBasisPointsTooLarge",
     "type": "error"
   },
   {
     "inputs": [],
-    "name": "TaxRateBasisPointsTooLarge",
+    "name": "TransferFailed",
     "type": "error"
   },
   {
@@ -744,6 +711,12 @@
         "name": "requestId",
         "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "unstakeAmount",
+        "type": "uint256"
+      },
       {
         "indexed": false,
         "internalType": "uint256[]",
@@ -909,19 +882,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "TOKEN",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "TREASURY",
@@ -989,11 +949,6 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
       {
         "internalType": "string",
         "name": "name",
@@ -1017,40 +972,7 @@
     ],
     "name": "createNode",
     "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "description",
-        "type": "string"
-      },
-      {
-        "internalType": "uint64",
-        "name": "taxRateBasisPoints",
-        "type": "uint64"
-      },
-      {
-        "internalType": "bool",
-        "name": "publicGood",
-        "type": "bool"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "createNodeAndDeposit",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "payable",
     "type": "function"
   },
   {
@@ -1080,16 +1002,10 @@
     "type": "function"
   },
   {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
+    "inputs": [],
     "name": "deposit",
     "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "payable",
     "type": "function"
   },
   {
@@ -1127,7 +1043,7 @@
     ],
     "name": "distributeRewards",
     "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "payable",
     "type": "function"
   },
   {
@@ -1857,11 +1773,6 @@
         "internalType": "address",
         "name": "nodeAddr",
         "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
       }
     ],
     "name": "stake",
@@ -1877,7 +1788,7 @@
         "type": "uint256"
       }
     ],
-    "stateMutability": "nonpayable",
+    "stateMutability": "payable",
     "type": "function"
   },
   {
@@ -1886,11 +1797,6 @@
         "internalType": "address",
         "name": "nodeAddr",
         "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
       }
     ],
     "name": "stakeToPublicPool",
@@ -1906,20 +1812,7 @@
         "type": "uint256"
       }
     ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "stakingToken",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
+    "stateMutability": "payable",
     "type": "function"
   },
   {
@@ -1954,5 +1847,9 @@
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "stateMutability": "payable",
+    "type": "receive"
   }
 ]
diff --git a/contract/l2/contract.go b/contract/l2/contract.go
@@ -29,7 +29,7 @@ var (
 
 	EventHashStakingDeposited         = crypto.Keccak256Hash([]byte("Deposited(address,uint256)"))
 	EventHashStakingStaked            = crypto.Keccak256Hash([]byte("Staked(address,address,uint256,uint256,uint256)"))
-	EventHashStakingUnstakeRequested  = crypto.Keccak256Hash([]byte("UnstakeRequested(address,address,uint256,uint256[])"))
+	EventHashStakingUnstakeRequested  = crypto.Keccak256Hash([]byte("UnstakeRequested(address,address,uint256,uint256,uint256[])"))
 	EventHashStakingUnstakeClaimed    = crypto.Keccak256Hash([]byte("UnstakeClaimed(uint256,address,address,uint256)"))
 	EventHashStakingWithdrawRequested = crypto.Keccak256Hash([]byte("WithdrawRequested(address,uint256,uint256)"))
 	EventHashStakingWithdrawalClaimed = crypto.Keccak256Hash([]byte("WithdrawalClaimed(uint256 indexed requestId)"))

diff --git a/contract/l2/contract_chips.go b/contract/l2/contract_chips.go
diff --git a/contract/l2/contract_staking.go b/contract/l2/contract_staking.go
diff --git a/deploy/config.yaml b/deploy/config.yaml
@@ -7,4 +7,4 @@ database:
 
 rss3_chain:
   endpoint_l1: https://rpc.ankr.com/eth_sepolia
-  endpoint_l2: https://rpc.testnet.rss3.dev
+  endpoint_l2: https://rpc.testnet.rss3.io
diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/ethereum/go-ethereum v1.13.10
 	github.com/go-playground/validator/v10 v10.16.0
 	github.com/labstack/echo/v4 v4.11.4
+	github.com/lib/pq v1.10.9
 	github.com/naturalselectionlabs/rss3-node v0.0.0-20240108094705-95832810ba63
 	github.com/orlangure/gnomock v0.30.0
 	github.com/pressly/goose/v3 v3.17.0
@@ -77,7 +78,6 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/lib/pq v1.10.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect

diff --git a/internal/database/client.go b/internal/database/client.go
@@ -36,6 +36,14 @@ type Client interface {
 
 	FindStakeStaker(ctx context.Context, user, node common.Address) (*schema.StakeStaker, error)
 	SaveStakeStaker(ctx context.Context, stakeStaker *schema.StakeStaker) error
+	FindStakeTransaction(ctx context.Context, id common.Hash) (*schema.StakeTransaction, error)
+	FindStakeTransactions(ctx context.Context) ([]*schema.StakeTransaction, error)
+	FindStakeTransactionsByUser(ctx context.Context, address common.Address) ([]*schema.StakeTransaction, error)
+	FindStakeTransactionsByNode(ctx context.Context, address common.Address) ([]*schema.StakeTransaction, error)
+	FindStakeEventsByID(ctx context.Context, id common.Hash) ([]*schema.StakeEvent, error)
+	FindStakeEventsByIDs(ctx context.Context, ids []common.Hash) ([]*schema.StakeEvent, error)
+	SaveStakeTransaction(ctx context.Context, stakeTransaction *schema.StakeTransaction) error
+	SaveStakeEvent(ctx context.Context, stakeEvent *schema.StakeEvent) error
 }
 
 type Session interface {

diff --git a/internal/database/dialer/cockroachdb/client_bridge.go b/internal/database/dialer/cockroachdb/client_bridge.go
@@ -31,7 +31,7 @@ func (c *client) FindBridgeTransactions(ctx context.Context) ([]*schema.BridgeTr
 	var rows []table.BridgeTransaction
 
 	if err := c.database.WithContext(ctx).Find(&rows).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fmt.Errorf("fin bridge transactions: %w", err)
+		return nil, fmt.Errorf("find bridge transactions: %w", err)
 	}
 
 	results := make([]*schema.BridgeTransaction, 0, len(rows))
@@ -52,7 +52,7 @@ func (c *client) FindBridgeTransactionsByAddress(ctx context.Context, address co
 	var rows []table.BridgeTransaction
 
 	if err := c.database.WithContext(ctx).Distinct("*").Where("sender = ? OR receiver = ?", address.String(), address.String()).Find(&rows).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fmt.Errorf("fin bridge transactions: %w", err)
+		return nil, fmt.Errorf("find bridge transactions: %w", err)
 	}
 
 	results := make([]*schema.BridgeTransaction, 0, len(rows))
@@ -77,7 +77,7 @@ func (c *client) FindBridgeEventsByID(ctx context.Context, id common.Hash) (*sch
 			return nil, database.ErrorRowNotFound
 		}
 
-		return nil, fmt.Errorf("fin bridge event: %w", err)
+		return nil, fmt.Errorf("find bridge event: %w", err)
 	}
 
 	return row.Export()
@@ -91,7 +91,7 @@ func (c *client) FindBridgeEventsByIDs(ctx context.Context, ids []common.Hash) (
 	})
 
 	if err := c.database.WithContext(ctx).Where("id IN ?", transactionIDs).Find(&rows).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fmt.Errorf("fin bridge event: %w", err)
+		return nil, fmt.Errorf("find bridge event: %w", err)
 	}
 
 	results := make([]*schema.BridgeEvent, 0, len(rows))