Integration of GSN with Sapphire #1

xmzheng · 2023-02-21T15:44:42Z

the init changes for making GSN work on Sapphire

nhynes

This approach looks good. Could you please demonstrate it working end-to-end before we merge?

nhynes · 2023-02-23T18:41:17Z

packages/contracts/src/RelayHub.sol

@@ -39,6 +40,7 @@ contract RelayHub is IRelayHub, Ownable, ERC165 {
    using Address for address;

    address private constant DRY_RUN_ADDRESS = 0x0000000000000000000000000000000000000000;
+    address private constant ZERO_ADDRESS = 0x0000000000000000000000000000000000000000;


you can use address(0) for this

nhynes · 2023-02-23T18:42:53Z

packages/contracts/src/RelayHub.sol

@@ -100,6 +105,15 @@ contract RelayHub is IRelayHub, Ownable, ERC165 {
        batchGateway = _batchGateway;
        relayRegistrar = _relayRegistrar;
        setConfiguration(_config);
+        bytes memory randomBytes = Sapphire.randomBytes(32, "");
+        (bytes memory rawPublicKey, bytes memory rawPrivateKey) = Sapphire.generateKeyPair(Sapphire.SigningAlg.Ed25519Oasis, randomBytes);


In the next runtime upgrade, you'll be able to use Sapphire.generateCurve25519KeyPair(), which is the correct thing to use.

nhynes · 2023-02-23T18:43:26Z

packages/contracts/src/RelayHub.sol

+            relayData : relayRequest.relayData
+            });
+
+        if (relayRequest.request.from == ZERO_ADDRESS && relayRequest.request.to == ZERO_ADDRESS) {


Suggested change

if (relayRequest.request.from == ZERO_ADDRESS && relayRequest.request.to == ZERO_ADDRESS) {

if (relayRequest.request.from == address(0) && relayRequest.request.to == address(0)) {

nhynes · 2023-02-23T18:45:58Z

packages/provider/src/RelayClient.ts

+  publicKey!: string
+  cipher!: deoxysii.AEAD


you will be able to use sapphire.cipher.X25519Deoxysii once the runtime upgrade happens and the key generation algs are aligned.

nhynes · 2023-02-23T18:46:54Z

packages/provider/src/RelayClient.ts

+    const keypair = nacl.box.keyPair()
+    this.publicKey = hexlify(keypair.publicKey)
+    const sharedKey = await this.dependencies.contractInteractor.getHubSymmetricKey(this.publicKey)
+    this.cipher = new deoxysii.AEAD(arrayify(sharedKey))


Please remember that this will be replaced with X25519DeoxysII from the compat lib!

…ed it

nhynes

If this does what it says it does on the tin and the questions in the comments are answered, it LGTM.

nhynes · 2023-05-17T18:42:12Z

packages/cli/src/CommandsLogic.ts

@@ -131,6 +133,10 @@ export class CommandsLogic {
      timeout: 120000
    })
    provider.sendAsync = provider.send.bind(provider)
+    if (privateKey == null) {


Suggested change

if (privateKey == null) {

if (privateKey === null) {

nhynes · 2023-05-17T18:42:27Z

packages/cli/src/CommandsLogic.ts

@@ -131,6 +133,10 @@ export class CommandsLogic {
      timeout: 120000
    })
    provider.sendAsync = provider.send.bind(provider)
+    if (privateKey == null) {
+      privateKey = process.env.PRIVATE_KEY
+      console.log(`the process.env.PRIVATE_KEY is ${privateKey}`)


Suggested change

console.log(`the process.env.PRIVATE_KEY is ${privateKey}`)

nhynes · 2023-05-17T18:43:00Z

packages/cli/src/commands/gsn-send-request.ts

@@ -51,6 +51,8 @@ async function getProvider (
    // provider-controlled private key
    from = commander.from
    console.log('using', from)
+    privateKey = '0x' + commander.privateKeyHex
+    console.log('privateKye is ', privateKey)


probably do not want the changes in this file

nhynes · 2023-05-17T18:43:22Z

packages/cli/src/commands/gsn-start.ts

@@ -9,6 +9,7 @@ gsnCommander(['n'])
 (async () => {
  try {
    const network: string = commander.network
+    console.log(`network is ${network}`)


(for the rest of the PR, please remove debugging console.logs)

nhynes · 2023-05-17T18:45:22Z

packages/contracts/src/RelayHub.sol

@@ -286,9 +316,15 @@ contract RelayHub is IRelayHub, Ownable, ERC165 {
    {
        RelayCallData memory vars;
        vars.initialGasLeft = aggregateGasleft();
+
+        // RelayHubValidator.verifyTransactionPacking(domainSeparatorName,rawRelayRequest,signature,approvalData);


Can you remove this comment since it's been moved?

nhynes · 2023-05-17T18:46:22Z

packages/deployer/deploy/deploy.ts

    const depositValue = parseEther(env.deploymentConfiguration.paymasterDeposit)

-    if (paymasterBalance.toString() === '0') {
+//    if (paymasterBalance.toString() === '0') {


is this not needed?

nhynes · 2023-05-17T18:47:03Z

packages/dev/migrations/2_deploy_contracts.js

-  await deployer.deploy(StakeManager, 30000, 0, 0, '0x0000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000001')
-  await deployer.deploy(Penalizer, 0, 0)
+    await deployer.deploy(StakeManager, 30000, 0, 0, '0x0000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000001',  {overwrite: false})
+    await deployer.deploy(Penalizer, 0, 0,  {overwrite: false})


hh-deploy should detect that these can be reused automatically?

nhynes · 2023-05-17T18:47:14Z

packages/dev/test/RelayServer.test.ts

@@ -37,6 +37,7 @@ const TestPaymasterConfigurableMisbehavior = artifacts.require('TestPaymasterCon

 contract('RelayServer', function (accounts: Truffle.Accounts) {
  const registrationRateSeconds = 500
+


Suggested change

nhynes · 2023-05-17T18:47:35Z

packages/dev/test/ServerTestEnvironment.ts

-    this.testToken = await TestToken.new()
-    this.stakeManager = await StakeManager.new(defaultEnvironment.maxUnstakeDelay, 0, 0, constants.BURN_ADDRESS, constants.BURN_ADDRESS)
-    this.penalizer = await Penalizer.new(defaultEnvironment.penalizerConfiguration.penalizeBlockDelay, defaultEnvironment.penalizerConfiguration.penalizeBlockExpiration)
+    console.debug("I am init here!")


nhynes · 2023-05-17T18:47:51Z

packages/dev/truffle.js

@@ -15,12 +15,24 @@ if (fs.existsSync(secretMnemonicFile)) {
  secretMnemonic = fs.readFileSync(secretMnemonicFile, { encoding: 'utf8' })
 }

+ const privateKey = '47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a'


I hope that this isn't a private key you care about

xmzheng added 3 commits February 21, 2023 00:06

modify gsn for sapphire

a4469c5

some lint fix

9476547

fill in the relayData

f674ae2

xmzheng requested a review from nhynes February 21, 2023 15:44

set from and to of encrpyted relayRequest to ZERO_ADDRESS

719f0f6

nhynes reviewed Feb 23, 2023

View reviewed changes

xmzheng added 4 commits March 13, 2023 12:02

add integration test

b210b59

add deployment instruction

74472ff

update deployment command

bc5a979

temp code for debugging

41d67d4

xmzheng changed the title ~~Xmzheng/sapphire~~ Integration of GSN with Sapphire Mar 14, 2023

make sure signature can be verified by forwarder

d666bd6

xmzheng force-pushed the xmzheng/sapphire branch from 9c1f354 to d666bd6 Compare May 14, 2023 00:20

don't verify the transaction data field since we have already encrypt…

6f17cbe

…ed it

nhynes approved these changes May 17, 2023

View reviewed changes

matevz mentioned this pull request May 26, 2023

Gasless chapter (On-Chain Signer + GSN) oasisprotocol/docs#445

Merged

address comments

0dd3388

xmzheng merged commit 9d221f5 into master Jun 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integration of GSN with Sapphire #1

Integration of GSN with Sapphire #1

xmzheng commented Feb 21, 2023

nhynes left a comment

nhynes Feb 23, 2023

nhynes Feb 23, 2023

nhynes Feb 23, 2023

nhynes Feb 23, 2023

nhynes Feb 23, 2023

nhynes left a comment

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

nhynes May 17, 2023

	if (relayRequest.request.from == ZERO_ADDRESS && relayRequest.request.to == ZERO_ADDRESS) {
	if (relayRequest.request.from == address(0) && relayRequest.request.to == address(0)) {

		@@ -37,6 +37,7 @@ const TestPaymasterConfigurableMisbehavior = artifacts.require('TestPaymasterCon

		contract('RelayServer', function (accounts: Truffle.Accounts) {
		const registrationRateSeconds = 500

Integration of GSN with Sapphire #1

Integration of GSN with Sapphire #1

Conversation

xmzheng commented Feb 21, 2023

nhynes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nhynes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment