[Gummyroll] Single authority for each tree (solana-labs#153)

* remove append_authority from contract * update gummyroll ts sdk * update gummyroll tests * remove append authority from bubblegum contract * update bubblegum ts sdk * Added slightly more robust logic to proof filling (solana-labs#155) * Added more tests to gummyroll for canopy proof inference * Change GRoll key for use on devnet Co-authored-by: Noah Gundotra <noahgundotra@noahs-mbp.mynetworksettings.com> Co-authored-by: Jarry Xiao <61092285+jarry-xiao@users.noreply.github.com> Co-authored-by: jarry-xiao <jarry.xiao@gmail.com>
ngundotra · Sep 8, 2022 · b6d2b47 · b6d2b47
1 parent ffd489c
commit b6d2b47
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/contracts/sdk/gummyroll/accounts/index.ts b/contracts/sdk/gummyroll/accounts/index.ts
@@ -45,7 +45,6 @@ type MerkleRollHeader = {
   maxDepth: number; // u32
   maxBufferSize: number; // u32
   authority: PublicKey;
-  appendAuthority: PublicKey;
   creationSlot: BN;
 };
 
@@ -83,7 +82,6 @@ export function decodeMerkleRoll(buffer: Buffer): OnChainMerkleRoll {
     maxBufferSize: reader.readU32(),
     maxDepth: reader.readU32(),
     authority: readPublicKey(reader),
-    appendAuthority: readPublicKey(reader),
     creationSlot: reader.readU64(),
   };
 
@@ -146,7 +144,7 @@ export function getMerkleRollAccountSize(
   maxBufferSize: number,
   canopyDepth?: number
 ): number {
-  let headerSize = 8 + 32 + 32;
+  let headerSize = 8 + 32;
   let changeLogSize = (maxDepth * 32 + 32 + 4 + 4) * maxBufferSize;
   let rightMostPathSize = maxDepth * 32 + 32 + 4 + 4;
   let merkleRollSize = 8 + 8 + 16 + changeLogSize + rightMostPathSize;

diff --git a/contracts/sdk/gummyroll/convenience.ts b/contracts/sdk/gummyroll/convenience.ts
@@ -55,7 +55,6 @@ export async function getCreateTreeIxs(
             accounts: {
                 merkleRoll,
                 authority: authority.publicKey,
-                appendAuthority,
                 candyWrapper: CANDY_WRAPPER_PROGRAM_ID
             },
             signers: [authority],

diff --git a/contracts/sdk/gummyroll/index.ts b/contracts/sdk/gummyroll/index.ts
@@ -11,7 +11,7 @@ export * from './convenience';
  * @category constants
  * @category generated
  */
-export const PROGRAM_ADDRESS = 'GRoLLMza82AiYN7W9S9KCCtCyyPRAQP2ifBy4v4D5RMD'
+export const PROGRAM_ADDRESS = 'GRoLLzvxpxxu2PGNJMMeZPyMxjAUH9pKqxGXV9DGiceU'
 
 /**
  * Program public key

diff --git a/contracts/sdk/gummyroll/instructions/index.ts b/contracts/sdk/gummyroll/instructions/index.ts
@@ -52,7 +52,6 @@ export function createAppendIx(
     gummyroll: Program<Gummyroll>,
     newLeaf: Buffer | ArrayLike<number>,
     authority: Keypair,
-    appendAuthority: Keypair,
     merkleRoll: PublicKey,
 ): TransactionInstruction {
     return gummyroll.instruction.append(
@@ -61,10 +60,9 @@ export function createAppendIx(
             accounts: {
                 merkleRoll,
                 authority: authority.publicKey,
-                appendAuthority: appendAuthority.publicKey,
                 candyWrapper: CANDY_WRAPPER_PROGRAM_ID,
             },
-            signers: [authority, appendAuthority],
+            signers: [authority],
         }
     );
 }
@@ -73,12 +71,10 @@ export function createTransferAuthorityIx(
     gummyroll: Program<Gummyroll>,
     authority: Keypair,
     merkleRoll: PublicKey,
-    newAuthority: PublicKey | null,
-    newAppendAuthority: PublicKey | null,
+    newAuthority: PublicKey,
 ): TransactionInstruction {
     return gummyroll.instruction.transferAuthority(
         newAuthority,
-        newAppendAuthority,
         {
             accounts: {
                 merkleRoll,