chore: refactor replace keystore and shadow key in code (scroll-node #211)

colinlyguo · colinlyguo · commit 1f28139c1b59 · 2022-10-19T17:45:17.000+08:00
diff --git a/bridge/config.json b/bridge/config.json
@@ -43,7 +43,7 @@
           "max_gas_price": 10000000000,
           "tx_type": "DynamicFeeTx"
         },
-        "private_key": "ad29c7c341a23f04851b6c8602c7c74b98e3fc9488582791bda60e0e261f9cbb"
+        "private_key": "1212121212121212121212121212121212121212121212121212121212121212"
       }
     },
     "db_config": {
diff --git a/bridge/l2/watcher_test.go b/bridge/l2/watcher_test.go
@@ -106,7 +106,7 @@ func TestWatcherFunction(t *testing.T) {
 		numTransactions := 3
 
 		for i := 0; i < numTransactions; i++ {
-			tx := mock.SendTxToL2Client(t, client)
+			tx := mock.SendTxToL2Client(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
 			// wait for mining
 			_, err = bind.WaitMined(context.Background(), client, tx)
 			assert.NoError(t, err)
@@ -134,7 +134,7 @@ func TestWatcherFunction(t *testing.T) {
 		previousHeight, err = client.BlockNumber(context.Background())
 		assert.NoError(t, err)
 
-		auth := prepareAuth(t, client)
+		auth := prepareAuth(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
 
 		// deploy mock bridge
 		_, tx, instance, err := mock_bridge.DeployMockBridge(auth, client)
@@ -147,7 +147,7 @@ func TestWatcherFunction(t *testing.T) {
 		rc.Start()
 
 		// Call mock_bridge instance sendMessage to trigger emit events
-		addr := common.HexToAddress("0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571")
+		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
 		nonce, err := client.PendingNonceAt(context.Background(), addr)
 		assert.NoError(t, err)
 		auth.Nonce = big.NewInt(int64(nonce))
@@ -161,7 +161,7 @@ func TestWatcherFunction(t *testing.T) {
 		}
 
 		//extra block mined
-		addr = common.HexToAddress("0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571")
+		addr = common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
 		nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
 		assert.NoError(t, nounceErr)
 		auth.Nonce = big.NewInt(int64(nonce))
@@ -208,7 +208,7 @@ func TestWatcherFunction(t *testing.T) {
 		previousHeight, err := client.BlockNumber(context.Background()) // shallow the global previousHeight
 		assert.NoError(t, err)
 
-		auth := prepareAuth(t, client)
+		auth := prepareAuth(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
 
 		_, trx, instance, err := mock_bridge.DeployMockBridge(auth, client)
 		assert.NoError(t, err)
@@ -224,7 +224,7 @@ func TestWatcherFunction(t *testing.T) {
 		var tx *types.Transaction
 
 		for i := 0; i < numTransactions; i++ {
-			addr := common.HexToAddress("0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571")
+			addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
 			nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
 			assert.NoError(t, nounceErr)
 			auth.Nonce = big.NewInt(int64(nonce))
@@ -240,7 +240,7 @@ func TestWatcherFunction(t *testing.T) {
 		}
 
 		// extra block mined
-		addr := common.HexToAddress("0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571")
+		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
 		nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
 		assert.NoError(t, nounceErr)
 		auth.Nonce = big.NewInt(int64(nonce))
@@ -299,8 +299,8 @@ func prepareRelayerClient(client *ethclient.Client, db database.OrmFactory, cont
 	return l2.NewL2WatcherClient(context.Background(), client, 0, 1, map[string]struct{}{}, contractAddr, messengerABI, db)
 }
 
-func prepareAuth(t *testing.T, client *ethclient.Client) *bind.TransactOpts {
-	privateKey, err := crypto.HexToECDSA("ad29c7c341a23f04851b6c8602c7c74b98e3fc9488582791bda60e0e261f9cbb")
+func prepareAuth(t *testing.T, client *ethclient.Client, private string) *bind.TransactOpts {
+	privateKey, err := crypto.HexToECDSA(private)
 	assert.NoError(t, err)
 	publicKey := privateKey.Public()
 	publicKeyECDSA, ok := publicKey.(*ecdsa.PublicKey)
diff --git a/bridge/mock/mock.go b/bridge/mock/mock.go
@@ -225,8 +225,8 @@ func PrepareDB(t *testing.T, db_cfg *database.DBConfig) database.OrmFactory {
 }
 
 // SendTxToL2Client will send a default Tx by calling l2geth client
-func SendTxToL2Client(t *testing.T, client *ethclient.Client) *types.Transaction {
-	privateKey, err := crypto.HexToECDSA("ad29c7c341a23f04851b6c8602c7c74b98e3fc9488582791bda60e0e261f9cbb")
+func SendTxToL2Client(t *testing.T, client *ethclient.Client, private string) *types.Transaction {
+	privateKey, err := crypto.HexToECDSA(private)
 	assert.NoError(t, err)
 	publicKey := privateKey.Public()
 	publicKeyECDSA, ok := publicKey.(*ecdsa.PublicKey)
diff --git a/bridge/sender/sender_test.go b/bridge/sender/sender_test.go
@@ -28,7 +28,7 @@ var (
 	TestConfig = &mock.TestConfig{
 		L1GethTestConfig: mock.L1GethTestConfig{
 			HPort: 0,
-			WPort: 8575,
+			WPort: 8576,
 		},
 	}
 
@@ -37,7 +37,9 @@ var (
 )
 
 func setupEnv(t *testing.T) {
-	prv, err := crypto.HexToECDSA("ad29c7c341a23f04851b6c8602c7c74b98e3fc9488582791bda60e0e261f9cbb")
+	cfg, err := config.NewConfig("../config.json")
+	assert.NoError(t, err)
+	prv, err := crypto.HexToECDSA(cfg.L2Config.RelayerConfig.PrivateKey)
 	assert.NoError(t, err)
 	private = prv
 	l1gethImg = mock.NewTestL1Docker(t, TestConfig)
diff --git a/common/docker/l1geth/genesis-keystore b/common/docker/l1geth/genesis-keystore
@@ -1 +1 @@
-{"address":"0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571","crypto":{"kdf":"pbkdf2","kdfparams":{"c":262144,"dklen":32,"prf":"hmac-sha256","salt":"5315dce5938c8ed2bf8eb354bfb0018b5cd0d42cb254931fb01ad94dc9f13cc7"},"cipher":"aes-128-ctr","ciphertext":"a0a87ed3cf2e0b37fdef68cbf40b939004d68a866e2a5a1a74af592a35825a00","cipherparams":{"iv":"ce2704a74a2ab501baf62db1b00dda17"},"mac":"6bd869db3078c176cb20a46d09f6cc2acbe2379ab0ef299b38639b5f630794f4"},"id":"ce33be41-50a5-448f-befe-62def4e52c53","version":3}
+{"address":"1c5a77d9fa7ef466951b2f01f724bca3a5820b63","crypto":{"cipher":"aes-128-ctr","ciphertext":"41aa5bb01833d30effb0b91f65214ea43dfc58a2f8f681a0878383baf74ca1d3","cipherparams":{"iv":"d4a3649e6b0807f4533d882fba251db4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"f3686473147bebdaf0da70d3309026fef35ba51cbf0e9f64b854d88cd429e9e2"},"mac":"2d3038633ca1d10720c6d1acd0819656aff93290d6af91b3c0db79846c0fea18"},"id":"ea5886f5-574c-47ba-89d0-519fb3aa9d9e","version":3}
diff --git a/common/docker/l1geth/genesis.json b/common/docker/l1geth/genesis.json
@@ -20,13 +20,13 @@
   },
   "nonce": "0x0",
   "timestamp": "0x61bc34a0",
-  "extraData": "0x00000000000000000000000000000000000000000000000000000000000000004cb1ab63af5d8931ce09673ebd8ae2ce16fd65710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "extraData": "0x00000000000000000000000000000000000000000000000000000000000000001c5a77d9fa7ef466951b2f01f724bca3a5820b630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
   "gasLimit": "940000000000000",
   "difficulty": "0x1",
   "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "coinbase": "0x0000000000000000000000000000000000000000",
   "alloc": {
-    "4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571": {
+    "1c5a77d9fa7ef466951b2f01f724bca3a5820b63": {
       "balance": "0x200000000000000000000000000000000000000000000000000000000000000"
     }
   },
diff --git a/common/docker/l1geth/password b/common/docker/l1geth/password
@@ -1 +1 @@
-scroll
+scrolltest
diff --git a/common/docker/l2geth/genesis-keystore b/common/docker/l2geth/genesis-keystore
@@ -1 +1 @@
-{"address":"0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571","crypto":{"kdf":"pbkdf2","kdfparams":{"c":262144,"dklen":32,"prf":"hmac-sha256","salt":"5315dce5938c8ed2bf8eb354bfb0018b5cd0d42cb254931fb01ad94dc9f13cc7"},"cipher":"aes-128-ctr","ciphertext":"a0a87ed3cf2e0b37fdef68cbf40b939004d68a866e2a5a1a74af592a35825a00","cipherparams":{"iv":"ce2704a74a2ab501baf62db1b00dda17"},"mac":"6bd869db3078c176cb20a46d09f6cc2acbe2379ab0ef299b38639b5f630794f4"},"id":"ce33be41-50a5-448f-befe-62def4e52c53","version":3}
+{"address":"1c5a77d9fa7ef466951b2f01f724bca3a5820b63","crypto":{"cipher":"aes-128-ctr","ciphertext":"41aa5bb01833d30effb0b91f65214ea43dfc58a2f8f681a0878383baf74ca1d3","cipherparams":{"iv":"d4a3649e6b0807f4533d882fba251db4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"f3686473147bebdaf0da70d3309026fef35ba51cbf0e9f64b854d88cd429e9e2"},"mac":"2d3038633ca1d10720c6d1acd0819656aff93290d6af91b3c0db79846c0fea18"},"id":"ea5886f5-574c-47ba-89d0-519fb3aa9d9e","version":3}
diff --git a/common/docker/l2geth/genesis.json b/common/docker/l2geth/genesis.json
@@ -20,13 +20,13 @@
   },
   "nonce": "0x0",
   "timestamp": "0x61bc34a0",
-  "extraData": "0x00000000000000000000000000000000000000000000000000000000000000004cb1ab63af5d8931ce09673ebd8ae2ce16fd65710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "extraData": "0x00000000000000000000000000000000000000000000000000000000000000001c5a77d9fa7ef466951b2f01f724bca3a5820b630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
   "gasLimit": "940000000000000",
   "difficulty": "0x1",
   "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "coinbase": "0x0000000000000000000000000000000000000000",
   "alloc": {
-    "4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571": {
+    "1c5a77d9fa7ef466951b2f01f724bca3a5820b63": {
       "balance": "0x200000000000000000000000000000000000000000000000000000000000000"
     }
   },
diff --git a/common/docker/l2geth/password b/common/docker/l2geth/password
@@ -1 +1 @@
-scroll
+scrolltest

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`"max_gas_price": 10000000000,`
`44`	`44`	`"tx_type": "DynamicFeeTx"`
`45`	`45`	`},`
`46`		`- "private_key": "ad29c7c341a23f04851b6c8602c7c74b98e3fc9488582791bda60e0e261f9cbb"`
	`46`	`+ "private_key": "1212121212121212121212121212121212121212121212121212121212121212"`
`47`	`47`	`}`
`48`	`48`	`},`
`49`	`49`	`"db_config": {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"address":"0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571","crypto":{"kdf":"pbkdf2","kdfparams":{"c":262144,"dklen":32,"prf":"hmac-sha256","salt":"5315dce5938c8ed2bf8eb354bfb0018b5cd0d42cb254931fb01ad94dc9f13cc7"},"cipher":"aes-128-ctr","ciphertext":"a0a87ed3cf2e0b37fdef68cbf40b939004d68a866e2a5a1a74af592a35825a00","cipherparams":{"iv":"ce2704a74a2ab501baf62db1b00dda17"},"mac":"6bd869db3078c176cb20a46d09f6cc2acbe2379ab0ef299b38639b5f630794f4"},"id":"ce33be41-50a5-448f-befe-62def4e52c53","version":3}
	`1`	`+{"address":"1c5a77d9fa7ef466951b2f01f724bca3a5820b63","crypto":{"cipher":"aes-128-ctr","ciphertext":"41aa5bb01833d30effb0b91f65214ea43dfc58a2f8f681a0878383baf74ca1d3","cipherparams":{"iv":"d4a3649e6b0807f4533d882fba251db4"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"f3686473147bebdaf0da70d3309026fef35ba51cbf0e9f64b854d88cd429e9e2"},"mac":"2d3038633ca1d10720c6d1acd0819656aff93290d6af91b3c0db79846c0fea18"},"id":"ea5886f5-574c-47ba-89d0-519fb3aa9d9e","version":3}`