@@ -95,11 +95,6 @@ export class RNCryptoClient implements CryptoClient {
9595 scalarToArrayBuffer ( advice . anonymityRevokerPublicKeyX ) ,
9696 scalarToArrayBuffer ( advice . anonymityRevokerPublicKeyY )
9797 ) ;
98- return new Uint8Array ( rawProof ) ;
99- } ) ;
100- } ,
101- pubInputs : async ( advice ) => {
102- return Promise . resolve ( ) . then ( ( ) => {
10398 const rawPubInputs = newAccountPubInputs (
10499 scalarToArrayBuffer ( advice . id ) ,
105100 scalarToArrayBuffer ( advice . nullifier ) ,
@@ -112,31 +107,34 @@ export class RNCryptoClient implements CryptoClient {
112107 scalarToArrayBuffer ( advice . anonymityRevokerPublicKeyY )
113108 ) ;
114109 return {
115- hNote : arrayBufferToScalar ( rawPubInputs . hashedNote ) ,
116- prenullifier : arrayBufferToScalar ( rawPubInputs . prenullifier ) ,
117- initialDeposit : arrayBufferToScalar ( rawPubInputs . initialDeposit ) ,
118- commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
119- tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
120- anonymityRevokerPublicKeyX : arrayBufferToScalar (
121- rawPubInputs . anonymityRevokerPublicKeyX
122- ) ,
123- anonymityRevokerPublicKeyY : arrayBufferToScalar (
124- rawPubInputs . anonymityRevokerPublicKeyY
125- ) ,
126- symKeyEncryption1X : arrayBufferToScalar (
127- rawPubInputs . symKeyEncryption1X
128- ) ,
129- symKeyEncryption1Y : arrayBufferToScalar (
130- rawPubInputs . symKeyEncryption1Y
131- ) ,
132- symKeyEncryption2X : arrayBufferToScalar (
133- rawPubInputs . symKeyEncryption2X
134- ) ,
135- symKeyEncryption2Y : arrayBufferToScalar (
136- rawPubInputs . symKeyEncryption2Y
137- ) ,
138- macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
139- macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
110+ proof : new Uint8Array ( rawProof ) ,
111+ pubInputs : {
112+ hNote : arrayBufferToScalar ( rawPubInputs . hashedNote ) ,
113+ prenullifier : arrayBufferToScalar ( rawPubInputs . prenullifier ) ,
114+ initialDeposit : arrayBufferToScalar ( rawPubInputs . initialDeposit ) ,
115+ commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
116+ tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
117+ anonymityRevokerPublicKeyX : arrayBufferToScalar (
118+ rawPubInputs . anonymityRevokerPublicKeyX
119+ ) ,
120+ anonymityRevokerPublicKeyY : arrayBufferToScalar (
121+ rawPubInputs . anonymityRevokerPublicKeyY
122+ ) ,
123+ symKeyEncryption1X : arrayBufferToScalar (
124+ rawPubInputs . symKeyEncryption1X
125+ ) ,
126+ symKeyEncryption1Y : arrayBufferToScalar (
127+ rawPubInputs . symKeyEncryption1Y
128+ ) ,
129+ symKeyEncryption2X : arrayBufferToScalar (
130+ rawPubInputs . symKeyEncryption2X
131+ ) ,
132+ symKeyEncryption2Y : arrayBufferToScalar (
133+ rawPubInputs . symKeyEncryption2Y
134+ ) ,
135+ macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
136+ macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
137+ } ,
140138 } ;
141139 } ) ;
142140 } ,
@@ -180,11 +178,7 @@ export class RNCryptoClient implements CryptoClient {
180178 scalarToArrayBuffer ( advice . nullifierNew ) ,
181179 scalarToArrayBuffer ( advice . macSalt )
182180 ) ;
183- return new Uint8Array ( rawProof ) ;
184- } ) ;
185- } ,
186- pubInputs : async ( advice ) => {
187- return Promise . resolve ( ) . then ( ( ) => {
181+
188182 const rawPubInputs = depositPubInputs (
189183 scalarToArrayBuffer ( advice . id ) ,
190184 scalarToArrayBuffer ( advice . nullifierOld ) ,
@@ -197,14 +191,17 @@ export class RNCryptoClient implements CryptoClient {
197191 scalarToArrayBuffer ( advice . macSalt )
198192 ) ;
199193 return {
200- merkleRoot : arrayBufferToScalar ( rawPubInputs . merkleRoot ) ,
201- hNullifierOld : arrayBufferToScalar ( rawPubInputs . hNullifierOld ) ,
202- hNoteNew : arrayBufferToScalar ( rawPubInputs . hNoteNew ) ,
203- value : arrayBufferToScalar ( rawPubInputs . value ) ,
204- commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
205- tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
206- macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
207- macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
194+ proof : new Uint8Array ( rawProof ) ,
195+ pubInputs : {
196+ merkleRoot : arrayBufferToScalar ( rawPubInputs . merkleRoot ) ,
197+ hNullifierOld : arrayBufferToScalar ( rawPubInputs . hNullifierOld ) ,
198+ hNoteNew : arrayBufferToScalar ( rawPubInputs . hNoteNew ) ,
199+ value : arrayBufferToScalar ( rawPubInputs . value ) ,
200+ commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
201+ tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
202+ macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
203+ macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
204+ } ,
208205 } ;
209206 } ) ;
210207 } ,
@@ -243,11 +240,7 @@ export class RNCryptoClient implements CryptoClient {
243240 scalarToArrayBuffer ( advice . commitment ) ,
244241 scalarToArrayBuffer ( advice . macSalt )
245242 ) ;
246- return new Uint8Array ( rawProof ) ;
247- } ) ;
248- } ,
249- pubInputs : async ( advice ) => {
250- return Promise . resolve ( ) . then ( ( ) => {
243+
251244 const rawPubInputs = withdrawPubInputs (
252245 scalarToArrayBuffer ( advice . id ) ,
253246 scalarToArrayBuffer ( advice . nullifierOld ) ,
@@ -260,14 +253,17 @@ export class RNCryptoClient implements CryptoClient {
260253 scalarToArrayBuffer ( advice . macSalt )
261254 ) ;
262255 return {
263- merkleRoot : arrayBufferToScalar ( rawPubInputs . merkleRoot ) ,
264- hNullifierOld : arrayBufferToScalar ( rawPubInputs . hNullifierOld ) ,
265- hNoteNew : arrayBufferToScalar ( rawPubInputs . hNoteNew ) ,
266- value : arrayBufferToScalar ( rawPubInputs . withdrawalValue ) ,
267- tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
268- commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
269- macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
270- macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
256+ proof : new Uint8Array ( rawProof ) ,
257+ pubInputs : {
258+ merkleRoot : arrayBufferToScalar ( rawPubInputs . merkleRoot ) ,
259+ hNullifierOld : arrayBufferToScalar ( rawPubInputs . hNullifierOld ) ,
260+ hNoteNew : arrayBufferToScalar ( rawPubInputs . hNoteNew ) ,
261+ value : arrayBufferToScalar ( rawPubInputs . withdrawalValue ) ,
262+ tokenAddress : arrayBufferToScalar ( rawPubInputs . tokenAddress ) ,
263+ commitment : arrayBufferToScalar ( rawPubInputs . commitment ) ,
264+ macSalt : arrayBufferToScalar ( rawPubInputs . macSalt ) ,
265+ macCommitment : arrayBufferToScalar ( rawPubInputs . macCommitment ) ,
266+ } ,
271267 } ;
272268 } ) ;
273269 } ,
0 commit comments