fix: integrate deposit fee and audit fixes (#3232)

* integrate deposit fee and audit fixes * unit test fix * latest gateway changes * latest gateway * latest gateway
zeta-chain · Dec 3, 2024 · 93f02bd · 93f02bd
1 parent e2c34d3
commit 93f02bd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/contrib/localnet/solana/gateway.so b/contrib/localnet/solana/gateway.so
diff --git a/e2e/runner/solana.go b/e2e/runner/solana.go
@@ -110,12 +110,13 @@ func (r *E2ERunner) CreateDepositSPLInstruction(
 		DataBytes: depositSPLData,
 		AccountValues: []*solana.AccountMeta{
 			solana.Meta(signer).WRITE().SIGNER(),
-			solana.Meta(r.ComputePdaAddress()),
+			solana.Meta(r.ComputePdaAddress()).WRITE(),
 			solana.Meta(whitelistEntry),
 			solana.Meta(mint),
 			solana.Meta(solana.TokenProgramID),
 			solana.Meta(from).WRITE(),
 			solana.Meta(to).WRITE(),
+			solana.Meta(solana.SystemProgramID),
 		},
 	}
 }

diff --git a/pkg/contracts/solana/gateway.go b/pkg/contracts/solana/gateway.go
@@ -19,8 +19,8 @@ const (
 	accountsNumDeposit = 3
 
 	// AccountsNumberOfDeposit is the number of accounts required for Solana gateway deposit spl instruction
-	// [signer, pda, whitelist_entry, mint_account, token_program, from, to]
-	accountsNumberDepositSPL = 7
+	// [signer, pda, whitelist_entry, mint_account, token_program, from, to, system_program]
+	accountsNumberDepositSPL = 8
 )
 
 var (

diff --git a/pkg/contracts/solana/gateway.json b/pkg/contracts/solana/gateway.json
@@ -143,6 +143,7 @@
         },
         {
           "name": "pda",
+          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -196,6 +197,10 @@
         {
           "name": "to",
           "writable": true
+        },
+        {
+          "name": "system_program",
+          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [
@@ -234,6 +239,7 @@
         },
         {
           "name": "pda",
+          "writable": true,
           "pda": {
             "seeds": [
               {
@@ -287,6 +293,10 @@
         {
           "name": "to",
           "writable": true
+        },
+        {
+          "name": "system_program",
+          "address": "11111111111111111111111111111111"
         }
       ],
       "args": [
@@ -1033,6 +1043,11 @@
       "code": 6009,
       "name": "SPLAtaAndMintAddressMismatch",
       "msg": "SPLAtaAndMintAddressMismatch"
+    },
+    {
+      "code": 6010,
+      "name": "EmptyReceiver",
+      "msg": "EmptyReceiver"
     }
   ],
   "types": [

diff --git a/...yLDze6nHSRi7L5REozKAZY1aAyPJ6TfibiqQL5JGwgSBkYux5z5JfXs5ed8LZqpXUy4VijoU3x15mBd66ZGE.json b/...yLDze6nHSRi7L5REozKAZY1aAyPJ6TfibiqQL5JGwgSBkYux5z5JfXs5ed8LZqpXUy4VijoU3x15mBd66ZGE.json
@@ -14,6 +14,7 @@
                 "8vquQi8xNxxBTsohf1u8xQHYbo7Fv8BEWCJz63RJSaeE",
                 "4GddKQ7baJpMyKna7bPPnhh7UQtpzfSGL1FgZ31hj4mp",
                 "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+                "11111111111111111111111111111111",
                 "94U5AHQMKkV5txNJ17QPXWoh474PheGou6cNP2FEuL1d"
             ],
             "header": {
@@ -24,15 +25,16 @@
             "recentBlockhash": "5ZB2NWKwp86t47ojCHPjRyd5vMKSWBdhxqDdtSZVPUj",
             "instructions": [
                 {
-                    "programIdIndex": 7,
+                    "programIdIndex": 8,
                     "accounts": [
                         0,
                         3,
                         4,
                         5,
                         6,
                         1,
-                        2
+                        2,
+                        7
                     ],
                     "data": "5JndgWCNHDyr2qQccK9VM1NxJFrVbUDvG2hfAxRC5z6nPPAVPsj7q3A"
                 }