diff --git a/package.json b/package.json index 023036d..7f62e1f 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@graphprotocol/client-cli": "^2.2.22", - "@railgun-community/wallet": "^10.8.3", + "@railgun-community/wallet": "^10.9.0", "@typechain/ethers-v6": "^0.3.3", "@types/chai": "^4.3.4", "@types/chai-as-promised": "^7.1.5", diff --git a/patches/@railgun-community+engine+9.5.2.patch b/patches/@railgun-community+engine+9.5.2.patch deleted file mode 100644 index 8a5e179..0000000 --- a/patches/@railgun-community+engine+9.5.2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/node_modules/@railgun-community/engine/dist/contracts/railgun-smart-wallet/V2/railgun-smart-wallet.js b/node_modules/@railgun-community/engine/dist/contracts/railgun-smart-wallet/V2/railgun-smart-wallet.js -index 62590aa..09eb89e 100644 ---- a/node_modules/@railgun-community/engine/dist/contracts/railgun-smart-wallet/V2/railgun-smart-wallet.js -+++ b/node_modules/@railgun-community/engine/dist/contracts/railgun-smart-wallet/V2/railgun-smart-wallet.js -@@ -264,6 +264,8 @@ class RailgunSmartWalletContract extends events_1.default { - * @param latestBlock - block to scan to - */ - async getHistoricalEvents(initialStartBlock, latestBlock, getNextStartBlockFromValidMerkletree, eventsCommitmentListener, eventsNullifierListener, eventsUnshieldListener, setLastSyncedBlock) { -+ // Cookbook does not need event scanning. -+ return; - const engineV3StartBlockNumber = RailgunSmartWalletContract.getEngineV2StartBlockNumber(this.chain); - const engineV3ShieldEventUpdate030923BlockNumber = RailgunSmartWalletContract.getEngineV2ShieldEventUpdate030923BlockNumber(this.chain); - // TODO: Possible data integrity issue in using commitment block numbers. -diff --git a/node_modules/@railgun-community/engine/dist/poi/poi.js b/node_modules/@railgun-community/engine/dist/poi/poi.js -index c140949..b5932c4 100644 ---- a/node_modules/@railgun-community/engine/dist/poi/poi.js -+++ b/node_modules/@railgun-community/engine/dist/poi/poi.js -@@ -229,6 +229,7 @@ class POI { - } - static isActiveForChain(chain) { - try { -+ return false; - return this.nodeInterface.isActive(chain); - } - catch (err) { -@@ -236,6 +237,7 @@ class POI { - } - } - static isRequiredForChain(chain) { -+ return false; - return this.nodeInterface.isRequired(chain); - } - static async getSpendableBalanceBuckets(chain) { diff --git a/patches/@railgun-community+engine+9.5.1.patch b/patches/@railgun-community+engine+9.6.0.patch similarity index 95% rename from patches/@railgun-community+engine+9.5.1.patch rename to patches/@railgun-community+engine+9.6.0.patch index 8a5e179..846fe00 100644 --- a/patches/@railgun-community+engine+9.5.1.patch +++ b/patches/@railgun-community+engine+9.6.0.patch @@ -12,10 +12,10 @@ index 62590aa..09eb89e 100644 const engineV3ShieldEventUpdate030923BlockNumber = RailgunSmartWalletContract.getEngineV2ShieldEventUpdate030923BlockNumber(this.chain); // TODO: Possible data integrity issue in using commitment block numbers. diff --git a/node_modules/@railgun-community/engine/dist/poi/poi.js b/node_modules/@railgun-community/engine/dist/poi/poi.js -index c140949..b5932c4 100644 +index 2c99f02..f55e738 100644 --- a/node_modules/@railgun-community/engine/dist/poi/poi.js +++ b/node_modules/@railgun-community/engine/dist/poi/poi.js -@@ -229,6 +229,7 @@ class POI { +@@ -233,6 +233,7 @@ class POI { } static isActiveForChain(chain) { try { @@ -23,7 +23,7 @@ index c140949..b5932c4 100644 return this.nodeInterface.isActive(chain); } catch (err) { -@@ -236,6 +237,7 @@ class POI { +@@ -240,6 +241,7 @@ class POI { } } static isRequiredForChain(chain) { diff --git a/patches/@railgun-community+wallet+10.8.3.patch b/patches/@railgun-community+wallet+10.8.3.patch deleted file mode 100644 index d1e932f..0000000 --- a/patches/@railgun-community+wallet+10.8.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/node_modules/@railgun-community/wallet/dist/services/railgun/core/load-provider.js b/node_modules/@railgun-community/wallet/dist/services/railgun/core/load-provider.js -index 9fd5143..8ae2e53 100644 ---- a/node_modules/@railgun-community/wallet/dist/services/railgun/core/load-provider.js -+++ b/node_modules/@railgun-community/wallet/dist/services/railgun/core/load-provider.js -@@ -44,9 +44,6 @@ const loadProviderForNetwork = async (chain, networkName, fallbackProviderJsonCo - throw new Error(`Could not find Relay Adapt contract for network: ${publicName}`); - } - const engine = (0, engine_1.getEngine)(); -- if (!engine.isPOINode && (0, shared_models_1.isDefined)(poi) && !wallet_poi_1.WalletPOI.started) { -- throw new Error('This network requires Proof Of Innocence. Pass "poiNodeURL" to startRailgunEngine to initialize POI before loading this provider.'); -- } - const deploymentBlocks = { - [shared_models_1.TXIDVersion.V2_PoseidonMerkle]: deploymentBlock ?? 0, - [shared_models_1.TXIDVersion.V3_PoseidonMerkle]: deploymentBlockPoseidonMerkleAccumulatorV3 ?? 0, diff --git a/patches/@railgun-community+wallet+10.8.1.patch b/patches/@railgun-community+wallet+10.9.0.patch similarity index 100% rename from patches/@railgun-community+wallet+10.8.1.patch rename to patches/@railgun-community+wallet+10.9.0.patch diff --git a/yarn.lock b/yarn.lock index 97a4069..79b05dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2367,10 +2367,10 @@ resolved "https://registry.yarnpkg.com/@railgun-community/curve25519-scalarmult-wasm/-/curve25519-scalarmult-wasm-0.1.5.tgz#edb5e40a8f1fdb7f7e0de1d04e8badabe41cb2a8" integrity sha512-Cur8uM/IdNW3WzUwdPloDG1CF0rpSBDWq2yGXJMZ7IMeBGdc4Jj0h9tnNMFRZ35ZuCVVbZ3yClmqSa4PsbpdGQ== -"@railgun-community/engine@9.5.2": - version "9.5.2" - resolved "https://registry.yarnpkg.com/@railgun-community/engine/-/engine-9.5.2.tgz#b450843563518deccb576191f1e409f41ebb41dc" - integrity sha512-2+ZVTonSy4uIbbgi/lFTTWcC5vW/Cuz47WRtjvZ77oerSqyEO5R6+3EjBAmfiO5Mz+2NTh13+7DRp3Wtwl8TiQ== +"@railgun-community/engine@^9.6.0": + version "9.6.0" + resolved "https://registry.yarnpkg.com/@railgun-community/engine/-/engine-9.6.0.tgz#c2d2f07bd37dce7c95f65ab827131e4c1fdc0683" + integrity sha512-dFMhO8i+hxFIr/u0gtaVKV0C3SRaM6bHccfIzzJ/nAWQOK5gPI/h6cgkw0ICjycDUy8ZSkism19jWsIuIBJVwg== dependencies: "@noble/ciphers" "^0.4.0" "@noble/ed25519" "^1.7.1" @@ -2402,15 +2402,15 @@ resolved "https://registry.yarnpkg.com/@railgun-community/poseidon-hash-wasm/-/poseidon-hash-wasm-1.0.1.tgz#bfd3b3f915391a59486d8c9d632069f029e152d6" integrity sha512-zDAbMu095ZjMqsKIoyOnuKR4Zofnqqx4eTCtnA6qYglnexX5cadxItvJa3ozhDDTmFkDGAidDssQ7Pzl3wwLDA== -"@railgun-community/shared-models@8.0.1", "@railgun-community/shared-models@^8.0.1": +"@railgun-community/shared-models@^8.0.1": version "8.0.1" resolved "https://registry.yarnpkg.com/@railgun-community/shared-models/-/shared-models-8.0.1.tgz#185a74f9fa60b7da74de7afde583926efc52b180" integrity sha512-g5Gt3j2O8XAMoJ+SzxvzyuB/KioFXXOs+2T0wxFQS5ebXB52e+HFBZ5UFVlORCbHteaAwLiURRcR2W8hOBUuoA== -"@railgun-community/wallet@^10.8.3": - version "10.8.3" - resolved "https://registry.yarnpkg.com/@railgun-community/wallet/-/wallet-10.8.3.tgz#0e85c4f57bdecd5bdbd74377833b5120d30fff4f" - integrity sha512-rfDoEyG1TiHQl/xhWJ43CSW70eiezvGO7++Qwydt9Jhfqk6H/zq6cklX0rofSFznTCYvaJiqyMltQTxEmZXkwQ== +"@railgun-community/wallet@^10.9.0": + version "10.9.0" + resolved "https://registry.yarnpkg.com/@railgun-community/wallet/-/wallet-10.9.0.tgz#60061855c37cf74a045ba8a718312520ee36475d" + integrity sha512-y2ncKCWkG3rWSYysBzXzPsTQvKMGE2lCFVwCgKjS3JnkZAHiKRYWjWrcMw1mSrFYmNjTO1/loYO4qALGz09cbg== dependencies: "@graphql-mesh/cache-localforage" "^0.7.20" "@graphql-mesh/cross-helpers" "^0.3.4" @@ -2423,8 +2423,8 @@ "@graphql-mesh/types" "^0.91.14" "@graphql-mesh/utils" "^0.43.22" "@noble/ed25519" "^1.7.1" - "@railgun-community/engine" "9.5.2" - "@railgun-community/shared-models" "8.0.1" + "@railgun-community/engine" "^9.6.0" + "@railgun-community/shared-models" "^8.0.1" "@whatwg-node/fetch" "^0.8.4" assert "2.0.0" axios "1.7.2"